1.1 --- a/en/ch13-hgext.xml	Thu Mar 19 21:18:52 2009 -0700
     1.2 +++ b/en/ch13-hgext.xml	Fri Mar 27 10:08:39 2009 -0700
     1.3 @@ -15,13 +15,13 @@
     1.4      <emphasis>plugins</emphasis>).  We've already discussed a few of
     1.5      these extensions in earlier chapters.</para>
     1.6    <itemizedlist>
     1.7 -    <listitem><para id="x_500">Section <xref linkend="sec:tour-merge:fetch"/>
     1.8 +    <listitem><para id="x_500"><xref linkend="sec:tour-merge:fetch"/>
     1.9  	covers the <literal role="hg-ext">fetch</literal> extension;
    1.10  	this combines pulling new changes and merging them with local
    1.11  	changes into a single command, <command
    1.12  	  role="hg-ext-fetch">fetch</command>.</para>
    1.13      </listitem>
    1.14 -    <listitem><para id="x_501">In chapter <xref linkend="chap:hook"/>, we covered
    1.15 +    <listitem><para id="x_501">In <xref linkend="chap:hook"/>, we covered
    1.16  	several extensions that are useful for hook-related
    1.17  	functionality: <literal role="hg-ext">acl</literal> adds
    1.18  	access control lists; <literal
    1.19 @@ -32,10 +32,10 @@
    1.20      </listitem>
    1.21      <listitem><para id="x_502">The Mercurial Queues patch management extension is
    1.22  	so invaluable that it merits two chapters and an appendix all
    1.23 -	to itself. Chapter <xref linkend="chap:mq"/> covers the
    1.24 -	basics; chapter <xref
    1.25 +	to itself. <xref linkend="chap:mq"/> covers the
    1.26 +	basics; <xref
    1.27  	  linkend="chap:mq-collab"/> discusses advanced topics;
    1.28 -	and appendix <xref linkend="chap:mqref"/> goes into detail on
    1.29 +	and <xref linkend="chap:mqref"/> goes into detail on
    1.30  	each
    1.31  	command.</para>
    1.32      </listitem></itemizedlist>
    1.33 @@ -45,7 +45,7 @@
    1.34      machinery you'll need to know about if you want to write an
    1.35      extension of your own.</para>
    1.36    <itemizedlist>
    1.37 -    <listitem><para id="x_504">In section <xref linkend="sec:hgext:inotify"/>,
    1.38 +    <listitem><para id="x_504">In <xref linkend="sec:hgext:inotify"/>,
    1.39  	we'll discuss the possibility of <emphasis>huge</emphasis>
    1.40  	performance improvements using the <literal
    1.41  	  role="hg-ext">inotify</literal> extension.</para>
    1.42 @@ -183,7 +183,7 @@
    1.43        </listitem>
    1.44        <listitem><para id="x_517">Make sure that you have the Mercurial Queues
    1.45  	  extension, <literal role="hg-ext">mq</literal>, enabled.  If
    1.46 -	  you've never used MQ, read section <xref
    1.47 +	  you've never used MQ, read <xref
    1.48  	    linkend="sec:mq:start"/> to get started
    1.49  	  quickly.</para>
    1.50        </listitem>
    1.51 @@ -353,7 +353,7 @@
    1.52        you can easily work around this with a little scripting.  For an
    1.53        example of such scripting in action with the <literal
    1.54  	role="hg-ext">mq</literal> extension and the
    1.55 -      <command>interdiff</command> command, see section <xref
    1.56 +      <command>interdiff</command> command, see <xref
    1.57  	linkend="mq-collab:tips:interdiff"/>.</para>
    1.58  
    1.59      <sect2>
    1.60 @@ -502,7 +502,7 @@
    1.61  	    use.</para>
    1.62  	</listitem>
    1.63  	<listitem><para id="x_53e">The default behaviour is to send unified diffs
    1.64 -	    (see section <xref linkend="sec:mq:patch"/> for a
    1.65 +	    (see <xref linkend="sec:mq:patch"/> for a
    1.66  	    description of the
    1.67  	    format), one per message.  You can send a binary bundle
    1.68  	    instead with the <option