[svnbook commit] r2844 - in trunk/src/en: . book
fitz
noreply at red-bean.com
Mon Aug 13 00:38:44 CDT 2007
Author: fitz
Date: Mon Aug 13 00:38:43 2007
New Revision: 2844
Log:
Remove all spurious uses of 'switch' where we meant 'option' (as in
cmdline options). This fixes issue #73.
* src/en/HACKING: Clarify our stance on option vs switch for --these
--things.
* src/en/book/ch00-preface.xml, src/en/book/ch09-reference.xml,
src/en/book/ch05-repository-admin.xml,
src/en/book/appb-svn-for-cvs-users.xml,
src/en/book/ch04-branching-and-merging.xml,
src/en/book/ch02-basic-usage.xml: s/switch/option/ where
appropriate.
Modified:
trunk/src/en/HACKING
trunk/src/en/book/appb-svn-for-cvs-users.xml
trunk/src/en/book/ch00-preface.xml
trunk/src/en/book/ch02-basic-usage.xml
trunk/src/en/book/ch04-branching-and-merging.xml
trunk/src/en/book/ch05-repository-admin.xml
trunk/src/en/book/ch09-reference.xml
Modified: trunk/src/en/HACKING
==============================================================================
--- trunk/src/en/HACKING (original)
+++ trunk/src/en/HACKING Mon Aug 13 00:38:43 2007
@@ -90,6 +90,9 @@
- Subcommand names: we always use long names of subcommands,
e.g. "checkout", not "co". This goes for both prose and examples.
+- Options, not switches: Those --blorg things are called options and
+ not switches. Don't ever call them switches.
+
- Option names:
- By default, identify an option by *both* its long and
@@ -137,7 +140,8 @@
<sect2 id="svn-ch-pi-sect-1.1">
<title>Cross-blather</title>
- <para>Cross-blather tends to create a hoopy pile of crandy. You
+ <para>Cross-blather tends to create a hoop
+ y pile of crandy. You
can avoid this by using the cross-blather avoid
command.</para>
Modified: trunk/src/en/book/appb-svn-for-cvs-users.xml
==============================================================================
--- trunk/src/en/book/appb-svn-for-cvs-users.xml (original)
+++ trunk/src/en/book/appb-svn-for-cvs-users.xml Mon Aug 13 00:38:43 2007
@@ -269,7 +269,7 @@
</screen>
<para>If you specify the <option>--show-updates</option>
- (<option>-u</option>) switch, a longer output format is
+ (<option>-u</option>) option, a longer output format is
used:</para>
<screen>
@@ -507,7 +507,7 @@
<para>As with CVS, Subversion still caches your credentials on
disk (in your <filename>~/.subversion/auth/</filename>
directory) unless you tell it not to by using the
- <option>--no-auth-cache</option> switch.</para>
+ <option>--no-auth-cache</option> option.</para>
<para>The exception to this behavior, however, is in the case of
accessing an <command>svnserve</command> server over an SSH
Modified: trunk/src/en/book/ch00-preface.xml
==============================================================================
--- trunk/src/en/book/ch00-preface.xml (original)
+++ trunk/src/en/book/ch00-preface.xml Mon Aug 13 00:38:43 2007
@@ -210,7 +210,7 @@
<varlistentry>
<term><command>Constant width</command></term>
<listitem>
- <para>Used for commands, command output, and switches</para>
+ <para>Used for commands, command output, and options</para>
</listitem>
</varlistentry>
Modified: trunk/src/en/book/ch02-basic-usage.xml
==============================================================================
--- trunk/src/en/book/ch02-basic-usage.xml (original)
+++ trunk/src/en/book/ch02-basic-usage.xml Mon Aug 13 00:38:43 2007
@@ -31,7 +31,7 @@
The Subversion command-line client is self-documenting—at
any time, a quick <command>svn help
<replaceable>SUBCOMMAND</replaceable></command> will describe
- the syntax, switches, and behavior of the subcommand.</para>
+ the syntax, options, and behavior of the subcommand.</para>
<screen>
$ svn help import
@@ -308,7 +308,7 @@
case-by-case basis.</para>
<para>To disable password caching for a particular one-time
- command, pass the <option >--no-auth-cache</option > switch on
+ command, pass the <option >--no-auth-cache</option > option on
the commandline. To permanently disable caching, you can add
the line <literal>store-passwords = no</literal> to your local
machine's Subversion configuration file. See <xref
@@ -340,7 +340,7 @@
<sect1 id="svn.tour.cycle">
<title>Basic Work Cycle</title>
- <para>Subversion has numerous features, switches, bells and
+ <para>Subversion has numerous features, options, bells and
whistles, but on a day-to-day basis, odds are that you will only
use a few of them. In this section we'll run through the most
common things that you might find yourself doing with Subversion
@@ -774,7 +774,7 @@
</screen>
<para><command>svn status</command> also has a
- <option>--verbose (-v)</option> switch, which will show you
+ <option>--verbose (-v)</option> option, which will show you
the status of <emphasis>every</emphasis> item in your
working copy, even if it has not been changed:</para>
@@ -913,7 +913,7 @@
unified diff format, by default. If you want diff output in
a different format, specify an external diff program using
<option>--diff-cmd</option> and pass any flags you'd like to
- it using the <option>--extensions (-x)</option> switch. For
+ it using the <option>--extensions (-x)</option> option. For
example, to see local differences in file
<filename>foo.c</filename> in context output format while
ignoring case differences, you might run <command>svn diff
@@ -1336,7 +1336,7 @@
the new revision you create. If your log message is brief,
you may wish to supply it on the command line using the
<option>--message</option> (or <option>-m</option>)
- switch:</para>
+ option:</para>
<screen>
$ svn commit -m "Corrected number of cheese slices."
@@ -1358,7 +1358,7 @@
</screen>
<para>If you fail to specify either the
- <option>--message</option> or <option>--file</option> switch,
+ <option>--message</option> or <option>--file</option> option,
then Subversion will automatically launch your favorite editor
(see the <literal>editor-cmd</literal> section in
<xref linkend="svn.advanced.confarea.opts.config"/>) for composing a log
@@ -1555,7 +1555,7 @@
<para>
<command>svn log</command> also takes a <option>--quiet</option>
- (<option>-q</option>) switch, which suppresses the body of the
+ (<option>-q</option>) option, which suppresses the body of the
log message. When combined with <option>--verbose</option>, it
gives just the names of the changed files.</para>
@@ -1623,7 +1623,7 @@
<title>Examining Local Changes</title>
<para>As we've seen, invoking <command>svn diff</command> with
- no switches will compare your working files to the cached
+ no options will compare your working files to the cached
<quote>pristine</quote> copies in
the <filename>.svn</filename> area:</para>
@@ -1821,7 +1821,7 @@
<para>In addition to all of the above commands, you can use
<command>svn update</command> and <command>svn
- checkout</command> with the <option>--revision</option> switch
+ checkout</command> with the <option>--revision</option> option
to take an entire working copy <quote>back in time</quote>
<footnote><para>See? We told you that Subversion was a time
machine.</para></footnote>:</para>
@@ -1851,7 +1851,7 @@
sans <filename>.svn</filename> directories. As
with <command>svn update</command> and
<command>svn checkout</command>, you can also pass the
- <option>--revision</option> switch to <command>svn
+ <option>--revision</option> option to <command>svn
export</command>:</para>
<screen>
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 Aug 13 00:38:43 2007
@@ -1314,7 +1314,7 @@
<para>One way to think about a repository revision is as a
specific group of changes (some version control systems call
these <firstterm>changesets</firstterm>). By using the
- <option>-r</option> switch, you can ask <command>svn
+ <option>-r</option> option, you can ask <command>svn
merge</command> to apply a changeset, or whole range of
changesets, to your working copy. In our case of undoing a
change, we're asking <command>svn merge</command> to apply
@@ -1814,7 +1814,7 @@
future.
<footnote>
<para>You <emphasis>can</emphasis>, however, use <command>svn
- switch</command> with the <option>--relocate</option> switch
+ switch</command> with the <option>--relocate</option> option
if the URL of your server changes and you don't want to
abandon an existing working copy. See <xref
linkend="svn.ref.svn.c.switch"/> for more information and an
Modified: trunk/src/en/book/ch05-repository-admin.xml
==============================================================================
--- trunk/src/en/book/ch05-repository-admin.xml (original)
+++ trunk/src/en/book/ch05-repository-admin.xml Mon Aug 13 00:38:43 2007
@@ -1909,7 +1909,7 @@
process (such as a compression program, filtering program, or
into a loading process). But if you're creating a dump file
for longer-term storage, you'll likely want to save disk space
- by using the <option>--deltas</option> switch. With this
+ by using the <option>--deltas</option> option. With this
option, successive revisions of files will be output as
compressed, binary differences—just as file revisions
are stored in a repository. This option is slower, but
Modified: trunk/src/en/book/ch09-reference.xml
==============================================================================
--- trunk/src/en/book/ch09-reference.xml (original)
+++ trunk/src/en/book/ch09-reference.xml Mon Aug 13 00:38:43 2007
@@ -18,10 +18,10 @@
<para>To use the command line client, you type
<command>svn</command>, the subcommand you wish to use
<footnote><para>Yes, yes, you don't need a subcommand to use the
- <option>--version</option> switch, but we'll get to that in just
- a minute.</para></footnote>, and any switches or targets that
+ <option>--version</option> option, but we'll get to that in just
+ a minute.</para></footnote>, and any options or targets that
you wish to operate on—there is no specific order that the
- subcommand and the switches must appear in. For example, all of
+ subcommand and the options must appear in. For example, all of
the following are valid ways to use <command>svn
status</command>:</para>
@@ -37,11 +37,11 @@
<!-- =============================================================== -->
<sect2 id="svn.ref.svn.sw">
- <title><command>svn</command> Switches</title>
+ <title><command>svn</command> Options</title>
- <para>While Subversion has different switches for its
- subcommands, all switches are global—that is, each
- switch is guaranteed to mean the same thing regardless of
+ <para>While Subversion has different options for its
+ subcommands, all options are global—that is, each
+ option is guaranteed to mean the same thing regardless of
the subcommand you use it with. For example,
<option>--verbose</option> (<option>-v</option>) always
means <quote>verbose output</quote>, regardless of the
@@ -79,8 +79,8 @@
Subversion's internal diff engine, which provides
unified diffs by default. If you want to use an
external diff program, use <option>--diff-cmd</option>.
- You can pass switches to the diff program with the
- <option>--extensions</option> switch (more on that later
+ You can pass options to the diff program with the
+ <option>--extensions</option> option (more on that later
in this section).</para>
</listitem>
</varlistentry>
@@ -133,7 +133,7 @@
valid only when used with the <command>svn
diff</command> or <command>svn merge</command> commands,
with the
- <option>--diff-cmd</option> switch.
+ <option>--diff-cmd</option> option.
If you wish to pass multiple
arguments, you must enclose all of them in quotes (for
example, <command>svn diff --diff-cmd /usr/bin/diff -x
@@ -161,9 +161,9 @@
<para>Forces a particular command or operation to run.
There are some operations that Subversion will prevent
you from doing in normal usage, but you can pass the
- force switch to tell Subversion <quote>I know what I'm
+ force option to tell Subversion <quote>I know what I'm
doing as well as the possible repercussions of doing it,
- so let me at 'em</quote>. This switch is the
+ so let me at 'em</quote>. This option is the
programmatic equivalent of doing your own electrical
work with the power on—if you don't know what
you're doing, you're likely to get a nasty shock.</para>
@@ -241,7 +241,7 @@
</term>
<listitem>
<para>Indicates that you will specify a commit message
- on the command line, following this switch. For
+ on the command line, following this option. For
example:</para>
<screen>
@@ -409,7 +409,7 @@
<para>Indicates that you're going to supply a revision (or
range of revisions) for a particular operation. You can
provide revision numbers, revision keywords or dates (in
- curly braces), as arguments to the revision switch. If
+ curly braces), as arguments to the revision option. If
you wish to provide a range of revisions, you can
provide two revisions separated by a colon. For
example:</para>
@@ -431,10 +431,10 @@
<term><option>--revprop</option></term>
<listitem>
<para>Operates on a revision property instead of a
- property specific to a file or directory. This switch
+ property specific to a file or directory. This option
requires that you also pass a revision with the
<option>--revision</option> (<option>-r</option>)
- switch.</para>
+ option.</para>
</listitem>
</varlistentry>
@@ -577,7 +577,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--targets FILENAME
@@ -682,7 +682,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -757,7 +757,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -846,7 +846,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -969,8 +969,8 @@
<option>--diff3-cmd</option> to allow cleanup to complete
any merging with your external diff program. You can also
specify any configuration directory with the
- <option>--config-dir</option> switch, but you should need
- these switches extremely infrequently.</para>
+ <option>--config-dir</option> option, but you should need
+ these options extremely infrequently.</para>
</refsect1>
@@ -990,7 +990,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--diff3-cmd CMD
@@ -1038,7 +1038,7 @@
<para>Send changes from your working copy to the
repository. If you do not supply a log message with your
commit by using either the <option>--file</option> or
- <option>--message</option> switch,
+ <option>--message</option> option,
<command>svn</command> will launch your editor for you
to compose a commit message. See the
<literal>editor-cmd</literal> section in <xref
@@ -1081,7 +1081,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--message (-m) TEXT
@@ -1130,7 +1130,7 @@
<para>If you want to use a file that's under version
control for your commit message with
<option>--file</option>, you need to pass the
- <option>--force-log</option> switch:</para>
+ <option>--force-log</option> option:</para>
<screen>
$ svn commit --file file_under_vc.txt foo.c
@@ -1242,7 +1242,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--message (-m) TEXT
@@ -1356,7 +1356,7 @@
directories that have not been committed) are
immediately removed from the working copy. The command
will not remove any unversioned or modified items; use
- the <option>--force</option> switch to override this
+ the <option>--force</option> option to override this
behavior.</para>
<para>Items specified by URL are deleted from
@@ -1381,7 +1381,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--force
@@ -1512,7 +1512,7 @@
<quote>@</quote> notation as described earlier.</para>
<para>If <replaceable>TARGET</replaceable> is a working copy
- path, then the <option>--revision</option> switch
+ path, then the <option>--revision</option> option
means:</para>
<variablelist>
@@ -1583,7 +1583,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -1750,7 +1750,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -1853,7 +1853,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--version
@@ -1908,7 +1908,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--message (-m) TEXT
@@ -2044,7 +2044,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -2195,7 +2195,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -2226,7 +2226,7 @@
…
</screen>
- <para>You can pass the <option>--verbose</option> switch for
+ <para>You can pass the <option>--verbose</option> option for
additional information, rather like the UNIX command
<command>ls -l</command>:</para>
@@ -2290,7 +2290,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--targets FILENAME
@@ -2410,7 +2410,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -2496,7 +2496,7 @@
<para>When you're concatenating the results of multiple
calls to the log command, you may want to use the
- <option>--incremental</option> switch. <command>svn
+ <option>--incremental</option> option. <command>svn
log</command> normally prints out a dashed line at the
beginning of a log message, after each subsequent log
message, and following the final log message. If you
@@ -2537,7 +2537,7 @@
</screen>
<para>You can avoid the clutter of the double dashed lines
- in your output by using the incremental switch:</para>
+ in your output by using the incremental option:</para>
<screen>
@@ -2555,9 +2555,9 @@
r27 | …
</screen>
- <para>The <option>--incremental</option> switch provides
+ <para>The <option>--incremental</option> option provides
similar output control when using the
- <option>--xml</option> switch.</para>
+ <option>--xml</option> option.</para>
@@ -2656,7 +2656,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -2757,7 +2757,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--message (-m) TEXT
@@ -2867,7 +2867,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--message (-m) TEXT
@@ -2952,7 +2952,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--quiet (-q)
@@ -3031,7 +3031,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -3109,7 +3109,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--recursive (-R)
@@ -3189,7 +3189,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--verbose (-v)
@@ -3286,7 +3286,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--file (-F) FILE
@@ -3417,7 +3417,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--targets FILENAME
@@ -3506,7 +3506,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--targets FILENAME
@@ -3853,7 +3853,7 @@
<para>The out-of-date information appears in the seventh
column (only if you pass the
- <option>--show-updates</option> switch).</para>
+ <option>--show-updates</option> option).</para>
<variablelist>
@@ -3877,9 +3877,9 @@
<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> options are passed.</para>
- <para>If the <option>--verbose</option> switch is passed,
+ <para>If the <option>--verbose</option> option is passed,
the last committed revision and last committed author
are displayed next.</para>
@@ -3904,7 +3904,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--show-updates (-u)
@@ -3935,7 +3935,7 @@
<para>If you want to find out what files in your working
copy are out-of-date, pass the
- <option>--show-updates</option> switch (this will
+ <option>--show-updates</option> option (this will
<emphasis>not</emphasis> make any changes to your
working copy). Here you can see that
<filename>wc/foo.c</filename> has changed in the
@@ -4039,7 +4039,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -4197,7 +4197,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--targets FILENAME
@@ -4270,7 +4270,7 @@
it brings your working copy up-to-date with the
<literal>HEAD</literal> revision. Otherwise, it
synchronizes the working copy to the revision given by the
- <option>--revision</option> switch. As part of the
+ <option>--revision</option> option. As part of the
synchronization, <command>svn update</command> also
removes any stale locks (see <xref
linkend="svn.tour.cleanup"/>) found in the
@@ -4340,7 +4340,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -4415,7 +4415,7 @@
<!-- =============================================================== -->
<sect2 id="svn.ref.svnadmin.sw">
- <title><command>svnadmin</command> Switches</title>
+ <title><command>svnadmin</command> Options</title>
<variablelist>
@@ -4464,7 +4464,7 @@
<para>By default, when loading data into repository that
already contains revisions, <command>svnadmin</command>
will ignore the <literal>UUID</literal> from the dump
- stream. This switch will cause the repository's
+ stream. This option will cause the repository's
<literal>UUID</literal> to be set to the
<literal>UUID</literal> from the stream.</para>
</listitem>
@@ -4476,7 +4476,7 @@
<para>By default, when loading an empty repository,
<command>svnadmin</command> will ignore the
<literal>UUID</literal> from the dump stream. This
- switch will force that UUID to be ignored (useful for
+ option will force that UUID to be ignored (useful for
overriding your configuration file if it has
<option>--force-uuid</option> set).</para>
</listitem>
@@ -4574,7 +4574,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--bdb-txn-nosync
@@ -4637,7 +4637,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -4700,7 +4700,7 @@
that exist in the original repository.</para>
<para>The second useful option is <option>--deltas</option>.
- This switch causes <command>svnadmin dump</command> to,
+ This option causes <command>svnadmin dump</command> to,
instead of emitting fulltext representations of file
contents and property lists, emit only deltas of those
items against their previous versions. This reduces (in
@@ -4714,7 +4714,7 @@
and <command>bzip2</command>.</para>
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -4811,7 +4811,7 @@
<para>This subcommand makes a full <quote>hot</quote> backup
of your repository, including all hooks, configuration
files, and, of course, database files. If you pass the
- <option>--clean-logs</option> switch,
+ <option>--clean-logs</option> option,
<command>svnadmin</command> will perform a hotcopy of your
repository, and then remove unused Berkeley DB logs from
the original repository. You can run this command at any
@@ -4821,7 +4821,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--clean-logs
@@ -4949,7 +4949,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--quiet (-q)
@@ -5012,7 +5012,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<para>None</para>
</refsect1>
@@ -5106,7 +5106,7 @@
your repository needs to be recovered.</para>
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--wait
</screen>
@@ -5183,7 +5183,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<para>None</para>
</refsect1>
@@ -5230,7 +5230,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--quiet (-q)
@@ -5299,7 +5299,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -5393,11 +5393,11 @@
<!-- =============================================================== -->
<sect2 id="svn.ref.svnlook.sw">
- <title><command>svnlook</command> Switches</title>
+ <title><command>svnlook</command> Options</title>
- <para>Switches in <command>svnlook</command> are global, just
+ <para>Options in <command>svnlook</command> are global, just
like in <command>svn</command> and
- <command>svnadmin</command>; however, most switches only
+ <command>svnadmin</command>; however, most options only
apply to one subcommand since the functionality of
<command>svnlook</command> is (intentionally) limited in
scope.</para>
@@ -5428,10 +5428,10 @@
<term><option>--revprop</option></term>
<listitem>
<para>Operates on a revision property instead of a
- property specific to a file or directory. This switch
+ property specific to a file or directory. This option
requires that you also pass a revision with the
<option>--revision</option> (<option>-r</option>)
- switch.</para>
+ option.</para>
</listitem>
</varlistentry>
@@ -5484,7 +5484,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -5530,7 +5530,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -5634,7 +5634,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -5689,7 +5689,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -5735,7 +5735,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -5807,7 +5807,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -5887,7 +5887,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -5950,7 +5950,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -6003,7 +6003,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<para>None</para>
</refsect1>
@@ -6051,7 +6051,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -6104,7 +6104,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -6159,7 +6159,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -6218,7 +6218,7 @@
</refsect1>
<refsect1>
- <title>Switches</title>
+ <title>Options</title>
<screen>
--revision (-r) REV
@@ -6356,12 +6356,12 @@
<!-- =============================================================== -->
<sect2 id="svn.ref.svnserve.sw">
- <title><command>svnserve</command> Switches</title>
+ <title><command>svnserve</command> Options</title>
<para>Unlike the previous commands we've
described, <command>svnserve</command> has no
subcommands—<command>svnserve</command> is controlled
- exclusively by switches.</para>
+ exclusively by options.</para>
<variablelist>
@@ -6398,8 +6398,8 @@
<term><option>--foreground</option></term>
<listitem>
<para>When used together with <option>-d</option>, this
- switch causes <command>svnserve</command> to stay in the
- foreground. This switch is mainly useful for
+ option causes <command>svnserve</command> to stay in the
+ foreground. This option is mainly useful for
debugging.</para>
</listitem>
</varlistentry>
@@ -6452,7 +6452,7 @@
you by the client when running over a tunnel agent such
as <command>ssh</command>. That means there's rarely
any need for <emphasis>you</emphasis> to pass this
- switch to <command>svnserve</command>. So if you find
+ option to <command>svnserve</command>. So if you find
yourself typing <literal>svnserve --tunnel</literal> on
the command line, and wondering what to do next, see
<xref linkend="svn.serverconfig.svnserve.sshauth"/>.
@@ -6464,7 +6464,7 @@
<term><option>--tunnel-user NAME</option></term>
<listitem>
<para>Used in conjunction with the <option>--tunnel</option>
- switch; tells svnserve to assume that
+ option; tells svnserve to assume that
<replaceable>NAME</replaceable> is the authenticated
user, rather than the UID of the svnserve
process. Useful for users wishing to share a single
@@ -6550,11 +6550,11 @@
</refsect1>
<refsect1 id="svn.ref.svnversion.re.sw">
- <title>Switches</title>
+ <title>Options</title>
<para>Like <command>svnserve</command>,
<command>svnversion</command> has no subcommands, it only
- has switches.</para>
+ has options.</para>
<variablelist>
More information about the svnbook-dev
mailing list