1.1 --- a/en/ch02-tour-basic.xml	Mon Mar 09 23:37:29 2009 -0700
     1.2 +++ b/en/ch02-tour-basic.xml	Thu Mar 12 17:11:59 2009 +0800
     1.3 @@ -1,10 +1,10 @@
     1.4  <!-- vim: set filetype=docbkxml shiftwidth=2 autoindent expandtab tw=77 : -->
     1.5  
     1.6 -<chapter id="chap:tour-basic">
     1.7 +<chapter id="chap.tour-basic">
     1.8    <?dbhtml filename="a-tour-of-mercurial-the-basics.html"?>
     1.9    <title>A tour of Mercurial: the basics</title>
    1.10  
    1.11 -  <sect1 id="sec:tour:install">
    1.12 +  <sect1 id="sec.tour.install">
    1.13      <title>Installing Mercurial on your system</title>
    1.14  
    1.15      <para>Prebuilt binary packages of Mercurial are available for
    1.16 @@ -250,7 +250,7 @@
    1.17  	log</command> is purely a summary; it is missing a lot of
    1.18        detail.</para>
    1.19  
    1.20 -    <para>Figure <xref linkend="fig:tour-basic:history"/> provides a
    1.21 +    <para>Figure <xref linkend="fig.tour-basic.history"/> provides a
    1.22        graphical representation of the history of the <filename
    1.23  	class="directory">hello</filename> repository, to make it a
    1.24        little easier to see which direction history is
    1.25 @@ -258,9 +258,9 @@
    1.26        several times in this chapter and the chapter that
    1.27        follows.</para>
    1.28  
    1.29 -    <informalfigure id="fig:tour-basic:history">
    1.30 +    <informalfigure id="fig.tour-basic.history">
    1.31        <mediaobject>
    1.32 -	<imageobject><imagedata fileref="tour-history"/></imageobject>
    1.33 +	<imageobject><imagedata fileref="images/tour-history.png"/></imageobject>
    1.34  	<textobject><phrase>XXX add text</phrase></textobject>
    1.35  	<caption><para>Graphical history of the <filename
    1.36  	      class="directory">hello</filename>
    1.37 @@ -361,7 +361,7 @@
    1.38  	<option role="hg-opt-log">--patch</option>) option.  This
    1.39  	displays the content of a change as a <emphasis>unified
    1.40  	  diff</emphasis> (if you've never seen a unified diff before,
    1.41 -	see section <xref linkend="sec:mq:patch"/> for an
    1.42 +	see section <xref linkend="sec.mq.patch"/> for an
    1.43  	overview).</para>
    1.44  
    1.45        &interaction.tour.log-vp;
    1.46 @@ -519,7 +519,7 @@
    1.47  	    <envar role="rc-item-ui">username</envar> entry, that will
    1.48  	    be used next.  To see what the contents of this file
    1.49  	    should look like, refer to section <xref
    1.50 -	      linkend="sec:tour-basic:username"/>
    1.51 +	      linkend="sec.tour-basic.username"/>
    1.52  	    below.</para></listitem>
    1.53  	<listitem><para>If you have set the <envar>EMAIL</envar>
    1.54  	    environment variable, this will be used
    1.55 @@ -543,7 +543,7 @@
    1.56  	and most robust way to set a username for yourself is by
    1.57  	creating a <filename role="special">.hgrc</filename> file; see
    1.58  	below for details.</para>
    1.59 -      <sect3 id="sec:tour-basic:username">
    1.60 +      <sect3 id="sec.tour-basic.username">
    1.61  	<title>Creating a Mercurial configuration file</title>
    1.62  
    1.63  	<para>To set a user name, use your favourite editor
    1.64 @@ -684,7 +684,7 @@
    1.65  	look at a few ways that we can propagate this change into
    1.66  	other repositories.</para>
    1.67  
    1.68 -    <sect2 id="sec:tour:pull">
    1.69 +    <sect2 id="sec.tour.pull">
    1.70        <title>Pulling changes from another repository</title>
    1.71        <para>To get started, let's clone our original
    1.72  	  <filename class="directory">hello</filename> repository,
    1.73 @@ -734,7 +734,7 @@
    1.74        <para>We have so far glossed over the relationship between a
    1.75  	repository and its working directory.  The <command
    1.76  	  role="hg-cmd">hg pull</command> command that we ran in
    1.77 -	section <xref linkend="sec:tour:pull"/> brought changes
    1.78 +	section <xref linkend="sec.tour.pull"/> brought changes
    1.79  	into the repository, but if we check, there's no sign of those
    1.80  	changes in the working directory.  This is because <command
    1.81  	  role="hg-cmd">hg pull</command> does not (by default) touch
    1.82 @@ -761,7 +761,7 @@
    1.83  
    1.84        <para>If you look back at the output of <command
    1.85  	  role="hg-cmd">hg pull</command> in section <xref
    1.86 -	    linkend="sec:tour:pull"/> when we ran it without <option
    1.87 +	    linkend="sec.tour.pull"/> when we ran it without <option
    1.88  	  role="hg-opt-pull">-u</option>, you can see that it printed
    1.89  	a helpful reminder that we'd have to take an explicit step to
    1.90  	update the working directory:</para>
    1.91 @@ -775,7 +775,7 @@
    1.92        &interaction.tour.parents;
    1.93  
    1.94        <para>If you look back at figure <xref
    1.95 -	  linkend="fig:tour-basic:history"/>,
    1.96 +	  linkend="fig.tour-basic.history"/>,
    1.97  	you'll see arrows connecting each changeset.  The node that
    1.98  	the arrow leads <emphasis>from</emphasis> in each case is a
    1.99  	parent, and the node that the arrow leads