[svnbook commit] r3212 - trunk/src/en/book

cmpilato noreply at red-bean.com
Fri Jul 25 14:09:38 CDT 2008


Author: cmpilato
Date: Fri Jul 25 14:09:38 2008
New Revision: 3212

Log:
Minor wording tweaks.

Modified:
   trunk/src/en/book/ch04-branching-and-merging.xml

Modified: trunk/src/en/book/ch04-branching-and-merging.xml
==============================================================================
--- trunk/src/en/book/ch04-branching-and-merging.xml	(original)
+++ trunk/src/en/book/ch04-branching-and-merging.xml	Fri Jul 25 14:09:38 2008
@@ -796,10 +796,10 @@
         <xref linkend="svn.branchmerge.basicmerging.resurrect"/>).</para>
 
       <para>At the time of writing (Subversion 1.5), once
-        a <option>--reintegrate</option> is done from branch to trunk,
+        a <option>--reintegrate</option> merge is done from branch to trunk,
         the branch is no longer usable for further work.  It's not
         able to correctly absorb new trunk changes, nor can it be
-        properly integrated to trunk again.  For this reason, if you
+        properly reintegrated to trunk again.  For this reason, if you
         want to keep working on your feature branch, we recommend
         destroying it and then re-creating it from the trunk:</para>
 




More information about the svnbook-dev mailing list