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

[maxb at red-bean.com]

Author: maxb
Date: Thu Mar 31 17:11:00 2005
New Revision: 1202

Modified:
   trunk/src/en/book/ch03.xml
   trunk/src/en/book/ch06.xml
Log:
Fix incorrect htpasswd syntax.
Reported by David Steinbrunner <carbon at pobox.com>.

* en/book/ch06.xml: Fix ordering of options on htpasswd command line.

Describe the meaning of "R" in status output.
Based on a patch by Marcel Gosselin <marcel.gosselin at polymtl.ca>,
wording tweaked by me.

* en/book/ch03.xml (status output): Describe meaning of "R".

Tiny spacing tweak.

* en/book/ch03.xml (status output <variablelist>):
    Fix the number of columns in example status lines.


Modified: trunk/src/en/book/ch03.xml
==============================================================================
--- trunk/src/en/book/ch03.xml	(original)
+++ trunk/src/en/book/ch03.xml	Thu Mar 31 17:11:00 2005
@@ -811,6 +811,7 @@
 D      stuff/fish.c        # this file is scheduled for deletion
 A      stuff/loot/bloo.h   # this file is scheduled for addition
 C      stuff/loot/lump.c   # this file has conflicts from an update
+R      xyz.c               # this file is scheduled for replacement
     S  stuff/squawk        # this file or dir has been switched to a branch
 </screen>
       
@@ -833,7 +834,7 @@
           </varlistentry>
 
           <varlistentry>
-            <term><computeroutput>C     item</computeroutput></term>
+            <term><computeroutput>C      item</computeroutput></term>
             <listitem>
               <para>The file <filename>item</filename> is in a state
                 of conflict.  That is, changes received from the
@@ -862,6 +863,18 @@
           </varlistentry>
 
           <varlistentry>
+            <term><computeroutput>R      item</computeroutput></term>
+            <listitem>
+              <para>The file, directory, or symbolic link
+                <filename>item</filename> has been scheduled to
+                replace <filename>item</filename> in the repository.
+                This means that the object is first deleted, then
+                another object of the same name is added, all within a
+                single revision.</para>
+            </listitem>
+          </varlistentry>
+
+          <varlistentry>
             <term><computeroutput>X      item</computeroutput></term>
             <listitem>
               <para>The directory <filename>item</filename> is
@@ -905,7 +918,7 @@
           </varlistentry>
 
           <varlistentry>
-            <term><computeroutput>~     item</computeroutput></term>
+            <term><computeroutput>~      item</computeroutput></term>
             <listitem>
               <para>The file, directory, or symbolic link
                 <filename>item</filename> is in the repository as one

Modified: trunk/src/en/book/ch06.xml
==============================================================================
--- trunk/src/en/book/ch06.xml	(original)
+++ trunk/src/en/book/ch06.xml	Thu Mar 31 17:11:00 2005
@@ -1172,7 +1172,7 @@
 New password: ***** 
 Re-type new password: *****
 Adding password for user harry
-$ htpasswd /etc/svn-auth-file -m sally
+$ htpasswd -m /etc/svn-auth-file sally
 New password: *******
 Re-type new password: *******
 Adding password for user sally