[svnbook] r5690 committed - branches/1.8/zh/book/ ch06-server-configuration.xml

[wuzhouhui at users.sourceforge.net]

Revision: 5690
          http://sourceforge.net/p/svnbook/source/5690
Author:   wuzhouhui
Date:     2018-05-18 14:44:37 +0000 (Fri, 18 May 2018)
Log Message:
-----------
1.8/zh: translation of chapter 6 in progress

Modified Paths:
--------------
    branches/1.8/zh/book/ch06-server-configuration.xml

Modified: branches/1.8/zh/book/ch06-server-configuration.xml
===================================================================
--- branches/1.8/zh/book/ch06-server-configuration.xml	2018-05-17 13:56:50 UTC (rev 5689)
+++ branches/1.8/zh/book/ch06-server-configuration.xml	2018-05-18 14:44:37 UTC (rev 5690)
@@ -1823,6 +1823,7 @@
 </programlisting>
         </informalexample>
 
+      <!--
         <para>The server process understands not only
           these <quote>blanket</quote> access controls to the
           repository, but also finer-grained access restrictions
@@ -1831,6 +1832,11 @@
           a file containing more detailed rules, and then set
           the <literal>authz-db</literal> variable to point to
           it:</para>
+      -->
+        <para>服务器进程不仅可以理解施加到仓库上的全局的访问控制, 还能理解
+          施加到文件或目录上的更细粒度的访问控制. 为了利用后者, 管理员创建一
+          个文件, 文件包含了更细致的规则, 然后让变量
+          <literal>authz-db</literal> 指向该文件:</para>
 
         <informalexample>
           <programlisting>
@@ -1843,6 +1849,7 @@
 </programlisting>
         </informalexample>
 
+      <!--
         <para>We discuss the syntax of the <filename>authzfile</filename> file
           in detail later in this chapter, in
           <xref linkend="svn.serverconfig.pathbasedauthz"/>.  Note
@@ -1851,6 +1858,13 @@
           and <literal>auth-access</literal> variables;  if all the
           variables are defined at once, <emphasis>all</emphasis>
           of the rules must be satisfied before access is allowed.</para>
+      -->
+        <para>我们在 <xref linkend="svn.serverconfig.pathbasedauthz"/> 详细
+          介绍 <filename>authzfile</filename> 的语法. 注意, 变量
+          <literal>authz-db</literal> 与 <literal>anon-access</literal>,
+          <literal>auth-access</literal> 并非互不相容, 如果同时定义了这三个
+          变量, 则只有在 <emphasis>所有</emphasis> 规则都被满足的情况下,
+          才能允许访问.</para>
 
       </sect3>
     </sect2>
@@ -1857,7 +1871,10 @@
 
     <!-- =============================================================== -->
     <sect2 id="svn.serverconfig.svnserve.sasl">
+      <!--
       <title>Using svnserve with SASL</title>
+      -->
+      <title>svnserve 使用 SASL</title>
 
       <para>For many teams, the built-in CRAM-MD5 authentication is
         all they need from <command>svnserve</command>.  However, if