[svnbook] r4073 committed - Read-thru edits....

svnbook at googlecode.com svnbook at googlecode.com
Thu Sep 8 10:58:44 CDT 2011


Revision: 4073
Author:   cmpilato at gmail.com
Date:     Thu Sep  8 08:57:46 2011
Log:      Read-thru edits.

* en/book/ch02-basic-usage.xml
   (svn.tour.help): Update 'svn help' output.
   (svn.tour.initial): Update the 'What Is This .svn Directory?'
     sidebar, including giving it a new name.
   (svn.tour.history.browsing.list): Update 'svn list' output, and
     don't use svn.collab.net in the examples.

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

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

=======================================
--- /trunk/en/book/ch02-basic-usage.xml	Tue Sep  6 14:02:35 2011
+++ /trunk/en/book/ch02-basic-usage.xml	Thu Sep  8 08:57:46 2011
@@ -64,7 +64,7 @@
      <informalexample>
        <screen>
  $ svn help
-Subversion command-line client, version 1.6.13.
+Subversion command-line client, version 1.7.0.
  Type 'svn help <subcommand>' for help on a specific subcommand.
  Type 'svn --version' to see the program version and RA modules
    or 'svn --version --quiet' to see just the version number.
@@ -279,16 +279,16 @@
        <informalexample>
          <screen>
  $ svn list file:///var/svn/single-project-repo
-/trunk
-/branches
-/tags
+trunk/
+branches/
+tags/
  $ svn list file:///var/svn/multi-project-repo
-/project-A
-/project-B
+project-A/
+project-B/
  $ svn list file:///var/svn/multi-project-repo/project-A
-/trunk
-/branches
-/tags
+trunk/
+branches/
+tags/
  $
  </screen>
        </informalexample>
@@ -427,27 +427,17 @@
        anything.</para>

      <sidebar>
-
-      <!-- ### This will change in 1.7 -->
-
-      <title>What's with the .svn Directory?</title>
-
-      <para>Every directory in a working copy contains an
-        administrative area—a subdirectory named
-        <filename>.svn</filename>.  Usually, directory listing
-        commands won't show this subdirectory, but it is nevertheless
-        an important directory.  Whatever you do, don't delete or
-        change anything in the administrative area!  Subversion uses
-        that directory and its contents to manage your working
-        copy.</para>
-
-      <para>If you accidentally remove the <filename>.svn</filename>
-        subdirectory, the easiest way to fix the problem is to remove
-        the entire containing directory (a normal system deletion,
-        not <command>svn delete</command>), then run <userinput>svn
-        update</userinput> from a parent directory.  The Subversion
-        client will download the directory you've deleted, with a
-        new <filename>.svn</filename> area as well.</para>
+      <title>What Is This .svn Directory?</title>
+
+      <para>The topmost directory of a working copy—and prior to
+        version 1.7, every versioned subdirectory
+        thereof—contains a special administrative subdirectory
+        named <filename>.svn</filename>.  Usually, your operating
+        system's directory listing commands won't show this
+        subdirectory, but it is nevertheless an important directory.
+        Whatever you do, don't delete or change anything in the
+        administrative area!  Subversion uses that directory and its
+        contents to manage your working copy.</para>
      </sidebar>

      <para>Notice that in the previous pair of examples, Subversion
@@ -2500,10 +2490,9 @@

          <informalexample>
            <screen>
-$ svn list http://svn.collab.net/repos/svn
+$ svn list http://svn.example.com/repo/project
  README
  branches/
-clients/
  tags/
  trunk/
  </screen>
@@ -2515,10 +2504,10 @@

          <informalexample>
            <screen>
-$ svn list -v http://svn.collab.net/repos/svn
+$ svn list -v http://svn.example.com/repo/project
+  23351 sally                 Feb 05 13:26 ./
    20620 harry            1084 Jul 13  2006 README
    23339 harry                 Feb 04 01:40 branches/
-  21282 sally                 Aug 27 09:41 developer-resources/
    23198 harry                 Jan 23 17:17 tags/
    23351 sally                 Feb 05 13:26 trunk/
  </screen>




More information about the svnbook-dev mailing list