[svnbook] r5685 committed - branches/1.7/en

[cmpilato at users.sourceforge.net]

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

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

Property Changed:
----------------
    branches/1.7/en/

Index: branches/1.7/en
===================================================================
--- branches/1.7/en	2018-05-16 13:09:30 UTC (rev 5684)
+++ branches/1.7/en	2018-05-16 13:10:24 UTC (rev 5685)

Property changes on: branches/1.7/en
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk/en:4202,4211,4216,4226,4231,4251,4261,4267-4270,4273,4296,4299,4305,4316,4320,4328,4335,4352,4364,4368,4370-4372,4374-4375,4378,4380,4382,4384,4386-4387,4390,4392-4393,4463,4516,4742,4958,5041,5043,5082,5089,5094,5165,5285,5288,5290,5365-5366,5391,5493,5572-5574
\ No newline at end of property
+/trunk/en:4202,4211,4216,4226,4231,4251,4261,4267-4270,4273,4296,4299,4305,4316,4320,4328,4335,4352,4364,4368,4370-4372,4374-4375,4378,4380,4382,4384,4386-4387,4390,4392-4393,4463,4516,4742,4958,5041,5043,5082,5089,5094,5165,5285,5288,5290,5365-5366,5391,5493,5572-5574,5684
\ No newline at end of property
Modified: branches/1.7/en/book/ch06-server-configuration.xml
===================================================================
--- branches/1.7/en/book/ch06-server-configuration.xml	2018-05-16 13:09:30 UTC (rev 5684)
+++ branches/1.7/en/book/ch06-server-configuration.xml	2018-05-16 13:10:24 UTC (rev 5685)
@@ -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">