[svnbook commit] r3047 - trunk/src/en/book

fitz noreply at red-bean.com
Fri May 2 20:45:46 CDT 2008


Author: fitz
Date: Fri May  2 20:45:46 2008
New Revision: 3047

Log:
Copyedits for approximately 1/3 of chapter 9.

* src/en/book/ch09-reference.xml: Copyedits for svn command line client


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	Fri May  2 20:45:46 2008
@@ -2,7 +2,7 @@
   <title>Subversion Complete Reference</title>
   
   <para>This chapter is intended to be a complete reference to using
-    Subversion.  This includes the command line client
+    Subversion.  This includes the command-line client
     (<command>svn</command>) and all its subcommands, as well as the
     repository administration programs (<command>svnadmin</command>
     and <command>svnlook</command>) and their respective
@@ -13,19 +13,19 @@
   <!-- ================================================================= -->
   <!-- ================================================================= -->
   <sect1 id="svn.ref.svn">
-    <title>The Subversion Command Line Client: <command>svn</command></title>
+    <title>The Subversion Command-Line Client: <command>svn</command></title>
     
-    <para>To use the command line client, you type
-      <command>svn</command>, the subcommand you wish to use,
+    <para>To use the command-line client, type
+      <command>svn</command>, the subcommand you wish to use, and
       <footnote>
         <para>Well, you don't need a subcommand to use the
           <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
-      options must appear in.  For example, all of the following are
-      valid ways to use <command>svn status</command>:</para>
+      any options or targets that you wish to operate on—there
+      is no specific order that the subcommand and the options must
+      appear in.  For example, all of the following are valid ways to
+      use <command>svn status</command>:</para>
 
     <screen>
 $ svn -v status
@@ -46,7 +46,7 @@
         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
+        means <quote>verbose output,</quote> regardless of the
         subcommand you use it with.</para>
 
       <variablelist>
@@ -59,7 +59,7 @@
               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>
+              <literal>launch.</literal></para>
           </listitem>
         </varlistentry>
 
@@ -86,7 +86,7 @@
           <term><option>--changelist</option>
             <replaceable>ARG</replaceable></term>
           <listitem>
-            <para>Operate only on members of changelist named
+            <para>Operate only on members of the changelist named
               <replaceable>ARG</replaceable>.  This option can be used
               multiple times to specify sets of changelists.</para>
           </listitem>
@@ -212,7 +212,7 @@
               you from doing in normal usage, but you can pass the
               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 option 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>
@@ -233,21 +233,21 @@
               Subversion will assume you've made a mistake, that the
               path was instead intended as the target of the
               operation, and that you simply failed to provide some
-              other—unversioned—file as the source of your log
-              message.  To assert your intent and override these types
-              of errors, pass the <option>--force-log</option> option 
-              to subcommands that accept log messages.</para>
+              other—unversioned—file as the source of your
+              log message.  To assert your intent and override these
+              types of errors, pass the <option>--force-log</option>
+              option to subcommands that accept log messages.</para>
           </listitem>
         </varlistentry>
         
         <varlistentry>
-          <term><option>--help</option> (<option>-h</option> or
+          <term><option>--help</option> (<option>-h</option>) or
                 <option>-?</option>)
           </term>
           <listitem>
             <para>If used with one or more subcommands, shows the
-              built-in help text for each subcommand.  If used alone,
-              it displays the general client help text.</para>
+              built-in help text for each.  If used alone, it displays
+              the general client help text.</para>
           </listitem>
         </varlistentry>
         
@@ -278,7 +278,7 @@
         <varlistentry>
           <term><option>--keep-changelist</option></term>
           <listitem>
-            <para>Don't delete changelist after commit.</para>
+            <para>Don't delete the changelist after commit.</para>
           </listitem>
         </varlistentry>
       
@@ -304,9 +304,9 @@
             <replaceable>MESSAGE</replaceable>
           </term>
           <listitem>
-            <para>Indicates that you will specify a either a log
-              message or a lock comment on the command line, following
-              this option.  For example:</para>
+            <para>Indicates that you will specify either a log message
+              or a lock comment on the command line, following this
+              option.  For example:</para>
             
             <screen>
 $ svn commit -m "They don't make Sunday."
@@ -326,7 +326,7 @@
           <term><option>--no-auth-cache</option></term>
           <listitem>
             <para>Prevents caching of authentication information
-              (e.g. username and password) in the Subversion
+              (e.g., username and password) in the Subversion
               administrative directories.</para>
           </listitem>
         </varlistentry>
@@ -377,11 +377,11 @@
         <varlistentry>
           <term><option>--non-interactive</option></term>
           <listitem>
-            <para>In the case of an authentication failure, or
+            <para>In the case of an authentication failure or
               insufficient credentials, prevents prompting for
-              credentials (e.g. username or password).  This is useful
+              credentials (e.g., username or password).  This is useful
               if you're running Subversion inside of an automated
-              script and it's more appropriate to have Subversion fail
+              script, and it's more appropriate to have Subversion fail
               than to prompt for more information.</para>
           </listitem>
         </varlistentry>
@@ -416,7 +416,7 @@
         <varlistentry>
           <term><option>--parents</option></term>
           <listitem>
-            <para>Create and add non-existent or non-versioned parent
+            <para>Create and add nonexistent or nonversioned parent
               subdirectories to the working copy or repository as part
               of an operation.  This is useful for automatically
               creating multiple subdirectories where none currently
@@ -491,9 +491,9 @@
           <listitem>
             <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 option.  If
-              you wish to provide a range of revisions, you can
+              provide revision numbers, keywords, or dates (in
+              curly braces) as arguments to the revision option.  If
+              you wish to offer a range of revisions, you can
               provide two revisions separated by a colon.  For
               example:</para>
 
@@ -536,7 +536,7 @@
           <term><option>--show-updates</option> (<option>-u</option>)</term>
           <listitem>
             <para>Causes the client to display information about
-              which files in your working copy are out-of-date.
+              which files in your working copy are out of date.
               This doesn't actually update any of your
               files—it just shows you which files will be
               updated if you run <command>svn update</command>.
@@ -547,7 +547,7 @@
         <varlistentry>
           <term><option>--stop-on-copy</option></term>
           <listitem>
-            <para>Causes a Subversion subcommand which is traversing
+            <para>Causes a Subversion subcommand that traverses
               the history of a versioned resource to stop harvesting
               that historical information when a copy—that is, a
               location in history where that resource was copied from
@@ -560,7 +560,7 @@
           <term><option>--strict</option></term>
           <listitem>
             <para>Causes Subversion to use strict semantics, a notion
