diff -r 62de989b2a02 -r b398e9c2dbd1 docs/index.rst --- a/docs/index.rst Fri Jul 06 18:43:25 2012 +0200 +++ b/docs/index.rst Wed Jul 11 13:59:06 2012 -0400 @@ -3,7 +3,7 @@ ======================================== -Here are various Materials on planned improvement to mercurial regarding +Here are various materials on planned improvement to Mercurial regarding rewriting history. First read about what challenge arise while rewriting history and how we plan to @@ -14,13 +14,13 @@ instability -The effort is splits in two parts: +The effort is split in two parts: - * The **obsolete marker** concept aims to provide and alternative to ``strip`` + * The **obsolete marker** concept aims to provide an alternative to ``strip`` to get rid of changesets. - * The **evolve** mercurial extension to rewrite history using *obsolete marker* - under the hood. + * The **evolve** mercurial extension rewrites history using obsolete + *marker* under the hood. The first and most important step is by far the **obsolete marker**. However most users will never be directly exposed to the concept. For this reason @@ -145,23 +145,24 @@ Here is a list of know issue that will be fixed later: - * ``hg stabilize`` does not handle merge conflict. You must fallback to graft or rebase when that happen. -* rewriting conflict are not detected yet``hg stabilize`` does not handle them. +* rewriting conflict are not detected yet``hg stabilize`` does not + handle them. * ``hg update`` can move an obsolete parent -* you need to provide to `graft --continue -O` if you started you graft using `-O`. +* you need to provide to `graft --continue -O` if you started you + graft using `-O`. * ``hg merge`` considers an extinct head to be a valid target, hence requiring you to manually specify target all the time. * trying to exchange obsolete relations with a static http repo will crash. -* Extinct changeset are turned secret by various commands. +* Extinct changesets are turned secret by various commands. * Extinct changesets are hidden using the *hidden* feature of mercurial only supported by a few commands.