[svnbook] r5892 committed - branches/1.8/zh/book/ref-svn.xml

[wuzhouhui at users.sourceforge.net]

Revision: 5892
          http://sourceforge.net/p/svnbook/source/5892
Author:   wuzhouhui
Date:     2019-02-27 04:56:48 +0000 (Wed, 27 Feb 2019)
Log Message:
-----------
1.8/zh: translation of svn reference in progress

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

Modified: branches/1.8/zh/book/ref-svn.xml
===================================================================
--- branches/1.8/zh/book/ref-svn.xml	2019-02-26 13:41:34 UTC (rev 5891)
+++ branches/1.8/zh/book/ref-svn.xml	2019-02-27 04:56:48 UTC (rev 5892)
@@ -1066,19 +1066,32 @@
       <varlistentry id="svn.ref.svn.sw.non_recursive">
         <term><option>--non-recursive</option> (<option>-N</option>)</term>
         <listitem>
+      <!--
           <para><emphasis>Deprecated</emphasis>.  Stops a subcommand
             from recursing into subdirectories.  Most subcommands
             recurse by default, but some do not.  Users should avoid
-            this option and use the more precise <option>--depth</option>
+            this option and use the more precise <option>- -depth</option>
             option instead.  For most subcommands, specifying
-            <option>--non-recursive</option> produces behavior which
+            <option>- -non-recursive</option> produces behavior which
             is the same as if you'd specified
-            <option>--depth=files</option>, but there are exceptions:
+            <option>- -depth=files</option>, but there are exceptions:
             non-recursive <command>svn status</command> operates at the
             <literal>immediates</literal> depth, and the  non-recursive
             forms of <command>svn revert</command>,
             <command>svn add</command>, and <command>svn commit</command>
             operate at an <literal>empty</literal> depth.</para>
+      -->
+          <para><emphasis>不再推荐使用该选项</emphasis>. 禁止子命令递归执行到
+            子目录内. 大多数子命令默认都会递归执行到子目录内, 但有些不会. 用户
+            应该不再使用该选项, 而使用更精确的 <option>--depth</option>, 对于
+            大多数子命令而言, 选项 <option>--non-interactive</option> 等价于
+            <option>--depth=files</option>, 但是对于 <command>svn
+              status</command> 来说, 与 <option>--non-recursive</option> 等价
+            的选项是 <option>--depth=immediates</option>, 对于
+            <command>svn revert</command>, <command>svn add</command> 和
+            <command>svn commit</command> 来说, 等价的选项则是
+            <option>--depth=empty</option>.</para>
+
         </listitem>
       </varlistentry>
 
@@ -1085,8 +1098,11 @@
       <varlistentry id="svn.ref.svn.sw.notice_ancestry">
         <term><option>--notice-ancestry</option></term>
         <listitem>
+      <!--
           <para>Pays attention to ancestry when calculating 
             differences.</para>
+      -->
+          <para>在计算差异时要考虑祖先.</para>
         </listitem>
       </varlistentry>
 
@@ -1093,8 +1109,12 @@
       <varlistentry id="svn.ref.svn.sw.old">
         <term><option>--old</option> <replaceable>ARG</replaceable></term>
         <listitem>
+      <!--
           <para>Uses <replaceable>ARG</replaceable> as the older
             target (for use with <command>svn diff</command>).</para>
+      -->
+          <para>使用 <replaceable>ARG</replaceable> 作为较旧的目标 (与
+            <command>svn diff</command> 配合使用).</para>
         </listitem>
       </varlistentry>