[svnbook] r3806 committed - * src/en/book/ch02-basic-usage.xml...

[svnbook at googlecode.com]

Revision: 3806
Author: cmpilato at gmail.com
Date: Thu Oct 21 10:40:34 2010
Log: * src/en/book/ch02-basic-usage.xml
   Consistify some section titles, and rephrase the bit about when you
   need to make 'update' part of your basic work cycle.

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

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

=======================================
--- /trunk/src/en/book/ch02-basic-usage.xml	Fri Oct 15 11:16:49 2010
+++ /trunk/src/en/book/ch02-basic-usage.xml	Thu Oct 21 10:40:34 2010
@@ -481,7 +481,7 @@
            command.</para>
        </listitem>
        <listitem>
-        <para><emphasis>Make changes.</emphasis> The most common
+        <para><emphasis>Make your changes.</emphasis> The most common
            changes that you'll make are edits to the contents of your
            existing files.  But sometimes you need to add, remove, copy
            and move files and directories—the <command>svn
@@ -505,7 +505,7 @@
            or directory to its unmodified state.</para>
        </listitem>
        <listitem>
-        <para><emphasis>Resolve conflicts (merge others'
+        <para><emphasis>Resolve any conflicts (merge others'
            changes).</emphasis>  In the time it takes you to make and
            review your changes, others might have made and published
            changes, too.  You'll want to integrate their changes into
@@ -529,17 +529,28 @@
      <sect2 id="svn.tour.cycle.update">
        <title>Update Your Working Copy</title>

-      <para>When working on a project with a team, you'll want to
-        update your working copy to receive any changes other developers
-        on the project have made since your last update.  Use
-        <command>svn update</command> to bring your working copy into
-        sync with the latest revision in the repository:</para>
+      <para>When working on a project that is being modified via
+        multiple working copies, you'll want to update your working
+        copy to receive any changes committed from other working
+        copies since your last update.  These might be changes that
+        other members of your project team have made, or they might
+        simply be changes you've made yourself from a different
+        computer.  To protect your data, Subversion won't
+        allow you commit new changes to out-of-date files and
+        directories, so it's best to have the latest versions
+        of all your project's files and directories before making new
+        changes of your own.</para>
+
+      <para>Use <command>svn update</command> to bring your working
+        copy into sync with the latest revision in the
+        repository:</para>

        <screen>
  $ svn update
  U  foo.c
  U  bar.c
  Updated to revision 2.
+$
  </screen>

        <para>In this case, it appears that someone checked in
@@ -558,7 +569,7 @@

      <!-- ===============================================================  
-->
      <sect2 id="svn.tour.cycle.edit">
-      <title>Make Changes to Your Working Copy</title>
+      <title>Make Your Changes </title>

        <para>Now you can get to work and make changes in your working
          copy.  It's usually most convenient to decide on a discrete
@@ -726,7 +737,7 @@

      <!-- ===============================================================  
-->
      <sect2 id="svn.tour.cycle.examine">
-      <title>Examine Your Changes</title>
+      <title>Review Your Changes</title>

        <para>Once you've finished making changes, you need to commit
          them to the repository, but before you do so, it's usually a
@@ -1044,7 +1055,7 @@

      <!-- ===============================================================  
-->
      <sect2 id="svn.tour.cycle.revert">
-      <title>Undoing Working Changes</title>
+      <title>Fix Your Mistakes</title>


        <para>Suppose while viewing the output of <command>svn
@@ -1113,7 +1124,7 @@

      <!-- ===============================================================  
-->
      <sect2 id="svn.tour.cycle.resolve">
-      <title>Resolve Conflicts (Merging Others' Changes)</title>
+      <title>Resolve Any Conflicts</title>

        <para>We've already seen how <userinput>svn status -u</userinput>
          can predict conflicts.  Suppose you run <userinput>svn