# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1345805232 -7200
# Node ID 4387e62bd4f485112943ca7658908fcdc8cd2a96
# Parent  a9c27df23129f21e7116ce1a024af4183c1b53e3
Doc: several update

diff -r a9c27df23129 -r 4387e62bd4f4 docs/evolve-faq.rst
--- a/docs/evolve-faq.rst	Fri Aug 24 11:53:55 2012 +0200
+++ b/docs/evolve-faq.rst	Fri Aug 24 12:47:12 2012 +0200
@@ -19,7 +19,7 @@
 `public` changesets.
 
 To understand what the result of amend will be I use the two following
-aliases  [#]_::
+aliases   [#]_::
 
     # diff what amend will look likes
     pdiff=diff --rev .^
@@ -41,7 +41,7 @@
           XXX add idank example
 
 
-.. [#] (added by enable.sh)
+.. [#] (defined by the evolve extension for you)
 
 
 
@@ -88,10 +88,10 @@
 .. note:: those command only exist for the convenience of getting qpush and qpop
           feeling back.
 
-Collapse changesets: ``amend``
+Collapse changesets: ``fold``
 ------------------------------------------------------------
 
-you can use amend -c to collapse multiple changeset in a single one.
+you can use ``hg fold`` to collapse multiple changeset in a single one.
 
 Getting changes out of a commit
 ------------------------------------------------------------
@@ -152,7 +152,7 @@
 .. warning:: Beware that rebasing obsolete changesets will result in
              conflicting versions of the changesets.
 
-Stabilize history: ``evolve``
+Resolve history troubles: ``evolve``
 ------------------------------------------------------------
 
 When you rewrite (amend) a changeset with children without rewriting
@@ -191,10 +191,13 @@
 View obsolete markers
 ------------------------------------------------------------
 
-hgview is the only viewer that support this feature. You need an experimental
-version available here:
+hgview_ is the only viewer that currently support this feature. You need version 1.6.2
+
+.. _hgview: http://www.logilab.org/project/hgview/
 
-    $ hg clone http://hg-dev.octopoid.net/hgwebdir.cgi/hgview/
+.. image:: figures/hgview-example.png
+    :scale: 50%
+
 
 You can also use a debug command
 
diff -r a9c27df23129 -r 4387e62bd4f4 docs/from-mq.rst
--- 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.