-              which is rather vague unless talking about specific
+              that is rather vague unless talking about specific
               subcommands (namely, <command>svn propget</command>).</para>
           </listitem>
         </varlistentry>
@@ -570,7 +570,7 @@
             <replaceable>FILENAME</replaceable></term>
           <listitem>
             <para>Tells Subversion to get the list of files that you
-              wish to operate on from the filename you provide
+              wish to operate on from the filename that you provide
               instead of listing all the files on the command line.
             </para>
           </listitem>
@@ -592,11 +592,11 @@
             (<option>-g</option>)</term>
           <listitem>
             <para>Use or display additional information from merge
-              history.  When used with svn copy or svn move, the
-              client will contact the server in order to propagate
-              merge history information.  When used with other
-              commands, the client will display merge history
-              information.</para>
+              history.  When used with <command>svn copy</command> or
+              <command>svn move</command>, the client will contact the
+              server in order to propagate merge history information.
+              When used with other commands, the client will display
+              merge history information.</para>
           </listitem>
         </varlistentry>
         
@@ -615,12 +615,11 @@
           <term><option>--version</option></term>
           <listitem>
             <para>Prints the client version info.  This information
-              not only includes the version number of the client,
-              but also a listing of all repository access modules
-              that the client can use to access a Subversion
-              repository.  With <option>--quiet</option>
-              (<option>-q</option>) it prints only the version number
-              in a compact form.</para>
+              not only includes the version number of the client, but
+              also a listing of all repository access modules that the
+              client can use to access a Subversion repository.
+              With <option>--quiet</option> (<option>-q</option>) it
+              prints only the version number in a compact form.</para>
           </listitem>
         </varlistentry>
         
@@ -638,11 +637,11 @@
             <replaceable>ARG</replaceable></term>
           <listitem>
             <para>When used with any command that writes to the
-              repository, set the revision property, using the
+              repository, this sets the revision property, using the
               <replaceable>NAME=VALUE</replaceable> format,
               <replaceable>NAME</replaceable> to
               <replaceable>VALUE</replaceable>.  When used with
-              <command>svn log --xml</command>, display the value of
+              <command>svn log --xml</command>, this displays the value of
               <replaceable>ARG</replaceable> in the log output.</para>
           </listitem>
         </varlistentry>
@@ -662,7 +661,7 @@
     <sect2 id="svn.ref.svn.c">
       <title><command>svn</command> Subcommands</title>
 
-      <para>Here are the various subcommands:</para>
+      <para>Here are the various subcommands.</para>
 
       <refentry id="svn.ref.svn.c.add">
 
@@ -784,7 +783,7 @@
 
         <refnamediv>
           <refname>svn blame</refname>
-          <refpurpose>Show author and revision information in-line
+          <refpurpose>Show author and revision information inline
             for the specified files or URLs.</refpurpose>
         </refnamediv>
         <refsect1>
@@ -794,7 +793,7 @@
         <refsect1>
           <title>Description</title>
           
-          <para>Show author and revision information in-line for the
+          <para>Show author and revision information inline for the
             specified files or URLs.  Each line of text is annotated
             at the beginning with the author (username) and the
             revision number for the last change to that line.</para>
@@ -802,7 +801,7 @@
 
         <refsect1>
           <title>Alternate Names</title>
-          <para>praise, annotate, ann</para>
+          <para><command>praise, annotate, ann</command></para>
         </refsect1>
 
         <refsect1>
@@ -863,7 +862,7 @@
         </refsect1>
 
         <refsect1>
-          <title>Examples</title>
+          <title>Example</title>
 
           <para>If you want to see blame annotated source for
             <filename>readme.txt</filename> in your test
@@ -875,10 +874,11 @@
 </screen>
 
           <para>Even if <command>svn blame</command> says that Harry
-            last modified readme.txt in revision 5, you'll have to
-            examine exactly what the revision changed to be sure that
-            Harry changed the <emphasis>context</emphasis> of the
-            line—he may have just adjusted the whitespace.
+            last modified <filename>readme.txt</filename> in revision
+            5, you'll have to examine exactly what the revision
+            changed to be sure that Harry changed
+            the <emphasis>context</emphasis> of the line—he may
+            have just adjusted the whitespace.
           </para>
         </refsect1>
       </refentry>
@@ -905,7 +905,7 @@
           
           <para>Output the contents of the specified files or URLs.
             For listing the contents of directories, see <command>svn
-            list</command>.</para>
+            list</command> later.</para>
         </refsect1>
 
         <refsect1>
@@ -937,10 +937,10 @@
         </refsect1>
 
         <refsect1>
-          <title>Examples</title>
+          <title>Example</title>
 
-          <para>If you want to view readme.txt in your repository
-            without checking it out:</para>
+          <para>If you want to view <filename>readme.txt</filename> in
+            your repository without checking it out:</para>
           <screen>
 $ svn cat http://svn.red-bean.com/repos/test/readme.txt
 This is a README file.
@@ -989,16 +989,16 @@
         <refsect1>
           <title>Description</title>
           
-          <para>Used for dividing files in a working copy into
-            changelist (logical named groupings) to allow users to
-            easily work on multiple file collections within a single
-            working copy.</para>
+          <para>Used for dividing files in a working copy into a
+            changelist (logical named grouping) in order to allow
+            users to easily work on multiple file collections within a
+            single working copy.</para>
 
         </refsect1>
 
         <refsect1>
-          <title>Alternate Names</title>
-          <para>cl</para>
+          <title>Alternate Name</title>
+          <para><command>cl</command></para>
         </refsect1>
 
         <refsect1>
@@ -1024,7 +1024,7 @@
         </refsect1>
 
         <refsect1>
-          <title>Examples</title>
+          <title>Example</title>
 
           <para>Edit three files, add them to a changelist, then
             commit only files in that changelist:</para>
@@ -1085,7 +1085,7 @@
           <para>Check out a working copy from a repository.  If
             <replaceable>PATH</replaceable> is omitted, the
             basename of the URL will be used as the destination.
-            If multiple URLs are given each will be checked out into a
+            If multiple URLs are given, each will be checked out into a
             subdirectory of <replaceable>PATH</replaceable>, with the
             name of the subdirectory being the basename of the
             URL.</para>
@@ -1093,8 +1093,8 @@
         </refsect1>
 
         <refsect1>
-          <title>Alternate Names</title>
-          <para>co</para>
+          <title>Alternate Name</title>
+          <para><command>co</command></para>
         </refsect1>
 
         <refsect1>
