[svnbook] r5838 committed - branches/1.8/zh/book/ch07-customizing-svn.xml

[wuzhouhui at users.sourceforge.net]

Revision: 5838
          http://sourceforge.net/p/svnbook/source/5838
Author:   wuzhouhui
Date:     2018-12-02 02:48:08 +0000 (Sun, 02 Dec 2018)
Log Message:
-----------
1.8/zh: translation of chapter 7 in progress

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

Modified: branches/1.8/zh/book/ch07-customizing-svn.xml
===================================================================
--- branches/1.8/zh/book/ch07-customizing-svn.xml	2018-12-01 03:12:23 UTC (rev 5837)
+++ branches/1.8/zh/book/ch07-customizing-svn.xml	2018-12-02 02:48:08 UTC (rev 5838)
@@ -219,13 +219,22 @@
 
     <!-- =============================================================== -->
     <sect2 id="svn.advanced.confarea.windows-registry">
+      <!--
       <title>Configuration and the Windows Registry</title>
+      -->
+      <title>配置与 Windows 系统注册表</title>
 
       <para>
         <indexterm>
           <primary>runtime configuration</primary>
           <secondary>Windows Registry</secondary>
-        </indexterm>In addition to the usual INI-based configuration
+        </indexterm>
+        除了通常的基于 INI 格式的配置文件, 在 Windows 平台上, Subversion 还
+        可以使用系统注册表存放配置选项. 选项的名字和值与 INI 文件相同,
+        <quote>文件/节</quote> 的层次结构仍然保留了下来, 不过是以另一种形式
+        呈现—文件与节变成了注册表键树的层次.</para>
+      <!--
+        In addition to the usual INI-based configuration
         area, Subversion clients running on Windows platforms may also
         use the Windows Registry to hold the configuration data.  The
         option names and their values are the same as in the INI
@@ -233,7 +242,9 @@
         as well, though addressed in a slightly different
         fashion—in this schema, files and sections are just
         levels in the Registry key tree.</para>
+      -->
 
+      <!--
       <para>Subversion looks for system-wide configuration values
         under the
         <literal>HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion</literal>
@@ -243,7 +254,17 @@
         <literal>HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion\Config\Miscellany\global-ignores</literal>.
         Per-user configuration values should be stored under
         <literal>HKEY_CURRENT_USER\Software\Tigris.org\Subversion</literal>.</para>
+      -->
+      <para>Subversion 在注册表的
+        <literal>HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion</literal>
+        里搜索全局配置, 例如选项 <literal>global-ignores</literal> 在文件
+        <filename>config</filename> 里的位置是在 <literal>miscellany</literal>
+        节内, 对应的注册表位置是
+        <literal>HKEY_LOCAL_MACHINE\Software\Tigris.org\Subversion\Config\Miscellany\global-ignores</literal>.
+        每用户的配置在
+        <literal>HKEY_CURRENT_USER\Software\Tigris.org\Subversion</literal>.</para>
 
+      <!--
       <para>Registry-based configuration options are parsed
         <emphasis>before</emphasis> their file-based counterparts, so
         they are overridden by values found in the configuration files.  In
@@ -250,22 +271,42 @@
         other words, Subversion looks for configuration information in
         the following locations on a Windows system; lower-numbered
         locations take precedence over higher-numbered locations:</para>
+      -->
+      <para>基于注册表的配置在基于文件的配置 <emphasis>之前</emphasis> 被读取,
+        因此配置文件将会覆盖注册表的配置. 换句话说, 在 Windows 系统中,
+        Subversion 会在下面这些位置搜索配置信息, 编号小的位置的配置将会覆盖
+        编号大的配置:</para>
       
       <orderedlist>
         <listitem>
+      <!--
           <para>Command-line options</para>
+      -->
+          <para>命令行选项</para>
         </listitem>
         <listitem>
+      <!--
           <para>The per-user INI files</para>
+      -->
+          <para>每用户的 INI 文件</para>
         </listitem>
         <listitem>
+      <!--
           <para>The per-user Registry values</para>
+      -->
+          <para>每用户的系统注册表</para>
         </listitem>
         <listitem>
+      <!--
           <para>The system-wide INI files</para>
+      -->
+          <para>全局的 INI 文件</para>
         </listitem>
         <listitem>
+      <!--
           <para>The system-wide Registry values</para>
+      -->
+          <para>全局的系统注册表</para>
         </listitem>
       </orderedlist>