docs/evolve-faq.rst
changeset 4774 12a88b988875
parent 4764 3968f6d58591
--- a/docs/evolve-faq.rst	Wed Jul 17 12:47:37 2019 -0700
+++ b/docs/evolve-faq.rst	Mon Jul 29 13:54:57 2019 +0200
@@ -157,11 +157,11 @@
 Fix my history afterward: ``prune -n``
 --------------------------------------
 
-Sometimes you need to create an obsolete marker by hand. This may happen when
-upstream has applied some of your patches for example.
+Sometimes you need to create an obsolescence marker by hand. This may happen
+when upstream has applied some of your patches for example.
 
-you can use ``hg prune <old-changeset> --succ <new-changeset>`` to add obsolete
-marker.
+You can use ``hg prune <old-changeset> --successor <new-changeset>`` to add
+obsolescence marker.
 
 View diff from the last amend
 -----------------------------
@@ -172,8 +172,8 @@
     [alias]
     odiff = diff --rev 'limit(predecessors(.),1)' --rev .
 
-View obsolete markers
----------------------
+View obsolescence markers
+-------------------------
 
 hgview_ is the only viewer that currently supports this feature. You
 need version 1.6.2
@@ -204,12 +204,3 @@
 graphical viewer do not.
 
 You can use ``hg log --graph --hidden`` from the command line
-
-
-
-
-
-
-
-
-