1.1 --- a/en/ch02-tour-merge.xml	Thu Mar 26 21:07:39 2009 -0700
     1.2 +++ b/en/ch02-tour-merge.xml	Thu Mar 26 21:22:03 2009 -0700
     1.3 @@ -37,7 +37,7 @@
     1.4      <para id="x_33d">We should now have two copies of
     1.5        <filename>hello.c</filename> with different contents.  The
     1.6        histories of the two repositories have also diverged, as
     1.7 -      illustrated in figure <xref
     1.8 +      illustrated in <xref
     1.9  	linkend="fig:tour-merge:sep-repos"/>.</para>
    1.10  
    1.11      &interaction.tour.merge.cat;
    1.12 @@ -83,13 +83,13 @@
    1.13  	</mediaobject>
    1.14        </figure>
    1.15  
    1.16 -      <para id="x_343">In figure <xref linkend="fig:tour-merge:pull"/>, you can
    1.17 +      <para id="x_343">In <xref linkend="fig:tour-merge:pull"/>, you can
    1.18  	see the effect of the pull from <filename
    1.19  	  class="directory">my-hello</filename> into <filename
    1.20  	  class="directory">my-new-hello</filename>.  The history that
    1.21  	was already present in <filename
    1.22  	  class="directory">my-new-hello</filename> is untouched, but
    1.23 -	a new revision has been added.  By referring to figure <xref
    1.24 +	a new revision has been added.  By referring to <xref
    1.25  	  linkend="fig:tour-merge:sep-repos"/>, we can see that the
    1.26  	<emphasis>changeset ID</emphasis> remains the same in the new
    1.27  	repository, but the <emphasis>revision number</emphasis> has
    1.28 @@ -156,7 +156,7 @@
    1.29  
    1.30        &interaction.tour.merge.tip;
    1.31  
    1.32 -      <para id="x_34a">In figure <xref
    1.33 +      <para id="x_34a">In <xref
    1.34  	  linkend="fig:tour-merge:merge"/>, you can see a
    1.35  	representation of what happens to the working directory during
    1.36  	the merge, and how this affects the repository when the commit
    1.37 @@ -184,7 +184,7 @@
    1.38        </mediaobject>
    1.39      </figure>
    1.40  
    1.41 -    <para id="x_34d">Figure <xref linkend="fig:tour-merge:conflict"/> illustrates
    1.42 +    <para id="x_34d"><xref linkend="fig:tour-merge:conflict"/> illustrates
    1.43        an instance of two conflicting changes to a document.  We
    1.44        started with a single version of the file; then we made some
    1.45        changes; while someone else made different changes to the same
    1.46 @@ -214,7 +214,7 @@
    1.47  	<command>kdiff3</command>, which I'll use to describe the
    1.48  	features that are common to graphical file merging tools.  You
    1.49  	can see a screenshot of <command>kdiff3</command> in action in
    1.50 -	figure <xref linkend="fig:tour-merge:kdiff3"/>.  The kind of
    1.51 +	<xref linkend="fig:tour-merge:kdiff3"/>.  The kind of
    1.52  	merge it is performing is called a <emphasis>three-way
    1.53  	  merge</emphasis>, because there are three different versions
    1.54  	of the file of interest to us.  The tool thus splits the upper
    1.55 @@ -274,7 +274,7 @@
    1.56        <title>A worked example</title>
    1.57  
    1.58        <para id="x_359">In this example, we will reproduce the file modification
    1.59 -	history of figure <xref linkend="fig:tour-merge:conflict"/>
    1.60 +	history of <xref linkend="fig:tour-merge:conflict"/>
    1.61  	above.  Let's begin by creating a repository with a base
    1.62  	version of our document.</para>
    1.63