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

[fitz]

Author: fitz
Date: Sat Jun 21 00:32:03 2008
New Revision: 3176

Log:
One more thing in Chapter 9, thanks to Karl Heinz Marbaise
(khmarbaise at gmx.de):

* src/en/book/ch09-reference.xml: Fix svn mergeinfo docs.


Modified:
   trunk/src/en/book/ch09-reference.xml

Modified: trunk/src/en/book/ch09-reference.xml
==============================================================================
--- trunk/src/en/book/ch09-reference.xml	(original)
+++ trunk/src/en/book/ch09-reference.xml	Sat Jun 21 00:32:03 2008
@@ -583,6 +583,15 @@
         </varlistentry>
 
         <varlistentry>
+          <term><option>--show-revs</option> <replaceable>ARG</replaceable></term>
+          <listitem>
+            <para>Used to make <command>svn mergeinfo</command>
+              display either <literal>merged</literal>
+              or <literal>eligible</literal> revisions.</para>
+          </listitem>
+        </varlistentry>
+        
+        <varlistentry>
           <term><option>--show-updates</option> (<option>-u</option>)</term>
           <listitem>
             <para>Causes the client to display information about
@@ -3295,12 +3304,21 @@
         </refnamediv>
         <refsect1>
           <title>Synopsis</title>
-          <programlisting>svn mergeinfo [TARGET[@REV]...]</programlisting>
+          <programlisting>svn mergeinfo SOURCE_URL[@REV] [TARGET[@REV]...]</programlisting>
 
         </refsect1>
         <refsect1>
           <title>Description</title>
-          <para>Query merge-related information.</para>
+          <para>Query information related to merges (or potential
+            merges) between <replaceable>SOURCE-URL</replaceable> and
+            <replaceable>TARGET</replaceable>.  If
+            the <option>--show-revs</option> option is not provided,
+            display revisions which have been merged
+            from <replaceable>SOURCE-URL</replaceable>
+            to <replaceable>TARGET</replaceable>.  Otherwise, display
+            either <literal>merged</literal>
+            or <literal>eligible</literal> revisions as specified by
+            the <option>--show-revs</option> option.</para>
 
         </refsect1>
         <refsect1>