[svnbook] r6046 committed - branches/1.8/zh

[wuzhouhui at users.sourceforge.net]

Revision: 6046
          http://sourceforge.net/p/svnbook/source/6046
Author:   wuzhouhui
Date:     2021-09-25 01:56:59 +0000 (Sat, 25 Sep 2021)
Log Message:
-----------
1.8/zh: merge changes from trunk

Modified Paths:
--------------
    branches/1.8/zh/Makefile
    branches/1.8/zh/README
    branches/1.8/zh/book/appb-svn-for-cvs-users.xml
    branches/1.8/zh/book/ch06-server-configuration.xml

Property Changed:
----------------
    branches/1.8/zh/

Index: branches/1.8/zh
===================================================================
--- branches/1.8/zh	2021-09-21 08:01:40 UTC (rev 6045)
+++ branches/1.8/zh	2021-09-25 01:56:59 UTC (rev 6046)

Property changes on: branches/1.8/zh
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk/en:5303-6025
\ No newline at end of property
+/trunk/en:5303-6045
\ No newline at end of property
Modified: branches/1.8/zh/Makefile
===================================================================
--- branches/1.8/zh/Makefile	2021-09-21 08:01:40 UTC (rev 6045)
+++ branches/1.8/zh/Makefile	2021-09-25 01:56:59 UTC (rev 6046)
@@ -1,5 +1,15 @@
 export FOP_CFG=-c book/fop.xconf
 include ../tools/Makefile.base
+
+# Customization hooks for xsltproc options
+
+# Customization for the html target
 HTML_XSLTPROC_OPTS = --stringparam l10n.gentext.language zh_cn
+
+# Customization for the pdf target
+# Examples
+# Custom page size: --stringparam page.height 9in --stringparam page.width 6.4in
+# Paper type A4: --stringparam paper.type A4
 FO_XSLTPROC_OPTS = --param fop1.extensions 1 --stringparam l10n.gentext.language zh_cn
+
 L10N_REVISION = r

Modified: branches/1.8/zh/README
===================================================================
--- branches/1.8/zh/README	2021-09-21 08:01:40 UTC (rev 6045)
+++ branches/1.8/zh/README	2021-09-25 01:56:59 UTC (rev 6046)
@@ -132,6 +132,9 @@
 
      Poof!  You now have PNG support.
 
+   * If you want to customize the output, for example change the paper
+     type, check the FO_XSLTPROC_OPTS variable in en/Makefile.
+     
    * From this directory (en, or another language directory), do 
 
         $ make all-pdf

Modified: branches/1.8/zh/book/appb-svn-for-cvs-users.xml
===================================================================
--- branches/1.8/zh/book/appb-svn-for-cvs-users.xml	2021-09-21 08:01:40 UTC (rev 6045)
+++ branches/1.8/zh/book/appb-svn-for-cvs-users.xml	2021-09-25 01:56:59 UTC (rev 6046)
@@ -891,7 +891,7 @@
 
       <!--
     <para>The most popular (and mature) conversion tool is
-      cvs2svn (<ulink url="http://cvs2svn.tigris.org/"/>), a Python
+      cvs2svn (<ulink url="https://github.com/mhagger/cvs2svn/"/>), a Python
       program originally created by members of Subversion's own
       development community.  This tool is meant to run exactly once:
       it scans your CVS repository multiple times and attempts to

Modified: branches/1.8/zh/book/ch06-server-configuration.xml
===================================================================
--- branches/1.8/zh/book/ch06-server-configuration.xml	2021-09-21 08:01:40 UTC (rev 6045)
+++ branches/1.8/zh/book/ch06-server-configuration.xml	2021-09-25 01:56:59 UTC (rev 6046)
@@ -6103,7 +6103,7 @@
             of the mechanisms that one might employ to accomplish this
             replication fall short in one way or
             another<footnote><para><ulink
-            url="http://subversion.tigris.org/issues/show_bug.cgi?id=3457"
+            url="https://subversion.apache.org/issue3457"
             /> tracks these problems.</para></footnote>.  Many teams
             don't use Subversion's locking features at all, so this
             may be a nonissue for you.  Sadly, for those teams which