@@ -1178,10 +1178,10 @@
 </screen>
 
           <para>If you interrupt a checkout (or something else
-            interrupts your checkout, like loss of connectivity, etc.),
-            you can restart it either by issuing the
-            identical checkout command again, or by updating the
-            incomplete working copy:</para>
+            interrupts your checkout, such as loss of connectivity,
+            etc.), you can restart it either by issuing the identical
+            checkout command again or by updating the incomplete
+            working copy:</para>
 
           <screen>
 $ svn checkout file:///var/svn/repos/test mine
@@ -1236,14 +1236,14 @@
           <title>Description</title>
 
           <para>Recursively clean up the working copy, removing
-            working copy locks and resuming unfinished operations.
-            If you ever get a <quote>working copy locked</quote> error,
-            run this command to remove stale locks and get your working copy
-            into a usable state again.</para>
+            working copy locks and resuming unfinished operations.  If
+            you ever get a <literal>working copy locked</literal>
+            error, run this command to remove stale locks and get your
+            working copy into a usable state again.</para>
 
           <para>If, for some reason, an <command>svn update</command>
             fails due to a problem running an external diff program
-            (e.g. user input or network failure), pass the
+            (e.g., user input or network failure), pass the
             <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
@@ -1278,11 +1278,11 @@
         </refsect1>
 
         <refsect1>
-          <title>Examples</title>
+          <title>Example</title>
 
-          <para>Well, there's not much to the examples here as
+          <para>Well, there's not much to the examples here, as
             <command>svn cleanup</command> generates no output.  If
-            you pass no <replaceable>PATH</replaceable>,
+            you pass no <replaceable>PATH</replaceable>, then
             <quote><filename>.</filename></quote> is used.</para>
 
           <screen>
@@ -1324,7 +1324,7 @@
 
           <para><command>svn commit</command> will send any lock
             tokens that it finds and will release locks on all
-            <replaceable>PATHS</replaceable> committed (recursively),
+            <replaceable>PATHS</replaceable> committed (recursively)
             unless <option>--no-unlock</option> is passed.</para>
 
           <tip>
@@ -1342,15 +1342,15 @@
 
         
         <refsect1>
-          <title>Alternate Names</title>
-          <para>ci (short for <quote>check in</quote>; not 
-            <quote>co</quote>, which is short for 
-            <quote>checkout</quote>)</para>
+          <title>Alternate Name</title>
+          <para><command>ci</command> (short for <command>check in</command>; not 
+            <command>co</command>, which is short for 
+            <command>checkout</command>)</para>
         </refsect1>
 
         <refsect1>
           <title>Changes</title>
-          <para>Working copy, repository</para>
+          <para>Working copy; repository</para>
         </refsect1>
 
         <refsect1>
@@ -1485,7 +1485,7 @@
               <varlistentry>
                 <term>URL -> WC</term>
                 <listitem>
-                  <para>Check out URL into WC, and schedule it for
+                  <para>Check out URL into WC and schedule it for
                     addition.</para>
                 </listitem>
               </varlistentry>
@@ -1504,8 +1504,8 @@
             children of <replaceable>DST</replaceable>, which must be
             a directory.</para>
 
-          <para>If no peg revision (i.e.
-            <replaceable>@REV</replaceable>) is supplied, by default
+          <para>If no peg revision (i.e.,
+            <replaceable>@REV</replaceable>) is supplied, by default,
             the <literal>BASE</literal> revision will be used for
             files copied from the working copy, while the
             <literal>HEAD</literal> revision will be used for files
@@ -1519,8 +1519,8 @@
         </refsect1>
 
         <refsect1>
-          <title>Alternate Names</title>
-          <para>cp</para>
+          <title>Alternate Name</title>
+          <para><command>cp</command></para>
         </refsect1>
 
         <refsect1>
@@ -1531,7 +1531,7 @@
 
         <refsect1>
           <title>Accesses Repository</title>
-          <para>If source or destination is in the repository, or if needed
+          <para>Yes, if source or destination is in the repository, or if needed
             to look up the source revision number.</para>
         </refsect1>
 
@@ -1601,18 +1601,18 @@
           <para>Copy an item from the repository to your working
             copy (just schedules the copy—nothing goes into the
             repository until you commit):</para>
+ 
+          <screen>
+$ svn copy file:///var/svn/repos/test/far-away near-here
+A         near-here
+</screen>
 
           <tip>
             <para>This is the recommended way to resurrect a dead
               file in your repository!</para>
           </tip>
 
-          <screen>
-$ svn copy file:///var/svn/repos/test/far-away near-here
-A         near-here
-</screen>
-
-          <para>And finally, copying between two URLs:</para>
+          <para>And finally, copy between two URLs:</para>
 
           <screen>
 $ svn copy file:///var/svn/repos/test/far-away file:///var/svn/repos/test/over-there -m "remote copy."
@@ -1620,6 +1620,13 @@
 Committed revision 9.
 </screen>
 
+          <screen>
+$ svn copy file:///var/svn/repos/test/trunk \
+    file:///var/svn/repos/test/tags/0.6.32-prerelease -m "tag tree"
+
+Committed revision 12.
+</screen>
+
           <tip>
             <para>This is the easiest way to <quote>tag</quote> a
               revision in your repository—just <command>svn
@@ -1627,17 +1634,12 @@
               <literal>HEAD</literal>) into your tags directory.</para>
           </tip>
 
-          <screen>
-$ svn copy file:///var/svn/repos/test/trunk file:///var/svn/repos/test/tags/0.6.32-prerelease -m "tag tree"
-
-Committed revision 12.
-</screen>
-
           <para>And don't worry if you forgot to tag—you can
             always specify an older revision and tag anytime:</para>
 
           <screen>
-$ svn copy -r 11 file:///var/svn/repos/test/trunk file:///var/svn/repos/test/tags/0.6.32-prerelease -m "Forgot to tag at rev 11"
+$ svn copy -r 11 file:///var/svn/repos/test/trunk \
+     file:///var/svn/repos/test/tags/0.6.32-prerelease -m "Forgot to tag at rev 11"
 
 Committed revision 13.
 </screen>
@@ -1686,7 +1688,7 @@
 
         <refsect1>
           <title>Changes</title>
-          <para>Working copy if operating on files, repository if
+          <para>Working copy if operating on files; repository if
             operating on URLs</para>
         </refsect1>
 
@@ -1722,8 +1724,8 @@
 
           <para>Using <command>svn</command> to delete a file from
             your working copy deletes your local copy of the file, but
