[svnbook] r5217 committed - www/bin/build-and-deploy.py

[cmpilato at users.sourceforge.net]

Revision: 5217
          http://sourceforge.net/p/svnbook/source/5217
Author:   cmpilato
Date:     2016-10-26 14:15:29 +0000 (Wed, 26 Oct 2016)
Log Message:
-----------
Followup to r5209, fixing a bug in the read of 'www_root_href' and updating
the sample configuration.

Revision Links:
--------------
    http://sourceforge.net/p/svnbook/source/5209

Modified Paths:
--------------
    www/bin/build-and-deploy.py

Modified: www/bin/build-and-deploy.py
===================================================================
--- www/bin/build-and-deploy.py	2016-10-26 06:43:13 UTC (rev 5216)
+++ www/bin/build-and-deploy.py	2016-10-26 14:15:29 UTC (rev 5217)
@@ -34,7 +34,18 @@
 #    # Sender name for build reports.
 #    report_sender_name =
 #
+#    # Directory of the web-accessible results of this build.  Build
+#    # artifacts are placed under this directory in a hierarchy that
+#    # includes the locale and version of the translation.  Defaults
+#    # to "www", which means that build results are placed in
+#    # "www/<locale>/<version>".
+#    www_root =
 #
+#    # URL that maps to the 'www_root' location (used only when
+#    # reporting build errors to point to the error log file).
+#    # Defaults to "http://svnbook.red-bean.com"
+#    www_root_href =
+#
 #    [BUILD-NAME1]
 #    
 #    # Locale code ("en", "de", ...).  Required.
@@ -47,11 +58,6 @@
 #    # "branches/<version>/<locale>".
 #    src_path =
 #
-#    # Path in which the build deliverables should be dropped.  Defaults
-#    # to "www/<locale>/<version>".
-#    # Caution : this script will erase the path before dropping files
-#    dst_path = PUBLISH-PATH
-#
 #    # Comma-delimited list of output formats to use.  Defaults to
 #    # "html, html-chunk, pdf".
 #    formats = FORMAT1[, FORMAT2 ...]
@@ -424,7 +430,7 @@
     mail_from_name = get_option(cfg, 'general', 'report_sender',
                                 'SvnBook Build Daemon')
     www_root = get_option(cfg, 'general', 'www_root', 'www')
-    www_root_href = get_option(cfg, 'general', 'www_root',
+    www_root_href = get_option(cfg, 'general', 'www_root_href',
                                'http://svnbook.red-bean.com/')
     for section in cfg.sections():
         if section == 'general':