Log message:
[[[
Book: add missing entries in the "svn Switches" section; fix formatting.
* doc/book/book/ch06.xml
Fix some formatting: use of "<option>".
* doc/book/book/ch08.xml
Add missing entries in the "svn Switches" section.
Fix some formatting, including missing white space.
Fix some text: "Addition"->"Deletion", a misplaced ")", etc.
]]]
- Julian
Index: doc/book/book/ch06.xml
===================================================================
--- doc/book/book/ch06.xml (revision 6580)
+++ doc/book/book/ch06.xml (working copy)
@@ -414,8 +414,9 @@
<para>This specifies the program Subversion will use to
query the user for a log message during a commit
operation, such as when using <command>svn
- commit</command> without either the <option>--message
- (-m)</option> or <option>--file (-F)</option> options.
+ commit</command> without either the
+ <option>--message</option> (<option>-m</option>) or
+ <option>--file</option> (<option>-F</option>) options.
This program is also used with the <command>svn
propedit</command> command—a temporary file is
populated with the current value of the property the
@@ -633,7 +634,8 @@
have a multi-line textual, or even binary, property value, you
probably do not want to supply that value on the command-line.
So the <command>propset</command> subcommand takes a
- <option>--file (-F)</option> option for specifying the name of
+ <option>--file</option> (<option>-F</option>) option for
+ specifying the name of
a file which contains the new property value.</para>
<screen>
@@ -704,7 +706,7 @@
<para>There's even a variation of the
<command>proplist</command> command which will list both the
name and value of all of the properties. Simply supply the
- <option>--verbose (-v)</option> option.</para>
+ <option>--verbose</option> (<option>-v</option>) option.</para>
<screen>
$ svn proplist --verbose calc/button.c
Index: doc/book/book/ch08.xml
===================================================================
--- doc/book/book/ch08.xml (revision 6580)
+++ doc/book/book/ch08.xml (working copy)
@@ -51,9 +51,10 @@
<variablelist>
<varlistentry>
- <term><option>--diff-cmd</option> <replaceable>CMD</replaceable></term>
+ <term><option>--diff-cmd</option>
+ <replaceable>CMD</replaceable></term>
<listitem>
- <para>Specifies the diff command to use to show
+ <para>Specifies an external program to use to show
differences between files. When <command>svn
diff</command> is invoked, it uses Subversion's internal
diff engine, which provides unified diffs by default. If
@@ -65,6 +66,14 @@
</varlistentry>
<varlistentry>
+ <term><option>--diff3-cmd</option>
+ <replaceable>CMD</replaceable></term>
+ <listitem>
+ <para>Specifies an external program to use to merge files.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--dry-run</option></term>
<listitem>
<para>Goes through all the motions of running a command,
@@ -74,6 +83,15 @@
</varlistentry>
<varlistentry>
+ <term><option>--editor-cmd</option>
+ <replaceable>CMD</replaceable></term>
+ <listitem>
+ <para>Specifies an external program to use to edit a log message
+ or a property value.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--encoding</option> <replaceable>ENC</replaceable></term>
<listitem>
<para>Tells Subversion that your commit message is encoded
@@ -155,6 +173,13 @@
</varlistentry>
<varlistentry>
+ <term><option>--ignore-ancestry</option></term>
+ <listitem>
+ <para>Ignores ancestry when calculating differences.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--incremental</option></term>
<listitem>
<para>Prints output in a format suitable for
@@ -171,12 +196,20 @@
on the command line, following this switch. For
example:</para>
- <para><command>$ svn commit -m "Initial
- import."</command></para>
+ <screen>
+$ svn commit -m "Initial import."
+ </screen>
</listitem>
</varlistentry>
<varlistentry>
+ <term><option>--new</option> <replaceable>ARG</replaceable></term>
+ <listitem>
+ <para>Uses ARG as the newer target.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--no-auth-cache</option></term>
<listitem>
<para>Prevents caching of authentication information
@@ -231,8 +264,16 @@
</varlistentry>
<varlistentry>
- <term><option>--password</option><replaceable>PASS</replaceable></term>
+ <term><option>--old</option> <replaceable>ARG</replaceable></term>
<listitem>
+ <para>Uses ARG as the older target.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--password</option>
+ <replaceable>PASS</replaceable></term>
+ <listitem>
<para>Indicates that you are providing your password for
authentication on the command line—otherwise, if
it is needed, Subversion will prompt you for
@@ -331,7 +372,8 @@
</varlistentry>
<varlistentry>
- <term><option>--username</option><replaceable>NAME</replaceable></term>
+ <term><option>--username</option>
+ <replaceable>NAME</replaceable></term>
<listitem>
<para>Indicates that you are providing your username for
authentication on the command line—otherwise, if
@@ -341,7 +383,7 @@
</varlistentry>
<varlistentry>
- <term><option>--verbose</option></term>
+ <term><option>--verbose</option> (<option>-v</option>)</term>
<listitem>
<para>Requests that the client print out as much
information as it can while running any subcommand.
@@ -1801,7 +1843,7 @@
------------------------------------------------------------------------
rev 27: ...
- </screen>
+ </screen>
<para>The <option>--incremental</option> switch provides
similar output control when using the
@@ -2736,7 +2778,7 @@
<varlistentry>
<term>'D'</term>
<listitem>
- <para>Item is scheduled for Addition.</para>
+ <para>Item is scheduled for Deletion.</para>
</listitem>
</varlistentry>
@@ -2759,7 +2801,7 @@
<term>'I'</term>
<listitem>
<para>Item is being ignored (e.g. with the
- svn:ignore) property</para>
+ svn:ignore property)</para>
</listitem>
</varlistentry>
@@ -2910,7 +2952,7 @@
<para>The remaining fields are variable width and
delimited by spaces. The working revision is the next
field if the <option>--show-updates</option> or
- <option>--verbose</option>switches are passed.</para>
+ <option>--verbose</option> switches are passed.</para>
<para>If the <option>--verbose</option> switch is passed,
the last committed revision and last committed author
@@ -3854,7 +3896,7 @@
<!-- ================================================================= -->
<sect2 id="svn-ch-8-sect-3.2">
<title><command>svnlook</command> Subcommands</title>
-
+
<refentry>
<refnamediv>
<refname>svnlook author</refname>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 25 19:59:45 2003