1.1 --- a/en/ch11-mq.xml	Thu Mar 19 21:18:52 2009 -0700
     1.2 +++ b/en/ch11-mq.xml	Thu Mar 26 21:22:03 2009 -0700
     1.3 @@ -36,7 +36,7 @@
     1.4  
     1.5      <para id="x_3b0">When you have few changes to maintain, it is easy to manage
     1.6        a single patch using the standard <command>diff</command> and
     1.7 -      <command>patch</command> programs (see section <xref
     1.8 +      <command>patch</command> programs (see <xref
     1.9  	linkend="sec:mq:patch"/> for a discussion of these
    1.10        tools). Once the number of changes grows, it starts to make
    1.11        sense to maintain patches as discrete <quote>chunks of
    1.12 @@ -241,7 +241,7 @@
    1.13        represented by one deletion and one insertion.</para>
    1.14  
    1.15      <para id="x_3c9">We will return to some of the more subtle aspects of patches
    1.16 -      later (in section <xref linkend="sec:mq:adv-patch"/>), but you
    1.17 +      later (in <xref linkend="sec:mq:adv-patch"/>), but you
    1.18        should have
    1.19        enough information now to use MQ.</para>
    1.20  
    1.21 @@ -400,17 +400,18 @@
    1.22  	<emphasis>knows about</emphasis>, or manages, a popped patch,
    1.23  	but the patch no longer has a corresponding changeset in the
    1.24  	repository, and the working directory does not contain the
    1.25 -	changes made by the patch.  Figure <xref
    1.26 +	changes made by the patch.  <xref
    1.27  	  linkend="fig:mq:stack"/> illustrates
    1.28  	the difference between applied and tracked patches.</para>
    1.29  
    1.30 -      <informalfigure id="fig:mq:stack">
    1.31 -	<mediaobject><imageobject><imagedata
    1.32 -				    fileref="mq-stack"/></imageobject><textobject><phrase>XXX 
    1.33 -	      add text</phrase></textobject><caption><para id="x_3dd">Applied and
    1.34 -	      unapplied patches in the MQ patch
    1.35 -	      stack</para></caption></mediaobject>
    1.36 -      </informalfigure>
    1.37 +      <figure id="fig:mq:stack">
    1.38 +	<title>Applied and unapplied patches in the MQ patch
    1.39 +	  stack</title>
    1.40 +	<mediaobject>
    1.41 +	  <imageobject><imagedata fileref="mq-stack"/></imageobject>
    1.42 +	  <textobject><phrase>XXX add text</phrase></textobject>
    1.43 +	</mediaobject>
    1.44 +      </figure>
    1.45  
    1.46        <para id="x_3de">You can reapply an unapplied, or popped, patch using the
    1.47  	<command role="hg-ext-mq">qpush</command> command.  This
    1.48 @@ -441,8 +442,7 @@
    1.49  	  role="hg-ext-mq-cmd-qpop-opt">-a</option> option to <command
    1.50  	  role="hg-ext-mq">qpop</command> causes it to pop all applied
    1.51  	patches.  (For some more ways to push and pop many patches,
    1.52 -	see section <xref linkend="sec:mq:perf"/>
    1.53 -	below.)</para>
    1.54 +	see <xref linkend="sec:mq:perf"/> below.)</para>
    1.55  
    1.56  &interaction.mq.tutorial.qpush-a;
    1.57  
    1.58 @@ -700,8 +700,7 @@
    1.59        <para id="x_3fa">If your patch <emphasis>used to</emphasis> apply cleanly,
    1.60  	and no longer does because you've changed the underlying code
    1.61  	that your patches are based on, Mercurial Queues can help; see
    1.62 -	section <xref
    1.63 -	  linkend="sec:mq:merge"/> for details.</para>
    1.64 +	<xref linkend="sec:mq:merge"/> for details.</para>
    1.65  
    1.66        <para id="x_3fb">Unfortunately, there aren't any great techniques for
    1.67  	dealing with rejected hunks.  Most often, you'll need to view
    1.68 @@ -941,7 +940,7 @@
    1.69  	  latest series of changes?</para>
    1.70  	<programlisting>hg email qbase:qtip</programlisting>
    1.71  	<para id="x_41c">  (Don't know what <quote>patchbombing</quote> is?  See
    1.72 -	  section <xref linkend="sec:hgext:patchbomb"/>.)</para>
    1.73 +	  <xref linkend="sec:hgext:patchbomb"/>.)</para>
    1.74        </listitem>
    1.75        <listitem><para id="x_41d">Need to see all of the patches since
    1.76  	  <literal>foo.patch</literal> that have touched files in a
    1.77 @@ -980,7 +979,7 @@
    1.78  	    role="hg-ext-mq">qpush</command> it again, the changeset
    1.79  	  that represents the patch after the pop/push will have a
    1.80  	  <emphasis>different identity</emphasis> than the changeset
    1.81 -	  that represented the hash beforehand.  See section <xref
    1.82 +	  that represented the hash beforehand.  See <xref
    1.83  	    linkend="sec:mqref:cmd:qpush"/> for
    1.84  	  information as to why this is.</para>
    1.85        </listitem>
    1.86 @@ -1132,7 +1131,7 @@
    1.87        hundreds of files across dozens of directories, a single
    1.88        invocation of <command>filterdiff</command> can generate a
    1.89        smaller patch that only touches files whose names match a
    1.90 -      particular glob pattern.  See section <xref
    1.91 +      particular glob pattern.  See <xref
    1.92  	linkend="mq-collab:tips:interdiff"/> for another
    1.93        example.</para>
    1.94  
    1.95 @@ -1170,7 +1169,7 @@
    1.96  
    1.97      <para id="x_436">For this reason, it is very much worth investing a little
    1.98        time to learn how to use some of the third-party tools I
    1.99 -      described in section <xref linkend="sec:mq:tools"/>,
   1.100 +      described in <xref linkend="sec:mq:tools"/>,
   1.101        particularly
   1.102        <command>diffstat</command> and <command>filterdiff</command>.
   1.103        The former will give you a quick idea of what changes your patch
   1.104 @@ -1292,7 +1291,7 @@
   1.105  
   1.106        <para id="x_447">Once you have this hunk, you can concatenate it onto the
   1.107  	end of your destination patch and continue with the remainder
   1.108 -	of section <xref linkend="sec:mq:combine"/>.</para>
   1.109 +	of <xref linkend="sec:mq:combine"/>.</para>
   1.110  
   1.111      </sect2>
   1.112    </sect1>