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

cmpilato svnbook-dev at red-bean.com
Mon Sep 19 08:20:03 CDT 2005


Author: cmpilato
Date: Mon Sep 19 08:20:02 2005
New Revision: 1695

Modified:
   trunk/src/en/book/ch02.xml
   trunk/src/en/book/ch03.xml
   trunk/src/en/book/ch04.xml
   trunk/src/en/book/ch06.xml
   trunk/src/en/book/ch07.xml
Log:
Fix indentiation of <screen> tags throughout.
Patch by Joshua Varner <jlvarner at gmail.com>.

* src/en/book/ch02.xml
* src/en/book/ch03.xml
* src/en/book/ch04.xml
* src/en/book/ch06.xml
* src/en/book/ch07.xml


Modified: trunk/src/en/book/ch02.xml
==============================================================================
--- trunk/src/en/book/ch02.xml	(original)
+++ trunk/src/en/book/ch02.xml	Mon Sep 19 08:20:02 2005
@@ -354,7 +354,7 @@
         if you check out <filename>/calc</filename>, you will get a
         working copy like this:</para>
 
-<screen>
+      <screen>
 $ svn checkout http://svn.example.com/repos/calc
 A  calc
 A  calc/Makefile
@@ -437,7 +437,7 @@
       <para>To publish your changes to others, you can use
         Subversion's <command>commit</command> command:</para>
 
-<screen>
+      <screen>
 $ svn commit button.c
 Sending        button.c
 Transmitting file data .
@@ -463,7 +463,7 @@
         well as any others that have been committed since she checked
         it out.</para>
 
-<screen>
+      <screen>
 $ pwd
 /home/sally/calc
 
@@ -547,7 +547,7 @@
         suppose you check out a working copy from a repository whose
         most recent revision is 4:</para>
 
-<screen>
+      <screen>
 calc/Makefile:4
      integer.c:4
      button.c:4
@@ -560,7 +560,7 @@
         commit will create revision 5 of the repository, and your
         working copy will now look like this:</para>
 
-<screen>
+      <screen>
 calc/Makefile:4
      integer.c:4
      button.c:5
@@ -571,7 +571,7 @@
         use <command>svn update</command> to bring your working copy
         up to date, then it will look like this:</para>
 
-<screen>
+      <screen>
 calc/Makefile:6
      integer.c:6
      button.c:6

Modified: trunk/src/en/book/ch03.xml
==============================================================================
--- trunk/src/en/book/ch03.xml	(original)
+++ trunk/src/en/book/ch03.xml	Mon Sep 19 08:20:02 2005
@@ -1666,7 +1666,7 @@
         that, the entire commit will fail with a message informing you
         that one or more of your files is out-of-date:</para>
 
-<screen>
+      <screen>
 $ svn commit --message "Add another rule"
 Sending        rules.txt
 svn: Commit failed (details follow):

Modified: trunk/src/en/book/ch04.xml
==============================================================================
--- trunk/src/en/book/ch04.xml	(original)
+++ trunk/src/en/book/ch04.xml	Mon Sep 19 08:20:02 2005
@@ -165,7 +165,7 @@
         clear.  To begin, check out a working copy of the project's
         root directory, <filename>/calc</filename>:</para>
 
-<screen>
+      <screen>
 $ svn checkout http://svn.example.com/repos/calc bigwc
 A  bigwc/trunk/
 A  bigwc/trunk/Makefile
@@ -179,7 +179,7 @@
         working-copy paths to the <command>svn copy</command>
         command:</para>
 
-<screen>
+      <screen>
 $ cd bigwc
 $ svn copy trunk branches/my-calc-branch
 $ svn status
@@ -201,7 +201,7 @@
         than resending all of the working copy data over the
         network:</para>
 
-<screen>
+      <screen>
 $ svn commit -m "Creating a private branch of /calc/trunk."
 Adding         branches/my-calc-branch
 Committed revision 341.
@@ -211,7 +211,7 @@
         should have told you about in the first place: <command>svn
         copy</command> is able to operate directly on two URLs.</para>
 
