1.1 --- a/en/ch03-tour-merge.xml	Mon Mar 09 23:37:29 2009 -0700
     1.2 +++ b/en/ch03-tour-merge.xml	Thu Mar 12 17:43:30 2009 +0800
     1.3 @@ -1,6 +1,6 @@
     1.4  <!-- vim: set filetype=docbkxml shiftwidth=2 autoindent expandtab tw=77 : -->
     1.5  
     1.6 -<chapter id="chap:tour-merge">
     1.7 +<chapter id="chap.tour-merge">
     1.8    <?dbhtml filename="a-tour-of-mercurial-merging-work.html"?>
     1.9    <title>A tour of Mercurial: merging work</title>
    1.10  
    1.11 @@ -38,13 +38,13 @@
    1.12        <filename>hello.c</filename> with different contents.  The
    1.13        histories of the two repositories have also diverged, as
    1.14        illustrated in figure <xref
    1.15 -	linkend="fig:tour-merge:sep-repos"/>.</para>
    1.16 +	linkend="fig.tour-merge.sep-repos"/>.</para>
    1.17  
    1.18      &interaction.tour.merge.cat;
    1.19  
    1.20 -    <informalfigure id="fig:tour-merge:sep-repos">
    1.21 +    <informalfigure id="fig.tour-merge.sep-repos">
    1.22        <mediaobject>
    1.23 -	<imageobject><imagedata fileref="tour-merge-sep-repos"/></imageobject>
    1.24 +	<imageobject><imagedata fileref="images/tour-merge-sep-repos.png"/></imageobject>
    1.25  	<textobject><phrase>XXX add text</phrase></textobject>
    1.26  	<caption><para>Divergent recent histories of the <filename
    1.27  	      class="directory">my-hello</filename> and <filename
    1.28 @@ -71,9 +71,9 @@
    1.29  	children, but a repository can contain more than one
    1.30  	head.</para>
    1.31  
    1.32 -      <informalfigure id="fig:tour-merge:pull">
    1.33 +      <informalfigure id="fig.tour-merge.pull">
    1.34  	<mediaobject><imageobject><imagedata
    1.35 -				    fileref="tour-merge-pull"/></imageobject><textobject><phrase>XXX 
    1.36 +				    fileref="images/tour-merge-pull.png"/></imageobject><textobject><phrase>XXX 
    1.37  	      add text</phrase></textobject>
    1.38  	  <caption><para>Repository contents after pulling from
    1.39  	      <filename class="directory">my-hello</filename> into
    1.40 @@ -82,14 +82,14 @@
    1.41  	</mediaobject>
    1.42        </informalfigure>
    1.43  
    1.44 -      <para>In figure <xref linkend="fig:tour-merge:pull"/>, you can
    1.45 +      <para>In figure <xref linkend="fig.tour-merge.pull"/>, you can
    1.46  	see the effect of the pull from <filename
    1.47  	  class="directory">my-hello</filename> into <filename
    1.48  	  class="directory">my-new-hello</filename>.  The history that
    1.49  	was already present in <filename
    1.50  	  class="directory">my-new-hello</filename> is untouched, but
    1.51  	a new revision has been added.  By referring to figure <xref
    1.52 -	  linkend="fig:tour-merge:sep-repos"/>, we can see that the
    1.53 +	  linkend="fig.tour-merge.sep-repos"/>, we can see that the
    1.54  	<emphasis>changeset ID</emphasis> remains the same in the new
    1.55  	repository, but the <emphasis>revision number</emphasis> has
    1.56  	changed.  (This, incidentally, is a fine example of why it's
    1.57 @@ -118,10 +118,10 @@
    1.58  
    1.59        &interaction.tour.merge.merge;
    1.60  
    1.61 -      <informalfigure id="fig:tour-merge:merge">
    1.62 +      <informalfigure id="fig.tour-merge.merge">
    1.63  
    1.64  	<mediaobject><imageobject><imagedata
    1.65 -				    fileref="tour-merge-merge"/></imageobject><textobject><phrase>XXX 
    1.66 +				    fileref="images/tour-merge-merge.png"/></imageobject><textobject><phrase>XXX 
    1.67  	      add text</phrase></textobject>
    1.68  	  <caption><para>Working directory and repository during
    1.69  	      merge, and following commit</para></caption>
    1.70 @@ -155,7 +155,7 @@
    1.71        &interaction.tour.merge.tip;
    1.72  
    1.73        <para>In figure <xref
    1.74 -	  linkend="fig:tour-merge:merge"/>, you can see a
    1.75 +	  linkend="fig.tour-merge.merge"/>, you can see a
    1.76  	representation of what happens to the working directory during
    1.77  	the merge, and how this affects the repository when the commit
    1.78  	happens.  During the merge, the working directory has two
    1.79 @@ -176,14 +176,14 @@
    1.80  
    1.81      <informalfigure>
    1.82  
    1.83 -      <mediaobject id="fig:tour-merge:conflict">
    1.84 -	<imageobject><imagedata fileref="tour-merge-conflict"/></imageobject>
    1.85 +      <mediaobject id="fig.tour-merge.conflict">
    1.86 +	<imageobject><imagedata fileref="images/tour-merge-conflict.png"/></imageobject>
    1.87  	<textobject><phrase>XXX add text</phrase></textobject>
    1.88  	<caption><para>Conflicting changes to a
    1.89  	    document</para></caption>      </mediaobject>
    1.90      </informalfigure>
    1.91  
    1.92 -    <para>Figure <xref linkend="fig:tour-merge:conflict"/> illustrates
    1.93 +    <para>Figure <xref linkend="fig.tour-merge.conflict"/> illustrates
    1.94        an instance of two conflicting changes to a document.  We
    1.95        started with a single version of the file; then we made some
    1.96        changes; while someone else made different changes to the same
    1.97 @@ -213,7 +213,7 @@
    1.98  	<command>kdiff3</command>, which I'll use to describe the
    1.99  	features that are common to graphical file merging tools.  You
   1.100  	can see a screenshot of <command>kdiff3</command> in action in
   1.101 -	figure <xref linkend="fig:tour-merge:kdiff3"/>.  The kind of
   1.102 +	figure <xref linkend="fig.tour-merge.kdiff3"/>.  The kind of
   1.103  	merge it is performing is called a <emphasis>three-way
   1.104  	  merge</emphasis>, because there are three different versions
   1.105  	of the file of interest to us.  The tool thus splits the upper
   1.106 @@ -243,9 +243,9 @@
   1.107  	in any of them, the others are updated to display the
   1.108  	corresponding sections of their respective files.</para>
   1.109  
   1.110 -      <informalfigure id="fig:tour-merge:kdiff3">
   1.111 -	<mediaobject><imageobject><imagedata
   1.112 -				    fileref="kdiff3"/></imageobject><textobject><phrase>XXX 
   1.113 +      <informalfigure id="fig.tour-merge.kdiff3">
   1.114 +	<mediaobject><imageobject><imagedata width="100%"
   1.115 +				    fileref="images/kdiff3.png"/></imageobject><textobject><phrase>XXX 
   1.116  	      add text</phrase></textobject>
   1.117  	  <caption><para>Using <command>kdiff3</command> to merge
   1.118  	      versions of a file</para></caption>
   1.119 @@ -270,7 +270,7 @@
   1.120        <title>A worked example</title>
   1.121  
   1.122        <para>In this example, we will reproduce the file modification
   1.123 -	history of figure <xref linkend="fig:tour-merge:conflict"/>
   1.124 +	history of figure <xref linkend="fig.tour-merge.conflict"/>
   1.125  	above.  Let's begin by creating a repository with a base
   1.126  	version of our document.</para>
   1.127  
   1.128 @@ -331,7 +331,7 @@
   1.129  
   1.130      </sect2>
   1.131    </sect1>
   1.132 -  <sect1 id="sec:tour-merge:fetch">
   1.133 +  <sect1 id="sec.tour-merge.fetch">
   1.134      <title>Simplifying the pull-merge-commit sequence</title>
   1.135  
   1.136      <para>The process of merging changes as outlined above is