-            merely schedules it to be deleted from the repository.
-            When you commit, the file is deleted in the
+            it merely schedules the file to be deleted from the
+            repository.  When you commit, the file is deleted in the
             repository.</para>
 
           <screen>
@@ -1783,52 +1785,68 @@
         <refsect1>
           <title>Description</title>
 
+          <itemizedlist>
 
-          <para>Display the differences between two paths.  The ways
-            you can use <command>svn diff</command> are:</para>
+            <listitem>
+              <para>Display the differences between two paths.  You can
+              use <command>svn diff</command> in the following ways:</para>
+            </listitem>
 
-          <para>Use just <command>svn diff'</command>to display local
-            modifications in a working copy.</para>
+            <listitem>
+              <para>Use just <command>svn diff</command>to display local
+                modifications in a working copy.</para>
+            </listitem>
 
-          <para>Display the changes made to
-            <replaceable>TARGET</replaceable>s as they are seen in
-            <replaceable>REV</replaceable> between two revisions.
-            <replaceable>TARGET</replaceable>s may be all working copy
-            paths or all <replaceable>URL</replaceable>s.  If
-            <replaceable>TARGET</replaceable>s are working copy paths,
-            <replaceable>N</replaceable> defaults to
-            <literal>BASE</literal> and <replaceable>M</replaceable>
-            to the working copy; if <replaceable>URL</replaceable>s,
-            <replaceable>N</replaceable> must be specified and
-            <replaceable>M</replaceable> defaults to
-            <literal>HEAD</literal>.  The <quote>-c M</quote> option
-            is equivalent to <quote>-r N:M</quote> where <literal>N =
-            M-1</literal>.  Using <quote>-c -M</quote> does the
-            reverse: <quote>-r M:N</quote> where <literal>N =
-            M-1</literal>.</para>
-
-          <para>Display the differences between
-            <replaceable>OLD-TGT</replaceable> as it was seen in
-            <replaceable>OLDREV</replaceable> and
-            <replaceable>NEW-TGT</replaceable> as it was seen in
-            <replaceable>NEWREV</replaceable>.
-            <replaceable>PATH</replaceable>s, if given, are relative
-            to <replaceable>OLD-TGT</replaceable> and
-            <replaceable>NEW-TGT</replaceable> and restrict the output
-            to differences for those paths.
-            <replaceable>OLD-TGT</replaceable> and
-            <replaceable>NEW-TGT</replaceable> may be working copy
-            paths or <replaceable>URL[@REV]</replaceable>.
-            <replaceable>NEW-TGT</replaceable> defaults to
-            <replaceable>OLD-TGT</replaceable> if not specified.
-            <quote>-r N</quote> makes OLDREV default to N, -r N:M
-            makes <replaceable>OLDREV</replaceable> default to
-            <replaceable>N</replaceable> and
-            <replaceable>NEWREV</replaceable> default to
-            <replaceable>M</replaceable>.</para>
+            <listitem>
+              <para>Display the changes made to
+                <replaceable>TARGET</replaceable>s as they are seen in
+                <replaceable>REV</replaceable> between two revisions.
+                <replaceable>TARGET</replaceable>s may be all working copy
+                paths or all <replaceable>URL</replaceable>s.  If
+                <replaceable>TARGET</replaceable>s are working copy paths,
+                <replaceable>N</replaceable> defaults to
+                <literal>BASE</literal> and <replaceable>M</replaceable>
+                to the working copy; if <replaceable>TARGET</replaceable>s
+                are <replaceable>URL</replaceable>s,
+                <replaceable>N</replaceable> must be specified and
+                <replaceable>M</replaceable> defaults to
+                <literal>HEAD</literal>.  The <literal>-c M</literal> option
+                is equivalent to <literal>-r N:M</literal> where <literal>N =
+                M-1</literal>.  Using <literal>-c -M</literal> does the
+                reverse: <literal>-r M:N</literal> where <literal>N =
+                M-1</literal>.</para>
+            </listitem>
 
-          <para>Shorthand for <command>svn diff --old=OLD-URL[@OLDREV]
-            --new=NEW-URL[@NEWREV]</command></para>
+            <listitem>
+              <para>Display the differences between
+                <replaceable>OLD-TGT</replaceable> as it was seen in
+                <replaceable>OLDREV</replaceable> and
+                <replaceable>NEW-TGT</replaceable> as it was seen in
+                <replaceable>NEWREV</replaceable>.
+                <replaceable>PATH</replaceable>s, if given, are relative
+                to <replaceable>OLD-TGT</replaceable> and
+                <replaceable>NEW-TGT</replaceable> and restrict the output
+                to differences for those paths.
+                <replaceable>OLD-TGT</replaceable> and
+                <replaceable>NEW-TGT</replaceable> may be working copy
+                paths or <replaceable>URL[@REV]</replaceable>.
+                <replaceable>NEW-TGT</replaceable> defaults to
+                <replaceable>OLD-TGT</replaceable> if not specified.
+                <literal>-r N</literal>
+                makes <replaceable>OLDREV</replaceable> default to
+                N; <literal>-r N:M</literal>
+                makes <replaceable>OLDREV</replaceable> default to
+                <replaceable>N</replaceable> and
+                <replaceable>NEWREV</replaceable> default to
+                <replaceable>M</replaceable>.</para>
+            </listitem>
+
+          </itemizedlist>
+
+          <para><command>diff OLD-URL[@OLDREV]
+            NEW-URL[@NEWREV]</command> is shorthand for <command>svn
+            diff --old=OLD-URL[@OLDREV]
+            --new=NEW-URL[@NEWREV].</command></para>
 
           <para><command>svn diff -r N:M URL</command> is shorthand
             for <command>svn diff -r N:M --old=URL
@@ -1840,7 +1858,7 @@
 
           <para>If <replaceable>TARGET</replaceable> is a URL, then
             revs N and M can be given either via the
-            <option>--revision</option> or by using
+            <option>--revision</option> option or by using the
             <quote>@</quote> notation as described earlier.</para>
 
           <para>If <replaceable>TARGET</replaceable> is a working copy
@@ -1853,9 +1871,9 @@
               <term><option>--revision N:M</option></term>
               <listitem>
                 <para>The server compares
-                  <replaceable>TARGET</replaceable>@<replaceable>N</replaceable>
+                  <replaceable>TARGET at N</replaceable>
                   and
-                  <replaceable>TARGET</replaceable>@<replaceable>M</replaceable>.</para>
+                  <replaceable>TARGET at M</replaceable>.</para>
               </listitem>
             </varlistentry>
 
