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

wuzhouhui at users.sourceforge.net wuzhouhui at users.sourceforge.net
Wed Dec 5 07:33:01 CST 2018


Revision: 5842
          http://sourceforge.net/p/svnbook/source/5842
Author:   wuzhouhui
Date:     2018-12-05 13:32:57 +0000 (Wed, 05 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-04 13:40:13 UTC (rev 5841)
+++ branches/1.8/zh/book/ch07-customizing-svn.xml	2018-12-05 13:32:57 UTC (rev 5842)
@@ -627,6 +627,7 @@
           <varlistentry>
             <term><literal>editor-cmd</literal></term>
             <listitem>
+      <!--
               <para>This specifies the program Subversion will use to
                 query the user for certain types of textual metadata
                 or when interactively resolving conflicts.  See
@@ -633,16 +634,26 @@
                 <xref linkend="svn.advanced.externaleditors"/> for
                 more details on using external text editors with
                 Subversion.</para>
+      -->
+              <para>指定文本编辑器程序. 当 Subversion 向用户请求输入文本,
+                或者交互式地解决冲突时将会用到该程序. 关于 Subversion 使用
+                外部编辑器的更多信息, 见 <xref
+                  linkend="svn.advanced.externaleditors"/>.</para>
             </listitem>
           </varlistentry>
           <varlistentry>
             <term><literal>merge-tool-cmd</literal></term>
             <listitem>
+      <!--
               <para>This specifies the program that Subversion will
                 use to perform three-way merge operations on your
                 versioned files.  See <xref
                 linkend="svn.advanced.externaldifftools"/> for more
                 details on using such programs.</para>
+      -->
+              <para>指定一个合并工具, 用于 Subversion 执行三路合并操作.
+                关于这种工具的更多信息, 见 <xref
+                  linkend="svn.advanced.externaldifftools"/>.</para>
             </listitem>
           </varlistentry>
         </variablelist>




More information about the svnbook-dev mailing list