1.1 --- a/en/appB-mq-ref.xml	Wed Mar 18 00:00:58 2009 -0700
     1.2 +++ b/en/appB-mq-ref.xml	Tue Mar 31 15:35:44 2009 -0700
     1.3 @@ -7,14 +7,14 @@
     1.4    <sect1 id="sec:mqref:cmdref">
     1.5      <title>MQ command reference</title>
     1.6  
     1.7 -    <para>For an overview of the commands provided by MQ, use the
     1.8 +    <para id="x_5e8">For an overview of the commands provided by MQ, use the
     1.9        command <command role="hg-cmd">hg help mq</command>.</para>
    1.10  
    1.11      <sect2>
    1.12        <title><command role="hg-ext-mq">qapplied</command>&emdash;print
    1.13  	applied patches</title>
    1.14  
    1.15 -      <para>The <command role="hg-ext-mq">qapplied</command> command
    1.16 +      <para id="x_5e9">The <command role="hg-ext-mq">qapplied</command> command
    1.17  	prints the current stack of applied patches.  Patches are
    1.18  	printed in oldest-to-newest order, so the last patch in the
    1.19  	list is the <quote>top</quote> patch.</para>
    1.20 @@ -24,7 +24,7 @@
    1.21        <title><command role="hg-ext-mq">qcommit</command>&emdash;commit
    1.22  	changes in the queue repository</title>
    1.23  
    1.24 -      <para>The <command role="hg-ext-mq">qcommit</command> command
    1.25 +      <para id="x_5ea">The <command role="hg-ext-mq">qcommit</command> command
    1.26  	commits any outstanding changes in the <filename
    1.27  	  role="special" class="directory">.hg/patches</filename>
    1.28  	repository.  This command only works if the <filename
    1.29 @@ -36,7 +36,7 @@
    1.30  	after running <command
    1.31  	  role="hg-ext-mq">qinit</command>.</para>
    1.32  
    1.33 -      <para>This command is shorthand for <command role="hg-cmd">hg
    1.34 +      <para id="x_5eb">This command is shorthand for <command role="hg-cmd">hg
    1.35  	  commit --cwd .hg/patches</command>.</para>
    1.36      </sect2>
    1.37      <sect2>
    1.38 @@ -45,7 +45,7 @@
    1.39  	from the <filename role="special">series</filename>
    1.40  	file}</title>
    1.41  
    1.42 -      <para>The <command role="hg-ext-mq">qdelete</command> command
    1.43 +      <para id="x_5ec">The <command role="hg-ext-mq">qdelete</command> command
    1.44  	removes the entry for a patch from the <filename
    1.45  	  role="special">series</filename> file in the <filename
    1.46  	  role="special" class="directory">.hg/patches</filename>
    1.47 @@ -54,9 +54,9 @@
    1.48  	the <option role="hg-ext-mq-cmd-qdel-opt">-f</option> option
    1.49  	to do that.</para>
    1.50  
    1.51 -      <para>Options:</para>
    1.52 -      <itemizedlist>
    1.53 -	<listitem><para><option
    1.54 +      <para id="x_5ed">Options:</para>
    1.55 +      <itemizedlist>
    1.56 +	<listitem><para id="x_5ee"><option
    1.57  	      role="hg-ext-mq-cmd-qdel-opt">-f</option>: Delete the
    1.58  	    patch file.</para>
    1.59  	</listitem></itemizedlist>
    1.60 @@ -66,7 +66,7 @@
    1.61        <title><command role="hg-ext-mq">qdiff</command>&emdash;print a
    1.62  	diff of the topmost applied patch</title>
    1.63  
    1.64 -      <para>The <command role="hg-ext-mq">qdiff</command> command
    1.65 +      <para id="x_5ef">The <command role="hg-ext-mq">qdiff</command> command
    1.66  	prints a diff of the topmost applied patch. It is equivalent
    1.67  	to <command role="hg-cmd">hg diff -r-2:-1</command>.</para>
    1.68  
    1.69 @@ -75,12 +75,12 @@
    1.70        <title><command role="hg-ext-mq">qfold</command>&emdash;merge
    1.71  	(<quote>fold</quote>) several patches into one</title>
    1.72  
    1.73 -      <para>The <command role="hg-ext-mq">qfold</command> command
    1.74 +      <para id="x_5f0">The <command role="hg-ext-mq">qfold</command> command
    1.75  	merges multiple patches into the topmost applied patch, so
    1.76  	that the topmost applied patch makes the union of all of the
    1.77  	changes in the patches in question.</para>
    1.78  
    1.79 -      <para>The patches to fold must not be applied; <command
    1.80 +      <para id="x_5f1">The patches to fold must not be applied; <command
    1.81  	  role="hg-ext-mq">qfold</command> will exit with an error if
    1.82  	any is.  The order in which patches are folded is significant;
    1.83  	<command role="hg-cmd">hg qfold a b</command> means
    1.84 @@ -88,7 +88,7 @@
    1.85  	  <literal>a</literal>, followed by
    1.86  	  <literal>b</literal></quote>.</para>
    1.87  
    1.88 -      <para>The comments from the folded patches are appended to the
    1.89 +      <para id="x_5f2">The comments from the folded patches are appended to the
    1.90  	comments of the destination patch, with each block of comments
    1.91  	separated by three asterisk
    1.92  	(<quote><literal>*</literal></quote>) characters.  Use the
    1.93 @@ -96,19 +96,19 @@
    1.94  	edit the commit message for the combined patch/changeset after
    1.95  	the folding has completed.</para>
    1.96  
    1.97 -      <para>Options:</para>
    1.98 -      <itemizedlist>
    1.99 -	<listitem><para><option
   1.100 +      <para id="x_5f3">Options:</para>
   1.101 +      <itemizedlist>
   1.102 +	<listitem><para id="x_5f4"><option
   1.103  	      role="hg-ext-mq-cmd-qfold-opt">-e</option>: Edit the
   1.104  	    commit message and patch description for the newly folded
   1.105  	    patch.</para>
   1.106  	</listitem>
   1.107 -	<listitem><para><option
   1.108 +	<listitem><para id="x_5f5"><option
   1.109  	      role="hg-ext-mq-cmd-qfold-opt">-l</option>: Use the
   1.110  	    contents of the given file as the new commit message and
   1.111  	    patch description for the folded patch.</para>
   1.112  	</listitem>
   1.113 -	<listitem><para><option
   1.114 +	<listitem><para id="x_5f6"><option
   1.115  	      role="hg-ext-mq-cmd-qfold-opt">-m</option>: Use the
   1.116  	    given text as the new commit message and patch description
   1.117  	    for the folded patch.</para>
   1.118 @@ -120,7 +120,7 @@
   1.119  	  role="hg-ext-mq">qheader</command>&emdash;display the
   1.120  	header/description of a patch</title>
   1.121  
   1.122 -      <para>The <command role="hg-ext-mq">qheader</command> command
   1.123 +      <para id="x_5f7">The <command role="hg-ext-mq">qheader</command> command
   1.124  	prints the header, or description, of a patch.  By default, it
   1.125  	prints the header of the topmost applied patch. Given an
   1.126  	argument, it prints the header of the named patch.</para>
   1.127 @@ -130,7 +130,7 @@
   1.128        <title><command role="hg-ext-mq">qimport</command>&emdash;import
   1.129  	a third-party patch into the queue</title>
   1.130  
   1.131 -      <para>The <command role="hg-ext-mq">qimport</command> command
   1.132 +      <para id="x_5f8">The <command role="hg-ext-mq">qimport</command> command
   1.133  	adds an entry for an external patch to the <filename
   1.134  	  role="special">series</filename> file, and copies the patch
   1.135  	into the <filename role="special"
   1.136 @@ -138,7 +138,7 @@
   1.137  	the entry immediately after the topmost applied patch, but
   1.138  	does not push the patch.</para>
   1.139  
   1.140 -      <para>If the <filename role="special"
   1.141 +      <para id="x_5f9">If the <filename role="special"
   1.142  	  class="directory">.hg/patches</filename> directory is a
   1.143  	repository, <command role="hg-ext-mq">qimport</command>
   1.144  	automatically does an <command role="hg-cmd">hg add</command>
   1.145 @@ -149,14 +149,14 @@
   1.146        <title><command role="hg-ext-mq">qinit</command>&emdash;prepare
   1.147  	a repository to work with MQ</title>
   1.148  
   1.149 -      <para>The <command role="hg-ext-mq">qinit</command> command
   1.150 +      <para id="x_5fa">The <command role="hg-ext-mq">qinit</command> command
   1.151  	prepares a repository to work with MQ.  It creates a directory
   1.152  	called <filename role="special"
   1.153  	  class="directory">.hg/patches</filename>.</para>
   1.154  
   1.155 -      <para>Options:</para>
   1.156 -      <itemizedlist>
   1.157 -	<listitem><para><option
   1.158 +      <para id="x_5fb">Options:</para>
   1.159 +      <itemizedlist>
   1.160 +	<listitem><para id="x_5fc"><option
   1.161  	      role="hg-ext-mq-cmd-qinit-opt">-c</option>: Create
   1.162  	    <filename role="special"
   1.163  	      class="directory">.hg/patches</filename> as a repository
   1.164 @@ -166,7 +166,7 @@
   1.165  	    file.</para>
   1.166  	</listitem></itemizedlist>
   1.167  
   1.168 -      <para>When the <filename role="special"
   1.169 +      <para id="x_5fd">When the <filename role="special"
   1.170  	  class="directory">.hg/patches</filename> directory is a
   1.171  	repository, the <command role="hg-ext-mq">qimport</command>
   1.172  	and <command role="hg-ext-mq">qnew</command> commands
   1.173 @@ -178,7 +178,7 @@
   1.174        <title><command role="hg-ext-mq">qnew</command>&emdash;create a
   1.175  	new patch</title>
   1.176  
   1.177 -      <para>The <command role="hg-ext-mq">qnew</command> command
   1.178 +      <para id="x_5fe">The <command role="hg-ext-mq">qnew</command> command
   1.179  	creates a new patch.  It takes one mandatory argument, the
   1.180  	name to use for the patch file.  The newly created patch is
   1.181  	created empty by default.  It is added to the <filename
   1.182 @@ -186,7 +186,7 @@
   1.183  	topmost applied patch, and is immediately pushed on top of
   1.184  	that patch.</para>
   1.185  
   1.186 -      <para>If <command role="hg-ext-mq">qnew</command> finds modified
   1.187 +      <para id="x_5ff">If <command role="hg-ext-mq">qnew</command> finds modified
   1.188  	files in the working directory, it will refuse to create a new
   1.189  	patch unless the <option
   1.190  	  role="hg-ext-mq-cmd-qnew-opt">-f</option> option is used
   1.191 @@ -194,16 +194,16 @@
   1.192  	  role="hg-ext-mq">qrefresh</command> your topmost applied
   1.193  	patch before you apply a new patch on top of it.</para>
   1.194  
   1.195 -      <para>Options:</para>
   1.196 -      <itemizedlist>
   1.197 -	<listitem><para><option
   1.198 +      <para id="x_600">Options:</para>
   1.199 +      <itemizedlist>
   1.200 +	<listitem><para id="x_601"><option
   1.201  	      role="hg-ext-mq-cmd-qnew-opt">-f</option>: Create a new
   1.202  	    patch if the contents of the working directory are
   1.203  	    modified.  Any outstanding modifications are added to the
   1.204  	    newly created patch, so after this command completes, the
   1.205  	    working directory will no longer be modified.</para>
   1.206  	</listitem>
   1.207 -	<listitem><para><option
   1.208 +	<listitem><para id="x_602"><option
   1.209  	      role="hg-ext-mq-cmd-qnew-opt">-m</option>: Use the given
   1.210  	    text as the commit message. This text will be stored at
   1.211  	    the beginning of the patch file, before the patch
   1.212 @@ -215,7 +215,7 @@
   1.213        <title><command role="hg-ext-mq">qnext</command>&emdash;print
   1.214  	the name of the next patch</title>
   1.215  
   1.216 -      <para>The <command role="hg-ext-mq">qnext</command> command
   1.217 +      <para id="x_603">The <command role="hg-ext-mq">qnext</command> command
   1.218  	prints the name name of the next patch in the <filename
   1.219  	  role="special">series</filename> file after the topmost
   1.220  	applied patch.  This patch will become the topmost applied
   1.221 @@ -227,15 +227,15 @@
   1.222        <title><command role="hg-ext-mq">qpop</command>&emdash;pop
   1.223  	patches off the stack</title>
   1.224  
   1.225 -      <para>The <command role="hg-ext-mq">qpop</command> command
   1.226 +      <para id="x_604">The <command role="hg-ext-mq">qpop</command> command
   1.227  	removes applied patches from the top of the stack of applied
   1.228  	patches.  By default, it removes only one patch.</para>
   1.229  
   1.230 -      <para>This command removes the changesets that represent the
   1.231 +      <para id="x_605">This command removes the changesets that represent the
   1.232  	popped patches from the repository, and updates the working
   1.233  	directory to undo the effects of the patches.</para>
   1.234  
   1.235 -      <para>This command takes an optional argument, which it uses as
   1.236 +      <para id="x_606">This command takes an optional argument, which it uses as
   1.237  	the name or index of the patch to pop to.  If given a name, it
   1.238  	will pop patches until the named patch is the topmost applied
   1.239  	patch.  If given a number, <command
   1.240 @@ -245,7 +245,7 @@
   1.241  	It pops patches until the patch identified by the given index
   1.242  	is the topmost applied patch.</para>
   1.243  
   1.244 -      <para>The <command role="hg-ext-mq">qpop</command> command does
   1.245 +      <para id="x_607">The <command role="hg-ext-mq">qpop</command> command does
   1.246  	not read or write patches or the <filename
   1.247  	  role="special">series</filename> file.  It is thus safe to
   1.248  	<command role="hg-ext-mq">qpop</command> a patch that you have
   1.249 @@ -254,31 +254,31 @@
   1.250  	In the latter two cases, use the name of the patch as it was
   1.251  	when you applied it.</para>
   1.252  
   1.253 -      <para>By default, the <command role="hg-ext-mq">qpop</command>
   1.254 +      <para id="x_608">By default, the <command role="hg-ext-mq">qpop</command>
   1.255  	command will not pop any patches if the working directory has
   1.256  	been modified.  You can override this behaviour using the
   1.257  	<option role="hg-ext-mq-cmd-qpop-opt">-f</option> option,
   1.258  	which reverts all modifications in the working
   1.259  	directory.</para>
   1.260  
   1.261 -      <para>Options:</para>
   1.262 -      <itemizedlist>
   1.263 -	<listitem><para><option
   1.264 +      <para id="x_609">Options:</para>
   1.265 +      <itemizedlist>
   1.266 +	<listitem><para id="x_60a"><option
   1.267  	      role="hg-ext-mq-cmd-qpop-opt">-a</option>: Pop all
   1.268  	    applied patches.  This returns the repository to its state
   1.269  	    before you applied any patches.</para>
   1.270  	</listitem>
   1.271 -	<listitem><para><option
   1.272 +	<listitem><para id="x_60b"><option
   1.273  	      role="hg-ext-mq-cmd-qpop-opt">-f</option>: Forcibly
   1.274  	    revert any modifications to the working directory when
   1.275  	    popping.</para>
   1.276  	</listitem>
   1.277 -	<listitem><para><option
   1.278 +	<listitem><para id="x_60c"><option
   1.279  	      role="hg-ext-mq-cmd-qpop-opt">-n</option>: Pop a patch
   1.280  	    from the named queue.</para>
   1.281  	</listitem></itemizedlist>
   1.282  
   1.283 -      <para>The <command role="hg-ext-mq">qpop</command> command
   1.284 +      <para id="x_60d">The <command role="hg-ext-mq">qpop</command> command
   1.285  	removes one line from the end of the <filename
   1.286  	  role="special">status</filename> file for each patch that it
   1.287  	pops.</para>
   1.288 @@ -288,7 +288,7 @@
   1.289        <title><command role="hg-ext-mq">qprev</command>&emdash;print
   1.290  	the name of the previous patch</title>
   1.291  
   1.292 -      <para>The <command role="hg-ext-mq">qprev</command> command
   1.293 +      <para id="x_60e">The <command role="hg-ext-mq">qprev</command> command
   1.294  	prints the name of the patch in the <filename
   1.295  	  role="special">series</filename> file that comes before the
   1.296  	topmost applied patch. This will become the topmost applied
   1.297 @@ -300,18 +300,18 @@
   1.298        <title><command role="hg-ext-mq">qpush</command>&emdash;push
   1.299  	patches onto the stack</title>
   1.300  
   1.301 -      <para>The <command role="hg-ext-mq">qpush</command> command adds
   1.302 +      <para id="x_60f">The <command role="hg-ext-mq">qpush</command> command adds
   1.303  	patches onto the applied stack.  By default, it adds only one
   1.304  	patch.</para>
   1.305  
   1.306 -      <para>This command creates a new changeset to represent each
   1.307 +      <para id="x_610">This command creates a new changeset to represent each
   1.308  	applied patch, and updates the working directory to apply the
   1.309  	effects of the patches.</para>
   1.310  
   1.311 -      <para>The default data used when creating a changeset are as
   1.312 +      <para id="x_611">The default data used when creating a changeset are as
   1.313  	follows:</para>
   1.314        <itemizedlist>
   1.315 -	<listitem><para>The commit date and time zone are the current
   1.316 +	<listitem><para id="x_612">The commit date and time zone are the current
   1.317  	    date and time zone.  Because these data are used to
   1.318  	    compute the identity of a changeset, this means that if
   1.319  	    you <command role="hg-ext-mq">qpop</command> a patch and
   1.320 @@ -319,32 +319,32 @@
   1.321  	    changeset that you push will have a different identity
   1.322  	    than the changeset you popped.</para>
   1.323  	</listitem>
   1.324 -	<listitem><para>The author is the same as the default used by
   1.325 +	<listitem><para id="x_613">The author is the same as the default used by
   1.326  	    the <command role="hg-cmd">hg commit</command>
   1.327  	    command.</para>
   1.328  	</listitem>
   1.329 -	<listitem><para>The commit message is any text from the patch
   1.330 +	<listitem><para id="x_614">The commit message is any text from the patch
   1.331  	    file that comes before the first diff header.  If there is
   1.332  	    no such text, a default commit message is used that
   1.333  	    identifies the name of the patch.</para>
   1.334  	</listitem></itemizedlist>
   1.335 -      <para>If a patch contains a Mercurial patch header (XXX add
   1.336 +      <para id="x_615">If a patch contains a Mercurial patch header (XXX add
   1.337  	link), the information in the patch header overrides these
   1.338  	defaults.</para>
   1.339  
   1.340 -      <para>Options:</para>
   1.341 -      <itemizedlist>
   1.342 -	<listitem><para><option
   1.343 +      <para id="x_616">Options:</para>
   1.344 +      <itemizedlist>
   1.345 +	<listitem><para id="x_617"><option
   1.346  	      role="hg-ext-mq-cmd-qpush-opt">-a</option>: Push all
   1.347  	    unapplied patches from the <filename
   1.348  	      role="special">series</filename> file until there are
   1.349  	    none left to push.</para>
   1.350  	</listitem>
   1.351 -	<listitem><para><option
   1.352 +	<listitem><para id="x_618"><option
   1.353  	      role="hg-ext-mq-cmd-qpush-opt">-l</option>: Add the name
   1.354  	    of the patch to the end of the commit message.</para>
   1.355  	</listitem>
   1.356 -	<listitem><para><option
   1.357 +	<listitem><para id="x_619"><option
   1.358  	      role="hg-ext-mq-cmd-qpush-opt">-m</option>: If a patch
   1.359  	    fails to apply cleanly, use the entry for the patch in
   1.360  	    another saved queue to compute the parameters for a
   1.361 @@ -352,12 +352,12 @@
   1.362  	    normal Mercurial merge machinery.  Use the resolution of
   1.363  	    the merge as the new patch content.</para>
   1.364  	</listitem>
   1.365 -	<listitem><para><option
   1.366 +	<listitem><para id="x_61a"><option
   1.367  	      role="hg-ext-mq-cmd-qpush-opt">-n</option>: Use the
   1.368  	    named queue if merging while pushing.</para>
   1.369  	</listitem></itemizedlist>
   1.370  
   1.371 -      <para>The <command role="hg-ext-mq">qpush</command> command
   1.372 +      <para id="x_61b">The <command role="hg-ext-mq">qpush</command> command
   1.373  	reads, but does not modify, the <filename
   1.374  	  role="special">series</filename> file.  It appends one line
   1.375  	to the <command role="hg-cmd">hg status</command> file for
   1.376 @@ -369,24 +369,24 @@
   1.377  	  role="hg-ext-mq">qrefresh</command>&emdash;update the
   1.378  	topmost applied patch</title>
   1.379  
   1.380 -      <para>The <command role="hg-ext-mq">qrefresh</command> command
   1.381 +      <para id="x_61c">The <command role="hg-ext-mq">qrefresh</command> command
   1.382  	updates the topmost applied patch.  It modifies the patch,
   1.383  	removes the old changeset that represented the patch, and
   1.384  	creates a new changeset to represent the modified
   1.385  	patch.</para>
   1.386  
   1.387 -      <para>The <command role="hg-ext-mq">qrefresh</command> command
   1.388 +      <para id="x_61d">The <command role="hg-ext-mq">qrefresh</command> command
   1.389  	looks for the following modifications:</para>
   1.390        <itemizedlist>
   1.391 -	<listitem><para>Changes to the commit message, i.e. the text
   1.392 +	<listitem><para id="x_61e">Changes to the commit message, i.e. the text
   1.393  	    before the first diff header in the patch file, are
   1.394  	    reflected in the new changeset that represents the
   1.395  	    patch.</para>
   1.396  	</listitem>
   1.397 -	<listitem><para>Modifications to tracked files in the working
   1.398 +	<listitem><para id="x_61f">Modifications to tracked files in the working
   1.399  	    directory are added to the patch.</para>
   1.400  	</listitem>
   1.401 -	<listitem><para>Changes to the files tracked using <command
   1.402 +	<listitem><para id="x_620">Changes to the files tracked using <command
   1.403  	      role="hg-cmd">hg add</command>, <command
   1.404  	      role="hg-cmd">hg copy</command>, <command
   1.405  	      role="hg-cmd">hg remove</command>, or <command
   1.406 @@ -395,25 +395,25 @@
   1.407  	    removed files and rename sources are removed.</para>
   1.408  	</listitem></itemizedlist>
   1.409  
   1.410 -      <para>Even if <command role="hg-ext-mq">qrefresh</command>
   1.411 +      <para id="x_621">Even if <command role="hg-ext-mq">qrefresh</command>
   1.412  	detects no changes, it still recreates the changeset that
   1.413  	represents the patch.  This causes the identity of the
   1.414  	changeset to differ from the previous changeset that
   1.415  	identified the patch.</para>
   1.416  
   1.417 -      <para>Options:</para>
   1.418 -      <itemizedlist>
   1.419 -	<listitem><para><option
   1.420 +      <para id="x_622">Options:</para>
   1.421 +      <itemizedlist>
   1.422 +	<listitem><para id="x_623"><option
   1.423  	      role="hg-ext-mq-cmd-qrefresh-opt">-e</option>: Modify
   1.424  	    the commit and patch description, using the preferred text
   1.425  	    editor.</para>
   1.426  	</listitem>
   1.427 -	<listitem><para><option
   1.428 +	<listitem><para id="x_624"><option
   1.429  	      role="hg-ext-mq-cmd-qrefresh-opt">-m</option>: Modify
   1.430  	    the commit message and patch description, using the given
   1.431  	    text.</para>
   1.432  	</listitem>
   1.433 -	<listitem><para><option
   1.434 +	<listitem><para id="x_625"><option
   1.435  	      role="hg-ext-mq-cmd-qrefresh-opt">-l</option>: Modify
   1.436  	    the commit message and patch description, using text from
   1.437  	    the given file.</para>
   1.438 @@ -424,11 +424,11 @@
   1.439        <title><command role="hg-ext-mq">qrename</command>&emdash;rename
   1.440  	a patch</title>
   1.441  
   1.442 -      <para>The <command role="hg-ext-mq">qrename</command> command
   1.443 +      <para id="x_626">The <command role="hg-ext-mq">qrename</command> command
   1.444  	renames a patch, and changes the entry for the patch in the
   1.445  	<filename role="special">series</filename> file.</para>
   1.446  
   1.447 -      <para>With a single argument, <command
   1.448 +      <para id="x_627">With a single argument, <command
   1.449  	  role="hg-ext-mq">qrename</command> renames the topmost
   1.450  	applied patch.  With two arguments, it renames its first
   1.451  	argument to its second.</para>
   1.452 @@ -439,21 +439,21 @@
   1.453  	  role="hg-ext-mq">qrestore</command>&emdash;restore saved
   1.454  	queue state</title>
   1.455  
   1.456 -      <para>XXX No idea what this does.</para>
   1.457 +      <para id="x_628">XXX No idea what this does.</para>
   1.458  
   1.459      </sect2>
   1.460      <sect2>
   1.461        <title><command role="hg-ext-mq">qsave</command>&emdash;save
   1.462  	current queue state</title>
   1.463  
   1.464 -      <para>XXX Likewise.</para>
   1.465 +      <para id="x_629">XXX Likewise.</para>
   1.466  
   1.467      </sect2>
   1.468      <sect2>
   1.469        <title><command role="hg-ext-mq">qseries</command>&emdash;print
   1.470  	the entire patch series</title>
   1.471  
   1.472 -      <para>The <command role="hg-ext-mq">qseries</command> command
   1.473 +      <para id="x_62a">The <command role="hg-ext-mq">qseries</command> command
   1.474  	prints the entire patch series from the <filename
   1.475  	  role="special">series</filename> file.  It prints only patch
   1.476  	names, not empty lines or comments.  It prints in order from
   1.477 @@ -464,7 +464,7 @@
   1.478        <title><command role="hg-ext-mq">qtop</command>&emdash;print the
   1.479  	name of the current patch</title>
   1.480  
   1.481 -      <para>The <command role="hg-ext-mq">qtop</command> prints the
   1.482 +      <para id="x_62b">The <command role="hg-ext-mq">qtop</command> prints the
   1.483  	name of the topmost currently applied patch.</para>
   1.484  
   1.485      </sect2>
   1.486 @@ -473,7 +473,7 @@
   1.487  	  role="hg-ext-mq">qunapplied</command>&emdash;print patches
   1.488  	not yet applied</title>
   1.489  
   1.490 -      <para>The <command role="hg-ext-mq">qunapplied</command> command
   1.491 +      <para id="x_62c">The <command role="hg-ext-mq">qunapplied</command> command
   1.492  	prints the names of patches from the <filename
   1.493  	  role="special">series</filename> file that are not yet
   1.494  	applied.  It prints them in order from the next patch that
   1.495 @@ -484,28 +484,28 @@
   1.496        <title><command role="hg-cmd">hg strip</command>&emdash;remove a
   1.497  	revision and descendants</title>
   1.498  
   1.499 -      <para>The <command role="hg-cmd">hg strip</command> command
   1.500 +      <para id="x_62d">The <command role="hg-cmd">hg strip</command> command
   1.501  	removes a revision, and all of its descendants, from the
   1.502  	repository.  It undoes the effects of the removed revisions
   1.503  	from the repository, and updates the working directory to the
   1.504  	first parent of the removed revision.</para>
   1.505  
   1.506 -      <para>The <command role="hg-cmd">hg strip</command> command
   1.507 +      <para id="x_62e">The <command role="hg-cmd">hg strip</command> command
   1.508  	saves a backup of the removed changesets in a bundle, so that
   1.509  	they can be reapplied if removed in error.</para>
   1.510  
   1.511 -      <para>Options:</para>
   1.512 -      <itemizedlist>
   1.513 -	<listitem><para><option role="hg-opt-strip">-b</option>: Save
   1.514 +      <para id="x_62f">Options:</para>
   1.515 +      <itemizedlist>
   1.516 +	<listitem><para id="x_630"><option role="hg-opt-strip">-b</option>: Save
   1.517  	    unrelated changesets that are intermixed with the stripped
   1.518  	    changesets in the backup bundle.</para>
   1.519  	</listitem>
   1.520 -	<listitem><para><option role="hg-opt-strip">-f</option>: If a
   1.521 +	<listitem><para id="x_631"><option role="hg-opt-strip">-f</option>: If a
   1.522  	    branch has multiple heads, remove all heads. XXX This
   1.523  	    should be renamed, and use <literal>-f</literal> to strip
   1.524  	    revs when there are pending changes.</para>
   1.525  	</listitem>
   1.526 -	<listitem><para><option role="hg-opt-strip">-n</option>: Do
   1.527 +	<listitem><para id="x_632"><option role="hg-opt-strip">-n</option>: Do
   1.528  	    not save a backup bundle.</para>
   1.529  	</listitem></itemizedlist>
   1.530  
   1.531 @@ -518,18 +518,18 @@
   1.532        <title>The <filename role="special">series</filename>
   1.533  	file</title>
   1.534  
   1.535 -      <para>The <filename role="special">series</filename> file
   1.536 +      <para id="x_633">The <filename role="special">series</filename> file
   1.537  	contains a list of the names of all patches that MQ can apply.
   1.538  	It is represented as a list of names, with one name saved per
   1.539  	line.  Leading and trailing white space in each line are
   1.540  	ignored.</para>
   1.541  
   1.542 -      <para>Lines may contain comments.  A comment begins with the
   1.543 +      <para id="x_634">Lines may contain comments.  A comment begins with the
   1.544  	<quote><literal>#</literal></quote> character, and extends to
   1.545  	the end of the line.  Empty lines, and lines that contain only
   1.546  	comments, are ignored.</para>
   1.547  
   1.548 -      <para>You will often need to edit the <filename
   1.549 +      <para id="x_635">You will often need to edit the <filename
   1.550  	  role="special">series</filename> file by hand, hence the
   1.551  	support for comments and empty lines noted above.  For
   1.552  	example, you can comment out a patch temporarily, and <command
   1.553 @@ -538,7 +538,7 @@
   1.554  	patches are applied by reordering their entries in the
   1.555  	<filename role="special">series</filename> file.</para>
   1.556  
   1.557 -      <para>Placing the <filename role="special">series</filename>
   1.558 +      <para id="x_636">Placing the <filename role="special">series</filename>
   1.559  	file under revision control is also supported; it is a good
   1.560  	idea to place all of the patches that it refers to under
   1.561  	revision control, as well.  If you create a patch directory
   1.562 @@ -551,7 +551,7 @@
   1.563        <title>The <filename role="special">status</filename>
   1.564  	file</title>
   1.565  
   1.566 -      <para>The <filename role="special">status</filename> file
   1.567 +      <para id="x_637">The <filename role="special">status</filename> file
   1.568  	contains the names and changeset hashes of all patches that MQ
   1.569  	currently has applied.  Unlike the <filename
   1.570  	  role="special">series</filename> file, this file is not