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

fitz noreply at red-bean.com
Thu May 1 18:42:02 CDT 2008


Author: fitz
Date: Thu May  1 18:42:02 2008
New Revision: 3042

Log:
More copyedits for Chapter 2.

* src/en/book/ch02-basic-usage.xml: Tweak option formatting.


Modified:
   trunk/src/en/book/ch02-basic-usage.xml

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	Thu May  1 18:42:02 2008
@@ -553,7 +553,7 @@
               underneath <filename>foo</filename> will be scheduled
               for addition.  If you want only to add
               <filename>foo</filename> itself, pass the
-              <option>--non-recursive</option> (<option>-N</option>)
+              <option>--non-recursive (-N)</option>
               option.</para>
           </listitem>
         </varlistentry>
@@ -816,7 +816,7 @@
 </screen>
 
         <para><command>svn status</command> also has a
-          <option>--verbose</option> (<option>-v</option>) option,
+          <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>
@@ -845,7 +845,7 @@
           status</command> contact the repository—instead, they
           compare the metadata in the <filename>.svn</filename>
           directory with the working copy.  Finally, there is the
-          <option>--show-updates</option> (<option>-u</option>)
+          <option>--show-updates (-u)</option>
           option, which contacts the repository and adds information
           about things that are out of date:</para>
 
@@ -956,10 +956,10 @@
           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</option>
-          (<option>-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
+          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 --diff-cmd /usr/bin/diff --extensions '-i'
           foo.c</command>.</para>
 
@@ -1613,8 +1613,7 @@
         describing your change.  Your log message will be attached to
         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>)
-        option:</para>
+        <option>--message (-m)</option> option:</para>
 
       <screen>
 $ svn commit -m "Corrected number of cheese slices."
@@ -1626,7 +1625,7 @@
       <para>However, if you've been composing your log message as you
         work, you may want to tell Subversion to get the message from
         a file by passing the filename with the
-        <option>--file</option> (<option>-F</option>) option:</para>
+        <option>--file (-F)</option> option:</para>
 
       <screen>
 $ svn commit -F logmsg
@@ -1784,7 +1783,7 @@
         <emphasis>reverse chronological order</emphasis> by default.
         If you wish to see a different range of revisions in a
         particular order or just a single revision, pass the
-        <option>--revision</option> (<option>-r</option>)
+        <option>--revision (-r)</option>
         option:</para>
 
       <screen>
@@ -1830,14 +1829,14 @@
           current revision, and thus you don't see the newly committed
           changes.  The solution here is to either update your working
           copy or explicitly provide a revision number to <command>svn
-          log</command> by using the <option>--revision</option>
-          (<option>-r</option>) option.</para>
+          log</command> by using the <option>--revision (-r)</option>
+          option.</para>
 
       </sidebar>
 
       <para>If you want even more information about a file or
         directory, <command>svn log</command> also takes a
-        <option>--verbose</option> (<option>-v</option>) option.
+        <option>--verbose (-v)</option> option.
         Because Subversion allows you to move and copy files and
         directories, it is important to be able to track path changes
         in the filesystem. So, in verbose mode, <command>svn
@@ -1859,9 +1858,9 @@
 </screen>
 
       <para>
-        <command>svn log</command> also takes a <option>--quiet</option>
-        (<option>-q</option>) option, which suppresses the body of the
-        log message.  When combined with <option>--verbose</option>, it
+        <command>svn log</command> also takes a <option>--quiet
+        (-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>
 
       <sidebar>
@@ -1954,10 +1953,9 @@
       <sect3 id="svn.tour.history.diff.wcrepos">
         <title>Comparing working copy to repository</title>
 
-        <para>If a single <option>--revision</option>
-          (<option>-r</option>) number is passed, then your
-          working copy is compared to the specified revision in the
-          repository.</para>
+        <para>If a single <option>--revision (-r)</option> number is
+          passed, then your working copy is compared to the specified
+          revision in the repository.</para>
 
         <screen>
 $ svn diff -r 3 rules.txt
@@ -1982,9 +1980,8 @@
         <title>Comparing repository to repository</title>
 
         <para>If two revision numbers, separated by a colon, are
-          passed via <option>--revision</option>
-          (<option>-r</option>), then the two revisions are directly
-          compared:</para>
+          passed via <option>--revision (-r)</option>, then the two
+          revisions are directly compared:</para>
 
         <screen>
 $ svn diff -r 2:3 rules.txt
@@ -2002,8 +1999,8 @@
 </screen>
 
         <para>A more convenient way of comparing a revision to the
-          previous revision is to use the <option>--change</option>
-          (<option>-c</option>) option:</para>
+          previous revision is to use the <option>--change
+          (-c)</option> option:</para>
 
         <screen>
 $ svn diff -c 3 rules.txt
@@ -2090,7 +2087,7 @@
 </screen>
 
         <para>If you want a more detailed listing, pass the
-          <option>--verbose</option> (<option>-v</option>) flag to get
+          <option>--verbose (-v)</option> flag to get
           output like this:</para>
 
         <screen>




More information about the svnbook-dev mailing list