--- a/docs/obs-terms.rst	Sat Apr 27 21:27:54 2019 -0400
+++ b/docs/obs-terms.rst	Sat Apr 27 21:41:04 2019 -0400
@@ -104,8 +104,8 @@
 |                     | for *unstable*           |                             |
 |                     | changeset to combine     | (possible alternative name: |
 |                     | multiple issue at once.  | precarious)                 |
-|                     | (a.k.a. divergent   and  |                             |
-|                     | orphan)                  +-----------------------------+
+|                     | (a.k.a. content-divergent|                             |
+|                     | and orphan)              +-----------------------------+
 |                     |                          |                             |
 |                     | (possible alternative    | **bumped**                  |
 |                     | names: unsettled,        |                             |
@@ -125,17 +125,18 @@
 |                     |                          | mindless, disenchanting)    |
 |                     |                          |                             |
 |                     |                          +-----------------------------+
-|                     |                          | **divergent**               |
+|                     |                          | **content-divergent**       |
 |                     |                          |                             |
-|                     |                          | *divergent*   is changeset  |
-|                     |                          | that appears when multiple  |
-|                     |                          | changesets are successors   |
-|                     |                          | of the same predecessor.    |
+|                     |                          | *content-divergent*   is a  |
+|                     |                          | changeset that appears when |
+|                     |                          | multiple changesets are     |
+|                     |                          | successors of the same      |
+|                     |                          | predecessor.                |
 |                     |                          |                             |
-|                     |                          | *divergent*   are solved    |
-|                     |                          | through a three ways merge  |
-|                     |                          | between the two             |
-|                     |                          | *divergent*   ,             |
+|                     |                          | *content-divergent*   are   |
+|                     |                          | solved through a three way  |
+|                     |                          | merge between the two       |
+|                     |                          | *content-divergent*   ,     |
 |                     |                          | using the last "obsolete-   |
 |                     |                          | -common-ancestor" as the    |
 |                     |                          | base.                       |
@@ -226,7 +227,7 @@
 ``````
 
 Automatically resolve *troublesome* changesets
-(*orphan*, *bumped* and *divergent*)
+(*orphan*, *bumped* and *content-divergent*)
 
 This is an important name as hg pull/push will suggest it the same way it
 suggest merging when you add heads.