[svnbook] r4403 committed - * en/book/ref-svn.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Wed Feb 6 13:58:52 CST 2013
Revision: 4403
Author: cmpilato at gmail.com
Date: Wed Feb 6 11:58:34 2013
Log: * en/book/ref-svn.xml
Merge the "global" and "not-so-global" options lists together, using
<note>'s to call out the options which are universally supported.
Add a title to the single <variablelist> so that it can be
crossreferenced cleanly.
* en/book/ref-svnadmin.xml,
* en/book/ref-svndumpfilter.xml,
* en/book/ref-svnlook.xml,
* en/book/ref-svnrdump.xml,
* en/book/ref-svnsync.xml
Give titles and IDs to the options lists here, too.
* en/book/styles.css
Style magic to make these named variable lists' titles stand out.
http://code.google.com/p/svnbook/source/detail?r=4403
Modified:
/trunk/en/book/ref-svn.xml
/trunk/en/book/ref-svnadmin.xml
/trunk/en/book/ref-svndumpfilter.xml
/trunk/en/book/ref-svnlook.xml
/trunk/en/book/ref-svnrdump.xml
/trunk/en/book/ref-svnsync.xml
/trunk/en/book/styles.css
=======================================
--- /trunk/en/book/ref-svn.xml Wed Feb 6 09:33:02 2013
+++ /trunk/en/book/ref-svn.xml Wed Feb 6 11:58:34 2013
@@ -82,107 +82,10 @@
</informalexample>
<para><command>svn</command> subcommands recognize the following
- global options:</para>
+ options:</para>
<variablelist id="svn.ref.svn.sw">
-
- <varlistentry id="svn.ref.svn.sw.config_dir">
- <term><option>--config-dir</option>
<replaceable>DIR</replaceable></term>
- <listitem>
- <para>Instructs Subversion to read configuration
- information from the specified directory instead of the
- default location (<filename>.subversion</filename> in
- the user's home directory).</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svn.sw.config_option">
- <term><option>--config-option</option>
<replaceable>CONFSPEC</replaceable></term>
- <listitem>
- <para>Sets, for the duration of the command, the value of
- a runtime configuration
- option. <replaceable>CONFSPEC</replaceable> is a string
- which specifies the configuration option namespace, name
- and value that you'd like to assign, formatted as
-
<replaceable>FILE</replaceable>:<replaceable>SECTION</replaceable>:<replaceable>OPTION</replaceable>=[<replaceable>VALUE</replaceable>].
- In this syntax, <replaceable>FILE</replaceable>
- and <replaceable>SECTION</replaceable> are the runtime
- configuration file (either <literal>config</literal>
- or <literal>servers</literal>) and the section thereof,
- respectively, which contain the option whose value you
- wish to change. <replaceable>OPTION</replaceable> is,
- of course, the option itself,
- and <replaceable>VALUE</replaceable> the value (if any)
- you wish to assign to the option. For example, to
- temporarily disable the use of the automatic property
- setting feature,
- use
<option>--config-option=config:miscellany:enable-auto-props=no</option>.
- You can use this option multiple times to change
- multiple option values simultaneously.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svn.sw.no_auth_cache">
- <term><option>--no-auth-cache</option></term>
- <listitem>
- <para>Prevents caching of authentication information
- (e.g., username and password) in the Subversion
- runtime configuration directories.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svn.sw.non_interactive">
- <term><option>--non-interactive</option></term>
- <listitem>
- <para>Disables all interactive prompting. Some examples
- of interactive prompting include requests for
- authentication credentials and conflict resolution
- decisions. This is useful if you're running Subversion
- inside an automated script and it's more appropriate
- to have Subversion fail than to prompt for more
- information.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svn.sw.password">
- <term><option>--password</option>
<replaceable>PASSWD</replaceable></term>
- <listitem>
- <para>Specifies the password to use when authenticating
- against a Subversion server. If not provided, or if
- incorrect, Subversion will prompt you for this
- information as needed.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svn.sw.trust_server_cert">
- <term><option>--trust-server-cert</option></term>
- <listitem>
- <para>When used with <option>--non-interactive</option>,
- instructs Subversion to accept SSL server certificates
- issued by unknown certificate authorities without first
- prompting the user. For security's sake, you should use
- this option only when the integrity of the remote server
- and the network path between it and your client is known
- to be trustworthy.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry id="svn.ref.svn.sw.username">
- <term><option>--username</option>
<replaceable>NAME</replaceable></term>
- <listitem>
- <para>Specifies the username to use when authenticating
- against a Subversion server. If not provided, or if
- incorrect, Subversion will prompt you for this
- information as needed.</para>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- <para>The rest of the options apply and are accepted by only a
- subset of the subcommand. They are as follows:</para>
-
- <variablelist>
+ <title>svn Options</title>
<varlistentry id="svn.ref.svn.sw.accept">
<term><option>--accept</option>
<replaceable>ACTION</replaceable></term>
@@ -341,6 +244,52 @@
</listitem>
</varlistentry>
+ <varlistentry id="svn.ref.svn.sw.config_dir">
+ <term><option>--config-dir</option>
<replaceable>DIR</replaceable></term>
+ <listitem>
+ <para>Instructs Subversion to read configuration
+ information from the specified directory instead of the
+ default location (<filename>.subversion</filename> in
+ the user's home directory).</para>
+
+ <note>
+ <para>This option is accepted by
+ all <command>svn</command> subcommands.</para>
+ </note>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="svn.ref.svn.sw.config_option">
+ <term><option>--config-option</option>
<replaceable>CONFSPEC</replaceable></term>
+ <listitem>
+ <para>Sets, for the duration of the command, the value of
+ a runtime configuration
+ option. <replaceable>CONFSPEC</replaceable> is a string
+ which specifies the configuration option namespace, name
+ and value that you'd like to assign, formatted as
+
<replaceable>FILE</replaceable>:<replaceable>SECTION</replaceable>:<replaceable>OPTION</replaceable>=[<replaceable>VALUE</replaceable>].
+ In this syntax, <replaceable>FILE</replaceable>
+ and <replaceable>SECTION</replaceable> are the runtime
+ configuration file (either <literal>config</literal>
+ or <literal>servers</literal>) and the section thereof,
+ respectively, which contain the option whose value you
+ wish to change. <replaceable>OPTION</replaceable> is,
+ of course, the option itself,
+ and <replaceable>VALUE</replaceable> the value (if any)
+ you wish to assign to the option. For example, to
+ temporarily disable the use of the automatic property
+ setting feature,
+ use
<option>--config-option=config:miscellany:enable-auto-props=no</option>.
+ You can use this option multiple times to change
+ multiple option values simultaneously.</para>
+
+ <note>
+ <para>This option is accepted by
+ all <command>svn</command> subcommands.</para>
+ </note>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="svn.ref.svn.sw.depth">
<term><option>--depth</option>
<replaceable>ARG</replaceable></term>
<listitem>
@@ -649,6 +598,20 @@
</listitem>
</varlistentry>
+ <varlistentry id="svn.ref.svn.sw.no_auth_cache">
+ <term><option>--no-auth-cache</option></term>
+ <listitem>
+ <para>Prevents caching of authentication information
+ (e.g., username and password) in the Subversion runtime
+ configuration directories.</para>
+
+ <note>
+ <para>This option is accepted by
+ all <command>svn</command> subcommands.</para>
+ </note>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="svn.ref.svn.sw.no_auto_props">
<term><option>--no-auto-props</option></term>
<listitem>
@@ -694,6 +657,24 @@
</listitem>
</varlistentry>
+ <varlistentry id="svn.ref.svn.sw.non_interactive">
+ <term><option>--non-interactive</option></term>
+ <listitem>
+ <para>Disables all interactive prompting. Some examples
+ of interactive prompting include requests for
+ authentication credentials and conflict resolution
+ decisions. This is useful if you're running Subversion
+ inside an automated script and it's more appropriate to
+ have Subversion fail than to prompt for more
+ information.</para>
+
+ <note>
+ <para>This option is accepted by
+ all <command>svn</command> subcommands.</para>
+ </note>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="svn.ref.svn.sw.non_recursive">
<term><option>--non-recursive</option>
(<option>-N</option>)</term>
<listitem>
@@ -741,6 +722,21 @@
</listitem>
</varlistentry>
+ <varlistentry id="svn.ref.svn.sw.password">
+ <term><option>--password</option>
<replaceable>PASSWD</replaceable></term>
+ <listitem>
+ <para>Specifies the password to use when authenticating
+ against a Subversion server. If not provided, or if
+ incorrect, Subversion will prompt you for this
+ information as needed.</para>
+
+ <note>
+ <para>This option is accepted by
+ all <command>svn</command> subcommands.</para>
+ </note>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="svn.ref.svn.sw.quiet">
<term><option>--quiet</option> (<option>-q</option>)</term>
<listitem>
@@ -959,6 +955,24 @@
</listitem>
</varlistentry>
+ <varlistentry id="svn.ref.svn.sw.trust_server_cert">
+ <term><option>--trust-server-cert</option></term>
+ <listitem>
+ <para>When used with <option>--non-interactive</option>,
+ instructs Subversion to accept SSL server certificates
+ issued by unknown certificate authorities without first
+ prompting the user. For security's sake, you should use
+ this option only when the integrity of the remote server
+ and the network path between it and your client is known
+ to be trustworthy.</para>
+
+ <note>
+ <para>This option is accepted by
+ all <command>svn</command> subcommands.</para>
+ </note>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="svn.ref.svn.sw.use_merge_history">
<term><option>--use-merge-history</option>
(<option>-g</option>)</term>
<listitem>
@@ -967,6 +981,21 @@
</listitem>
</varlistentry>
+ <varlistentry id="svn.ref.svn.sw.username">
+ <term><option>--username</option>
<replaceable>NAME</replaceable></term>
+ <listitem>
+ <para>Specifies the username to use when authenticating
+ against a Subversion server. If not provided, or if
+ incorrect, Subversion will prompt you for this
+ information as needed.</para>
+
+ <note>
+ <para>This option is accepted by
+ all <command>svn</command> subcommands.</para>
+ </note>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="svn.ref.svn.sw.verbose">
<term><option>--verbose</option> (<option>-v</option>)</term>
<listitem>
=======================================
--- /trunk/en/book/ref-svnadmin.xml Tue Feb 5 13:51:43 2013
+++ /trunk/en/book/ref-svnadmin.xml Wed Feb 6 11:58:34 2013
@@ -17,7 +17,8 @@
<para>Options in <command>svnadmin</command> are global, just
as they are in <command>svn</command>:</para>
- <variablelist>
+ <variablelist id="svn.ref.svnadmin.sw">
+ <title>svnadmin Options</title>
<varlistentry id="svn.ref.svnadmin.sw.bdb_log_keep">
<term><option>--bdb-log-keep</option></term>
=======================================
--- /trunk/en/book/ref-svndumpfilter.xml Tue Feb 5 13:51:43 2013
+++ /trunk/en/book/ref-svndumpfilter.xml Wed Feb 6 11:58:34 2013
@@ -16,7 +16,8 @@
as they are in <command>svn</command> and
<command>svnadmin</command>:</para>
- <variablelist>
+ <variablelist id="svn.ref.svndumpfilter.sw">
+ <title>svndumpfilter Options</title>
<varlistentry id="svn.ref.svndumpfilter.sw.drop_empty_revs">
<term><option>--drop-empty-revs</option></term>
=======================================
--- /trunk/en/book/ref-svnlook.xml Tue Feb 5 13:51:43 2013
+++ /trunk/en/book/ref-svnlook.xml Wed Feb 6 11:58:34 2013
@@ -25,7 +25,8 @@
<command>svnlook</command> is (intentionally) limited in
scope:</para>
- <variablelist>
+ <variablelist id="svn.ref.svnlook.sw">
+ <title>svnlook Options</title>
<varlistentry id="svn.ref.svnlook.sw.copy_info">
<term><option>--copy-info</option></term>
=======================================
--- /trunk/en/book/ref-svnrdump.xml Tue Feb 5 13:51:43 2013
+++ /trunk/en/book/ref-svnrdump.xml Wed Feb 6 11:58:34 2013
@@ -16,7 +16,8 @@
as they are in <command>svn</command> and
<command>svnadmin</command>:</para>
- <variablelist>
+ <variablelist id="svn.ref.svnrdump.sw">
+ <title>svnrdump Options</title>
<varlistentry id="svn.ref.svnrdump.sw.config_dir">
<term><option>--config-dir</option>
<replaceable>DIR</replaceable></term>
=======================================
--- /trunk/en/book/ref-svnsync.xml Tue Feb 5 13:51:43 2013
+++ /trunk/en/book/ref-svnsync.xml Wed Feb 6 11:58:34 2013
@@ -31,7 +31,8 @@
as they are in <command>svn</command> and
<command>svnadmin</command>:</para>
- <variablelist>
+ <variablelist id="svn.ref.svnsync.sw">
+ <title>svnsync Options</title>
<varlistentry id="svn.ref.svnsync.sw.allow_non_empty">
<term><option>--allow-non-empty</option></term>
=======================================
--- /trunk/en/book/styles.css Wed Feb 6 07:39:43 2013
+++ /trunk/en/book/styles.css Wed Feb 6 11:58:34 2013
@@ -126,6 +126,12 @@
font-style: italic;
font-weight: normal;
}
+.variablelist p.title strong {
+ font-size: 100%;
+ font-weight: bold;
+ font-style: normal;
+ font-family: serif;
+}
.table table {
border-width: 1px;
border-style: solid;
More information about the svnbook-dev
mailing list