1.1 --- a/en/ch01-tour-basic.xml	Sun Apr 12 00:05:30 2009 -0700
     1.2 +++ b/en/ch01-tour-basic.xml	Tue Apr 21 23:49:27 2009 -0700
     1.3 @@ -131,7 +131,7 @@
     1.4  
     1.5        &interaction.tour.clone;
     1.6  
     1.7 -      <para>One advantage of using <command role="hg-cmd">hg
     1.8 +      <para id="x_67c">One advantage of using <command role="hg-cmd">hg
     1.9  	  clone</command> is that, as we can see above, it lets us clone
    1.10  	repositories over the network.  Another is that it remembers
    1.11  	where we cloned from, which we'll find useful soon when we
    1.12 @@ -233,7 +233,7 @@
    1.13  	  the text message that the creator of the changeset entered
    1.14  	  to describe the changeset.</para></listitem>
    1.15        <listitem>
    1.16 -	<para>Some changesets, such as the first in the list above,
    1.17 +	<para id="x_67d">Some changesets, such as the first in the list above,
    1.18  	  have a <literal>tag</literal> field.  A tag is another way
    1.19  	  to identify a changeset, by giving it an easy-to-remember
    1.20  	  name. (The tag named <literal>tip</literal> is special: it
    1.21 @@ -364,7 +364,7 @@
    1.22  
    1.23        &interaction.tour.log-vp;
    1.24  
    1.25 -      <para>The <option role="hg-opt-log">-p</option> option is
    1.26 +      <para id="x_67e">The <option role="hg-opt-log">-p</option> option is
    1.27  	tremendously useful, so it's well worth remembering.</para>
    1.28  
    1.29      </sect2>
    1.30 @@ -410,7 +410,7 @@
    1.31  	    role="hg-opt-log">--rev</option> arguments.</para>
    1.32        </listitem>
    1.33        <listitem>
    1.34 -	<para>If you are using short options, you can save typing by
    1.35 +	<para id="x_67f">If you are using short options, you can save typing by
    1.36  	  running them together. For example, the command <command
    1.37  	    role="hg-cmd">hg log -v -p -r 2</command> can be written
    1.38  	  as <command role="hg-cmd">hg log -vpr2</command>.</para>
    1.39 @@ -430,7 +430,7 @@
    1.40      <note>
    1.41        <title>Option naming consistency</title>
    1.42  
    1.43 -      <para>Almost always, Mercurial commands use consistent option
    1.44 +      <para id="x_680">Almost always, Mercurial commands use consistent option
    1.45  	names to refer to the same concepts.  For instance, if a
    1.46  	command deals with changesets, you'll always identify them
    1.47  	with <option role="hg-opt-log">--rev</option> or <option
    1.48 @@ -454,7 +454,7 @@
    1.49        locally, we can just clone that instead.  This is much faster
    1.50        than cloning over the network, and cloning a local repository
    1.51        uses less disk space in most cases, too<footnote>
    1.52 -	<para>The saving of space arises when source and destination
    1.53 +	<para id="x_681">The saving of space arises when source and destination
    1.54  	  repositories are on the same filesystem, in which case
    1.55  	  Mercurial will use hardlinks to do copy-on-write sharing of
    1.56  	  its internal metadata.  If that explanation meant nothing to
    1.57 @@ -479,7 +479,7 @@
    1.58  
    1.59      &interaction.tour.cat1;
    1.60  
    1.61 -    <para>Let's edit this file so that it prints a second line of
    1.62 +    <para id="x_682">Let's edit this file so that it prints a second line of
    1.63        output.</para>
    1.64  
    1.65      &interaction.tour.cat2;
    1.66 @@ -516,7 +516,7 @@
    1.67      <tip>
    1.68        <title>Understanding patches</title>
    1.69  
    1.70 -      <para>Remember to take a look at <xref
    1.71 +      <para id="x_683">Remember to take a look at <xref
    1.72  	  linkend="sec:mq:patch"/> if you don't know how to read
    1.73  	output above.</para>
    1.74      </tip>
    1.75 @@ -726,7 +726,7 @@
    1.76  	repository as the <emphasis>tip revision</emphasis>, or simply
    1.77  	the <emphasis>tip</emphasis>.</para>
    1.78  
    1.79 -      <para>By the way, the <command role="hg-cmd">hg tip</command>
    1.80 +      <para id="x_684">By the way, the <command role="hg-cmd">hg tip</command>
    1.81  	command accepts many of the same options as <command
    1.82  	  role="hg-cmd">hg log</command>, so <option
    1.83  	  role="hg-opt-global">-v</option> above indicates <quote>be