docs/obs-terms.rst
changeset 4618 803d32f4e498
parent 4615 8406d9b06130
child 4619 93514c421528
--- a/docs/obs-terms.rst	Sat Apr 27 21:09:47 2019 -0400
+++ b/docs/obs-terms.rst	Sat Apr 27 21:24:18 2019 -0400
@@ -92,9 +92,9 @@
 |                     |                          |                             |
 |                     +--------------------------+-----------------------------+
 |                     |                          |                             |
-|                     | **troubled**             | **unstable**                |
+|                     | **troubled**             | **orphan**                  |
 |                     |                          |                             |
-|                     | *troubled*    has        | *unstable* is a changeset   |
+|                     | *troubled*    has        | *orphan* is a changeset     |
 |                     | unresolved issue caused  | with obsolete ancestors.    |
 |                     | by *obsolete* relations. |                             |
 |                     |                          |                             |
@@ -105,7 +105,7 @@
 |                     | changeset to combine     | (possible alternative name: |
 |                     | multiple issue at once.  | precarious)                 |
 |                     | (a.k.a. divergent   and  |                             |
-|                     | unstable)                +-----------------------------+
+|                     | orphan)                  +-----------------------------+
 |                     |                          |                             |
 |                     | (possible alternative    | **bumped**                  |
 |                     | names: unsettled,        |                             |
@@ -226,7 +226,7 @@
 ``````
 
 Automatically resolve *troublesome* changesets
-(*unstable*, *bumped* and *divergent*)
+(*orphan*, *bumped* and *divergent*)
 
 This is an important name as hg pull/push will suggest it the same way it
 suggest merging when you add heads.