-<screen>
+      <screen>
 $ svn copy http://svn.example.com/repos/calc/trunk \
            http://svn.example.com/repos/calc/branches/my-calc-branch \
       -m "Creating a private branch of /calc/trunk."
@@ -284,7 +284,7 @@
       <para>Now that you've created a branch of the project, you can
         check out a new working copy to start using it:</para>
 
-<screen>
+      <screen>
 $ svn checkout http://svn.example.com/repos/calc/branches/my-calc-branch
 A  my-calc-branch/Makefile
 A  my-calc-branch/integer.c
@@ -337,7 +337,7 @@
         changes made to your copy of
         <filename>integer.c</filename>:</para>
 
-<screen>
+      <screen>
 $ pwd
 /home/user/my-calc-branch
 
@@ -382,7 +382,7 @@
         copied.  Now look what happens when Sally runs the same
         command on her copy of the file:</para>
 
-<screen>
+      <screen>
 $ pwd
 /home/sally/calc
 
@@ -512,7 +512,7 @@
         you can ask <command>svn diff</command> to show you the exact
         change made by Sally in revision 344:</para>
 
-<screen>
+      <screen>
 $ svn diff -r 343:344 http://svn.example.com/repos/calc/trunk
 
 Index: integer.c
@@ -562,7 +562,7 @@
         terminal, however, it applies them directly to your working
         copy as <emphasis>local modifications</emphasis>:</para>
     
-<screen>
+      <screen>
 $ svn merge -r 343:344 http://svn.example.com/repos/calc/trunk
 U  integer.c
 
@@ -596,7 +596,7 @@
         message mentions that you're porting a specific change from
         one branch to another.  For example:</para>
 
-<screen>
+      <screen>
 $ svn commit -m "integer.c: ported r344 (spelling fixes) from trunk."
 Sending        integer.c
 Transmitting file data .
@@ -615,7 +615,7 @@
           <command>patch</command> command to accomplish the same job?
           For example:</para>
 
-<screen>
+        <screen>
 $ svn diff -r 343:344 http://svn.example.com/repos/calc/trunk > patchfile
 $ patch -p0  < patchfile
 Patching file integer.c using Plan A...
@@ -684,7 +684,7 @@
         directory of your working copy, you'll have to specify the
         target directory to receive the changes:</para>
       
-<screen>
+      <screen>
 $ svn merge -r 343:344 http://svn.example.com/repos/calc/trunk my-calc-branch
 U   my-calc-branch/integer.c
 </screen>
@@ -748,7 +748,7 @@
         specify the three necessary arguments rather flexibly.  Here
         are some examples:</para>
 
-<screen>      
+      <screen>      
 $ svn merge http://svn.example.com/repos/branch1@150 \
             http://svn.example.com/repos/branch2@212 \
             my-working-copy
@@ -926,7 +926,7 @@
           <quote>failed hunks</quote>, <command>svn merge</command>
           will complain about <quote>skipped targets</quote>:</para>
 
-<screen>
+        <screen>
 $ svn merge -r 1288:1351 http://svn.example.com/repos/branch
 U  foo.c
 U  bar.c
@@ -1117,7 +1117,7 @@
 
         <para>So in our continuing example,</para>
 
-<screen>
+        <screen>
 $ svn log --verbose --stop-on-copy \
           http://svn.example.com/repos/calc/branches/my-calc-branch
 …
@@ -1137,7 +1137,7 @@
 
       <para>Here's the final merging procedure, then:</para>
 
-<screen>
+      <screen>
 $ cd calc/trunk
 $ svn update
 At revision 405.
@@ -1200,7 +1200,7 @@
         branch changes after that—by comparing revisions 406 and
         <literal>HEAD</literal>.</para>
 
-<screen>
+      <screen>
 $ cd calc/trunk
 $ svn update
 At revision 480.
@@ -1245,7 +1245,7 @@
         <emphasis>reverse</emphasis> difference:</para>
 
 
-<screen>
+      <screen>
 $ svn merge -r 303:302 http://svn.example.com/repos/calc/trunk
 U  integer.c
 
@@ -1660,7 +1660,7 @@
       <filename>/calc/trunk</filename> to mirror the new branch
       location:</para>
 
