[svnbook] r5494 committed - branches/1.7/en

[cmpilato at users.sourceforge.net]

Revision: 5494
          http://sourceforge.net/p/svnbook/source/5494
Author:   cmpilato
Date:     2017-11-14 18:19:33 +0000 (Tue, 14 Nov 2017)
Log Message:
-----------
Merge from ^/trunk/en r5493.

Modified Paths:
--------------
    branches/1.7/en/book/ch04-branching-and-merging.xml

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

Index: branches/1.7/en
===================================================================
--- branches/1.7/en	2017-11-14 18:12:05 UTC (rev 5493)
+++ branches/1.7/en	2017-11-14 18:19:33 UTC (rev 5494)

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
\ 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
\ No newline at end of property
Modified: branches/1.7/en/book/ch04-branching-and-merging.xml
===================================================================
--- branches/1.7/en/book/ch04-branching-and-merging.xml	2017-11-14 18:12:05 UTC (rev 5493)
+++ branches/1.7/en/book/ch04-branching-and-merging.xml	2017-11-14 18:19:33 UTC (rev 5494)
@@ -2819,7 +2819,7 @@
 
     <!-- =============================================================== -->
     <sect2 id="svn.branchmerge.advanced.pre1.5clients">
-      <title>Blocking Merge-Unaware Clients</title>
+      <title>Preventing Naïve Clients from Committing Merges</title>
 
       <para>If you've just upgraded your server to Subversion 1.5 or
         later, there's a risk that pre-1.5 Subversion