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

[stsp]

Author: stsp
Date: Mon Jan  5 08:55:05 2009
New Revision: 3397

Log:
* src/en/book/ch02-basic-usage.xml
  (svn.tour.cycle.resolve, svn.tour.cycle.resolve.diff): The text was
   referring to a 'diff' command during interactive conflict resolution.
   But the command is actually called 'diff-full'.

Review by: kfogel
           julianfoad


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	Mon Jan  5 08:55:05 2009
@@ -1116,7 +1116,7 @@
 
 
         <varlistentry>
-          <term>(<computeroutput>d</computeroutput>)iff</term>
+          <term>(<computeroutput>d</computeroutput>)iff-(<computeroutput>f</computeroutput>)ull</term>
           <listitem>
 
             <para>Display the differences between the base revision
@@ -1206,8 +1206,8 @@
 
         <para>Before deciding how to attack a conflict interactively,
           odds are that you'd like to see exactly what is in conflict,
-          and the <firstterm>diff</firstterm> command
-          (<userinput>d</userinput>) is what you'll use for this:</para>
+          and the <firstterm>diff-full</firstterm> command
+          (<userinput>df</userinput>) is what you'll use for this:</para>
 
         <screen>
 …