-<screen>
+    <screen>
 $ cd calc
 
 $ svn info | grep URL
@@ -1816,7 +1816,7 @@
         <filename>/calc/trunk</filename> exactly as it looks in the
         <literal>HEAD</literal> revision, then make a copy of it:</para>
 
-<screen>
+      <screen>
 $ svn copy http://svn.example.com/repos/calc/trunk \
            http://svn.example.com/repos/calc/tags/release-1.0 \
       -m "Tagging the 1.0 release of the 'calc' project."
@@ -1897,7 +1897,7 @@
         including the ability to copy a working-copy tree to the
         repository:</para>
 
-<screen>
+      <screen>
 $ ls
 my-working-copy/
 
@@ -1953,7 +1953,7 @@
         tag copies.  If a repository holds only one project, then
         often people create these top-level directories:</para>
 
-<screen>
+      <screen>
 /trunk
 /branches
 /tags
@@ -1964,7 +1964,7 @@
         linkend="svn.reposadmin.projects.chooselayout"/> to read more about
         <quote>project roots</quote>):</para>
 
-<screen>
+      <screen>
 /paint/trunk
 /paint/branches
 /paint/tags
@@ -2011,7 +2011,7 @@
         no need for your private branch directory to stick around
         anymore:</para>
 
-<screen>
+      <screen>
 $ svn delete http://svn.example.com/repos/calc/branches/my-calc-branch \
              -m "Removing obsolete branch of calc project."
 
@@ -2033,7 +2033,7 @@
         use <command>svn copy -r</command> to copy it from the old
         revision:</para>
 
-<screen>
+      <screen>
 $ svn copy -r 374 http://svn.example.com/repos/calc/branches/my-calc-branch \
                   http://svn.example.com/repos/calc/branches/my-calc-branch
 
@@ -2054,7 +2054,7 @@
         a <quote>stable</quote> branch of the software that won't
         change much:</para>
 
-<screen>
+      <screen>
 $ svn copy http://svn.example.com/repos/calc/trunk \
          http://svn.example.com/repos/calc/branches/stable-1.0 \
          -m "Creating stable branch of calc project."

Modified: trunk/src/en/book/ch06.xml
==============================================================================
--- trunk/src/en/book/ch06.xml	(original)
+++ trunk/src/en/book/ch06.xml	Mon Sep 19 08:20:02 2005
@@ -270,7 +270,7 @@
       <para>To disable caching for a single command, pass the
         <option>--no-auth-cache</option> option:</para>
 
-<screen>
+      <screen>
 $ svn commit -F log_msg.txt --no-auth-cache
 Authentication realm: <svn://host.example.com:3690> example realm
 Username:  joe
@@ -296,7 +296,7 @@
         <literal>no</literal>, and no credentials will be cached on
         disk, ever.</para>
 
-<screen>
+      <screen>
 [auth]
 store-auth-creds = no
 </screen>
@@ -310,7 +310,7 @@
         the particular server realm that the file is associated
         with:</para>
 
-<screen>
+      <screen>
 $ ls ~/.subversion/auth/svn.simple/
 5671adf2865e267db74f09ba6f872c28        
 3893ed123b39500bca8a0b382839198e
@@ -433,7 +433,7 @@
         process, then you can pass the <option>-i</option>
         (<option>--inetd</option>) option:</para>
 
-<screen>
+      <screen>
 $ svnserve -i
 ( success ( 1 2 ( ANONYMOUS ) ( edit-pipeline ) ) )
 </screen>