@@ -1863,7 +1881,7 @@
               <term><option>--revision N</option></term>
               <listitem>
                 <para>The client compares
-                  <replaceable>TARGET</replaceable>@<replaceable>N</replaceable>
+                  <replaceable>TARGET at N</replaceable>
                   against working copy.</para>
               </listitem>
             </varlistentry>
@@ -1894,13 +1912,13 @@
             paths in question will be taken into consideration when
             comparing revisions (that is, if you run <command>svn
             diff</command> on two files with identical contents but
-            different ancestry you will see the entire contents of the
-            file as having been removed and added again).</para>
+            different ancestry, you will see the entire contents of
+            the file as having been removed and added again).</para>
 
         </refsect1>
         <refsect1>
-          <title>Alternate Names</title>
-          <para>di</para>
+          <title>Alternate Name</title>
+          <para><command>di</command></para>
         </refsect1>
 
         <refsect1>
@@ -1981,7 +1999,8 @@
             syntax:</para>
 
           <screen>
-$ svn diff http://svn.collab.net/repos/svn/trunk/COMMITTERS@3000 http://svn.collab.net/repos/svn/trunk/COMMITTERS@3500
+$ svn diff http://svn.collab.net/repos/svn/trunk/COMMITTERS@3000 \
+    http://svn.collab.net/repos/svn/trunk/COMMITTERS@3500
 Index: COMMITTERS
 ===================================================================
 --- COMMITTERS	(revision 3000)
@@ -1990,7 +2009,7 @@
 </screen>
 
           <para>Compare revision 3000 to revision 3500 using range
-            notation (you only pass the one URL in this
+            notation (pass only the one URL in this
             case):</para>
 
           <screen>
@@ -2002,7 +2021,7 @@
 </screen>
 
 
-          <para>Compare revision 3000 to revision 3500 of all files in
+          <para>Compare revision 3000 to revision 3500 of all the files in
             <filename>trunk</filename> using range notation:</para>
 
           <screen>
@@ -2032,7 +2051,7 @@
           <para>Use <option>--diff-cmd</option>
             <replaceable>CMD</replaceable> <option>-x</option> to
             pass arguments directly to the external diff
-            program</para>
+            program:</para>
           
           <screen>
 $ svn diff --diff-cmd /usr/bin/diff -x "-i -b" COMMITTERS 
@@ -2067,7 +2086,7 @@
           <title>Description</title>
 
           <para>The first form exports a clean directory tree from the
-            repository specified by URL, at revision
+            repository specified by URL—at revision
             <replaceable>REV</replaceable> if it is given, otherwise
             at <literal>HEAD</literal>, into
             <replaceable>PATH</replaceable>.  If
@@ -2138,14 +2157,15 @@
 Exported revision 15.
 </screen>
 
-          <para>When rolling operating-system-specific release
-            packages, it can be useful to export a tree which uses a
+          <para>When rolling operating system-specific release
+            packages, it can be useful to export a tree that uses a
             specific EOL character for line endings.  The
             <option>--native-eol</option> option will do this, but it
-            only affects files that have <literal>svn:eol-style =
+            affects only files that have <literal>svn:eol-style =
             native</literal> properties attached to them.  For
             example, to export a tree with all CRLF line endings
-            (possibly for a Windows .zip file distribution):</para>
+            (possibly for a Windows <literal>.zip</literal> file
+            distribution):</para>
 
           <screen>
 $ svn export file:///var/svn/repos my-export --native-eol CRLF
@@ -2157,7 +2177,7 @@
 
           <para>You can specify <literal>LR</literal>,
             <literal>CR</literal>, or <literal>CRLF</literal> as a
-            line ending type with the <option>--native-eol</option>
+            line-ending type with the <option>--native-eol</option>
             option.</para>
 
         </refsect1>
@@ -2191,7 +2211,7 @@
         <refsect1>
           <title>Alternate Names</title>
           <para>?, h</para>
-          <para>The options <option>-?</option>, <option>-h</option>
+          <para>The options <option>-?</option>, <option>-h</option>,
             and <option>--help</option> have the same effect as using the
             <command>help</command> subcommand.</para>
         </refsect1>
@@ -2238,7 +2258,7 @@
           <para>Recursively commit a copy of
             <replaceable>PATH</replaceable> to
             <replaceable>URL</replaceable>.  If
-            <replaceable>PATH</replaceable> is omitted
+            <replaceable>PATH</replaceable> is omitted,
             <quote><filename>.</filename></quote> is assumed.  Parent
             directories are created in the repository as necessary.
             Unversionable items such as device files and pipes are
@@ -2353,17 +2373,17 @@
             <listitem><para>Path</para></listitem>
             <listitem><para>Name</para></listitem>
             <listitem><para>URL</para></listitem>
-            <listitem><para>Repository Root</para></listitem>
+            <listitem><para>Repository root</para></listitem>
             <listitem><para>Repository UUID</para></listitem>
             <listitem><para>Revision</para></listitem>
-            <listitem><para>Node Kind</para></listitem>
-            <listitem><para>Last Changed Author</para></listitem>
-            <listitem><para>Last Changed Revision</para></listitem>
-            <listitem><para>Last Changed Date</para></listitem>
-            <listitem><para>Lock Token</para></listitem>
-            <listitem><para>Lock Owner</para></listitem>
-            <listitem><para>Lock Created (date)</para></listitem>
-            <listitem><para>Lock Expires (date)</para></listitem>
+            <listitem><para>Node kind</para></listitem>
+            <listitem><para>Last changed author</para></listitem>
+            <listitem><para>Last changed revision</para></listitem>
+            <listitem><para>Last changed date</para></listitem>
+            <listitem><para>Lock token</para></listitem>
+            <listitem><para>Lock owner</para></listitem>
+            <listitem><para>Lock created (date)</para></listitem>
+            <listitem><para>Lock expires (date)</para></listitem>
           </itemizedlist>
 
           <para>Additional kinds of information available only for
@@ -2371,15 +2391,15 @@
 
           <itemizedlist>
             <listitem><para>Schedule</para></listitem>
-            <listitem><para>Copied From URL</para></listitem>
-            <listitem><para>Copied From Rev</para></listitem>
-            <listitem><para>Text Last Updated</para></listitem>
-            <listitem><para>Properties Last Updated</para></listitem>
+            <listitem><para>Copied from URL</para></listitem>
+            <listitem><para>Copied from rev</para></listitem>
+            <listitem><para>Text last updated</para></listitem>
+            <listitem><para>Properties last updated</para></listitem>
             <listitem><para>Checksum</para></listitem>
-            <listitem><para>Conflict Previous Base File</para></listitem>
-            <listitem><para>Conflict Previous Working File</para></listitem>
-            <listitem><para>Conflict Current Base File</para></listitem>
-            <listitem><para>Conflict Properties File</para></listitem>
+            <listitem><para>Conflict previous base file</para></listitem>
+            <listitem><para>Conflict previous working file</para></listitem>
+            <listitem><para>Conflict current base file</para></listitem>
+            <listitem><para>Conflict properties file</para></listitem>
           </itemizedlist>
         </refsect1>
 
@@ -2459,8 +2479,9 @@
 </screen>
 
            <para><command>svn info</command> also acts on URLs (also
-             note that the file readme.doc in this example is locked,
-             so lock information is also provided):</para>
+             note that the file <filename>readme.doc</filename> in
+             this example is locked, so lock information is also
+             provided):</para>
 
            <screen>
 $ svn info http://svn.red-bean.com/repos/test/readme.doc
