docs: proof-read and review
authorBenoit Allard <benoit@aeteurope.nl>
Wed, 09 May 2012 19:02:35 +0200
changeset 232 adb7e29cb2bd
parent 231 f589d054329a
child 233 9e153a9101c3
docs: proof-read and review
docs/evolve-collaboration.rst
docs/from-mq.rst
docs/qsync.rst
hgext/evolve.py
--- 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
--- a/docs/from-mq.rst	Wed May 09 18:52:57 2012 +0200
+++ b/docs/from-mq.rst	Wed May 09 19:02:35 2012 +0200
@@ -8,7 +8,6 @@
 ==============================  ============================================
 mq command                       new equivalent
 ==============================  ============================================
-
 qseries                         ``log``
 qnew                            ``commit``
 qrefresh                        ``amend``
@@ -20,6 +19,7 @@
 
 qfinish                         --
 qimport                         --
+==============================  ============================================
 
 
 Replacement details
--- a/docs/qsync.rst	Wed May 09 18:52:57 2012 +0200
+++ b/docs/qsync.rst	Wed May 09 19:02:35 2012 +0200
@@ -3,7 +3,7 @@
 ---------------------------------------------------------------------
 
 
-People may have tools or wo-worker that export to receive mutable history using
+People may have tools or co-worker that export to receive mutable history using
 versionned mq repository.
 
 For this purpose you can use the ``qsync`` extension:
--- a/hgext/evolve.py	Wed May 09 18:52:57 2012 +0200
+++ b/hgext/evolve.py	Wed May 09 19:02:35 2012 +0200
@@ -250,7 +250,7 @@
 
 @command('^gdown',
     [],
-    '')
+    'update to working directory parent and display summary lines')
 def cmdgdown(ui, repo):
     """update to working directory parent an display summary lines"""
     wkctx = repo[None]
@@ -273,7 +273,7 @@
 
 @command('^gup',
     [],
-    '')
+    'update to working directory children and display summary lines')
 def cmdup(ui, repo):
     """update to working directory children an display summary lines"""
     wkctx = repo[None]