diff docs/from-mq.rst @ 182:33b9cb1ce659

docs: polishing of from-mq.

--- a/docs/from-mq.rst	Tue Mar 27 19:46:54 2012 +0200
+++ b/docs/from-mq.rst	Tue Mar 27 19:59:47 2012 +0200
@@ -28,11 +28,11 @@
 hg qseries
 ```````````
 
-All your work in progress are now real changeset all the time.
+All your work in progress is now in real changeset all the time.
 
-You can then use standard log to display them. You can use phase revset to
-display unfinished business only and template to have the same kind of compact
-output qseries have.
+You can use the standard log to display them. You can use the phase revset to
+display unfinished business only and templates to have the same kind of compact
+output qseries has.
 
 This will result in something like that::
 
@@ -42,9 +42,9 @@
 hg qnew
 ````````
 
-With evolve you handle standard changeset without additional overlay.
+With evolve you handle standard changesets without an additional overlay.
 
-Standard changeset are created using hg commit as usual.
+Standard changeset are created using hg commit as usual.::
 
   $ hg commit
 
@@ -52,7 +52,7 @@
 setting your changeset in the secret phase using the phase command.
 
 Note that you only need it for the first commit you want to be secret. Later
-commit will inherit their parents phase.
+commits will inherit their parents phase.
 
 If you always want your new commit to be in the secret phase, your should
 consider updating your configuration:
@@ -69,11 +69,11 @@
   $ hg amend
 
 
-This command takes the same option than commit  plus useful switch '-e' (--edit)
-to edit the commit message.
+This command takes the same options as commit, plus the switch '-e' (--edit)
+to edit the commit message in an editor.
 
-Amend have also a -c switch which allow you to make and explicit amending
-commit before rewriting a changeset.
+Amend have also a -c switch which allow you to make an explicit amending
+commit before rewriting a changeset.::
 
   $ hg record -m 'feature A'
   # oups, I forget some stuff
@@ -99,19 +99,19 @@
 hg qpush
 ````````
 
-When you rewrite changeset, descendant of rewritten changeset are marked as
-"out of sync". You new to rewrite them on top of the new version of their
+When you rewrite changesets, descendants of rewritten changesets are marked as
+"out of sync". You need to rewrite them on top of the new version of their
 ancestor.
 
-The evolution extension add a command to rewrite the next changeset:
+The evolution extension adds a command to rewrite the "out of sync" changesets:::
 
   $ hg stabilize
 
-You can also decide to do it manually using
+You can also decide to do it manually using::
 
   $ hg graft -O <old-version>
 
-or 
+or::
 
   $ hg rebase -r <revset for old version> -d .
 
@@ -122,7 +122,7 @@
 hg qrm
 ```````
 
-evolution introduce a new command to mark a changeset as "not wanted anymore".
+evolution introduce a new command to mark a changeset as "not wanted anymore".::
 
   $ hg kill <revset>
 
@@ -139,27 +139,26 @@
 or later::
 
   $ hg collapse # XXX not implemented
-
   $ hg rebase --collapse # XXX not tested
 
 
 hg qdiff
 `````````
 
-``odiff`` is an alias for `hg diff -r .^` it works as qdiff event outside mq.
+``odiff`` is an alias for `hg diff -r .^` it works as qdiff, but outside mq.
 
 
 
 hg qfinish and hg qimport
 ````````````````````````````
 
-Is not useful anymore if you want to controll exchange and mutability of
-changeset see the phase feature
+Is not necessary anymore. If you want to control exchange and mutability of
+changesets, see the phase feature
 
 
 
 hg qcommit
 ```````````````
 
-If you really need to send patches through a versionned mq patches you should
+If you really need to send patches through versioned mq patches, you should
 look at the qsync extension.