@@ -448,7 +448,7 @@
         add lines to <filename>/etc/services</filename> like these (if
         they don't already exist):</para>
 
-<screen>
+      <screen>
 svn           3690/tcp   # Subversion
 svn           3690/udp   # Subversion
 </screen>
@@ -457,7 +457,7 @@
         <command>inetd</command> daemon, you can add this line to
         <filename>/etc/inetd.conf</filename>:</para>
 
-<screen>
+      <screen>
 svn stream tcp nowait svnowner /usr/bin/svnserve svnserve -i
 </screen>
 
@@ -543,7 +543,7 @@
         which restricts it to exporting only repositories below that
         path:</para>
       
-<screen>
+      <screen>
 $ svnserve -d -r /usr/local/repositories
 …
 </screen>
@@ -554,7 +554,7 @@
         have that path portion removed from them, leaving much
         shorter (and much less revealing) URLs:</para>
       
-<screen>
+      <screen>
 $ svn checkout svn://host.example.com/project1
 …
 </screen>
@@ -633,7 +633,7 @@
           need.  Begin by defining a file which contains usernames and
           passwords, and an authentication realm:</para>
 
-<screen>
+        <screen>
 [general]
 password-db = userfile
 realm = example realm
@@ -650,7 +650,7 @@
           file that contains a list of usernames and passwords, using
           the same familiar format.  For example:</para>
 
-<screen>
+        <screen>
 [users]
 harry = foopassword
 sally = barpassword
@@ -688,7 +688,7 @@
           repository, and <literal>write</literal> allows complete
           read/write access to the repository.  For example:</para>
 
-<screen>
+        <screen>
 [general]
 password-db = userfile
 realm = example realm
@@ -705,7 +705,7 @@
           want to be even more conservative, you can block anonymous
           access completely:</para>
 
-<screen>
+        <screen>
 [general]
 password-db = userfile
 realm = example realm
@@ -753,7 +753,7 @@
         <command>svnserve</command>.  The client simply uses the
         <literal>svn+ssh://</literal> URL schema to connect:</para>
 
-<screen>
+      <screen>
 $ whoami
 harry
 
@@ -829,7 +829,7 @@
         <filename>config</filename> file, simply define it like
         this:</para>
 
-<screen>
+      <screen>
 [tunnels]
 rsh = rsh
 </screen>
@@ -845,7 +845,7 @@
         username at host svnserve -t</command>).  But you can define new
         tunneling schemes to be much more clever than that:</para>
 
-<screen>
+      <screen>
 [tunnels]
 joessh = $JOESSH /opt/alternate/ssh -p 29934
 </screen>
@@ -906,7 +906,7 @@
           allowed to connect.  The lines are typically of the
           form:</para>
 
-<screen>
+        <screen>
   ssh-dsa AAAABtce9euch.... user at example.com
 </screen>
           
@@ -916,7 +916,7 @@
           line can be preceded by a <literal>command</literal>
           field:</para>
 
-<screen>
+        <screen>
   command="program" ssh-dsa AAAABtce9euch.... user at example.com
 </screen>
 
@@ -927,7 +927,7 @@
           of server-side tricks.  In the following examples, we
           abbreviate the lines of the file as:</para>
 
-<screen>
+        <screen>
   command="program" TYPE KEY COMMENT
 </screen>
 
@@ -940,7 +940,7 @@
           it's easy to name a specific <command>svnserve</command>
           binary to run and to pass it extra arguments:</para>
         
-<screen>
+        <screen>
   command="/path/to/svnserve -t -r /virtual/root" TYPE KEY COMMENT
 </screen>
 
@@ -964,7 +964,7 @@
           line, and use the <option>--tunnel-user</option>
           option:</para>
 
-<screen>
+        <screen>
   command="svnserve -t --tunnel-user=harry" TYPE1 KEY1 harry at example.com
   command="svnserve -t --tunnel-user=sally" TYPE2 KEY2 sally at example.com
 </screen>
@@ -990,7 +990,7 @@
           want to specify a number of restrictive options immediately
           after the <literal>command</literal>:</para>
 
-<screen>
+        <screen>
   command="svnserve -t --tunnel-user=harry",no-port-forwarding,\
            no-agent-forwarding,no-X11-forwarding,no-pty \
            TYPE1 KEY1 harry at example.com

Modified: trunk/src/en/book/ch07.xml
==============================================================================
--- trunk/src/en/book/ch07.xml	(original)
+++ trunk/src/en/book/ch07.xml	Mon Sep 19 08:20:02 2005
@@ -1292,7 +1292,7 @@
         <para>If you want to see the ignored files, you can pass the 
           <option>--no-ignore</option> option to Subversion:</para>
 
-<screen>
+        <screen>
 $ svn status --no-ignore
  M     calc/button.c
 I      calc/calculator



More information about the svnbook-dev mailing list