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

[wuzhouhui at users.sourceforge.net]

Revision: 5837
          http://sourceforge.net/p/svnbook/source/5837
Author:   wuzhouhui
Date:     2018-12-01 03:12:23 +0000 (Sat, 01 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-11-29 06:52:26 UTC (rev 5836)
+++ branches/1.8/zh/book/ch07-customizing-svn.xml	2018-12-01 03:12:23 UTC (rev 5837)
@@ -124,7 +124,17 @@
         <indexterm>
           <primary>runtime configuration</primary>
           <secondary>system-wide</secondary>
-        </indexterm>In addition to the per-user configuration area, Subversion
+        </indexterm>
+        除了每用户配置区域, Subversion 还会考虑全局配置区域, 全局配置区域
+        允许管理员为所有用户设定一个默认配置. 注意, 每用户配置区域的设置会
+        覆盖全局配置区域的设置, 而 <command>svn</command> 的命令行参数则会
+        覆盖每用户配置区域的设置. 对于类 Unix 系统, 全局配置区域在
+        <filename>/etc/subversion</filename>; 对于 Windows 系统, 全局配置区域
+        在 <filename>Application Data</filename> (同样, 它的确切位置由系统注
+        表决定) <filename>Subversion</filename> 目录内. 与每用户配置区域不
+        同的是 <command>svn</command> 不会在启动时尝试创建全局配置区域.</para>
+      <!--
+        In addition to the per-user configuration area, Subversion
         also recognizes the existence of a system-wide configuration
         area.  This gives system administrators the ability to
         establish defaults for all users on a given machine.  Note
@@ -141,7 +151,9 @@
         specified by the Windows Registry).  Unlike the per-user
         case, the <command>svn</command> program does not attempt
         to create the system-wide configuration area.</para>
+      -->
 
+      <!--
       <para>The per-user configuration area currently contains three
         files—two configuration files (<filename>config</filename> and
         <filename>servers</filename>), and a <filename>README.txt</filename> 
@@ -155,21 +167,41 @@
         any time you wish to have the default configuration settings
         restored, you can simply remove (or rename) your configuration
         directory and then run some innocuous <command>svn</command>
-        command, such as <userinput>svn --version</userinput>.  A new
+        command, such as <userinput>svn - -version</userinput>.  A new
         configuration directory with the default contents will be
         created.</para>
+      -->
+      <para>每用户配置区域包含了三个文件—两个配置文件
+        (<filename>config</filename> 和 <filename>servers</filename>) 和
+        一个 <filename>README.txt</filename>, <filename>README.txt</filename>
+        介绍了 INI 格式的语法. 每用户配置区域被创建时, 配置文件包含了
+        Subversion 所支持的选项的默认值, 大多数内容都被分组注释, 注释描述了
+        选项值将会如何影响 Subversion 的行为. 为了修改配置, 用户只需要用文本
+        编辑器打开配置文件, 然后修改选项的值. 如果你想恢复每用户配置区域的
+        默认配置, 只需要删除 (或移动) 每用户配置区域的目录, 然后随便执行一
+        个无害的 <command>svn</command> 命令, 例如
+        <userinput>svn --version</userinput>, 此时就会重新生成包含了默认配置
+        的每用户配置区域.</para>
 
       <para>
         <indexterm>
           <primary>runtime configuration</primary>
           <secondary>command-line override</secondary>
-        </indexterm>Subversion also allows you to override individual
+        </indexterm>
+        Subversion 还允许用户通过命令行选项 <option>--config-option</option>
+        修改个别的配置选项, 如果用户想要临时修改配置, 那么这个选项就会很有用.
+        关于 <option>--config-option</option> 的详细用法, 见
+        <xref linkend="svn.ref.svn.sw"/>.</para>
+      <!--
+        Subversion also allows you to override individual
         configuration option values at the command line via
-        the <option>--config-option</option> option, which is
+        the <option>- -config-option</option> option, which is
         especially useful if you need to make a (very) temporary
         change in behavior.  For more about this option's proper
         usage, see <xref linkend="svn.ref.svn.sw"/>.</para>
+      -->
 
+      <!--
       <para>The per-user configuration area also contains a cache of
         authentication data.  The <filename>auth</filename> directory
         holds a set of subdirectories that contain pieces of cached
@@ -177,6 +209,11 @@
         authentication methods.  This directory is created in such a
         way that only the user herself has permission to read its
         contents.</para>
+      -->
+      <para>每用户配置区域还包含了认证数据的缓存. 目录
+        <filename>auth</filename> 内含有多个子目录, 这些子目录包含了
+        Subversion 支持的不同认证方式所需的缓存信息. 目录
+        <filename>auth</filename> 的权限配置仅允许用户进行访问.</para>
 
     </sect2>