docs: fix typos in evolve collaboration.
diff --git a/docs/evolve-collaboration.rst b/docs/evolve-collaboration.rst --- a/docs/evolve-collaboration.rst +++ b/docs/evolve-collaboration.rst @@ -7,7 +7,7 @@ Collaboration Using Evolve: A user story After having written some code for ticket #42, M W. start a patch (this will be kind of like a 'work-in-progress' checkpoint initially):: - $ ci -m '[entities] remove magic' + $ hg ci -m '[entities] remove magic' Instant patch ! Note how the default phase of this changeset is (still) in "draft" state. @@ -27,7 +27,7 @@ changesets into public ones. Older mercu "publishing" since they do not have the notion of non-public changesets (or mutable history). -In the transition ... phase from older mercurial servers, this will +During the transition from older mercurial servers to new ones, this will happen often, so be careful. Now let's come back to our patch. Next hour sees good progress and W. @@ -44,7 +44,7 @@ give C.W. the signal that something is r $ hg push # was done with a modern mercurial, draft phase is preserved -The next day, Mr C.W, which arrives very very early, can immediately +The next day, Mr C.W., who arrives very early, can immediately work out some glitches in the patch. He then starts another one, for ticket #43 and finally commits it.