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

[wuzhouhui at users.sourceforge.net]

Revision: 5687
          http://sourceforge.net/p/svnbook/source/5687
Author:   wuzhouhui
Date:     2018-05-16 13:46:24 +0000 (Wed, 16 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-16 13:11:46 UTC (rev 5686)
+++ branches/1.8/zh/book/ch06-server-configuration.xml	2018-05-16 13:46:24 UTC (rev 5687)
@@ -1653,6 +1653,7 @@
       使用该用户名作为已认证的用户. 更多的相关内容, 见
       <xref linkend="svn.serverconfig.svnserve.sshauth"/>.</para>
 
+      <!--
       <para>As you've already guessed, a repository's
         <filename>svnserve.conf</filename> file is the central
         mechanism for controlling authentication and authorization
@@ -1664,16 +1665,33 @@
         contains specific variables that can be set (<literal>variable
         = value</literal>).  Let's walk through these files and learn
         how to use them.</para>
+      -->
+      <para>读者可能已经猜到了, 仓库里的 <filename>svnserve.conf</filename>
+        正是控制认证和授权策略的关键. 该文件的格式和其他配置文件相同 (见
+        <xref linkend="svn.advanced.confarea"/>): 节名用一对方括号标记
+        (<literal>[</literal> 和 <literal>]</literal>), 注释由井号
+        (<literal>#</literal>) 开始, 每一节都包含了可被赋值的特定变量
+        (<literal>variable = value</literal>), 下面介绍各个变量并学习如何
+        使用它们.</para>
 
       <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
       <sect3 id="svn.serverconfig.svnserve.auth.users">
+      <!--
+           ### TODO realm
         <title>Create a users file and realm</title>
+      -->
+        <title>创建一个用户文件和领域</title>
 
+      <!--
         <para>For now, the <literal>[general]</literal> section of
           <filename>svnserve.conf</filename> has all the variables you
           need.  Begin by changing the values of those variables:
           choose a name for a file that will contain your usernames
           and passwords and choose an authentication realm:</para>
+      -->
+        <para>现在, 你所需要的所有变量都在 <filename>svnserve.conf</filename>
+          的 <literal>[general]</literal> 部分. 先从修改这些变量的值开始:
+          为存放用户名和密码的文件选择一个名字; 选择一个认证领域:</para>
 
         <informalexample>
           <programlisting>
@@ -1683,6 +1701,7 @@
 </programlisting>
         </informalexample>
 
+      <!--
         <para>The <literal>realm</literal> is a name that you define.
           It tells clients which sort of <quote>authentication
           namespace</quote> they're connecting to; the Subversion
@@ -1693,6 +1712,15 @@
           <literal>password-db</literal> variable points to a separate
           file that contains a list of usernames and passwords, using
           the same familiar format.  For example:</para>
+      -->
+        <para><literal>realm</literal> 的值是你自己定义的一个名字, 它告诉
+          客户端它们正在连接的是哪一个 <quote>认证空间</quote>; Subversion
+          客户端在认证的提示信息里显示 <literal>realm</literal> 的值, 并
+          用它 (再加上服务器的主机名和端口号) 作为缓存在磁盘上的证书的键
+          (见 <xref linkend="svn.serverconfig.netmodel.credcache"/>).
+          变量 <literal>password-db</literal> 指向一个单独的文件, 它包含了
+          一连串的用户名和密码, 文件的格式和
+          <filename>svnserve.conf</filename> 是相同的, 例如:</para>
 
         <informalexample>
           <programlisting>