1.1 --- a/en/ch09-undo.xml	Thu Mar 12 15:51:39 2009 +0800
     1.2 +++ b/en/ch09-undo.xml	Wed Mar 18 21:50:57 2009 +0800
     1.3 @@ -354,18 +354,21 @@
     1.4  	that <command role="hg-cmd">hg backout</command> has created
     1.5  	is a child of the changeset we backed out.  It's easier to see
     1.6  	this in figure <xref
     1.7 -	  linkend="fig.undo.backout"/>, which presents a graphical
     1.8 +	  endterm="fig.undo.backout.caption" linkend="fig.undo.backout"/>,
     1.9 +	which presents a graphical
    1.10  	view of the change history.  As you can see, the history is
    1.11  	nice and linear.</para>
    1.12  
    1.13        <informalfigure id="fig.undo.backout">
    1.14 -	<mediaobject><imageobject><imagedata
    1.15 -				    fileref="images/undo-simple.png"/></imageobject><textobject><phrase>XXX 
    1.16 -	      add text</phrase></textobject><caption><para>Backing out
    1.17 -	      a change using the <command role="hg-cmd">hg
    1.18 -		backout</command>
    1.19 -	      command</para></caption></mediaobject>
    1.20 -	
    1.21 +        <mediaobject>
    1.22 +          <imageobject><imagedata fileref="images/undo-simple.png"/>
    1.23 +          </imageobject>
    1.24 +          <textobject><phrase>XXX add text</phrase></textobject>
    1.25 +          <caption><para id="fig.undo.backout.caption">Backing out
    1.26 +            a change using the 
    1.27 +            <command role="hg-cmd">hg backout</command>
    1.28 +            command</para></caption>
    1.29 +      </mediaobject>
    1.30        </informalfigure>
    1.31  
    1.32      </sect2>
    1.33 @@ -393,6 +396,7 @@
    1.34        &interaction.backout.non-tip.cat;
    1.35  
    1.36        <para>As the graphical history in figure <xref
    1.37 +	  endterm="fig.undo.backout-non-tip.caption"
    1.38  	  linkend="fig.undo.backout-non-tip"/> illustrates, Mercurial
    1.39  	actually commits <emphasis>two</emphasis> changes in this kind
    1.40  	of situation (the box-shaped nodes are the ones that Mercurial
    1.41 @@ -407,12 +411,14 @@
    1.42  	second merge automatically!</para>
    1.43  
    1.44        <informalfigure id="fig.undo.backout-non-tip">
    1.45 -	<mediaobject><imageobject><imagedata
    1.46 -				    fileref="images/undo-non-tip.png"/></imageobject><textobject><phrase>XXX 
    1.47 -	      add text</phrase></textobject><caption><para>Automated
    1.48 -	      backout of a non-tip change using the <command
    1.49 -		role="hg-cmd">hg backout</command>
    1.50 -	      command</para></caption></mediaobject>
    1.51 +        <mediaobject>
    1.52 +          <imageobject><imagedata fileref="images/undo-non-tip.png"/>
    1.53 +          </imageobject>
    1.54 +          <textobject><phrase>XXX add text</phrase></textobject>
    1.55 +          <caption><para id="fig.undo.backout-non-tip.caption">Automated
    1.56 +            backout of a non-tip change using the
    1.57 +            <command role="hg-cmd">hg backout</command> command</para></caption>
    1.58 +        </mediaobject>
    1.59        </informalfigure>
    1.60  
    1.61        <para>The result is that you end up <quote>back where you
    1.62 @@ -465,6 +471,7 @@
    1.63  
    1.64        <para>Again, it's easier to see what has happened by looking at
    1.65  	a graph of the revision history, in figure <xref
    1.66 +	  endterm="fig.undo.backout-manual.caption"
    1.67  	  linkend="fig.undo.backout-manual"/>.  This makes it clear
    1.68  	that when we use <command role="hg-cmd">hg backout</command>
    1.69  	to back out a change other than the tip, Mercurial adds a new
    1.70 @@ -472,13 +479,14 @@
    1.71  	box-shaped).</para>
    1.72  
    1.73        <informalfigure id="fig.undo.backout-manual">
    1.74 -	<mediaobject><imageobject><imagedata
    1.75 -				    fileref="images/undo-manual.png"/></imageobject><textobject><phrase>XXX 
    1.76 -	      add text</phrase></textobject><caption><para>Backing out
    1.77 -	      a change using the <command role="hg-cmd">hg
    1.78 -		backout</command>
    1.79 -	      command</para></caption></mediaobject>
    1.80 -	
    1.81 +        <mediaobject>
    1.82 +          <imageobject><imagedata fileref="images/undo-manual.png"/>
    1.83 +          </imageobject>
    1.84 +          <textobject><phrase>XXX add text</phrase></textobject>
    1.85 +          <caption><para id="fig.undo.backout-manual.caption">Backing out a
    1.86 +            change using the <command role="hg-cmd">hg backout</command>
    1.87 +            command</para></caption>
    1.88 +        </mediaobject>
    1.89        </informalfigure>
    1.90  
    1.91        <para>After the <command role="hg-cmd">hg backout</command>
    1.92 @@ -509,14 +517,17 @@
    1.93  
    1.94        <para>Afterwards, the graphical history of our repository looks
    1.95  	like figure
    1.96 -	<xref linkend="fig.undo.backout-manual-merge"/>.</para>
    1.97 +	<xref endterm="fig.undo.backout-manual-merge.caption"
    1.98 +	  linkend="fig.undo.backout-manual-merge"/>.</para>
    1.99  
   1.100        <informalfigure id="fig.undo.backout-manual-merge">
   1.101 -	<mediaobject><imageobject><imagedata
   1.102 -				    fileref="images/undo-manual-merge.png"/></imageobject><textobject><phrase>XXX 
   1.103 -	      add text</phrase></textobject><caption><para>Manually
   1.104 -	      merging a backout change</para></caption></mediaobject>
   1.105 -	
   1.106 +        <mediaobject>
   1.107 +          <imageobject><imagedata fileref="images/undo-manual-merge.png"/>
   1.108 +          </imageobject>
   1.109 +          <textobject><phrase>XXX add text</phrase></textobject>
   1.110 +          <caption><para id="fig.undo.backout-manual-merge.caption">Manually
   1.111 +            merging a backout change</para></caption>
   1.112 +        </mediaobject>
   1.113        </informalfigure>
   1.114  
   1.115      </sect2>