[svnbook] r4149 committed - * en/book/ch04-branching-and-merging.xml...

svnbook at googlecode.com svnbook at googlecode.com
Thu Nov 3 17:02:36 CDT 2011


Revision: 4149
Author:   ptburba at gmail.com
Date:     Thu Nov  3 15:01:37 2011
Log:      * en/book/ch04-branching-and-merging.xml
* en/book/ch09-reference.xml
   </screen> tags should be fully left-aligned.

http://code.google.com/p/svnbook/source/detail?r=4149

Modified:
  /trunk/en/book/ch04-branching-and-merging.xml
  /trunk/en/book/ch09-reference.xml

=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml	Thu Nov  3 14:56:40 2011
+++ /trunk/en/book/ch04-branching-and-merging.xml	Thu Nov  3 15:01:37 2011
@@ -831,7 +831,7 @@
   U   .
  --- Eliding mergeinfo from 'doc/INSTALL':
   U   doc/INSTALL
-          </screen>
+</screen>
          </informalexample>

          <indexterm zone="svn.branchemerge.basicmerging.stayinsync.subtree">
@@ -1155,7 +1155,7 @@
  $ svn mergeinfo ^/trunk/src/main.c ^/branches/proj-X/src/main.c
  651
  652
-          </screen>
+</screen>
          </informalexample>

          <para>Notice from our first subcommand that only the root of
@@ -1199,7 +1199,7 @@
  $ svn mergeinfo ^/trunk/src/main.c ^/branches/proj-X/src/main.c
  651
  652
-          </screen>
+</screen>
          </informalexample>

          <para>You might never have to think about mergeinfo inheritance
@@ -2121,7 +2121,7 @@
     M /trunk/src/frazzle.c

  Reintegrate the frazzle-feature-branch to trunk.
-        </screen>
+</screen>
        </informalexample>

        <para>Because r1055 was a reintegrate merge we know that mergeinfo
@@ -2139,7 +2139,7 @@
  ___________________________________________________________________
  Modified: svn:mergeinfo
     Merged /branches/frazzle-feature-branch:r997-1003
-        </screen>
+</screen>
        </informalexample>

        <para>Now simply blocking merges of r1055 from
@@ -2175,7 +2175,7 @@
  Modified: svn:mergeinfo
     Merged /trunk:r1055
     Merged /branches/frazzle-feature-branch:r997-1003
-        </screen>
+</screen>
        </informalexample>

        <para>Blocking changes with <option>--record-only</option>
=======================================
--- /trunk/en/book/ch09-reference.xml	Thu Nov  3 12:47:55 2011
+++ /trunk/en/book/ch09-reference.xml	Thu Nov  3 15:01:37 2011
@@ -2262,7 +2262,7 @@
            <informalexample>
              <screen>
  $ svn diff -r 3000:3500 http://svn.collab.net/repos/svn/trunk
-          </screen>
+</screen>
            </informalexample>


@@ -2274,7 +2274,7 @@
              <screen>
  $ svn diff -r 3000:3500 --old http://svn.collab.net/repos/svn/trunk \
             COMMITTERS README HACKING
-          </screen>
+</screen>
            </informalexample>

            <para>If you have a working copy, you can obtain the




More information about the svnbook-dev mailing list