docs/evolve-collaboration.rst
changeset 232 adb7e29cb2bd
parent 189 e7d7201e79ce
child 357 b398e9c2dbd1
--- a/docs/evolve-collaboration.rst	Wed May 09 18:52:57 2012 +0200
+++ b/docs/evolve-collaboration.rst	Wed May 09 19:02:35 2012 +0200
@@ -20,7 +20,7 @@
 See ? Until the day it becomes a "public" changeset, this can be altered
 to no end. How ? It happens with an explicit::
 
-    $ hg phase -p
+    $ hg phase --public
 
 In practice, pushing to a "publishing" repository can also turn draft
 changesets into public ones. Older mercurial releases are automatically
@@ -108,13 +108,13 @@
 currently updating the very middle of an history !
 
 Being now done with grammar and typo fixes, W. decides it is time to
-stabilize again the tree. He:
+stabilize again the tree. He::
 
     $ hg stabilize
 
 two times, one for each unstable descendant. The last time, hgview
 shows him a straight line again. Wow ! that feels a bit like a
-well-planned surgical operation. At the end, the patient^Wtree has
+well-planned surgical operation. At the end, the patient tree has
 been properly sewed and any conflict properly handled.
 
 Of course nothing fancy really happened: each "stablilize" can be