diff en/ch03-tour-merge.xml @ 724:cfdb601a3c8b

Fix imagedata fileref in xml files, and replace ':' with '.' in id attribute

--- a/en/ch03-tour-merge.xml	Thu Mar 12 15:47:15 2009 +0800
+++ b/en/ch03-tour-merge.xml	Thu Mar 12 15:51:39 2009 +0800
@@ -1,6 +1,6 @@
 <!-- vim: set filetype=docbkxml shiftwidth=2 autoindent expandtab tw=77 : -->
 
-<chapter id="chap:tour-merge">
+<chapter id="chap.tour-merge">
   <?dbhtml filename="a-tour-of-mercurial-merging-work.html"?>
   <title>A tour of Mercurial: merging work</title>
 
@@ -38,13 +38,13 @@
       <filename>hello.c</filename> with different contents.  The
       histories of the two repositories have also diverged, as
       illustrated in figure <xref
-	linkend="fig:tour-merge:sep-repos"/>.</para>
+	linkend="fig.tour-merge.sep-repos"/>.</para>
 
     &interaction.tour.merge.cat;
 
-    <informalfigure id="fig:tour-merge:sep-repos">
+    <informalfigure id="fig.tour-merge.sep-repos">
       <mediaobject>
-	<imageobject><imagedata fileref="tour-merge-sep-repos"/></imageobject>
+	<imageobject><imagedata fileref="images/tour-merge-sep-repos.png"/></imageobject>
 	<textobject><phrase>XXX add text</phrase></textobject>
 	<caption><para>Divergent recent histories of the <filename
 	      class="directory">my-hello</filename> and <filename
@@ -71,9 +71,9 @@
 	children, but a repository can contain more than one
 	head.</para>
 
-      <informalfigure id="fig:tour-merge:pull">
+      <informalfigure id="fig.tour-merge.pull">
 	<mediaobject><imageobject><imagedata
-				    fileref="tour-merge-pull"/></imageobject><textobject><phrase>XXX 
+				    fileref="images/tour-merge-pull.png"/></imageobject><textobject><phrase>XXX 
 	      add text</phrase></textobject>
 	  <caption><para>Repository contents after pulling from
 	      <filename class="directory">my-hello</filename> into
@@ -82,14 +82,14 @@
 	</mediaobject>
       </informalfigure>
 
-      <para>In figure <xref linkend="fig:tour-merge:pull"/>, you can
+      <para>In figure <xref linkend="fig.tour-merge.pull"/>, you can
 	see the effect of the pull from <filename
 	  class="directory">my-hello</filename> into <filename
 	  class="directory">my-new-hello</filename>.  The history that
 	was already present in <filename
 	  class="directory">my-new-hello</filename> is untouched, but
 	a new revision has been added.  By referring to figure <xref
-	  linkend="fig:tour-merge:sep-repos"/>, we can see that the
+	  linkend="fig.tour-merge.sep-repos"/>, we can see that the
 	<emphasis>changeset ID</emphasis> remains the same in the new
 	repository, but the <emphasis>revision number</emphasis> has
 	changed.  (This, incidentally, is a fine example of why it's
@@ -118,10 +118,10 @@
 
       &interaction.tour.merge.merge;
 
-      <informalfigure id="fig:tour-merge:merge">
+      <informalfigure id="fig.tour-merge.merge">
 
 	<mediaobject><imageobject><imagedata
-				    fileref="tour-merge-merge"/></imageobject><textobject><phrase>XXX 
+				    fileref="images/tour-merge-merge.png"/></imageobject><textobject><phrase>XXX 
 	      add text</phrase></textobject>
 	  <caption><para>Working directory and repository during
 	      merge, and following commit</para></caption>
@@ -155,7 +155,7 @@
       &interaction.tour.merge.tip;
 
       <para>In figure <xref
-	  linkend="fig:tour-merge:merge"/>, you can see a
+	  linkend="fig.tour-merge.merge"/>, you can see a
 	representation of what happens to the working directory during
 	the merge, and how this affects the repository when the commit
 	happens.  During the merge, the working directory has two
@@ -176,14 +176,14 @@
 
     <informalfigure>
 
-      <mediaobject id="fig:tour-merge:conflict">
-	<imageobject><imagedata fileref="tour-merge-conflict"/></imageobject>
+      <mediaobject id="fig.tour-merge.conflict">
+	<imageobject><imagedata fileref="images/tour-merge-conflict.png"/></imageobject>
 	<textobject><phrase>XXX add text</phrase></textobject>
 	<caption><para>Conflicting changes to a
 	    document</para></caption>      </mediaobject>
     </informalfigure>
 
-    <para>Figure <xref linkend="fig:tour-merge:conflict"/> illustrates
+    <para>Figure <xref linkend="fig.tour-merge.conflict"/> illustrates
       an instance of two conflicting changes to a document.  We
       started with a single version of the file; then we made some
       changes; while someone else made different changes to the same
@@ -213,7 +213,7 @@
 	<command>kdiff3</command>, which I'll use to describe the
 	features that are common to graphical file merging tools.  You
 	can see a screenshot of <command>kdiff3</command> in action in
-	figure <xref linkend="fig:tour-merge:kdiff3"/>.  The kind of
+	figure <xref linkend="fig.tour-merge.kdiff3"/>.  The kind of
 	merge it is performing is called a <emphasis>three-way
 	  merge</emphasis>, because there are three different versions
 	of the file of interest to us.  The tool thus splits the upper
@@ -243,9 +243,9 @@
 	in any of them, the others are updated to display the
 	corresponding sections of their respective files.</para>
 
-      <informalfigure id="fig:tour-merge:kdiff3">
-	<mediaobject><imageobject><imagedata
-				    fileref="kdiff3"/></imageobject><textobject><phrase>XXX 
+      <informalfigure id="fig.tour-merge.kdiff3">
+	<mediaobject><imageobject><imagedata width="100%"
+				    fileref="images/kdiff3.png"/></imageobject><textobject><phrase>XXX 
 	      add text</phrase></textobject>
 	  <caption><para>Using <command>kdiff3</command> to merge
 	      versions of a file</para></caption>
@@ -270,7 +270,7 @@
       <title>A worked example</title>
 
       <para>In this example, we will reproduce the file modification
-	history of figure <xref linkend="fig:tour-merge:conflict"/>
+	history of figure <xref linkend="fig.tour-merge.conflict"/>
 	above.  Let's begin by creating a repository with a base
 	version of our document.</para>
 
@@ -331,7 +331,7 @@
 
     </sect2>
   </sect1>
-  <sect1 id="sec:tour-merge:fetch">
+  <sect1 id="sec.tour-merge.fetch">
     <title>Simplifying the pull-merge-commit sequence</title>
 
     <para>The process of merging changes as outlined above is