docs/from-mq.rst
changeset 367 5bc3e5dc2637
parent 347 631cdf4295bc
parent 366 c67af39d1ae9
child 377 1d6cc8c22cd9
--- a/docs/from-mq.rst	Fri Jul 13 13:07:42 2012 +0200
+++ b/docs/from-mq.rst	Sun Jul 15 14:51:52 2012 +0200
@@ -13,7 +13,7 @@
 qrefresh                        ``amend``
 qpop                            ``update`` or ``qdown``
 qpush                           ``update`` or ``gup`` sometimes ``stabilize``
-qrm                             ``kill``
+qrm                             ``prune`̀`
 qfold                           ``amend -c`` (for now, ``collapse`` soon)
 qdiff                           ``odiff``
 
@@ -28,11 +28,11 @@
 hg qseries
 ```````````
 
-All your work in progress is now in real changeset all the time.
+All your work in progress is now in real changesets all the time.
 
-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.
+You can use the standard log command to display them. You can use the
+phase revset to display unfinished work only, and use templates to have
+the same kind of compact that the output of qseries has.
 
 This will result in something like that::
 
@@ -48,8 +48,8 @@
 
   $ hg commit
 
-If you want to keep the "wip are not pushed" behavior, you are looking for
-setting your changeset in the secret phase using the phase command.
+If you want to keep the "WIP is not pushed" behavior, you want to
+set 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
 commits will inherit their parents phase.
@@ -64,16 +64,15 @@
 ````````
 
 A new command from evolution will allow you to rewrite the changeset you are
-currently on. just call:
+currently on. Just call:
 
   $ hg amend
 
-
 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 an explicit amending
-commit before rewriting a changeset.::
+The amend command also has 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
@@ -93,11 +92,11 @@
 hg qpop
 `````````
 
-the following command emule the behavior of hg qpop:
+The following command emulate the behavior of hg qpop:
 
   $ hg gdown
 
-If you need to go back to an arbitrary commit you can just us:
+If you need to go back to an arbitrary commit you can use:
 
   $ hg update
 
@@ -111,7 +110,8 @@
 "out of sync". You need to rewrite them on top of the new version of their
 ancestor.
 
-The evolution extension adds a command to rewrite the "out of sync" changesets:::
+The evolution extension adds a command to rewrite the "out of sync"
+changesets:::
 
   $ hg stabilize
 
@@ -123,7 +123,7 @@
 
   $ hg rebase -r <revset for old version> -d .
 
-note: using graft allow you to pick the changeset you want next as the --move
+note: using graft allows you to pick the changeset you want next as the --move
 option of qpush do.
 
 
@@ -132,7 +132,7 @@
 
 evolution introduce a new command to mark a changeset as "not wanted anymore".::
 
-  $ hg kill <revset>
+  $ hg prune <revset>
 
 hg qfold
 `````````
@@ -160,8 +160,8 @@
 hg qfinish and hg qimport
 ````````````````````````````
 
-Is not necessary anymore. If you want to control exchange and mutability of
-changesets, see the phase feature
+These are not necessary anymore. If you want to control exchange and
+mutability of changesets, see the phase feature