1.1 --- a/en/ch01-tour-basic.xml	Thu Mar 26 21:07:39 2009 -0700
     1.2 +++ b/en/ch01-tour-basic.xml	Thu Mar 26 21:22:03 2009 -0700
     1.3 @@ -246,8 +246,8 @@
     1.4  	log</command> is purely a summary; it is missing a lot of
     1.5        detail.</para>
     1.6  
     1.7 -    <para id="x_23">Figure <xref linkend="fig:tour-basic:history"/> provides a
     1.8 -      graphical representation of the history of the <filename
     1.9 +    <para id="x_23"><xref linkend="fig:tour-basic:history"/> provides
    1.10 +      a graphical representation of the history of the <filename
    1.11  	class="directory">hello</filename> repository, to make it a
    1.12        little easier to see which direction history is
    1.13        <quote>flowing</quote> in.  We'll be returning to this figure
    1.14 @@ -351,13 +351,13 @@
    1.15  
    1.16        &interaction.tour.log-v;
    1.17  
    1.18 -      <para id="x_2f">If you want to see both the description and content of a
    1.19 -	change, add the <option role="hg-opt-log">-p</option> (or
    1.20 -	<option role="hg-opt-log">--patch</option>) option.  This
    1.21 -	displays the content of a change as a <emphasis>unified
    1.22 -	  diff</emphasis> (if you've never seen a unified diff before,
    1.23 -	see section <xref linkend="sec:mq:patch"/> for an
    1.24 -	overview).</para>
    1.25 +      <para id="x_2f">If you want to see both the description and
    1.26 +	content of a change, add the <option
    1.27 +	  role="hg-opt-log">-p</option> (or <option
    1.28 +	  role="hg-opt-log">--patch</option>) option.  This displays
    1.29 +	the content of a change as a <emphasis>unified diff</emphasis>
    1.30 +	(if you've never seen a unified diff before, see <xref
    1.31 +	  linkend="sec:mq:patch"/> for an overview).</para>
    1.32  
    1.33        &interaction.tour.log-vp;
    1.34  
    1.35 @@ -509,11 +509,12 @@
    1.36  	<listitem><para id="x_44">If you have set the <envar>HGUSER</envar>
    1.37  	    environment variable, this is checked
    1.38  	    next.</para></listitem>
    1.39 -	<listitem><para id="x_45">If you create a file in your home directory
    1.40 -	    called <filename role="special">.hgrc</filename>, with a
    1.41 -	    <envar role="rc-item-ui">username</envar> entry, that will
    1.42 -	    be used next.  To see what the contents of this file
    1.43 -	    should look like, refer to section <xref
    1.44 +	<listitem><para id="x_45">If you create a file in your home
    1.45 +	    directory called <filename
    1.46 +	      role="special">.hgrc</filename>, with a <envar
    1.47 +	      role="rc-item-ui">username</envar> entry, that will be
    1.48 +	    used next.  To see what the contents of this file should
    1.49 +	    look like, refer to <xref
    1.50  	      linkend="sec:tour-basic:username"/>
    1.51  	    below.</para></listitem>
    1.52  	<listitem><para id="x_46">If you have set the <envar>EMAIL</envar>
    1.53 @@ -727,12 +728,12 @@
    1.54      <sect2>
    1.55        <title>Updating the working directory</title>
    1.56  
    1.57 -      <para id="x_5e">We have so far glossed over the relationship between a
    1.58 -	repository and its working directory.  The <command
    1.59 +      <para id="x_5e">We have so far glossed over the relationship
    1.60 +	between a repository and its working directory.  The <command
    1.61  	  role="hg-cmd">hg pull</command> command that we ran in
    1.62 -	section <xref linkend="sec:tour:pull"/> brought changes
    1.63 -	into the repository, but if we check, there's no sign of those
    1.64 -	changes in the working directory.  This is because <command
    1.65 +	<xref linkend="sec:tour:pull"/> brought changes into the
    1.66 +	repository, but if we check, there's no sign of those changes
    1.67 +	in the working directory.  This is because <command
    1.68  	  role="hg-cmd">hg pull</command> does not (by default) touch
    1.69  	the working directory.  Instead, we use the <command
    1.70  	  role="hg-cmd">hg update</command> command to do this.</para>
    1.71 @@ -756,7 +757,7 @@
    1.72  	  role="hg-cmd">hg pull</command>.</para>
    1.73  
    1.74        <para id="x_61">If you look back at the output of <command
    1.75 -	  role="hg-cmd">hg pull</command> in section <xref
    1.76 +	  role="hg-cmd">hg pull</command> in <xref
    1.77  	    linkend="sec:tour:pull"/> when we ran it without <option
    1.78  	  role="hg-opt-pull">-u</option>, you can see that it printed
    1.79  	a helpful reminder that we'd have to take an explicit step to
    1.80 @@ -770,7 +771,7 @@
    1.81  
    1.82        &interaction.tour.parents;
    1.83  
    1.84 -      <para id="x_63">If you look back at figure <xref
    1.85 +      <para id="x_63">If you look back at <xref
    1.86  	  linkend="fig:tour-basic:history"/>,
    1.87  	you'll see arrows connecting each changeset.  The node that
    1.88  	the arrow leads <emphasis>from</emphasis> in each case is a