[svnbook] r4075 committed - Merge from ^/trunk/en the 1.6-relevant bits of r4070-r4073.

[svnbook at googlecode.com]

Revision: 4075
Author:   cmpilato at gmail.com
Date:     Thu Sep  8 09:02:56 2011
Log:      Merge from ^/trunk/en the 1.6-relevant bits of r4070-r4073.
http://code.google.com/p/svnbook/source/detail?r=4075

Modified:
  /branches/1.6/en
  /branches/1.6/en/book/ch00-preface.xml
  /branches/1.6/en/book/ch01-fundamental-concepts.xml
  /branches/1.6/en/book/ch02-basic-usage.xml

=======================================
--- /branches/1.6/en/book/ch00-preface.xml	Tue Jul  5 09:25:22 2011
+++ /branches/1.6/en/book/ch00-preface.xml	Thu Sep  8 09:02:56 2011
@@ -174,20 +174,22 @@
          <primary>CollabNet</primary>
        </indexterm>

-      <para>In early 2000, CollabNet, Inc. (<ulink
-        url="http://www.collab.net"/>) began seeking developers to
-        write a replacement for CVS.  CollabNet offers a collaboration
-        software suite called CollabNet Enterprise Edition (CEE), of
-        which one component is version control.  Although CEE used CVS
-        as its initial version control system, CVS's limitations were
-        obvious from the beginning, and CollabNet knew it would
-        eventually have to find something better.  Unfortunately, CVS
-        had become the de facto standard in the open source world
-        largely because there <emphasis>wasn't</emphasis> anything
-        better, at least not under a free license.  So CollabNet
-        determined to write a new version control system from scratch,
-        retaining the basic ideas of CVS, but without the bugs and
-        misfeatures.</para>
+      <para>In early 2000, CollabNet,
+        Inc. (<ulink url="http://www.collab.net"/>) began seeking
+        developers to write a replacement for CVS.  CollabNet
+        offered<footnote><para>CollabNet Enterprise Edition has since
+        been replaced by a new product line called CollabNet
+        TeamForge.</para></footnote> a collaboration software suite
+        called CollabNet Enterprise Edition (CEE), of which one
+        component was version control.  Although CEE used CVS as its
+        initial version control system, CVS's limitations were obvious
+        from the beginning, and CollabNet knew it would eventually
+        have to find something better.  Unfortunately, CVS had become
+        the de facto standard in the open source world largely because
+        there <emphasis>wasn't</emphasis> anything better, at least
+        not under a free license.  So CollabNet determined to write a
+        new version control system from scratch, retaining the basic
+        ideas of CVS, but without the bugs and misfeatures.</para>

        <para>In February 2000, they contacted Karl Fogel, the author of
          <citetitle>Open Source Development with CVS</citetitle>
@@ -365,7 +367,7 @@
            <listitem>
              <para>A custom standalone server program, runnable as a
                daemon process or invokable by SSH; another way to make
-              your repository available to others over a network.</para>
+              your repository available to others over a network</para>
            </listitem>
          </varlistentry>

=======================================
--- /branches/1.6/en/book/ch01-fundamental-concepts.xml	Thu Aug 18 10:51:43  
2011
+++ /branches/1.6/en/book/ch01-fundamental-concepts.xml	Thu Sep  8 09:02:56  
2011
@@ -537,7 +537,7 @@
              <row>
                <entry><literal>https://</literal></entry>
                <entry>Same as <literal>http://</literal>, but with
-                SSL encryption.</entry>
+                SSL encryption</entry>
              </row>
              <row>
                <entry><literal>svn://</literal></entry>
@@ -547,7 +547,7 @@
              <row>
                <entry><literal>svn+ssh://</literal></entry>
                <entry>Same as <literal>svn://</literal>, but through
-                an SSH tunnel.</entry>
+                an SSH tunnel</entry>
              </row>
            </tbody>
          </tgroup>
=======================================
--- /branches/1.6/en/book/ch02-basic-usage.xml	Tue Aug 30 07:57:58 2011
+++ /branches/1.6/en/book/ch02-basic-usage.xml	Thu Sep  8 09:02:56 2011
@@ -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>
@@ -2485,10 +2485,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>
@@ -2500,10 +2499,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>