# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1240813386 25200
# Node ID 2c266a253b44a99042e5ebb22b488549ef6b2af8
# Parent  0ffae4ee4c47870e23c55ee2cff04bf3b6d99d4d# Parent  f3f901cfbfc7875d82f3fec1a1c2df2f19f277c6
Merge with myself

diff -r 0ffae4ee4c47 -r 2c266a253b44 en/ch11-mq.xml
--- a/en/ch11-mq.xml	Sun Apr 26 23:22:04 2009 -0700
+++ b/en/ch11-mq.xml	Sun Apr 26 23:23:06 2009 -0700
@@ -197,7 +197,7 @@
       file.  Take a look below for a simple example of these commands
       in action.</para>
 
-&interaction.mq.dodiff.diff;
+      &interaction.mq.dodiff.diff;
 
     <para id="x_3c4">The type of file that <command>diff</command> generates (and
       <command>patch</command> takes as input) is called a
@@ -766,15 +766,19 @@
     <sect2>
       <title>Converting to and from permanent revisions</title>
 
-      <para id="x_6dd">Once you're done working on a patch and want to turn it
-	into a permanent changeset, use the <command
-	  role="hg-ext-mq">hg qdelete -r</command> command.  Pass a
-	revision to the <option>-r</option> option to identify the
-	patch that you want to turn into a regular changeset; this
-	patch must already be applied.</para>
+      <para id="x_6dd">Once you're done working on a patch and want to
+      turn it into a permanent changeset, use the <command
+      role="hg-ext-mq">hg qfinish</command> command. Pass a revision
+      to the command to identify the patch that you want to turn into
+      a regular changeset; this patch must already be applied.</para>
 
       &interaction.ch11-qdelete.convert;
 
+      <para id="x_6e0">The <command role="hg-ext-mq">hg qfinish</command> command
+        accepts an <option>--all</option> or <option>-a</option>
+        option, which turns all applied patches into regular
+        changesets.</para>
+
       <para id="x_6de">It is also possible to turn an existing changeset into a
 	patch, by passing the <option>-r</option> option to <command
 	  role="hg-ext-mq">hg qimport</command>.</para>
diff -r 0ffae4ee4c47 -r 2c266a253b44 en/examples/ch11/qdelete
--- a/en/examples/ch11/qdelete	Sun Apr 26 23:22:04 2009 -0700
+++ b/en/examples/ch11/qdelete	Sun Apr 26 23:23:06 2009 -0700
@@ -22,7 +22,7 @@
 echo a > a
 hg add a
 hg qrefresh -m 'Good change'
-hg qdelete -r tip
+hg qfinish tip
 hg qapplied
 hg tip --style=compact