[svnbook] r5355 committed - branches/1.8/zh/book/ch03-advanced-topics.xml

[wuzhouhui at users.sourceforge.net]

Revision: 5355
          http://sourceforge.net/p/svnbook/source/5355
Author:   wuzhouhui
Date:     2017-07-12 12:54:04 +0000 (Wed, 12 Jul 2017)
Log Message:
-----------
Branch 1.8/zh: translation of chapter 3 in progress

Modified Paths:
--------------
    branches/1.8/zh/book/ch03-advanced-topics.xml

Modified: branches/1.8/zh/book/ch03-advanced-topics.xml
===================================================================
--- branches/1.8/zh/book/ch03-advanced-topics.xml	2017-07-12 12:21:23 UTC (rev 5354)
+++ branches/1.8/zh/book/ch03-advanced-topics.xml	2017-07-12 12:54:04 UTC (rev 5355)
@@ -2032,11 +2032,16 @@
       <command>svnlook proplist</command> 按照类似的方法使用选项
       <option>--show-inherited-props</option>.</para>
 
+    <!--
       <para>Let's look at an example of how this works. The following
         recursive propget on the root of our working copy finds that the
         <literal>svn:auto-props</literal> property is set on both the target
         of the subcommand and one of its subdirectories <filename>site
         </filename>:</para>
+    -->
+        <para>现在来看一个例子. 在工作副本的根目录递归地调用 <command>propget
+            </command>, 发现子命令的目标路径及其中的一个子目录 <filename>site
+        </filename> 都设置了属性 <literal>svn:auto-props</literal>:</para>
 
         <informalexample>
           <screen>
@@ -2053,6 +2058,7 @@
 </screen>
         </informalexample>
 
+    <!--
       <para>If we were to instead make the target of the subcommand the
         subdirectory <filename>site</filename>, then using the <option>
         -show-inherited-props</option> option, we find that the <literal>
@@ -2059,6 +2065,11 @@
         svn:auto-props</literal> property is set on the target <emphasis>
         and</emphasis> its parent.  The parent's properties are called out
         as "inherited":</para>
+    -->
+      <para>如果我们把子目录 <filename>site</filename> 作为子命令的目标路径,
+        然后使用选项 <option>--show-inherited-props</option>, 我们将会看到属性
+        <literal>svn:auto-props</literal> 存在于目标路径 <emphasis>和</emphasis>
+        它的父路径上, 父路径的属性是 <quote>被继承的</quote>:</para>
 
         <informalexample>
           <screen>
@@ -2076,6 +2087,7 @@
 </screen>
         </informalexample>
 
+    <!--
       <para>In the prior examples the root of the working copy
         corresponds to the root of the repository, but properties can
         also be inherited from outside the working copy when this is
@@ -2082,6 +2094,10 @@
         not the case.  Let's checkout the <filename>site</filename>
         directory from the prior example, making it the root of our
         working copy:</para>
+    -->
+      <para>在上一个例子里, 工作副本的根目录对应仓库的根目录, 但即使没有这种
+        对应, 属性也可以从工作副本的外面继承. 现在检出上一个例子的
+        <filename>site</filename> 目录, 使它成为工作副本的根目录:</para>
 
         <informalexample>
           <screen>
@@ -2100,10 +2116,15 @@
 </screen>
         </informalexample>
 
+    <!--
       <para>Now when we check for inherited properties on a working copy
         path we can see that one property is inherited from a working
         copy parent and one from a repository parent representing a
         location "above" the root of the working copy:</para>
+    -->
+      <para>当我们在一条工作副本路径上检查继承的属性时将会看到, 一个属性继承
+        自工作副本里的父目录, 一个属性继承自仓库里的父路径, 该路径在工作副本
+        的根目录的 <quote>上层</quote>:</para>
 
         <informalexample>
           <screen>