diff en/ch08-undo.xml @ 690:b788b405e141

Replace uses of <informalfigure> with <figure>

--- a/en/ch08-undo.xml	Thu Mar 26 20:24:44 2009 -0700
+++ b/en/ch08-undo.xml	Thu Mar 26 21:07:39 2009 -0700
@@ -358,15 +358,14 @@
 	view of the change history.  As you can see, the history is
 	nice and linear.</para>
 
-      <informalfigure id="fig:undo:backout">
-	<mediaobject><imageobject><imagedata
-				    fileref="undo-simple"/></imageobject><textobject><phrase>XXX 
-	      add text</phrase></textobject><caption><para id="x_fc">Backing out
-	      a change using the <command role="hg-cmd">hg
-		backout</command>
-	      command</para></caption></mediaobject>
-	
-      </informalfigure>
+      <figure id="fig:undo:backout">
+	<title>Backing out a change using the <command
+	    role="hg-cmd">hg backout</command> command</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="undo-simple"/></imageobject>
+	  <textobject><phrase>XXX add text</phrase></textobject>
+	</mediaobject>
+      </figure>
 
     </sect2>
     <sect2>
@@ -406,14 +405,14 @@
       <para id="x_101">% TODO: to me it looks like mercurial doesn't commit the
 	second merge automatically!</para>
 
-      <informalfigure id="fig:undo:backout-non-tip">
-	<mediaobject><imageobject><imagedata
-				    fileref="undo-non-tip"/></imageobject><textobject><phrase>XXX 
-	      add text</phrase></textobject><caption><para id="x_102">Automated
-	      backout of a non-tip change using the <command
-		role="hg-cmd">hg backout</command>
-	      command</para></caption></mediaobject>
-      </informalfigure>
+      <figure id="fig:undo:backout-non-tip">
+	<title>Automated backout of a non-tip change using the
+	  <command role="hg-cmd">hg backout</command> command</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="undo-non-tip"/></imageobject>
+	  <textobject><phrase>XXX add text</phrase></textobject>
+	</mediaobject>
+      </figure>
 
       <para id="x_103">The result is that you end up <quote>back where you
 	  were</quote>, only with some extra history that undoes the
@@ -471,15 +470,14 @@
 	head to the repository (the change it committed is
 	box-shaped).</para>
 
-      <informalfigure id="fig:undo:backout-manual">
-	<mediaobject><imageobject><imagedata
-				    fileref="undo-manual"/></imageobject><textobject><phrase>XXX 
-	      add text</phrase></textobject><caption><para id="x_109">Backing out
-	      a change using the <command role="hg-cmd">hg
-		backout</command>
-	      command</para></caption></mediaobject>
-	
-      </informalfigure>
+      <figure id="fig:undo:backout-manual">
+	<title>Backing out a change using the <command
+	    role="hg-cmd">hg backout</command> command</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="undo-manual"/></imageobject>
+	  <textobject><phrase>XXX add text</phrase></textobject>
+	</mediaobject>
+      </figure>
 
       <para id="x_10a">After the <command role="hg-cmd">hg backout</command>
 	command has completed, it leaves the new
@@ -511,13 +509,13 @@
 	like figure
 	<xref linkend="fig:undo:backout-manual-merge"/>.</para>
 
-      <informalfigure id="fig:undo:backout-manual-merge">
-	<mediaobject><imageobject><imagedata
-				    fileref="undo-manual-merge"/></imageobject><textobject><phrase>XXX 
-	      add text</phrase></textobject><caption><para id="x_10f">Manually
-	      merging a backout change</para></caption></mediaobject>
-	
-      </informalfigure>
+      <figure id="fig:undo:backout-manual-merge">
+	<title>Manually merging a backout change</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="undo-manual-merge"/></imageobject>
+	  <textobject><phrase>XXX add text</phrase></textobject>
+	</mediaobject>
+      </figure>
 
     </sect2>
     <sect2>