--- a/docs/evolve-faq.rst Wed Jan 02 14:01:24 2013 +0100
+++ b/docs/evolve-faq.rst Wed Jan 02 14:17:17 2013 +0100
@@ -132,14 +132,18 @@
# current changeset (.) and previous one (.^) replace A (42)
$ hg prune --new . --new .^ 42
+For more complexe scenario we recommand the use of the histedit_ extension.
-Update my current work in progess after a pull
+.. _histedit:: http://mercurial.selenic.com/wiki/HisteditExtension
+
+
+Update my current work in progress after a pull
----------------------------------------------
-Whenever you are working on some changesets, it is more likely that a pull
+Whenever you are working on some changesets, it is more likely that a pull
will, eventually, import new changesets in your tree.
-And it is likely that you will want your work in progress changsets to be
+And it is likely that you will want your work in progress changiesets to be
rebased on the top of this newly imported subtree.
Doing so is only a matter of rebasing.