[svnbook] r5698 committed - branches/1.7/en

[cmpilato at users.sourceforge.net]

Revision: 5698
          http://sourceforge.net/p/svnbook/source/5698
Author:   cmpilato
Date:     2018-05-24 20:47:02 +0000 (Thu, 24 May 2018)
Log Message:
-----------
Merge from ^/trunk/en r5697.

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-24 20:46:16 UTC (rev 5697)
+++ branches/1.7/en	2018-05-24 20:47:02 UTC (rev 5698)

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,5684
\ 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,5697
\ 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-24 20:46:16 UTC (rev 5697)
+++ branches/1.7/en/book/ch06-server-configuration.xml	2018-05-24 20:47:02 UTC (rev 5698)
@@ -1187,8 +1187,7 @@
           how to configure the server appropriately for each.  For the
           purposes of this discussion, we'll just demonstrate a simple
           example of configuring the DIGEST-MD5 mechanism.  For
-          example, if your <filename>subversion.conf</filename>
-          (or <filename>svn.conf</filename>) file contains the
+          example, if your <filename>svn.conf</filename> file contains the
           following:</para>
 
         <informalexample>