[svnbook] r5686 committed - branches/1.6/en

[cmpilato at users.sourceforge.net]

Revision: 5686
          http://sourceforge.net/p/svnbook/source/5686
Author:   cmpilato
Date:     2018-05-16 13:11:46 +0000 (Wed, 16 May 2018)
Log Message:
-----------
Merge from ^/trunk/en r5684.

Modified Paths:
--------------
    branches/1.6/en/book/ch06-server-configuration.xml

Property Changed:
----------------
    branches/1.6/en/

Index: branches/1.6/en
===================================================================
--- branches/1.6/en	2018-05-16 13:10:24 UTC (rev 5685)
+++ branches/1.6/en	2018-05-16 13:11:46 UTC (rev 5686)

Property changes on: branches/1.6/en
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk/en:3996,3999,4011,4024,4036-4037,4039,4043,4046,4049,4052,4054,4060,4062,4066,4070-4073,4076,4078-4079,4081-4089,4092,4095,4097,4099,4103,4105,4107,4117-4118,4121,4136-4137,4192-4193,4231,4261,4296,4299,4305,4335,4352,4364,4742,4958,5043,5089,5165,5285,5290,5391,5493
\ No newline at end of property
+/trunk/en:3996,3999,4011,4024,4036-4037,4039,4043,4046,4049,4052,4054,4060,4062,4066,4070-4073,4076,4078-4079,4081-4089,4092,4095,4097,4099,4103,4105,4107,4117-4118,4121,4136-4137,4192-4193,4231,4261,4296,4299,4305,4335,4352,4364,4742,4958,5043,5089,5165,5285,5290,5391,5493,5684
\ No newline at end of property
Modified: branches/1.6/en/book/ch06-server-configuration.xml
===================================================================
--- branches/1.6/en/book/ch06-server-configuration.xml	2018-05-16 13:10:24 UTC (rev 5685)
+++ branches/1.6/en/book/ch06-server-configuration.xml	2018-05-16 13:11:46 UTC (rev 5686)
@@ -926,15 +926,19 @@
 
       <para>As you've already guessed, a repository's
         <filename>svnserve.conf</filename> file is the central
-        mechanism for controlling authentication and authorization
-        policies.  The file has the same format as other configuration
-        files (see <xref linkend="svn.advanced.confarea"/>):
-        section names are marked by square brackets
-        (<literal>[</literal> and <literal>]</literal>), comments
-        begin with hashes (<literal>#</literal>), and each section
-        contains specific variables that can be set (<literal>variable
-        = value</literal>).  Let's walk through these files and learn
-        how to use them.</para>
+        mechanism for controlling access to the repository.  When used
+        in conjunction with other supplemental files described in this
+        section, this configuration file offers an administrator a
+        complete solution for governing user authentication and
+        authorization policies.  Each of the files we'll discuss uses
+        the format common to other configuration files (see
+        <xref linkend="svn.advanced.confarea"/>): section names are
+        marked by square brackets (<literal>[</literal>
+        and <literal>]</literal>), comments begin with hashes
+        (<literal>#</literal>), and each section contains specific
+        variables that can be set (<literal>variable =
+        value</literal>).  Let's walk through these files now and
+        learn how to use them.</para>
 
       <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
       <sect3 id="svn.serverconfig.svnserve.auth.users">