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

[cmpilato]

Author: cmpilato
Date: Wed Sep  3 23:57:50 2008
New Revision: 3289

Log:
* src/en/book/ch02-basic-usage.xml
  Rework some stuff to avoid talking about "checking in", which is
  explicitly forbidden in our HACKING document.  As a side-effect,
  lose a reference to making changes to a file "in a repository",
  since those changes are in fact made in the working copy and
  explicitly *not* transferred to the repository in this particular
  example.

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

Modified: trunk/src/en/book/ch02-basic-usage.xml
==============================================================================
--- trunk/src/en/book/ch02-basic-usage.xml	(original)
+++ trunk/src/en/book/ch02-basic-usage.xml	Wed Sep  3 23:57:50 2008
@@ -1377,10 +1377,10 @@
         </itemizedlist>
 
         <para>For example, Sally makes changes to the file
-          <filename>sandwich.txt</filename> in the repository.  Harry has
-          just changed the file in his working copy and checked it in.
-          Sally updates her working copy before checking in and she gets
-          a conflict, which she postpones:</para>
+          <filename>sandwich.txt</filename>, but does not yet commit
+          those changes.  Meanwhile, Harry commits changes to that
+          same file.  Sally updates her working copy before committing
+          and she gets a conflict, which she postpones:</para>
 
         <screen>
 $ svn update
@@ -1517,7 +1517,7 @@
             <para>And if you ask them for it, they may very well ride
               you out of town on a rail.</para>
           </footnote>
-          Once you've agreed on the changes you will check in, edit
+          Once you've agreed on the changes you will commit, edit
           your file and remove the conflict markers:</para>
 
         <screen>