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

[wuzhouhui at users.sourceforge.net]

Revision: 5411
          http://sourceforge.net/p/svnbook/source/5411
Author:   wuzhouhui
Date:     2017-08-28 12:38:56 +0000 (Mon, 28 Aug 2017)
Log Message:
-----------
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-08-28 11:43:38 UTC (rev 5410)
+++ branches/1.8/zh/book/ch03-advanced-topics.xml	2017-08-28 12:38:56 UTC (rev 5411)
@@ -7029,6 +7029,7 @@
         svn propset</command>) 修改属性.</para>
     </tip>
 
+    <!--
     <para>Subversion releases prior to 1.5 honor an externals
       definition format that is a multiline table of subdirectories
       (relative to the versioned directory on which the property is
@@ -7035,6 +7036,10 @@
       set), optional revision flags, and fully qualified, absolute
       Subversion repository URLs.  An example of this might look as
       follows:</para>
+    -->
+    <para>Subversion 1.5 之前的外部定义的格式是一个多行表格, 每一行包括子
+      目录 (相对于设置了属性的目录), 可选的版本号标志, 以及一个完全限定的,
+      Subversion 仓库 URL 的绝对路径. 外部定义的一个例子是:</para>
 
     <informalexample>
       <screen>
@@ -7045,10 +7050,14 @@
 </screen>
     </informalexample>
 
+    <!--
     <para>When someone checks out a working copy of the
       <filename>calc</filename> directory referred to in the previous
       example, Subversion also continues to check out the items found
       in its externals definition.</para>
+    -->
+    <para>如果用户检出了目录 <filename>calc</filename>, Subversion 会继续检出
+      外部定义里的项目.</para>
 
     <informalexample>
       <screen>
@@ -7073,6 +7082,7 @@
 </screen>
     </informalexample>
 
+    <!--
     <para>As of Subversion 1.5, though, a new format of the
       <literal>svn:externals</literal> property is supported.
       Externals definitions are still multiline, but the order and
@@ -7086,6 +7096,14 @@
       format supports relative URLs and URLs that carry peg revisions.
       The previous example of an externals definition might, in
       Subversion 1.5, look like the following:</para>
+    -->
+    <para>从 Subversion 1.5 开始, <literal>svn:externals</literal> 开始支持一
+      种新的格式, 外部定义仍然是多行文本, 但某些信息的顺序与格式发生了变化.
+      新的语法更加贴近 <command>svn checkout</command> 的参数: 首先是可选的
+      版本号标志, 然后是外部仓库的 URL, 本地目录的相对路径. 注意, 这次我们没有
+      说 <quote>完全限制的, Subversion 仓库的 URL 的绝对路径</quote>, 这是因为
+      新的格式支持相对 URL 和带有挂勾版本号的 URL. 上面的例子在 Subversion 1.5
+      里的写法是:</para>
 
     <informalexample>
       <screen>
@@ -7096,9 +7114,13 @@
 </screen>
     </informalexample>
 
+    <!--
     <para>Or, making use of the peg revision syntax (which we describe
       in detail in <xref linkend="svn.advanced.pegrevs" />), it might
       appear as:</para>
+    -->
+    <para>带有挂勾版本号 (见 <xref linkend="svn.advanced.pegrevs" /> 的写法是:
+    </para>
 
     <informalexample>
       <screen>