gnucash-htdocs master: replace all "trunk" by REAME: master docs.phtml: nightly viewdoc.phtml: maint which is nightly built on code
Frank H.Ellenberger
fell at code.gnucash.org
Mon Feb 5 14:12:09 EST 2018
Updated via https://github.com/Gnucash/gnucash-htdocs/commit/e736e21d (commit)
from https://github.com/Gnucash/gnucash-htdocs/commit/b617bba6 (commit)
commit e736e21d6685a016da33ecc37861364ed58a1a14
Author: fell <frank.h.ellenberger at gmail.com>
Date: Mon Feb 5 20:12:05 2018 +0100
replace all "trunk" by
REAME: master
docs.phtml: nightly
viewdoc.phtml: maint which is nightly built on code
diff --git a/README b/README
index 59b7dc9..e983cec 100644
--- a/README
+++ b/README
@@ -123,7 +123,7 @@ Which will make all the known translations.
Publishing the website
----------------------
-Changes that are committed to 'trunk' are published automatically.
+Changes that are committed to 'master' are published automatically.
No other steps are required.
------------------------
@@ -140,5 +140,5 @@ To work in this beta environment, checkout the beta branch from svn:
svn checkout http://svn.gnucash.org/repo/htdocs/branches/beta htdocs-beta
WARNING: this branch is currently not kept in sync with trunk. So if you
- intend to experiment with the current conten in trunk, please ask
- one of the devs to merge the current trunk to beta first !
+ intend to experiment with the current content in master, please ask
+ one of the devs to merge the current master to beta first !
diff --git a/docs.phtml b/docs.phtml
index 63db374..648c986 100644
--- a/docs.phtml
+++ b/docs.phtml
@@ -288,7 +288,7 @@ if ($old_stable) { ?>
<tbody>
<tr class="doctr">
<td><?php echo T_("English");?> :</td><td>
- <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=C&doc=help">
+ <a href="<?=$top_dir;?>/viewdoc.phtml?rev=nightly&lang=C&doc=help">
<img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
<a href="http://code.gnucash.org/docs/C/gnucash-help.pdf">
<img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
@@ -299,7 +299,7 @@ if ($old_stable) { ?>
</td></tr>
<tr class="doctr">
<td><?php echo T_("German");?> :</td><td>
- <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=de&doc=help">
+ <a href="<?=$top_dir;?>/viewdoc.phtml?rev=nightly&lang=de&doc=help">
<img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
<a href="http://code.gnucash.org/docs/de/gnucash-help.pdf">
<img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
@@ -310,7 +310,7 @@ if ($old_stable) { ?>
</td></tr>
<tr class="doctr">
<td><?php echo T_("Italian");?> :</td><td>
- <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=it&doc=help">
+ <a href="<?=$top_dir;?>/viewdoc.phtml?rev=nightly&lang=it&doc=help">
<img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
<a href="http://code.gnucash.org/docs/it/gnucash-help.pdf">
<img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
@@ -321,7 +321,7 @@ if ($old_stable) { ?>
</td></tr>
<tr class="doctr">
<td><?php echo T_("Portuguese");?> :</td><td>
- <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=pt&doc=help">
+ <a href="<?=$top_dir;?>/viewdoc.phtml?rev=nightly&lang=pt&doc=help">
<img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
<a href="http://code.gnucash.org/docs/pt/gnucash-help.pdf">
<img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
@@ -338,7 +338,7 @@ if ($old_stable) { ?>
<tbody>
<tr class="doctr">
<td><?php echo T_("English");?> :</td><td>
- <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=C&doc=guide">
+ <a href="<?=$top_dir;?>/viewdoc.phtml?rev=nightly&lang=C&doc=guide">
<img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
<a href="http://code.gnucash.org/docs/C/gnucash-guide.pdf">
<img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
@@ -349,7 +349,7 @@ if ($old_stable) { ?>
</td></tr>
<tr class="doctr">
<td><?php echo T_("German");?> :</td><td>
- <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=de&doc=guide">
+ <a href="<?=$top_dir;?>/viewdoc.phtml?rev=nightly&lang=de&doc=guide">
<img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
<a href="http://code.gnucash.org/docs/de/gnucash-guide.pdf">
<img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
@@ -360,7 +360,7 @@ if ($old_stable) { ?>
</td></tr>
<tr class="doctr">
<td><?php echo T_("Italian");?> :</td><td>
- <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=it&doc=guide">
+ <a href="<?=$top_dir;?>/viewdoc.phtml?rev=nightly&lang=it&doc=guide">
<img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
<a href="http://code.gnucash.org/docs/it/gnucash-guide.pdf">
<img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
@@ -371,7 +371,7 @@ if ($old_stable) { ?>
</td></tr>
<tr class="doctr">
<td><?php echo T_("Japanese");?> :</td><td>
- <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=ja&doc=guide">
+ <a href="<?=$top_dir;?>/viewdoc.phtml?rev=nightly&lang=ja&doc=guide">
<img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
<a href="http://code.gnucash.org/docs/ja/gnucash-guide.pdf">
<img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
@@ -382,7 +382,7 @@ if ($old_stable) { ?>
</td></tr>
<tr class="doctr">
<td><?php echo T_("Portuguese");?> :</td><td>
- <a href="<?=$top_dir;?>/viewdoc.phtml?rev=trunk&lang=pt&doc=guide">
+ <a href="<?=$top_dir;?>/viewdoc.phtml?rev=nightly&lang=pt&doc=guide">
<img class="docicon" alt="online" title="<?php echo T_($online);?>" src="<?=$top_dir;?>/images/icons/online_logo.png" /></a> |
<a href="http://code.gnucash.org/docs/pt/gnucash-guide.pdf">
<img class="docicon" alt="pdf" title="<?php echo T_($pdf);?>" src="<?=$top_dir;?>/images/icons/pdf_logo.png" /></a> |
diff --git a/viewdoc.phtml b/viewdoc.phtml
index 1b3f088..2d86810 100644
--- a/viewdoc.phtml
+++ b/viewdoc.phtml
@@ -71,11 +71,11 @@ if (isset ($_GET["rev"])) {
case "current":
$showrev = $current_stable;
break;
- case "trunk":
- $showrev = "trunk";
+ case "maint":
+ $showrev = "maint";
break;
case "nightly":
- $showrev = "trunk";
+ $showrev = "maint";
break;
default: /* unknown version requested, will current stable by default */
$req_rev_ok = false;
@@ -89,7 +89,7 @@ if (isset ($_GET["rev"])) {
# First evaluate the nightly builds, they are located on a different server
# To avoid network traffic, the available languages are hard-coded here and should be
# updated if list of languages in which the documentation is available changes
-if ($showrev == "trunk") {
+if ($showrev == "maint") {
$basepath = "https://lists.gnucash.org/docs";
$trunk_langs = array ( $helpdoc => array( "C", "de", "it", "pt"),
$tcdoc => array( "C", "de", "it", "ja", "pt"));
Summary of changes:
README | 6 +++---
docs.phtml | 18 +++++++++---------
viewdoc.phtml | 8 ++++----
3 files changed, 16 insertions(+), 16 deletions(-)
More information about the gnucash-changes
mailing list