[svnbook commit] r3151 - trunk/src/en/book
fitz
noreply at red-bean.com
Mon Jun 16 22:58:53 CDT 2008
Author: fitz
Date: Mon Jun 16 22:58:52 2008
New Revision: 3151
Log:
Several things in Chapter 9, thanks to a great tech review from Karl
Heinz Marbaise (khmarbaise at gmx.de):
- Fix typo
- Add abbrev for --limit
- Remove unnecessary abbrev for --revision in --record-only doc
* src/en/book/ch09-reference.xml: Fixes.
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 Mon Jun 16 22:58:52 2008
@@ -56,7 +56,7 @@
<replaceable>ACTION</replaceable></term>
<listitem>
<para>Specify action for automatic conflict resolution.
- Possible actions are (<literal>postpone</literal>,
+ Possible actions are <literal>postpone</literal>,
<literal>base</literal>, <literal>mine-full</literal>,
<literal>theirs-full</literal>, <literal>edit</literal>, and
<literal>launch.</literal></para>
@@ -300,7 +300,7 @@
</varlistentry>
<varlistentry>
- <term><option>--limit</option>
+ <term><option>--limit</option> (<option>-l</option>)
<replaceable>NUM</replaceable></term>
<listitem>
<para>Show only the first <replaceable>NUM</replaceable>
@@ -457,7 +457,7 @@
<term><option>--record-only</option></term>
<listitem>
<para>Mark revisions as merged (for use with
- <option>--revision</option> (<option>-r</option>)</para>
+ <option>--revision</option>)</para>
</listitem>
</varlistentry>
More information about the svnbook-dev
mailing list