[svnbook] r3862 committed - * src/en/book/ch01-fundamental-concepts.xml...

svnbook at googlecode.com svnbook at googlecode.com
Thu Jun 30 09:25:38 CDT 2011


Revision: 3862
Author:   cmpilato at gmail.com
Date:     Thu Jun 30 07:24:39 2011
Log:      * src/en/book/ch01-fundamental-concepts.xml
   Wrap all examples in <informalexample>...</informalexample>.  Remove
   <screen>...</screen> wrappers from an example that doesn't show
   screen output.

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

Modified:
  /trunk/src/en/book/ch01-fundamental-concepts.xml

=======================================
--- /trunk/src/en/book/ch01-fundamental-concepts.xml	Wed Jun 29 08:44:51  
2011
+++ /trunk/src/en/book/ch01-fundamental-concepts.xml	Thu Jun 30 07:24:39  
2011
@@ -807,7 +807,8 @@
            if you check out <filename>/calc</filename>, you will get a
            working copy like this:</para>

-        <screen>
+        <informalexample>
+          <screen>
  $ svn checkout http://svn.example.com/repos/calc
  A    calc/Makefile
  A    calc/integer.c
@@ -817,6 +818,7 @@
  Makefile  button.c integer.c .svn/
  $
  </screen>
+        </informalexample>

          <para>The list of letter <literal>A</literal>s in the left
            margin indicates that Subversion is adding a number of items
@@ -852,13 +854,15 @@
          <para>To publish your changes to others, you can use
            Subversion's <command>svn commit</command> command:</para>

-        <screen>
+        <informalexample>
+          <screen>
  $ svn commit button.c -m "Fixed a typo in button.c."
  Sending        button.c
  Transmitting file data .
  Committed revision 57.
  $
  </screen>
+        </informalexample>

          <para>Now your changes to <filename>button.c</filename> have
            been committed to the repository, with a note describing your
@@ -894,7 +898,8 @@
            your changes into her working copy, as well as any others that
            have been committed since she checked it out.</para>

-        <screen>
+        <informalexample>
+          <screen>
  $ pwd
  /home/sally/calc
  $ ls -A
@@ -904,6 +909,7 @@
  Updated to revision 57.
  $
  </screen>
+        </informalexample>

          <para>The output from the <command>svn update</command> command
            indicates that Subversion updated the contents of
@@ -933,11 +939,14 @@
            revisions.  For example, suppose you check out a working copy
            from a repository whose most recent revision is 4:</para>

-        <screen>
-calc/Makefile:4
-     integer.c:4
-     button.c:4
-</screen>
+        <informalexample>
+          <literallayout>
+calc/
+   Makefile:4
+   integer.c:4
+   button.c:4
+</literallayout>
+        </informalexample>

          <para>At the moment, this working directory corresponds exactly
            to revision 4 in the repository.  However, suppose you make a
@@ -946,22 +955,28 @@
            commit will create revision 5 of the repository, and your
            working copy will now look like this:</para>

-        <screen>
-calc/Makefile:4
-     integer.c:4
-     button.c:5
-</screen>
+        <informalexample>
+          <literallayout>
+calc/
+   Makefile:4
+   integer.c:4
+   button.c:5
+</literallayout>
+        </informalexample>

          <para>Suppose that, at this point, Sally commits a change to
            <filename>integer.c</filename>, creating revision 6.  If you
            use <command>svn update</command> to bring your working copy
            up to date, it will look like this:</para>

-        <screen>
-calc/Makefile:6
-     integer.c:6
-     button.c:6
-</screen>
+        <informalexample>
+          <literallayout>
+calc/
+   Makefile:6
+   integer.c:6
+   button.c:6
+</literallayout>
+        </informalexample>

          <para>Sally's change to <filename>integer.c</filename> will
            appear in your working copy, and your change will still be




More information about the svnbook-dev mailing list