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

[sussman]

Author: sussman
Date: Sat Aug  6 18:57:34 2005
New Revision: 1593

Modified:
   trunk/src/en/book/ch01.xml
   trunk/src/en/book/ch02.xml
Log:

Clarifications based on suggestions from Robert P. J. Day
<rpjday at mindspring.com>.


* src/en/book/ch01.xml 

  (Installing Subversion):  explain APR, clarify that apache is not required.

  (A Quick Start): clarify that 'project' is just a directory.  note
                   that the branchs/tags/trunk structure is merely a
                   convention, not a requirement.


* src/en/book/ch02.xml 
  
  (Working Copies):  mention that you can have multiple working copies.



Modified: trunk/src/en/book/ch01.xml
==============================================================================
--- trunk/src/en/book/ch01.xml	(original)
+++ trunk/src/en/book/ch01.xml	Sat Aug  6 18:57:34 2005
@@ -295,11 +295,18 @@
 
     <title>Installing Subversion</title>
 
-    <para>Subversion is built on a portability layer called APR (the
-      Apache Portable Runtime library).  This means Subversion should
-      work on any operating system that the Apache httpd server runs
-      on: Windows, Linux, all flavors of BSD, Mac OS X, Netware, and
-      others.</para>
+    <para>Subversion is built on a portability layer called
+      APR—the Apache Portable Runtime library.  The APR library
+      provides all the interfaces that Subversion needs to function on
+      different operating systems: disk access, network access, memory
+      management, and so on.  While Subversion is able to use Apache
+      as one of its network server programs, its dependence on APR
+      <emphasis>does not</emphasis> mean that Apache is a required
+      component.  APR is a standalone library useable by any
+      application.  It does mean, however, that like Apache,
+      Subversion clients and servers run on any operating system that
+      the Apache httpd server runs on: Windows, Linux, all flavors of
+      BSD, Mac OS X, Netware, and others.</para>
 
     <para>The easiest way to get Subversion is to download a binary
       package built for your operating system.  Subversion's website
@@ -464,14 +471,17 @@
       in <xref linkend="svn.reposadmin.projects.chooselayout"/>.
       Either way, the repository only manages files and directories,
       so it's up to humans to interpret particular directories
-      as <quote>projects</quote>.</para>
+      as <quote>projects</quote>.  So while you might see references
+      to projects throughout this book, keep in mind that we're only
+      ever talking about some directory (or collection of directories)
+      in the repository.</para>
 
     <para>In this example, we assume that you already have some sort
       of project (a collection of files and directories) that you wish
       to import into your newly created Subversion repository.  Begin
       by organizing them into a single directory
       called <filename>myproject</filename> (or whatever you wish).
-      For reasons that will be clear later on (see
+      For reasons that will be clear later (see
       <xref linkend="svn.branchmerge"/>), your project's tree
       structure should contain three top-level directories
       named <filename>branches</filename>,
@@ -491,6 +501,11 @@
                     …
 </screen>
 
+    <para>The <filename>branches</filename>, <filename>tags</filename>,
+      and <filename>trunk</filename> subdirectories aren't actually
+      required by Subversion.  They're merely a popular convention
+      that you'll most likely want to use later on.</para>
+
     <para>Once you have your tree of data ready to go, import it into
       the repository with the <command>svn import</command> command
       (see <xref linkend="svn.tour.other.import"/>):</para>

Modified: trunk/src/en/book/ch02.xml
==============================================================================
--- trunk/src/en/book/ch02.xml	(original)
+++ trunk/src/en/book/ch02.xml	Sat Aug  6 18:57:34 2005
@@ -307,7 +307,8 @@
         way.  Your working copy is your own private work area:
         Subversion will never incorporate other people's changes, nor
         make your own changes available to others, until you
-        explicitly tell it to do so.</para>
+        explicitly tell it to do so.  You can even have multiple
+        working copies of the same project.</para>
 
       <para>After you've made some changes to the files in your
         working copy and verified that they work properly, Subversion