Commits

Benoît Allard committed e6680b0

docs: proof-read and review

  • Participants
  • Parent commits 0892b91

Comments (0)

Files changed (4)

File docs/evolve-collaboration.rst

 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
 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

File docs/from-mq.rst

 ==============================  ============================================
 mq command                       new equivalent
 ==============================  ============================================
-
 qseries                         ``log``
 qnew                            ``commit``
 qrefresh                        ``amend``
 
 qfinish                         --
 qimport                         --
+==============================  ============================================
 
 
 Replacement details

File docs/qsync.rst

 ---------------------------------------------------------------------
 
 
-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:

File hgext/evolve.py

 
 @command('^gdown',
     [],
-    'update to working directory parent an display summary lines')
+    'update to working directory parent and display summary lines')
 def cmdgdown(ui, repo):
     wkctx = repo[None]
     wparents = wkctx.parents()
 
 @command('^gup',
     [],
-    'update to working directory children an display summary lines')
+    'update to working directory children and display summary lines')
 def cmdup(ui, repo):
     wkctx = repo[None]
     wparents = wkctx.parents()