# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1345800069 -7200
# Node ID 9a4867b79f6cc483554cf9940ff00d43c2addd56
# Parent  7ecd41520dae5f8687130f1a8e0812122d19d797
doc: some terms update

diff -r 7ecd41520dae -r 9a4867b79f6c docs/obs-terms.rst
--- a/docs/obs-terms.rst	Fri Aug 24 11:17:18 2012 +0200
+++ b/docs/obs-terms.rst	Fri Aug 24 11:21:09 2012 +0200
@@ -89,16 +89,16 @@
 |                     |                          |                             |
 |                     +--------------------------+-----------------------------+
 |                     |                          |                             |
-|                     | **troublesome**          | **unstable**                |
+|                     | **troubled**             | **unstable**                |
 |                     |                          |                             |
-|                     | *troublesome* has        | *unstable* is a changeset   |
+|                     | *troubled*    has        | *unstable* is a changeset   |
 |                     | unresolved issue caused  | with obsolete ancestors.    |
 |                     | by *obsolete* relations. |                             |
 |                     |                          |                             |
 |                     | Possible issues are      | It must be rebased on a     |
-|                     | listed in the next       | non *troublesome* base to   |
+|                     | listed in the next       | non *troubled*    base to   |
 |                     | column. It is possible   | solve the problem.          |
-|                     | for *troublesome*        |                             |
+|                     | for *troubled*           |                             |
 |                     | changeset to combine     | (possible alternative name: |
 |                     | multiple issue at once.  | precarious)                 |
 |                     | (a.k.a. conflicting and  |                             |
@@ -106,7 +106,7 @@
 |                     |                          |                             |
 |                     | (possible alternative    | **latecomer**               |
 |                     | names: unsettled,        |                             |
-|                     | troubled)                | *latecomer* is a changeset  |
+|                     | troublesome              | *latecomer* is a changeset  |
 |                     |                          | that tries to be successor  |
 |                     |                          | of  public changesets.      |
 |                     |                          |                             |
@@ -141,10 +141,13 @@
 |                     |                          | properly not detected as a  |
 |                     |                          | conflict)                   |
 |                     |                          |                             |
+|                     |                          | (possible alternative names:|
+|                     |                          | clashing, rival)            |
+|                     |                          |                             |
 |                     +--------------------------+-----------------------------+
 |                     |                                                        |
 |                     | Mutable changesets which are neither *obsolete* or     |
-|                     | *troublesome* are *"ok"*.                              |
+|                     | *troubled*    are *"ok"*.                              |
 |                     |                                                        |
 |                     | Do we really need a name for it ? *"ok"* is a pretty   |
 |                     | crappy name :-/ other possibilities are:               |
@@ -176,7 +179,7 @@
 
           - "ok" changeset
           - latecomer
-          - troublesome
+          - conflicting
 
           Any better idea are welcome.