[svnbook] r5495 committed - branches/1.6/en

cmpilato at users.sourceforge.net cmpilato at users.sourceforge.net
Tue Nov 14 12:20:39 CST 2017


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

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

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

Index: branches/1.6/en
===================================================================
--- branches/1.6/en	2017-11-14 18:19:33 UTC (rev 5494)
+++ branches/1.6/en	2017-11-14 18:20:39 UTC (rev 5495)

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
\ 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
\ No newline at end of property
Modified: branches/1.6/en/book/ch04-branching-and-merging.xml
===================================================================
--- branches/1.6/en/book/ch04-branching-and-merging.xml	2017-11-14 18:19:33 UTC (rev 5494)
+++ branches/1.6/en/book/ch04-branching-and-merging.xml	2017-11-14 18:20:39 UTC (rev 5495)
@@ -2219,7 +2219,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 significant risk that pre-1.5 Subversion




More information about the svnbook-dev mailing list