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

[cmpilato]

Author: cmpilato
Date: Tue Jul  5 23:52:52 2005
New Revision: 1519

Modified:
   trunk/src/en/book/ch09.xml
Log:
* src/en/book/ch09.xml
  (svn merge): Fix a mismatched reference to the "second form" of 'svn
    merge's usage where the third form was the one being described.
    Noticed by Yves Bergeron <yves.bergeron at shq.gouv.qc.ca>.


Modified: trunk/src/en/book/ch09.xml
==============================================================================
--- trunk/src/en/book/ch09.xml	(original)
+++ trunk/src/en/book/ch09.xml	Tue Jul  5 23:52:52 2005
@@ -2284,13 +2284,14 @@
         <refsect1>
           <title>Description</title>
 
-          <para>In the first form, the source URLs are specified at
-            revisions <replaceable>N</replaceable> and
+          <para>In the first and second forms, the source paths (URLs
+            in the first form, working copy paths in the second) are
+            specified at revisions <replaceable>N</replaceable> and
             <replaceable>M</replaceable>.  These are the two sources
             to be compared.  The revisions default to
             <literal>HEAD</literal> if omitted.</para>
 
-          <para>In the second form, <replaceable>SOURCE</replaceable>
+          <para>In the third form, <replaceable>SOURCE</replaceable>
             can be a URL or working copy item, in which case the
             corresponding URL is used.  This URL, at revisions
             <replaceable>N</replaceable> and