1.1 --- a/en/ch12-mq.xml	Thu May 07 21:07:35 2009 -0700
     1.2 +++ b/en/ch12-mq.xml	Tue Oct 27 22:46:49 2009 -0500
     1.3 @@ -438,7 +438,7 @@
     1.4  	<command role="hg-ext-mq">qpop</command> each operate on a
     1.5  	single patch at a time by default, you can push and pop many
     1.6  	patches in one go.  The <option
     1.7 -	  role="hg-ext-mq-cmd-qpush-opt">hg -a</option> option to
     1.8 +	  role="hg-ext-mq-cmd-qpush-opt">-a</option> option to
     1.9  	<command role="hg-ext-mq">qpush</command> causes it to push
    1.10  	all unapplied patches, while the <option
    1.11  	  role="hg-ext-mq-cmd-qpop-opt">-a</option> option to <command
    1.12 @@ -469,10 +469,10 @@
    1.13  	named <option>-f</option>.  The exact meaning of
    1.14  	<option>-f</option> depends on the command.  For example,
    1.15  	<command role="hg-cmd">hg qnew <option
    1.16 -	    role="hg-ext-mq-cmd-qnew-opt">hg -f</option></command>
    1.17 +	    role="hg-ext-mq-cmd-qnew-opt">-f</option></command>
    1.18  	will incorporate any outstanding changes into the new patch it
    1.19  	creates, but <command role="hg-cmd">hg qpop <option
    1.20 -	    role="hg-ext-mq-cmd-qpop-opt">hg -f</option></command>
    1.21 +	    role="hg-ext-mq-cmd-qpop-opt">-f</option></command>
    1.22  	will revert modifications to any files affected by the patch
    1.23  	that it is popping.  Be sure to read the documentation for a
    1.24  	command's <option>-f</option> option before you use it!</para>
    1.25 @@ -808,9 +808,9 @@
    1.26  
    1.27      <para id="x_404">On my old, slow laptop, I was able to <command
    1.28  	role="hg-cmd">hg qpush <option
    1.29 -	  role="hg-ext-mq-cmd-qpush-opt">hg -a</option></command> all
    1.30 +	  role="hg-ext-mq-cmd-qpush-opt">-a</option></command> all
    1.31        1,738 patches in 3.5 minutes, and <command role="hg-cmd">hg qpop
    1.32 -	<option role="hg-ext-mq-cmd-qpop-opt">hg -a</option></command>
    1.33 +	<option role="hg-ext-mq-cmd-qpop-opt">-a</option></command>
    1.34        them all in 30 seconds.  (On a newer laptop, the time to push
    1.35        all patches dropped to two minutes.)  I could <command
    1.36  	role="hg-ext-mq">qrefresh</command> one of the biggest patches
    1.37 @@ -866,7 +866,7 @@
    1.38  	  -a</option></command> your patches, then <command
    1.39  	role="hg-cmd">hg pull</command> changes into the underlying
    1.40        repository, and finally <command role="hg-cmd">hg qpush <option
    1.41 -	  role="hg-ext-mq-cmd-qpop-opt">hg -a</option></command> your
    1.42 +	  role="hg-ext-mq-cmd-qpop-opt">-a</option></command> your
    1.43        patches again.  MQ will stop pushing any time it runs across a
    1.44        patch that fails to apply during conflicts, allowing you to fix
    1.45        your conflicts, <command role="hg-ext-mq">qrefresh</command> the
    1.46 @@ -1138,9 +1138,9 @@
    1.47  	  update</command> changes to patches or the <filename
    1.48  	  role="special">series</filename> file, you will have to
    1.49  	<command role="hg-cmd">hg qpop <option
    1.50 -	    role="hg-ext-mq-cmd-qpop-opt">hg -a</option></command> and
    1.51 +	    role="hg-ext-mq-cmd-qpop-opt">-a</option></command> and
    1.52  	then <command role="hg-cmd">hg qpush <option
    1.53 -	    role="hg-ext-mq-cmd-qpush-opt">hg -a</option></command> in
    1.54 +	    role="hg-ext-mq-cmd-qpush-opt">-a</option></command> in
    1.55  	the underlying repository to see those changes show up there.
    1.56  	If you forget to do this, you can confuse MQ's idea of which
    1.57  	patches are applied.</para>