Mercurial > evolve
changeset 183:8907a9269549
docs: polish for glossary
author | Arne Babenhauserheide <bab@draketo.de> |
---|---|
date | Tue, 27 Mar 2012 20:03:59 +0200 |
parents | 33b9cb1ce659 |
children | 135827b4d770 |
files | docs/glossary.rst |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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)