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

[cmpilato]

Author: cmpilato
Date: Mon Jul 28 22:19:28 2008
New Revision: 3218

Log:
* src/en/book/ch04-branching-and-merging.xml
  s/Collabnet/CollabNet/.  Patch by Hyrum K. Wright.


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	Mon Jul 28 22:19:28 2008
@@ -2033,12 +2033,12 @@
         concepts; they'll eventually fade into the background as pesky
         implementation details.  All that said, if you enjoy this sort
         of thing, you can get a fantastic overview in a paper posted
-        at Collabnet's website: <ulink
+        at CollabNet's website: <ulink
         url="http://www.collab.net/community/subversion/articles/merge-info.html"
         >http://www.collab.net/community/subversion/articles/merge-info.html</ulink>.</para>
 
       <para>For now, if you want to steer clear of bugs and odd
-        behaviors in automatic merging, the Collabnet article
+        behaviors in automatic merging, the CollabNet article
         recommends you stick to these simple best practices:</para>
 
       <itemizedlist>