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

[wuzhouhui at users.sourceforge.net]

Revision: 5359
          http://sourceforge.net/p/svnbook/source/5359
Author:   wuzhouhui
Date:     2017-07-15 14:38:20 +0000 (Sat, 15 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-15 09:38:13 UTC (rev 5358)
+++ branches/1.8/zh/book/ch03-advanced-topics.xml	2017-07-15 14:38:20 UTC (rev 5359)
@@ -2375,6 +2375,7 @@
         <xref linkend="svn.advanced.props.special.mime-type" />).</para>
 
       <note>
+    <!--
         <para>UTF-16 is commonly used to encode files whose semantic
           content is textual in nature, but the encoding itself makes
           heavy use of bytes which are outside the typical ASCII
@@ -2383,8 +2384,14 @@
           users who desire line-based differencing and merging,
           keyword substitution, and other behaviors for those
           files.</para>
+    -->
+        <para>有很多文件使用的是 UTF-16 编码, 虽然在语义上文件的内容是纯文本
+          的, 但是 UTF-16 使用的字节在 ASCII 字符的范围之外, 因此 Subversion
+          更倾向于把它们分类成二进制文件, 用户在给这些文件进行差异比较, 合并
+          和关键词替换时也会因此遇到一些小麻烦.</para>
       </note>
 
+    <!--
       <para>Subversion also provides, via its runtime configuration
         system (see <xref linkend="svn.advanced.confarea" />), a more
         flexible automatic property setting feature that allows you
@@ -2404,6 +2411,20 @@
         set to <literal>Id</literal>.  For more details on automatic
         property support in the runtime configuration see <xref
         linkend="svn.advanced.confarea.opts.config"/>.</para>
+    -->
+    <para>借助运行时配置系统 (见 <xref linkend="svn.advanced.confarea"/>),
+      Subversion 提供了一种更加灵活的自动属性设置功能, 它允许用户创建文件名
+      模式到属性名和值的映射. 再说一次, 这些映射会影响
+      <command>svn add</command> 和 <command>svn import</command>, 除了会
+      覆盖由 Subversion 判断出的默认 MIME 类型, 还可能添加额外的属性或自定义
+      属性. 例如, 用户想创建一个映射, 这个映射是说每次添加一个 JPEG 文件时
+      —文件的名字符合模式 <literal>*.jpg</literal>—Subversion
+      都应该自动地把这个文件的 <literal>svn:mime-type</literal> 属性设置为
+      <literal>image/jpeg</literal>. 又或者说匹配模式 <literal>*.cpp</literal>
+      的文件都应该把 <literal>svn:eol-style</literal> 设置成 <literal>native
+        </literal>, 把 <literal>svn:keywords</literal> 设置成 <literal>Id
+      </literal>. 关于运行时配置如果支持自动属性的更多细节, 见
+      <xref linkend="svn.advanced.confarea.opts.config"/>.</para>
 
 
       <para>While automatic property support via the runtime