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

[cmpilato]

Author: cmpilato
Date: Mon Jun 16 08:07:22 2008
New Revision: 3142

Log:
* src/en/book/ch04-branching-and-merging.xml
  s/typcial/typical/, and rewrap a paragraph.

Suggested by: Arfrever Frehtes Taifersar Arahesis <arfrever.fta {at} gmail.com>


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 Jun 16 08:07:22 2008
@@ -2003,13 +2003,14 @@
       <para>We've chosen not to cover these detailed topics in this
         book for a couple of reasons.  First, the level of detail is
         absolutely overwhelming for a typical user.  Second, as
-        Subversion continues to improve, we feel that a typcial
-        user <emphasis>shouldn't</emphasis> have to understand these
+        Subversion continues to improve, we feel that a typical user
+        <emphasis>shouldn't</emphasis> have to understand these
         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 url="http://www.collab.net/community/subversion/articles/merge-info.html">http://www.collab.net/community/subversion/articles/merge-info.html</ulink>.</para>
+        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