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

[wuzhouhui at users.sourceforge.net]

Revision: 5382
          http://sourceforge.net/p/svnbook/source/5382
Author:   wuzhouhui
Date:     2017-08-02 12:46:14 +0000 (Wed, 02 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-07-31 13:27:10 UTC (rev 5381)
+++ branches/1.8/zh/book/ch03-advanced-topics.xml	2017-08-02 12:46:14 UTC (rev 5382)
@@ -4080,6 +4080,7 @@
         而不仅仅是目录的直接子文件.</para>
 
     <note>
+    <!--
       <para>Subversion's support for ignorable file patterns extends
         only to the one-time process of adding unversioned
         files and directories to version control.  Once an object is
@@ -4089,11 +4090,21 @@
         simply because that file's name matches an ignore
         pattern—Subversion <emphasis>always</emphasis> notices
         all of its versioned objects.</para>
+    -->
+      <para>Subversion 的忽略文件名模式只对未被版本控制的文件和目录起作用, 一旦
+        文件和目录被版本控制了, 忽略文件名模式就不会对它们产生影响. 也就是说,
+        不要以为某个被版本控制的文件名符合忽略模式, 在你提交时, Subversion 就
+        会忽略它的修改—Subversion <emphasis>总是</emphasis> 会注意到所有
+        的被版本控制的对象.</para>
     </note>
 
     <sidebar>
+    <!--
       <title>Ignore Patterns for CVS Users</title>
+    -->
+      <title>CVS 用户的忽略模式</title>
     
+    <!--
       <para>The Subversion <literal>svn:ignore</literal> property is
         very similar in syntax and function to the CVS
         <filename>.cvsignore</filename> file.  In fact, if you are
@@ -4101,6 +4112,12 @@
         migrate the ignore patterns by using the
         <filename>.cvsignore</filename> file as input to the
         <command>svn propset</command> command:</para>
+    -->
+      <para>Subversion 的 <literal>svn:ignore</literal> 属性的语法和功能非常
+        像 CVS <filename>.cvsignore</filename> 文件. 实际上, 如果用户想从 CVS
+        的工作副本迁移到 Subversion 的工作副本中, 为了迁移忽略模式, 可以把
+        <filename>.cvsignore</filename> 作为命令 <command>svn propset</command>
+        的输出:</para>
    
       <informalexample>
         <screen>
@@ -4110,6 +4127,7 @@
 </screen>
       </informalexample>
     
+    <!--
       <para>There are, however, some differences in the ways that CVS
         and Subversion handle ignore patterns.  The two systems use
         the ignore patterns at some different times, and there are
@@ -4117,9 +4135,15 @@
         Also, Subversion does not recognize the use of the
         <literal>!</literal> pattern as a reset back to having no
         ignore patterns at all.</para>
+    -->
+      <para>但是, CVS 和 Subversion 在忽略模式的使用方式上有所区别. 两个系统
+        使用忽略模式的时机不同, 在忽略模式的作用目标上也有细微的差别, 另外,
+        Subversion 无法识别 <literal>!</literal> 的特殊意义, 对 CVS 来说,
+        <literal>!</literal> 表示不要忽略这种模式.</para>
 
     </sidebar>
 
+    <!--
     <para>The ignore patterns in the <literal>global-ignores</literal>
       runtime configuration option tend to be more a
       matter of personal taste<footnote><para>Despite being a matter
@@ -4135,9 +4159,20 @@
       on the <literal>svn:ignore</literal> and
       <literal>svn:global-ignores</literal> properies and their
       uses.</para>
+    -->
+    <para>运行时配置选项 <literal>global-ignores</literal> 里的忽略模式更
+      倾向于个人化 <footnote><para>抛开个人化不说, 如果用户没有显式地设置
+          <literal>global-ignores</literal>, Subversion 就会使用默认值,
+          见 <xref linkend="svn.advanced.confarea.opts.config"/></para>
+      </footnote>, 并且和工作副本相比, 更贴近用户的个人需求. 所以, 本节的余
+      下部分主要关注 <literal>svn:ignore</literal>, <literal>
+        svn:global-ignores</literal> 及如何使用它们.</para>
 
+    <!--
     <para>Say you have the following output from <command>svn
       status</command>:</para>
+    -->
+  <para>假设某个工作副本的 <command>svn status</command> 输出是:</para>
 
     <informalexample>
       <screen>