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

[svnbook at googlecode.com]

Revision: 3683
Author: cmpilato at gmail.com
Date: Sat Feb  6 21:57:56 2010
Log: * src/en/book/ch02-basic-usage.xml
   Follow-up to r3674, continuing what 'songdongsheng' begun in the
   area of cleaning up improper uses of the <computeroutput> tag.

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

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

=======================================
--- /trunk/src/en/book/ch02-basic-usage.xml	Fri Jan 29 21:43:46 2010
+++ /trunk/src/en/book/ch02-basic-usage.xml	Sat Feb  6 21:57:56 2010
@@ -1067,17 +1067,16 @@
          (h) help for more options:
  </screen>

-      <para>The <computeroutput>U</computeroutput> and
-        <computeroutput>G</computeroutput> codes are no cause for
-        concern; those files cleanly absorbed changes from the
-        repository.  The files marked with
-        <computeroutput>U</computeroutput> contained no local changes
-        but were <computeroutput>U</computeroutput>pdated with changes
-        from the repository.  The <computeroutput>G</computeroutput>
-        stands for mer<computeroutput>G</computeroutput>ed, which
-        means that the file had local changes to begin with, but the
-        changes coming from the repository didn't overlap with the local
-        changes.</para>
+      <para>The <computeroutput>U</computeroutput> (which stands for
+        <quote>Updated</quote>) and <computeroutput>G</computeroutput>
+        (for <quote>merGed</quote>) codes are no cause for concern;
+        those files cleanly absorbed changes from the repository.  A
+        file marked with <computeroutput>U</computeroutput> contains
+        no local changes but was updated with changes from the
+        repository.  One marked with
+        <computeroutput>G</computeroutput> had local changes to begin
+        with, but the changes coming from the repository didn't
+        overlap with those local changes.</para>

        <para>But the next two lines are part of a feature (new in
          Subversion 1.5) called <firstterm>interactive conflict
@@ -1104,7 +1103,7 @@

        <variablelist>
          <varlistentry>
-          <term>(<computeroutput>p</computeroutput>)ostpone</term>
+          <term><computeroutput>(p)  postpone</computeroutput></term>
            <listitem>

              <para>Leave the file in a conflicted state for you to
@@ -1116,7 +1115,7 @@


          <varlistentry>
-           
<term>(<computeroutput>d</computeroutput>)iff-(<computeroutput>f</computeroutput>)ull</term>
+          <term><computeroutput>(df) diff-full</computeroutput></term>
            <listitem>

              <para>Display the differences between the base revision
@@ -1127,7 +1126,7 @@


          <varlistentry>
-          <term>(<computeroutput>e</computeroutput>)dit</term>
+          <term><computeroutput>(e)  edit</computeroutput></term>
            <listitem>

              <para>Open the file in conflict with your favorite editor,
@@ -1139,7 +1138,7 @@


          <varlistentry>
-          <term>(<computeroutput>r</computeroutput>)esolved</term>
+          <term><computeroutput>(r)  resolved</computeroutput></term>
            <listitem>

              <para>After editing a file, tell
@@ -1152,7 +1151,7 @@
          </varlistentry>

          <varlistentry>
-           
<term>(<computeroutput>m</computeroutput>)ine-(<computeroutput>f</computeroutput>)ull</term>
+          <term><computeroutput>(mf) mine-full</computeroutput></term>
            <listitem>

              <para>Discard the newly received changes from the server
@@ -1162,7 +1161,7 @@
          </varlistentry>

          <varlistentry>
-           
<term>(<computeroutput>t</computeroutput>)heirs-(<computeroutput>f</computeroutput>)ull</term>
+          <term><computeroutput>(tf) theirs-full</computeroutput></term>
            <listitem>

              <para>Discard your local changes to the file under review
@@ -1173,7 +1172,7 @@
          </varlistentry>

          <varlistentry>
-          <term>(<computeroutput>l</computeroutput>)aunch</term>
+          <term><computeroutput>(l)  launch</computeroutput></term>
            <listitem>

              <para>Launch an external program to perform the conflict
@@ -1184,7 +1183,7 @@
          </varlistentry>

          <varlistentry>
-          <term>(<computeroutput>h</computeroutput>)elp</term>
+          <term><computeroutput>(h)  help</computeroutput></term>
            <listitem>

              <para>Show the list of all possible commands you can use
@@ -1305,14 +1304,13 @@
            with a <computeroutput>C</computeroutput>
            automatically.</para>

-        <para>The <computeroutput>C</computeroutput> stands for
-          conflict.  This means that
-          the changes from the server overlapped with your own, and
-          now you have to manually choose between them after the
-          update has completed.  When you postpone a conflict
-          resolution, <command>svn</command> typically does three
-          things to assist you in noticing and resolving that
-          conflict:</para>
+        <para>The <computeroutput>C</computeroutput>
+          (for <quote>Conflicted</quote>) means that the changes from the
+          server overlapped with your own, and now you have to
+          manually choose between them after the update has completed.
+          When you postpone a conflict resolution,
+          <command>svn</command> typically does three things to assist
+          you in noticing and resolving that conflict:</para>

          <itemizedlist>