diff -r 93514c421528 -r a05bfdf372fb docs/user-guide.rst
--- a/docs/user-guide.rst	Sat Apr 27 21:27:54 2019 -0400
+++ b/docs/user-guide.rst	Sat Apr 27 21:41:04 2019 -0400
@@ -356,7 +356,7 @@
 a consistent way for you to get back to a stable repository.
 
 (Incidentally, there are two other types of instability that changesets
-can get into with ``evolve``: they may be *divergent* or
+can get into with ``evolve``: they may be *content-divergent* or
 *bumped*. Both of those states are more likely to occur when
 `sharing mutable history`_, so we won't cover them in this user guide.)
 
@@ -594,7 +594,7 @@
 change in the future. Consider the history in Figure 12, where revision 27
 is obsolete and the child of 26, also obsolete. If we ``hg touch 27``, that
 creates a new revision which is a non-obsolete child of 26—i.e., it is an
-orphan. It's also *divergent*, another type of trouble that we'll learn
+orphan. It's also *content-divergent*, another type of trouble that we'll learn
 about in the `next section`_.
 
 .. _`next section`: sharing.html