--- a/docs/from-mq.rst	Fri Aug 24 11:53:55 2012 +0200
+++ b/docs/from-mq.rst	Fri Aug 24 12:47:12 2012 +0200
@@ -71,13 +71,16 @@
 This command takes the same options as commit, plus the switch '-e' (--edit)
 to edit the commit message in an editor.
 
-The amend command also has a -c switch which allow you to make an
-explicit amending commit before rewriting a changeset.::
 
-  $ hg record -m 'feature A'
-  # oups, I forget some stuff
-  $ hg record babar.py
-  $ hg amend -c .^ # .^ refer to "working directoy parent, here 'feature A'
+.. -c is very confusig
+..
+.. The amend command also has a -c switch which allow you to make an
+.. explicit amending commit before rewriting a changeset.::
+..
+..   $ hg record -m 'feature A'
+..   # oups, I forget some stuff
+..   $ hg record babar.py
+..   $ hg amend -c .^ # .^ refer to "working directoy parent, here 'feature A'
 
 note: refresh is an alias for amend
 
@@ -140,20 +143,12 @@
 
 ::
 
-  $ hg up <top changeset>
-  $ amend --edit -c <bottom changeset>
-
-
-or later::
-
-  $ hg collapse # XXX not implemented
-  $ hg rebase --collapse # XXX not tested
-
+  $ hg fold first::last
 
 hg qdiff
 `````````
 
-``odiff`` is an alias for `hg diff -r .^` it works as qdiff, but outside mq.
+``pdiff`` is an alias for `hg diff -r .^` it works as qdiff, but outside mq.