[svnbook commit] r3292 - trunk/src/en/book
cmpilato
noreply at red-bean.com
Thu Sep 4 00:38:31 CDT 2008
Author: cmpilato
Date: Thu Sep 4 00:38:31 2008
New Revision: 3292
Log:
* src/en/book/ch09-reference.xml,
* src/en/book/ch03-advanced-topics.xml,
* src/en/book/appb-svn-for-cvs-users.xml,
* src/en/book/ch05-repository-admin.xml,
* src/en/book/ch06-server-configuration.xml,
* src/en/book/ch04-branching-and-merging.xml
Make a handful of mostly minor wording or formatting fixes found
during our ORA QC1 review cycle.
Modified:
trunk/src/en/book/appb-svn-for-cvs-users.xml
trunk/src/en/book/ch03-advanced-topics.xml
trunk/src/en/book/ch04-branching-and-merging.xml
trunk/src/en/book/ch05-repository-admin.xml
trunk/src/en/book/ch06-server-configuration.xml
trunk/src/en/book/ch09-reference.xml
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 Thu Sep 4 00:38:31 2008
@@ -548,7 +548,7 @@
<para>The most popular (and mature) conversion tool is
cvs2svn (<ulink url="http://cvs2svn.tigris.org/"/>), a Python
- script originally created by members of Subversion's own
+ program originally created by members of Subversion's own
development community. This tool is meant to run exactly once:
it scans your CVS repository multiple times and attempts to
deduce commits, branches, and tags as best it can. When it
Modified: trunk/src/en/book/ch03-advanced-topics.xml
==============================================================================
--- trunk/src/en/book/ch03-advanced-topics.xml (original)
+++ trunk/src/en/book/ch03-advanced-topics.xml Thu Sep 4 00:38:31 2008
@@ -3009,25 +3009,25 @@
<variablelist>
<varlistentry>
- <term>../</term>
+ <term><literal>../</literal></term>
<listitem><para>Relative to the URL of the directory on which
the <literal>svn:externals</literal> property is
set</para></listitem>
</varlistentry>
<varlistentry>
- <term>^/</term>
+ <term><literal>^/</literal></term>
<listitem><para>Relative to the root of the repository in
which the <literal>svn:externals</literal> property is
versioned</para></listitem>
</varlistentry>
<varlistentry>
- <term>//</term>
+ <term><literal>//</literal></term>
<listitem><para>Relative to the scheme of the URL of the
directory on which the <literal>svn:externals</literal>
property is set</para></listitem>
</varlistentry>
<varlistentry>
- <term>/</term>
+ <term><literal>/</literal></term>
<listitem><para>Relative to the root URL of the server on
which the <literal>svn:externals</literal> property is
versioned</para></listitem>
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 Thu Sep 4 00:38:31 2008
@@ -1525,7 +1525,7 @@
</varlistentry>
<varlistentry>
- <term>Apply reverse merges to a target's natural history</term>
+ <term>Applying reverse merges to a target's natural history</term>
<listitem>
<para>Earlier in this chapter
(<xref linkend="svn.branchmerge.basicmerging.undo"/>)
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 Thu Sep 4 00:38:31 2008
@@ -1178,7 +1178,7 @@
<para>This output is human-readable, meaning items such as the
datestamp are displayed using a textual representation
instead of something more obscure (such as the number of
- nanoseconds since the Tasty Freeze guy drove by). But the
+ nanoseconds since the Tastee Freez guy drove by). But the
output is also machine-parsable—because the log
message can contain multiple lines and be unbounded in
length, <command>svnlook</command> provides the length of
Modified: trunk/src/en/book/ch06-server-configuration.xml
==============================================================================
--- trunk/src/en/book/ch06-server-configuration.xml (original)
+++ trunk/src/en/book/ch06-server-configuration.xml Thu Sep 4 00:38:31 2008
@@ -487,8 +487,8 @@
</screen>
<para>When running <command>svnserve</command> in daemon mode,
- you can use the <option>--listen-port=</option> and
- <option>--listen-host=</option> options to customize the
+ you can use the <option>--listen-port</option> and
+ <option>--listen-host</option> options to customize the
exact port and hostname to <quote>bind</quote> to.</para>
<para>Once we successfully start <command>svnserve</command> as
@@ -1369,7 +1369,7 @@
one line—since SSH <filename>authorized_keys</filename>
files do not even allow the conventional backslash character
(<literal>\</literal>) for line continuation. The only
- reason we've formatted it with a line break is to fit it on
+ reason we've shown it with a line break is to fit it on
the physical page of a book.</para>
</sect3>
Modified: trunk/src/en/book/ch09-reference.xml
==============================================================================
--- trunk/src/en/book/ch09-reference.xml (original)
+++ trunk/src/en/book/ch09-reference.xml Thu Sep 4 00:38:31 2008
@@ -1892,18 +1892,18 @@
</itemizedlist>
- <para><command>svn diff OLD-URL[@OLDREV]
- NEW-URL[@NEWREV]</command> is shorthand for <command>svn
+ <para><userinput>svn diff OLD-URL[@OLDREV]
+ NEW-URL[@NEWREV]</userinput> is shorthand for <userinput>svn
diff --old=OLD-URL[@OLDREV]
- --new=NEW-URL[@NEWREV].</command></para>
+ --new=NEW-URL[@NEWREV].</userinput></para>
- <para><command>svn diff -r N:M URL</command> is shorthand
- for <command>svn diff -r N:M --old=URL
- --new=URL</command>.</para>
-
- <para><command>svn diff [-r N[:M]] URL1[@N]
- URL2[@M]</command> is shorthand for <command>svn diff [-r
- N[:M]] --old=URL1 --new=URL2</command>.</para>
+ <para><userinput>svn diff -r N:M URL</userinput> is shorthand
+ for <userinput>svn diff -r N:M --old=URL
+ --new=URL</userinput>.</para>
+
+ <para><userinput>svn diff [-r N[:M]] URL1[@N]
+ URL2[@M]</userinput> is shorthand for <userinput>svn diff [-r
+ N[:M]] --old=URL1 --new=URL2</userinput>.</para>
<para>If <replaceable>TARGET</replaceable> is a URL, then
revs <literal>N</literal> and <literal>M</literal> can be given either via the
@@ -1911,8 +1911,12 @@
<quote>@</quote> notation as described earlier.</para>
<para>If <replaceable>TARGET</replaceable> is a working copy
- path, the <option>--revision</option> option
- means:</para>
+ path, the default behavior (when no
+ <option>--revision</option> option is provided) is to
+ display the differences between the base and working
+ copies of <replaceable>TARGET</replaceable>. If a
+ <option>--revision</option> option is specified in this
+ scenario, though, it means:</para>
<variablelist>
@@ -1935,14 +1939,6 @@
</listitem>
</varlistentry>
- <varlistentry>
- <term>(no <option>--revision</option>)</term>
- <listitem>
- <para>The client compares base and working copies of
- <replaceable>TARGET</replaceable>.</para>
- </listitem>
- </varlistentry>
-
</variablelist>
<para>If the alternate syntax is used, the server compares
@@ -2044,7 +2040,7 @@
<screen>
$ svn diff http://svn.collab.net/repos/svn/trunk/COMMITTERS@3000 \
- http://svn.collab.net/repos/svn/trunk/COMMITTERS@3500
+ http://svn.collab.net/repos/svn/trunk/COMMITTERS@3500
Index: COMMITTERS
===================================================================
--- COMMITTERS (revision 3000)
More information about the svnbook-dev
mailing list