diff tests/test-tutorial.t @ 900:98b5ac44a259

merge stable into default

--- a/tests/test-tutorial.t	Mon Apr 07 16:41:29 2014 -0700
+++ b/tests/test-tutorial.t	Sun Apr 13 16:46:13 2014 -0400
@@ -444,9 +444,10 @@
   
   move changes from parent revision to working directory
   
-      Changes to selected files in parent revision appear again as uncommitted
-      changed in the working directory. A new revision without selected changes
-      is created, becomes the new parent and obsoletes the previous one.
+      Changes to selected files in the checked out revision appear again as
+      uncommitted changed in the working directory. A new revision without the
+      selected changes is created, becomes the checked out revision, and
+      obsoletes the previous one.
   
       The --include option specifies patterns to uncommit. The --exclude option
       specifies patterns to keep in the commit.
@@ -477,11 +478,11 @@
   
   Fold multiple revisions into a single one
   
-      Revision from your current working directory to the specified one are fold
-      as a new one replacing the other
+      The revisions from your current working directory to the given one are
+      folded into a single successor revision.
   
-      you can alternatively use --rev to explicitly specify revision to be fold
-      ignoring the current working directory parent.
+      you can alternatively use --rev to explicitly specify revisions to be
+      folded, ignoring the current working directory parent.
   
   options: