--- a/docs/glossary.rst Tue Mar 27 19:59:47 2012 +0200
+++ b/docs/glossary.rst Tue Mar 27 20:03:59 2012 +0200
@@ -7,7 +7,7 @@
:obsolete marker:
express a relation from 0..n new changesets to 1 old changeset
:obsolete changesets:
- non public changeset target of a obsolete marker
+ non public changeset which are target of a obsolete marker
:unstable changeset:
changeset not obsolete but with obsolete ancestor
@@ -34,8 +34,8 @@
diff between a changeset and it's obsolete parent
:obsolete-tip:
- obsolete-descendants not obsolete themself.
+ obsolete-descendants which are not obsolete themselves.
:conflicting changeset:
multiple obsolete-tip for an obsolete changeset through diverging obsolete
- marker (no changeset split marker)
+ markers (no changeset split marker)