1.1 --- a/en/ch02-tour-merge.xml	Thu Mar 19 21:18:52 2009 -0700
     1.2 +++ b/en/ch02-tour-merge.xml	Thu Mar 26 21:07:39 2009 -0700
     1.3 @@ -42,16 +42,16 @@
     1.4  
     1.5      &interaction.tour.merge.cat;
     1.6  
     1.7 -    <informalfigure id="fig:tour-merge:sep-repos">
     1.8 +    <figure id="fig:tour-merge:sep-repos">
     1.9 +      <title>Divergent recent histories of the <filename
    1.10 +	  class="directory">my-hello</filename> and <filename
    1.11 +	  class="directory">my-new-hello</filename>
    1.12 +	repositories</title>
    1.13        <mediaobject>
    1.14  	<imageobject><imagedata fileref="tour-merge-sep-repos"/></imageobject>
    1.15  	<textobject><phrase>XXX add text</phrase></textobject>
    1.16 -	<caption><para id="x_33e">Divergent recent histories of the <filename
    1.17 -	      class="directory">my-hello</filename> and <filename
    1.18 -	      class="directory">my-new-hello</filename>
    1.19 -	    repositories</para></caption>
    1.20        </mediaobject>
    1.21 -    </informalfigure>
    1.22 +    </figure>
    1.23  
    1.24      <para id="x_33f">We already know that pulling changes from our <filename
    1.25  	class="directory">my-hello</filename> repository will have no
    1.26 @@ -71,16 +71,17 @@
    1.27  	children, but a repository can contain more than one
    1.28  	head.</para>
    1.29  
    1.30 -      <informalfigure id="fig:tour-merge:pull">
    1.31 -	<mediaobject><imageobject><imagedata
    1.32 -				    fileref="tour-merge-pull"/></imageobject><textobject><phrase>XXX 
    1.33 -	      add text</phrase></textobject>
    1.34 -	  <caption><para id="x_342">Repository contents after pulling from
    1.35 -	      <filename class="directory">my-hello</filename> into
    1.36 -	      <filename
    1.37 -		class="directory">my-new-hello</filename></para></caption>
    1.38 +      <figure id="fig:tour-merge:pull">
    1.39 +	<title>Repository contents after pulling from <filename
    1.40 +	    class="directory">my-hello</filename> into <filename
    1.41 +	    class="directory">my-new-hello</filename></title>
    1.42 +	<mediaobject>
    1.43 +	  <imageobject>
    1.44 +	    <imagedata fileref="tour-merge-pull"/>
    1.45 +	  </imageobject>
    1.46 +	  <textobject><phrase>XXX add text</phrase></textobject>
    1.47  	</mediaobject>
    1.48 -      </informalfigure>
    1.49 +      </figure>
    1.50  
    1.51        <para id="x_343">In figure <xref linkend="fig:tour-merge:pull"/>, you can
    1.52  	see the effect of the pull from <filename
    1.53 @@ -118,15 +119,16 @@
    1.54  
    1.55        &interaction.tour.merge.merge;
    1.56  
    1.57 -      <informalfigure id="fig:tour-merge:merge">
    1.58 -
    1.59 -	<mediaobject><imageobject><imagedata
    1.60 -				    fileref="tour-merge-merge"/></imageobject><textobject><phrase>XXX 
    1.61 -	      add text</phrase></textobject>
    1.62 -	  <caption><para id="x_346">Working directory and repository during
    1.63 -	      merge, and following commit</para></caption>
    1.64 +      <figure id="fig:tour-merge:merge">
    1.65 +	<title>Working directory and repository during merge, and
    1.66 +	  following commit</title>
    1.67 +	<mediaobject>
    1.68 +	  <imageobject>
    1.69 +	    <imagedata fileref="tour-merge-merge"/>
    1.70 +	  </imageobject>
    1.71 +	  <textobject><phrase>XXX add text</phrase></textobject>
    1.72  	</mediaobject>
    1.73 -      </informalfigure>
    1.74 +      </figure>
    1.75  
    1.76        <para id="x_347">This updates the working directory so that it contains
    1.77  	changes from <emphasis>both</emphasis> heads, which is
    1.78 @@ -174,14 +176,13 @@
    1.79        to decide how to reconcile the different changes into something
    1.80        coherent.</para>
    1.81  
    1.82 -    <informalfigure>
    1.83 -
    1.84 -      <mediaobject id="fig:tour-merge:conflict">
    1.85 +    <figure id="fig:tour-merge:conflict">
    1.86 +      <title>Conflicting changes to a document</title>
    1.87 +      <mediaobject>
    1.88  	<imageobject><imagedata fileref="tour-merge-conflict"/></imageobject>
    1.89  	<textobject><phrase>XXX add text</phrase></textobject>
    1.90 -	<caption><para id="x_34c">Conflicting changes to a
    1.91 -	    document</para></caption>      </mediaobject>
    1.92 -    </informalfigure>
    1.93 +      </mediaobject>
    1.94 +    </figure>
    1.95  
    1.96      <para id="x_34d">Figure <xref linkend="fig:tour-merge:conflict"/> illustrates
    1.97        an instance of two conflicting changes to a document.  We
    1.98 @@ -243,14 +244,17 @@
    1.99  	in any of them, the others are updated to display the
   1.100  	corresponding sections of their respective files.</para>
   1.101  
   1.102 -      <informalfigure id="fig:tour-merge:kdiff3">
   1.103 -	<mediaobject><imageobject><imagedata
   1.104 -				    fileref="kdiff3"/></imageobject><textobject><phrase>XXX 
   1.105 -	      add text</phrase></textobject>
   1.106 -	  <caption><para id="x_356">Using <command>kdiff3</command> to merge
   1.107 -	      versions of a file</para></caption>
   1.108 +      <figure id="fig:tour-merge:kdiff3">
   1.109 +	<title>Using <command>kdiff3</command> to merge versions of a
   1.110 +	  file</title>
   1.111 +	<mediaobject>
   1.112 +	  <imageobject>
   1.113 +	    <imagedata fileref="kdiff3"/></imageobject>
   1.114 +	  <textobject>
   1.115 +	    <phrase>XXX add text</phrase>
   1.116 +	  </textobject>
   1.117  	</mediaobject>
   1.118 -      </informalfigure>
   1.119 +      </figure>
   1.120  
   1.121        <para id="x_357">For each conflicting portion of the file, we can choose to
   1.122  	resolve the conflict using some combination of text from the