1.1 --- a/en/ch01-tour-basic.xml	Thu Mar 26 20:24:44 2009 -0700
     1.2 +++ b/en/ch01-tour-basic.xml	Thu Mar 26 21:07:39 2009 -0700
     1.3 @@ -254,15 +254,14 @@
     1.4        several times in this chapter and the chapter that
     1.5        follows.</para>
     1.6  
     1.7 -    <informalfigure id="fig:tour-basic:history">
     1.8 +    <figure id="fig:tour-basic:history">
     1.9 +      <title>Graphical history of the <filename
    1.10 +	  class="directory">hello</filename> repository</title>
    1.11        <mediaobject>
    1.12  	<imageobject><imagedata fileref="tour-history"/></imageobject>
    1.13  	<textobject><phrase>XXX add text</phrase></textobject>
    1.14 -	<caption><para id="x_24">Graphical history of the <filename
    1.15 -	      class="directory">hello</filename>
    1.16 -	    repository</para></caption>
    1.17        </mediaobject>
    1.18 -    </informalfigure>
    1.19 +    </figure>
    1.20  
    1.21      <sect2>
    1.22        <title>Changesets, revisions, and talking to other

     2.1 --- a/en/ch02-tour-merge.xml	Thu Mar 26 20:24:44 2009 -0700
     2.2 +++ b/en/ch02-tour-merge.xml	Thu Mar 26 21:07:39 2009 -0700
     2.3 @@ -42,16 +42,16 @@
     2.4  
     2.5      &interaction.tour.merge.cat;
     2.6  
     2.7 -    <informalfigure id="fig:tour-merge:sep-repos">
     2.8 +    <figure id="fig:tour-merge:sep-repos">
     2.9 +      <title>Divergent recent histories of the <filename
    2.10 +	  class="directory">my-hello</filename> and <filename
    2.11 +	  class="directory">my-new-hello</filename>
    2.12 +	repositories</title>
    2.13        <mediaobject>
    2.14  	<imageobject><imagedata fileref="tour-merge-sep-repos"/></imageobject>
    2.15  	<textobject><phrase>XXX add text</phrase></textobject>
    2.16 -	<caption><para id="x_33e">Divergent recent histories of the <filename
    2.17 -	      class="directory">my-hello</filename> and <filename
    2.18 -	      class="directory">my-new-hello</filename>
    2.19 -	    repositories</para></caption>
    2.20        </mediaobject>
    2.21 -    </informalfigure>
    2.22 +    </figure>
    2.23  
    2.24      <para id="x_33f">We already know that pulling changes from our <filename
    2.25  	class="directory">my-hello</filename> repository will have no
    2.26 @@ -71,16 +71,17 @@
    2.27  	children, but a repository can contain more than one
    2.28  	head.</para>
    2.29  
    2.30 -      <informalfigure id="fig:tour-merge:pull">
    2.31 -	<mediaobject><imageobject><imagedata
    2.32 -				    fileref="tour-merge-pull"/></imageobject><textobject><phrase>XXX 
    2.33 -	      add text</phrase></textobject>
    2.34 -	  <caption><para id="x_342">Repository contents after pulling from
    2.35 -	      <filename class="directory">my-hello</filename> into
    2.36 -	      <filename
    2.37 -		class="directory">my-new-hello</filename></para></caption>
    2.38 +      <figure id="fig:tour-merge:pull">
    2.39 +	<title>Repository contents after pulling from <filename
    2.40 +	    class="directory">my-hello</filename> into <filename
    2.41 +	    class="directory">my-new-hello</filename></title>
    2.42 +	<mediaobject>
    2.43 +	  <imageobject>
    2.44 +	    <imagedata fileref="tour-merge-pull"/>
    2.45 +	  </imageobject>
    2.46 +	  <textobject><phrase>XXX add text</phrase></textobject>
    2.47  	</mediaobject>
    2.48 -      </informalfigure>
    2.49 +      </figure>
    2.50  
    2.51        <para id="x_343">In figure <xref linkend="fig:tour-merge:pull"/>, you can
    2.52  	see the effect of the pull from <filename
    2.53 @@ -118,15 +119,16 @@
    2.54  
    2.55        &interaction.tour.merge.merge;
    2.56  
    2.57 -      <informalfigure id="fig:tour-merge:merge">
    2.58 -
    2.59 -	<mediaobject><imageobject><imagedata
    2.60 -				    fileref="tour-merge-merge"/></imageobject><textobject><phrase>XXX 
    2.61 -	      add text</phrase></textobject>
    2.62 -	  <caption><para id="x_346">Working directory and repository during
    2.63 -	      merge, and following commit</para></caption>
    2.64 +      <figure id="fig:tour-merge:merge">
    2.65 +	<title>Working directory and repository during merge, and
    2.66 +	  following commit</title>
    2.67 +	<mediaobject>
    2.68 +	  <imageobject>
    2.69 +	    <imagedata fileref="tour-merge-merge"/>
    2.70 +	  </imageobject>
    2.71 +	  <textobject><phrase>XXX add text</phrase></textobject>
    2.72  	</mediaobject>
    2.73 -      </informalfigure>
    2.74 +      </figure>
    2.75  
    2.76        <para id="x_347">This updates the working directory so that it contains
    2.77  	changes from <emphasis>both</emphasis> heads, which is
    2.78 @@ -174,14 +176,13 @@
    2.79        to decide how to reconcile the different changes into something
    2.80        coherent.</para>
    2.81  
    2.82 -    <informalfigure>
    2.83 -
    2.84 -      <mediaobject id="fig:tour-merge:conflict">
    2.85 +    <figure id="fig:tour-merge:conflict">
    2.86 +      <title>Conflicting changes to a document</title>
    2.87 +      <mediaobject>
    2.88  	<imageobject><imagedata fileref="tour-merge-conflict"/></imageobject>
    2.89  	<textobject><phrase>XXX add text</phrase></textobject>
    2.90 -	<caption><para id="x_34c">Conflicting changes to a
    2.91 -	    document</para></caption>      </mediaobject>
    2.92 -    </informalfigure>
    2.93 +      </mediaobject>
    2.94 +    </figure>
    2.95  
    2.96      <para id="x_34d">Figure <xref linkend="fig:tour-merge:conflict"/> illustrates
    2.97        an instance of two conflicting changes to a document.  We
    2.98 @@ -243,14 +244,17 @@
    2.99  	in any of them, the others are updated to display the
   2.100  	corresponding sections of their respective files.</para>
   2.101  
   2.102 -      <informalfigure id="fig:tour-merge:kdiff3">
   2.103 -	<mediaobject><imageobject><imagedata
   2.104 -				    fileref="kdiff3"/></imageobject><textobject><phrase>XXX 
   2.105 -	      add text</phrase></textobject>
   2.106 -	  <caption><para id="x_356">Using <command>kdiff3</command> to merge
   2.107 -	      versions of a file</para></caption>
   2.108 +      <figure id="fig:tour-merge:kdiff3">
   2.109 +	<title>Using <command>kdiff3</command> to merge versions of a
   2.110 +	  file</title>
   2.111 +	<mediaobject>
   2.112 +	  <imageobject>
   2.113 +	    <imagedata fileref="kdiff3"/></imageobject>
   2.114 +	  <textobject>
   2.115 +	    <phrase>XXX add text</phrase>
   2.116 +	  </textobject>
   2.117  	</mediaobject>
   2.118 -      </informalfigure>
   2.119 +      </figure>
   2.120  
   2.121        <para id="x_357">For each conflicting portion of the file, we can choose to
   2.122  	resolve the conflict using some combination of text from the

     3.1 --- a/en/ch03-concepts.xml	Thu Mar 26 20:24:44 2009 -0700
     3.2 +++ b/en/ch03-concepts.xml	Thu Mar 26 21:07:39 2009 -0700
     3.3 @@ -49,14 +49,14 @@
     3.4  	repository is illustrated in figure <xref
     3.5  	  linkend="fig:concepts:filelog"/>.</para>
     3.6  
     3.7 -      <informalfigure id="fig:concepts:filelog">
     3.8 -	<mediaobject><imageobject><imagedata
     3.9 -				    fileref="filelog"/></imageobject><textobject><phrase>XXX 
    3.10 -	      add text</phrase></textobject>
    3.11 -	  <caption><para id="x_2ed">Relationships between files in working
    3.12 -	      directory and filelogs in
    3.13 -	      repository</para></caption></mediaobject>
    3.14 -      </informalfigure>
    3.15 +      <figure id="fig:concepts:filelog">
    3.16 +	<title>Relationships between files in working directory and
    3.17 +	  filelogs in repository</title>
    3.18 +	<mediaobject>
    3.19 +	  <imageobject><imagedata fileref="filelog"/></imageobject>
    3.20 +	  <textobject><phrase>XXX add text</phrase></textobject>
    3.21 +	</mediaobject>
    3.22 +      </figure>
    3.23  
    3.24      </sect2>
    3.25      <sect2>
    3.26 @@ -99,13 +99,13 @@
    3.27  	was created.  These relationships are illustrated in figure
    3.28  	<xref linkend="fig:concepts:metadata"/>.</para>
    3.29  
    3.30 -      <informalfigure id="fig:concepts:metadata">
    3.31 -	<mediaobject><imageobject><imagedata
    3.32 -				    fileref="metadata"/></imageobject><textobject><phrase>XXX 
    3.33 -	      add text</phrase></textobject><caption><para id="x_2f2">Metadata
    3.34 -	      relationships</para></caption>
    3.35 +      <figure id="fig:concepts:metadata">
    3.36 +	<title>Metadata relationships</title>
    3.37 +	<mediaobject>
    3.38 +	  <imageobject><imagedata fileref="metadata"/></imageobject>
    3.39 +	  <textobject><phrase>XXX add text</phrase></textobject>
    3.40  	</mediaobject>
    3.41 -      </informalfigure>
    3.42 +      </figure>
    3.43  
    3.44        <para id="x_2f3">As the illustration shows, there is
    3.45  	<emphasis>not</emphasis> a <quote>one to one</quote>
    3.46 @@ -184,13 +184,13 @@
    3.47  	file accumulates, the more revisions you must read, hence the
    3.48  	longer it takes to reconstruct a particular revision.</para>
    3.49  
    3.50 -      <informalfigure id="fig:concepts:snapshot">
    3.51 -	<mediaobject><imageobject><imagedata
    3.52 -				    fileref="snapshot"/></imageobject><textobject><phrase>XXX 
    3.53 -	      add text</phrase></textobject><caption><para id="x_2fb">Snapshot of
    3.54 -	      a revlog, with incremental
    3.55 -	      deltas</para></caption></mediaobject>
    3.56 -      </informalfigure>
    3.57 +      <figure id="fig:concepts:snapshot">
    3.58 +	<title>Snapshot of a revlog, with incremental deltas</title>
    3.59 +	<mediaobject>
    3.60 +	  <imageobject><imagedata fileref="snapshot"/></imageobject>
    3.61 +	  <textobject><phrase>XXX add text</phrase></textobject>
    3.62 +	</mediaobject>
    3.63 +      </figure>
    3.64  
    3.65        <para id="x_2fc">The innovation that Mercurial applies to this problem is
    3.66  	simple but effective.  Once the cumulative amount of delta
    3.67 @@ -288,11 +288,13 @@
    3.68        revision that represents a merge between branches has two normal
    3.69        revision IDs in its parent slots.</para>
    3.70  
    3.71 -    <informalfigure id="fig:concepts:revlog">
    3.72 -      <mediaobject><imageobject><imagedata
    3.73 -				  fileref="revlog"/></imageobject><textobject><phrase>XXX 
    3.74 -	    add text</phrase></textobject></mediaobject>
    3.75 -    </informalfigure>
    3.76 +    <figure id="fig:concepts:revlog">
    3.77 +      <title>The conceptual structure of a revlog</title>
    3.78 +      <mediaobject>
    3.79 +	<imageobject><imagedata fileref="revlog"/></imageobject>
    3.80 +	<textobject><phrase>XXX add text</phrase></textobject>
    3.81 +      </mediaobject>
    3.82 +    </figure>
    3.83  
    3.84    </sect1>
    3.85    <sect1>
    3.86 @@ -337,13 +339,13 @@
    3.87  	dirstate as <emphasis>the parents of a new
    3.88  	  changeset</emphasis> when you perform a commit.</para>
    3.89  
    3.90 -      <informalfigure id="fig:concepts:wdir">
    3.91 -	<mediaobject><imageobject><imagedata
    3.92 -				    fileref="wdir"/></imageobject><textobject><phrase>XXX 
    3.93 -	      add text</phrase></textobject><caption><para id="x_30c">The working
    3.94 -	      directory can have two
    3.95 -	      parents</para></caption></mediaobject>
    3.96 -      </informalfigure>
    3.97 +      <figure id="fig:concepts:wdir">
    3.98 +	<title>The working directory can have two parents</title>
    3.99 +	<mediaobject>
   3.100 +	  <imageobject><imagedata fileref="wdir"/></imageobject>
   3.101 +	  <textobject><phrase>XXX add text</phrase></textobject>
   3.102 +	</mediaobject>
   3.103 +      </figure>
   3.104  
   3.105        <para id="x_30d">Figure <xref linkend="fig:concepts:wdir"/> shows the
   3.106  	normal state of the working directory, where it has a single
   3.107 @@ -351,13 +353,14 @@
   3.108  	<emphasis>tip</emphasis>, the newest changeset in the
   3.109  	repository that has no children.</para>
   3.110  
   3.111 -      <informalfigure id="fig:concepts:wdir-after-commit">
   3.112 -	<mediaobject><imageobject><imagedata
   3.113 -				    fileref="wdir-after-commit"/></imageobject><textobject><phrase>XXX 
   3.114 -	      add text</phrase></textobject><caption><para id="x_30e">The working
   3.115 -	      directory gains new parents after a
   3.116 -	      commit</para></caption></mediaobject>
   3.117 -      </informalfigure>
   3.118 +      <figure id="fig:concepts:wdir-after-commit">
   3.119 +	<title>The working directory gains new parents after a
   3.120 +	  commit</title>
   3.121 +	<mediaobject>
   3.122 +	  <imageobject><imagedata fileref="wdir-after-commit"/></imageobject>
   3.123 +	  <textobject><phrase>XXX add text</phrase></textobject>
   3.124 +	</mediaobject>
   3.125 +      </figure>
   3.126  
   3.127        <para id="x_30f">It's useful to think of the working directory as
   3.128  	<quote>the changeset I'm about to commit</quote>.  Any files
   3.129 @@ -391,13 +394,14 @@
   3.130  	committed that changeset.  The effect of this is shown in
   3.131  	figure <xref linkend="fig:concepts:wdir-pre-branch"/>.</para>
   3.132  
   3.133 -      <informalfigure id="fig:concepts:wdir-pre-branch">
   3.134 -	<mediaobject><imageobject><imagedata
   3.135 -				    fileref="wdir-pre-branch"/></imageobject><textobject><phrase>XXX 
   3.136 -	      add text</phrase></textobject><caption><para id="x_312">The working
   3.137 -	      directory, updated to an older
   3.138 -	      changeset</para></caption></mediaobject>
   3.139 -      </informalfigure>
   3.140 +      <figure id="fig:concepts:wdir-pre-branch">
   3.141 +	<title>The working directory, updated to an older
   3.142 +	  changeset</title>
   3.143 +	<mediaobject>
   3.144 +	  <imageobject><imagedata fileref="wdir-pre-branch"/></imageobject>
   3.145 +	  <textobject><phrase>XXX add text</phrase></textobject>
   3.146 +	</mediaobject>
   3.147 +      </figure>
   3.148  
   3.149        <para id="x_313">Having updated the working directory to an older
   3.150  	changeset, what happens if you make some changes, and then
   3.151 @@ -410,13 +414,14 @@
   3.152  	this creates in figure <xref
   3.153  	  linkend="fig:concepts:wdir-branch"/>.</para>
   3.154  
   3.155 -      <informalfigure id="fig:concepts:wdir-branch">
   3.156 -	<mediaobject><imageobject><imagedata
   3.157 -				    fileref="wdir-branch"/></imageobject><textobject><phrase>XXX 
   3.158 -	      add text</phrase></textobject><caption><para id="x_314">After a
   3.159 -	      commit made while synced to an older
   3.160 -	      changeset</para></caption></mediaobject>
   3.161 -      </informalfigure>
   3.162 +      <figure id="fig:concepts:wdir-branch">
   3.163 +	<title>After a commit made while synced to an older
   3.164 +	  changeset</title>
   3.165 +	<mediaobject>
   3.166 +	  <imageobject><imagedata fileref="wdir-branch"/></imageobject>
   3.167 +	  <textobject><phrase>XXX add text</phrase></textobject>
   3.168 +	</mediaobject>
   3.169 +      </figure>
   3.170  
   3.171        <note>
   3.172  	<para id="x_315">  If you're new to Mercurial, you should keep in mind a
   3.173 @@ -451,12 +456,15 @@
   3.174  	changeset you're merging with, as shown in figure <xref
   3.175  	  linkend="fig:concepts:wdir-merge"/>.</para>
   3.176  
   3.177 -      <informalfigure id="fig:concepts:wdir-merge">
   3.178 -	<mediaobject><imageobject><imagedata
   3.179 -				    fileref="wdir-merge"/></imageobject><textobject><phrase>XXX 
   3.180 -	      add text</phrase></textobject><caption><para id="x_318">Merging two
   3.181 -	      heads</para></caption></mediaobject>
   3.182 -      </informalfigure>
   3.183 +      <figure id="fig:concepts:wdir-merge">
   3.184 +	<title>Merging two heads</title>
   3.185 +	<mediaobject>
   3.186 +	  <imageobject>
   3.187 +	    <imagedata fileref="wdir-merge"/>
   3.188 +	  </imageobject>
   3.189 +	  <textobject><phrase>XXX add text</phrase></textobject>
   3.190 +	</mediaobject>
   3.191 +      </figure>
   3.192  
   3.193        <para id="x_319">Mercurial also has to modify the working directory, to
   3.194  	merge the files managed in the two changesets.  Simplified a

     4.1 --- a/en/ch05-collab.xml	Thu Mar 26 20:24:44 2009 -0700
     4.2 +++ b/en/ch05-collab.xml	Thu Mar 26 21:07:39 2009 -0700
     4.3 @@ -270,12 +270,13 @@
     4.4  	People working on an individual branch are typically quite
     4.5  	isolated from developments on other branches.</para>
     4.6  
     4.7 -      <informalfigure id="fig:collab:feature-branches">
     4.8 -	<mediaobject><imageobject><imagedata
     4.9 -				    fileref="feature-branches"/></imageobject><textobject><phrase>XXX 
    4.10 -	      add text</phrase></textobject><caption><para id="x_46a">Feature
    4.11 -	      branches</para></caption></mediaobject>
    4.12 -      </informalfigure>
    4.13 +      <figure id="fig:collab:feature-branches">
    4.14 +	<title>Feature branches</title>
    4.15 +	<mediaobject>
    4.16 +	  <imageobject><imagedata fileref="feature-branches"/></imageobject>
    4.17 +	  <textobject><phrase>XXX add text</phrase></textobject>
    4.18 +	</mediaobject>
    4.19 +      </figure>
    4.20  
    4.21        <para id="x_46b">When a particular feature is deemed to be in suitable
    4.22  	shape, someone on that feature team pulls and merges from the

     5.1 --- a/en/ch08-undo.xml	Thu Mar 26 20:24:44 2009 -0700
     5.2 +++ b/en/ch08-undo.xml	Thu Mar 26 21:07:39 2009 -0700
     5.3 @@ -358,15 +358,14 @@
     5.4  	view of the change history.  As you can see, the history is
     5.5  	nice and linear.</para>
     5.6  
     5.7 -      <informalfigure id="fig:undo:backout">
     5.8 -	<mediaobject><imageobject><imagedata
     5.9 -				    fileref="undo-simple"/></imageobject><textobject><phrase>XXX 
    5.10 -	      add text</phrase></textobject><caption><para id="x_fc">Backing out
    5.11 -	      a change using the <command role="hg-cmd">hg
    5.12 -		backout</command>
    5.13 -	      command</para></caption></mediaobject>
    5.14 -	
    5.15 -      </informalfigure>
    5.16 +      <figure id="fig:undo:backout">
    5.17 +	<title>Backing out a change using the <command
    5.18 +	    role="hg-cmd">hg backout</command> command</title>
    5.19 +	<mediaobject>
    5.20 +	  <imageobject><imagedata fileref="undo-simple"/></imageobject>
    5.21 +	  <textobject><phrase>XXX add text</phrase></textobject>
    5.22 +	</mediaobject>
    5.23 +      </figure>
    5.24  
    5.25      </sect2>
    5.26      <sect2>
    5.27 @@ -406,14 +405,14 @@
    5.28        <para id="x_101">% TODO: to me it looks like mercurial doesn't commit the
    5.29  	second merge automatically!</para>
    5.30  
    5.31 -      <informalfigure id="fig:undo:backout-non-tip">
    5.32 -	<mediaobject><imageobject><imagedata
    5.33 -				    fileref="undo-non-tip"/></imageobject><textobject><phrase>XXX 
    5.34 -	      add text</phrase></textobject><caption><para id="x_102">Automated
    5.35 -	      backout of a non-tip change using the <command
    5.36 -		role="hg-cmd">hg backout</command>
    5.37 -	      command</para></caption></mediaobject>
    5.38 -      </informalfigure>
    5.39 +      <figure id="fig:undo:backout-non-tip">
    5.40 +	<title>Automated backout of a non-tip change using the
    5.41 +	  <command role="hg-cmd">hg backout</command> command</title>
    5.42 +	<mediaobject>
    5.43 +	  <imageobject><imagedata fileref="undo-non-tip"/></imageobject>
    5.44 +	  <textobject><phrase>XXX add text</phrase></textobject>
    5.45 +	</mediaobject>
    5.46 +      </figure>
    5.47  
    5.48        <para id="x_103">The result is that you end up <quote>back where you
    5.49  	  were</quote>, only with some extra history that undoes the
    5.50 @@ -471,15 +470,14 @@
    5.51  	head to the repository (the change it committed is
    5.52  	box-shaped).</para>
    5.53  
    5.54 -      <informalfigure id="fig:undo:backout-manual">
    5.55 -	<mediaobject><imageobject><imagedata
    5.56 -				    fileref="undo-manual"/></imageobject><textobject><phrase>XXX 
    5.57 -	      add text</phrase></textobject><caption><para id="x_109">Backing out
    5.58 -	      a change using the <command role="hg-cmd">hg
    5.59 -		backout</command>
    5.60 -	      command</para></caption></mediaobject>
    5.61 -	
    5.62 -      </informalfigure>
    5.63 +      <figure id="fig:undo:backout-manual">
    5.64 +	<title>Backing out a change using the <command
    5.65 +	    role="hg-cmd">hg backout</command> command</title>
    5.66 +	<mediaobject>
    5.67 +	  <imageobject><imagedata fileref="undo-manual"/></imageobject>
    5.68 +	  <textobject><phrase>XXX add text</phrase></textobject>
    5.69 +	</mediaobject>
    5.70 +      </figure>
    5.71  
    5.72        <para id="x_10a">After the <command role="hg-cmd">hg backout</command>
    5.73  	command has completed, it leaves the new
    5.74 @@ -511,13 +509,13 @@
    5.75  	like figure
    5.76  	<xref linkend="fig:undo:backout-manual-merge"/>.</para>
    5.77  
    5.78 -      <informalfigure id="fig:undo:backout-manual-merge">
    5.79 -	<mediaobject><imageobject><imagedata
    5.80 -				    fileref="undo-manual-merge"/></imageobject><textobject><phrase>XXX 
    5.81 -	      add text</phrase></textobject><caption><para id="x_10f">Manually
    5.82 -	      merging a backout change</para></caption></mediaobject>
    5.83 -	
    5.84 -      </informalfigure>
    5.85 +      <figure id="fig:undo:backout-manual-merge">
    5.86 +	<title>Manually merging a backout change</title>
    5.87 +	<mediaobject>
    5.88 +	  <imageobject><imagedata fileref="undo-manual-merge"/></imageobject>
    5.89 +	  <textobject><phrase>XXX add text</phrase></textobject>
    5.90 +	</mediaobject>
    5.91 +      </figure>
    5.92  
    5.93      </sect2>
    5.94      <sect2>