@@ -2591,7 +2612,7 @@
 </screen>
 
           <para>You can pass the <option>--verbose</option> option for
-            additional information, rather like the UNIX command
+            additional information, rather like the Unix command
             <command>ls -l</command>:</para>
 
           <screen>
@@ -2601,7 +2622,7 @@
      24 harry               Jan 18 11:27 examples/
 </screen>
 
-          <para>For further details, see <xref
+          <para>For further details, see the earlier section <xref
             linkend="svn.tour.history.browsing.list"/>.</para>
 
         </refsect1>
@@ -2645,7 +2666,7 @@
 
         <refsect1>
           <title>Changes</title>
-          <para>Working Copy, Repository</para>
+          <para>Working copy, repository</para>
         </refsect1>
 
         <refsect1>
@@ -2676,7 +2697,6 @@
           <para>Lock two files in your working copy:</para>
 
           <screen>
-
 $ svn lock tree.jpg house.jpg
 'tree.jpg' locked by user 'harry'.
 'house.jpg' locked by user 'harry'.
@@ -2845,7 +2865,7 @@
 
           <para>If you want several distinct paths underneath the
             same URL, you can use the <literal>URL [PATH...]</literal>
-            syntax.</para>
+            syntax:</para>
 
           <screen>
 $ svn log http://svn.red-bean.com/repos/test/ foo.c bar.c
@@ -2881,8 +2901,8 @@
 ------------------------------------------------------------------------
 </screen>
 
-          <para>However, if you wanted to gather 2 non-sequential
-            log messages into a file, you might do something like
+          <para>However, if you wanted to gather two nonsequential log
+            messages into a file, you might do something like
             this:</para>
 
           <screen>
@@ -2905,7 +2925,8 @@
 </screen>
 
           <para>You can avoid the clutter of the double dashed lines
-            in your output by using the incremental option:</para>
+            in your output by using the <option>--incremental</option>
+            option:</para>
 
 
           <screen>
@@ -2932,7 +2953,7 @@
           <tip>
             <para>If you run <command>svn log</command> on a specific
               path and provide a specific revision and get no output
-              at all</para>
+              at all as in the following:</para>
 
             <screen>
 $ svn log -r 20 http://svn.red-bean.com/untouched.txt
@@ -2941,7 +2962,7 @@
 
             <para>That just means that the path was not modified in
               that revision.  If you log from the top of the
-              repository, or know the file that changed in that
+              repository or know the file that changed in that
               revision, you can specify it explicitly:</para>
             
             <screen>
@@ -3016,13 +3037,14 @@
             <replaceable>WCPATH</replaceable> is omitted, a default
             value of <quote><filename>.</filename></quote> is assumed,
             unless the sources have identical basenames that match a
-            file within <quote><filename>.</filename></quote>: in which
-            case, the differences will be applied to that file.</para>
+            file within <quote><filename>.</filename></quote>.  In
+            this case, the differences will be applied to that
+            file.</para>
 
           <para>Subversion will only internally track metadata about
             the merge operation if the two sources are ancestrally
             related—if the first source is an ancestor of the
-            second, or vice-versa.  This is guaranteed to be the case
+            second or vice-versa.  This is guaranteed to be the case
             when using the third form.  Unlike <command>svn
             diff</command>, the merge command takes the ancestry of a
             file into consideration when performing a merge operation.
@@ -3126,8 +3148,7 @@
         </refsect1>
         <refsect1>
           <title>Description</title>
-
-          <para></para>
+          <para>Query merge-related information.</para>
 
         </refsect1>
         <refsect1>
@@ -3159,7 +3180,7 @@
         </refsect1>
 
         <refsect1>
-          <title>Examples</title>
+          <title>Example</title>
 
           <para>Find out which changesets your trunk directory has
             already received as well as what changesets it's still
@@ -3204,7 +3225,7 @@
             in the working copy.  A directory specified by a URL is
             created in the repository via an immediate commit.
             Multiple directory URLs are committed atomically.  In both
-            cases all the intermediate directories must already exist
+            cases, all the intermediate directories must already exist
             unless the <option>--parents</option> option is
             used.</para>
         </refsect1>
@@ -3216,7 +3237,7 @@
 
         <refsect1>
           <title>Changes</title>
-          <para>Working copy, repository if operating on a URL</para>
+          <para>Working copy; repository if operating on a URL</para>
         </refsect1>
 
         <refsect1>
@@ -3332,7 +3353,7 @@
 
         <refsect1>
           <title>Changes</title>
-          <para>Working copy, repository if operating on a URL</para>
+          <para>Working copy; repository if operating on a URL</para>
         </refsect1>
 
         <refsect1>
@@ -3422,7 +3443,7 @@
             revisions.  The first form removes versioned properties in
             your working copy, while the second removes unversioned
             remote properties on a repository revision
