[svnbook] r5841 committed - branches/1.8/zh/book/ch07-customizing-svn.xml

[wuzhouhui at users.sourceforge.net]

Revision: 5841
          http://sourceforge.net/p/svnbook/source/5841
Author:   wuzhouhui
Date:     2018-12-04 13:40:13 +0000 (Tue, 04 Dec 2018)
Log Message:
-----------
1.8/zh: translation of chapter 7 in progress

Modified Paths:
--------------
    branches/1.8/zh/book/ch07-customizing-svn.xml

Modified: branches/1.8/zh/book/ch07-customizing-svn.xml
===================================================================
--- branches/1.8/zh/book/ch07-customizing-svn.xml	2018-12-02 13:23:45 UTC (rev 5840)
+++ branches/1.8/zh/book/ch07-customizing-svn.xml	2018-12-04 13:40:13 UTC (rev 5841)
@@ -544,6 +544,7 @@
           <varlistentry>
             <term><literal>diff-cmd</literal></term>
             <listitem>
+      <!--
               <para>This specifies the absolute path of a differencing
                 program, used when Subversion generates
                 <quote>diff</quote> output (such as when using the
@@ -553,12 +554,21 @@
                 perform this task using an external program.  See
                 <xref linkend="svn.advanced.externaldifftools"/> for
                 more details on using such programs.</para>
+      -->
+              <para>指定差异比较工具的绝对路径, Subversion 在生成
+                <quote>差异</quote> 输出时 (例如执行命令 <command>svn
+                  diff</command>) 将会用到该工具. 默认情况下, Subversion
+                使用的是自己内部的差异比较库函数来生成差异输出—设置该
+                选项将导致 Subversion 转而使用外部差异比较工具. 关于如何使用
+                外部差异比较工具的更多信息, 见
+                <xref linkend="svn.advanced.externaldifftools"/>.</para>
             </listitem>
           </varlistentry>
           <varlistentry>
             <term><literal>diff-extensions</literal></term>
             <listitem>
-              <para>Like the <option>--extensions</option>
+      <!--
+              <para>Like the <option>- -extensions</option>
                 (<option>-x</option>) command-line option, this
                 specifies additional options passed to the file
                 content differencing engine.  The set of meaningful
@@ -568,11 +578,18 @@
                 of <userinput>svn help diff</userinput> for details.
                 The default value for this option
                 is <literal>-u</literal>.</para>
+      -->
+              <para>就像命令行选项 <option>--extensions</option>
+                (<option>-x</option>), 该选项向差异比较引擎 (内部的或外部的)
+                传递额外的参数. 选项的有效值与 Subversion 所使用的差异比较
+                引擎有关, 更多的细节见 <userinput>svn help diff</userinput>
+                的输出. 该选项的默认值是 <literal>-u</literal>.</para>
             </listitem>
           </varlistentry>
           <varlistentry>
             <term><literal>diff3-cmd</literal></term>
             <listitem>
+      <!--
               <para>This specifies the absolute path of a three-way
                 differencing program.  Subversion uses this program to
                 merge changes made by the user with those received
@@ -582,16 +599,29 @@
                 external program.  See <xref
                 linkend="svn.advanced.externaldifftools"/> for more
                 details on using such programs.</para>
+      -->
+              <para>该选项指定三路差异比较工具的绝对路径. 当工作副本从服务器
+                接收更新时, Subversion 将使用该工具把服务器上的更新合并到本地.
+                默认情况下 Subversion 使用的是自己内部的差异比较库函数来合并
+                更新—设置该选项将导致 Subversion 转而使用外部工具来完成
+                合并. 关于如何使用三路差异比较工具的更多信息, 见
+                <xref linkend="svn.advanced.externaldifftools"/>.</para>
             </listitem>
           </varlistentry>
           <varlistentry>
             <term><literal>diff3-has-program-arg</literal></term>
             <listitem>
+      <!--
               <para>This flag should be set to <literal>true</literal>
                 if the program specified by the
                 <literal>diff3-cmd</literal> option accepts a
-                <option>--diff-program</option> command-line
+                <option>- -diff-program</option> command-line
                 parameter.</para>
+      -->
+              <para>如果由选项 <literal>diff3-cmd</literal> 指定的程序支持
+                命令行参数 <option>--diff-program</option>, 那么就应该把
+                <literal>diff3-has-program-arg</literal> 设置成
+                <literal>true</literal>.</para>
             </listitem>
           </varlistentry>
           <varlistentry>