-            (<replaceable>TARGET</replaceable> only determines which
+            (<replaceable>TARGET</replaceable> determines only which
             repository to access).</para>
         </refsect1>
 
@@ -3433,7 +3454,7 @@
 
         <refsect1>
           <title>Changes</title>
-          <para>Working copy, repository only if operating on a URL</para>
+          <para>Working copy; repository only if operating on a URL</para>
         </refsect1>
 
         <refsect1>
@@ -3462,7 +3483,7 @@
           <title>Examples</title>
 
           <para>Delete a property from a file in your working
-            copy</para>
+            copy:</para>
 
           <screen>
 $ svn propdel svn:mime-type  some-script
@@ -3505,7 +3526,7 @@
             editor.  The first form edits versioned properties in
             your working copy, while the second edits unversioned
             remote properties on a repository revision
-            (<replaceable>TARGET</replaceable> only determines which
+            (<replaceable>TARGET</replaceable> determines only which
             repository to access).</para>
         </refsect1>
 
@@ -3516,7 +3537,7 @@
 
         <refsect1>
           <title>Changes</title>
-          <para>Working copy, repository only if operating on a URL</para>
+          <para>Working copy; repository only if operating on a URL</para>
         </refsect1>
 
         <refsect1>
@@ -3545,7 +3566,7 @@
         </refsect1>
 
         <refsect1>
-          <title>Examples</title>
+          <title>Example</title>
 
           <para><command>svn propedit</command> makes it easy to
             modify properties that have multiple values:</para>
@@ -3598,7 +3619,7 @@
 
         <refsect1>
           <title>Changes</title>
-          <para>Working copy, repository only if operating on a URL</para>
+          <para>Working copy; repository only if operating on a URL</para>
         </refsect1>
 
         <refsect1>
@@ -3671,7 +3692,7 @@
             revisions.  The first form lists versioned properties in
             your working copy, while the second lists unversioned remote
             properties on a repository revision
-            (<replaceable>TARGET</replaceable> only determines which
+            (<replaceable>TARGET</replaceable> determines only which
             repository to access).</para>
         </refsect1>
 
@@ -3682,7 +3703,7 @@
 
         <refsect1>
           <title>Changes</title>
-          <para>Working copy, repository only if operating on a URL</para>
+          <para>Working copy; repository only if operating on a URL</para>
         </refsect1>
 
         <refsect1>
@@ -3765,7 +3786,7 @@
             property change in the working copy, and the second
             creates an unversioned, remote property change on a
             repository revision
-            (<replaceable>TARGET</replaceable> only determines which
+            (<replaceable>TARGET</replaceable> determines only which
             repository to access).</para>
 
           <tip>
@@ -3783,7 +3804,7 @@
 
         <refsect1>
           <title>Changes</title>
-          <para>Working copy, repository only if operating on a URL</para>
+          <para>Working copy; repository only if operating on a URL</para>
         </refsect1>
 
         <refsect1>
@@ -3822,7 +3843,7 @@
 property 'svn:mime-type' set on 'foo.jpg'
 </screen>
 
-          <para>On a UNIX system, if you want a file to have the
+          <para>On a Unix system, if you want a file to have the
             executable permission set:</para>
 
           <screen>
@@ -3849,7 +3870,7 @@
 </screen>
 
           <para>Or, if you don't have a working copy, you can
-            provide a URL.</para>
+            provide a URL:</para>
           
           <screen>
 $ svn propset --revprop -r 26 svn:log "Document nap." http://svn.red-bean.com/repos
@@ -3904,7 +3925,7 @@
             conflict-related artifact files and allows
             <replaceable>PATH</replaceable> to be committed again;
             that is, it tells Subversion that the conflicts have been
-            <quote>resolved</quote>.  See <xref
+            <quote>resolved.</quote>  See <xref
             linkend="svn.tour.cycle.resolve"/> for an in-depth look at
             resolving conflicts.</para> </refsect1>
 
@@ -3936,7 +3957,7 @@
         </refsect1>
         
         <refsect1>
-          <title>Examples</title>
+          <title>Example</title>
           
           <para>If you get a conflict on an update, your working
             copy will sprout three new files:</para>
@@ -3993,7 +4014,7 @@
             revert</command> will not only revert the contents of an
             item in your working copy, but also any property
             changes.  Finally, you can use it to undo any scheduling
-            operations that you may have done (e.g. files scheduled
+            operations that you may have done (e.g., files scheduled
             for addition or deletion can be
             <quote>unscheduled</quote>).</para>
         </refsect1>
@@ -4120,35 +4141,35 @@
           <variablelist>
             
             <varlistentry>
-              <term>' '</term>
+              <term><literal>' '</literal></term>
               <listitem>
                 <para>No modifications.</para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term>'A'</term>
+              <term><literal>'A'</literal></term>
               <listitem>
-                <para>Item is scheduled for Addition.</para>
+                <para>Item is scheduled for addition.</para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term>'D'</term>
+              <term><literal>'D'</literal></term>
               <listitem>
-                <para>Item is scheduled for Deletion.</para>
+                <para>Item is scheduled for deletion.</para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term>'M'</term>
+              <term><literal>'M'</literal></term>
               <listitem>
                 <para>Item has been modified.</para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term>'R'</term>
+              <term><literal>'R'</literal></term>
               <listitem>
                 <para>Item has been replaced in your working copy.
                 This means the file was scheduled for deletion, and
@@ -4158,7 +4179,7 @@
             </varlistentry>
 
             <varlistentry>
-              <term>'C'</term>
+              <term><literal>'C'</literal></term>
               <listitem>
                 <para>The contents (as opposed to the properties) of
                   the item conflict with updates received from the
@@ -4167,29 +4188,29 @@
             </varlistentry>
 
             <varlistentry>
-              <term>'X'</term>
+              <term><literal>'X'</literal></term>
               <listitem>
                 <para>Item is present because of an externals definition.</para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term>'I'</term>
+              <term><literal>'I'</literal></term>
               <listitem>
-                <para>Item is being ignored (e.g. with the 
+                <para>Item is being ignored (e.g., with the 
                   <literal>svn:ignore</literal> property).</para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term>'?'</term>
+              <term><literal>'?'</literal></term>
               <listitem>
                 <para>Item is not under version control.</para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term>'!'</term>
+              <term><literal>'!'</literal></term>
               <listitem>
                 <para>Item is missing (e.g. you moved or deleted it
                   without using <command>svn</command>).  This also
@@ -4199,7 +4220,7 @@
             </varlistentry>
 
             <varlistentry>
-              <term>'~'</term>
+              <term><literal>'~'</literal></term>
               <listitem>
                 <para>Item is versioned as one kind of object (file,
                   directory, link), but has been replaced by different
@@ -4215,14 +4236,14 @@
           <variablelist>
             
             <varlistentry>
-              <term>' '</term>
+              <term><literal>' '</literal></term>
               <listitem>
                 <para>No modifications.</para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term>'M'</term>
+              <term><literal>'M'</literal></term>
               <listitem>
                 <para>Properties for this item have been
                   modified.</para>
@@ -4230,7 +4251,7 @@
             </varlistentry>
 
             <varlistentry>
-              <term>'C'</term>
+              <term><literal>'C'</literal></term>
               <listitem>
                 <para>Properties for this item are in conflict with
                   property updates received from the
@@ -4247,14 +4268,14 @@
           <variablelist>
             
             <varlistentry>
-              <term>' '</term>
+              <term><literal>' '</literal></term>
               <listitem>
                 <para>Item is not locked.</para>
               </listitem>
             </varlistentry>
             
             <varlistentry>
-              <term>'L'</term>
+              <term><literal>'L'</literal></term>
               <listitem>
                 <para>Item is locked.</para>
               </listitem>
@@ -4268,14 +4289,14 @@
           <variablelist>
             
             <varlistentry>
-              <term>' '</term>
+              <term><literal>' '</literal></term>
               <listitem>
                 <para>No history scheduled with commit.</para>
               </listitem>
             </varlistentry>
             
             <varlistentry>
-              <term>'+'</term>
+              <term><literal>'+'</literal></term>
               <listitem>
                 <para>History scheduled with commit.</para>
               </listitem>
@@ -4290,14 +4311,14 @@
           <variablelist>
             
             <varlistentry>
-              <term>' '</term>
+              <term><literal>' '</literal></term>
               <listitem>
                 <para>Item is a child of its parent directory.</para>
               </listitem>
             </varlistentry>
             
             <varlistentry>
-              <term>'S'</term>
+              <term><literal>'S'</literal></term>
               <listitem>
                 <para>Item is switched.</para>
               </listitem>
@@ -4310,7 +4331,7 @@
           <variablelist>
             
             <varlistentry>
-              <term>' '</term>
+              <term><literal>' '</literal></term>
               <listitem>
                 <para>When <option>--show-updates</option> is used,
                 the file is not locked.  If
@@ -4331,7 +4352,7 @@
               <term>O</term>
               <listitem>
                 <para>File is locked either by another user or in
-                another working copy.  This only appears when
+                another working copy.  This appears only when
                 <option>--show-updates</option> is used.</para>
               </listitem>
             </varlistentry>
@@ -4342,7 +4363,7 @@
                 <para>File was locked in this working copy, but the
                 lock has been <quote>stolen</quote> and is invalid.
                 The file is currently locked in the repository.  This
-                only appears when <option>--show-updates</option> is
+                appears only when <option>--show-updates</option> is
                 used.</para>
               </listitem>
             </varlistentry>
@@ -4352,7 +4373,7 @@
               <listitem>
                 <para>File was locked in this working copy, but the
                 lock has been <quote>broken</quote> and is invalid.
-                The file is no longer locked This only appears when
+                The file is no longer locked.  This appears only when
                 <option>--show-updates</option> is used.</para>
               </listitem>
             </varlistentry>
@@ -4369,14 +4390,14 @@
           <variablelist>
             
             <varlistentry>
-              <term>' '</term>
+              <term><literal>' '</literal></term>
               <listitem>
-                <para>The item in your working copy is up-to-date.</para>
+                <para>The item in your working copy is up to date.</para>
               </listitem>
             </varlistentry>
             
             <varlistentry>
-              <term>'*'</term>
+              <term><literal>'*'</literal></term>
               <listitem>
                 <para>A newer revision of the item exists on the
                   server.</para>
@@ -4475,7 +4496,7 @@
           </note>
 
           <para>And finally, the most information you can get out of
-            the status subcommand:</para>
+            the status subcommand is as follows:</para>
 
           <screen>
 $ svn status --show-updates --verbose wc
@@ -4517,7 +4538,7 @@
 
           <para>The first variant of this subcommand (without the
             <option>--relocate</option> option) updates your working
-            copy to point to a new URL—usually a URL which
+            copy to point to a new URL—usually a URL that
             shares a common ancestor with your working copy, although
             not necessarily.  This is the Subversion way to move a
             working copy to a new branch.  If specified,
@@ -4530,7 +4551,7 @@
             obstructing paths in the working copy do not automatically
             cause a failure if the switch attempts to add the same
             path.  If the obstructing path is the same type (file or
-            directory) as the corresponding path in the repository it
+            directory) as the corresponding path in the repository, it
             becomes versioned but its contents are left untouched in
             the working copy.  This means that an obstructing
             directory's unversioned children may also obstruct and
@@ -4560,7 +4581,7 @@
         </refsect1>
 
         <refsect1>
-          <title>Alternate Names</title>
+          <title>Alternate Name</title>
           <para>sw</para>
         </refsect1>
 
@@ -4636,7 +4657,7 @@
             words, the content of the repository doesn't change, but
             the repository's root URL does.  For example, the hostname
             may change, the URL scheme may change, or any part of the
-            URL which leads to the repository itself may change.
+            URL that leads to the repository itself may change.
             Rather than check out a new working copy, you can have the
             <command>svn switch</command> command
             <quote>rewrite</quote> your working copy's administrative
@@ -4758,7 +4779,6 @@
           <para>Unlock two files in your working copy:</para>
 
           <screen>
-
 $ svn unlock tree.jpg house.jpg
 'tree.jpg' unlocked.
 'house.jpg' unlocked.
@@ -4809,7 +4829,7 @@
 
           <para><command>svn update</command> brings changes from the
             repository into your working copy.  If no revision is given,
-            it brings your working copy up-to-date with the
+            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> option.  As part of the
@@ -4825,42 +4845,42 @@
           <variablelist>
 
             <varlistentry>
-              <term>A</term>
+              <term><literal>A</literal></term>
               <listitem>
                 <para>Added</para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term>D</term>
+              <term><literal>D</literal></term>
               <listitem>
                 <para>Deleted</para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term>U</term>
+              <term><literal>U</literal></term>
               <listitem>
                 <para>Updated</para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term>C</term>
+              <term><literal>C</literal></term>
               <listitem>
                 <para>Conflicted</para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term>G</term>
+              <term><literal>G</literal></term>
               <listitem>
                 <para>Merged</para>
               </listitem>
             </varlistentry>
 
             <varlistentry>
-              <term>E</term>
+              <term><literal>E</literal></term>
               <listitem>
                 <para>Existed</para>
               </listitem>
@@ -4883,8 +4903,8 @@
         </refsect1>
 
         <refsect1>
-          <title>Alternate Names</title>
-          <para>up</para>
+          <title>Alternate Name</title>
+          <para><command>up</command></para>
         </refsect1>
 
         <refsect1>
@@ -4922,7 +4942,7 @@
         </refsect1>
 
         <refsect1>
-          <title>Examples</title>
+          <title>Example</title>
 
           <para>Pick up repository changes that have happened since
             your last update:</para>




More information about the svnbook-dev mailing list