1.1 --- a/en/ch03-concepts.xml	Thu Mar 19 21:18:52 2009 -0700
     1.2 +++ b/en/ch03-concepts.xml	Thu Mar 26 21:07:39 2009 -0700
     1.3 @@ -49,14 +49,14 @@
     1.4  	repository is illustrated in figure <xref
     1.5  	  linkend="fig:concepts:filelog"/>.</para>
     1.6  
     1.7 -      <informalfigure id="fig:concepts:filelog">
     1.8 -	<mediaobject><imageobject><imagedata
     1.9 -				    fileref="filelog"/></imageobject><textobject><phrase>XXX 
    1.10 -	      add text</phrase></textobject>
    1.11 -	  <caption><para id="x_2ed">Relationships between files in working
    1.12 -	      directory and filelogs in
    1.13 -	      repository</para></caption></mediaobject>
    1.14 -      </informalfigure>
    1.15 +      <figure id="fig:concepts:filelog">
    1.16 +	<title>Relationships between files in working directory and
    1.17 +	  filelogs in repository</title>
    1.18 +	<mediaobject>
    1.19 +	  <imageobject><imagedata fileref="filelog"/></imageobject>
    1.20 +	  <textobject><phrase>XXX add text</phrase></textobject>
    1.21 +	</mediaobject>
    1.22 +      </figure>
    1.23  
    1.24      </sect2>
    1.25      <sect2>
    1.26 @@ -99,13 +99,13 @@
    1.27  	was created.  These relationships are illustrated in figure
    1.28  	<xref linkend="fig:concepts:metadata"/>.</para>
    1.29  
    1.30 -      <informalfigure id="fig:concepts:metadata">
    1.31 -	<mediaobject><imageobject><imagedata
    1.32 -				    fileref="metadata"/></imageobject><textobject><phrase>XXX 
    1.33 -	      add text</phrase></textobject><caption><para id="x_2f2">Metadata
    1.34 -	      relationships</para></caption>
    1.35 +      <figure id="fig:concepts:metadata">
    1.36 +	<title>Metadata relationships</title>
    1.37 +	<mediaobject>
    1.38 +	  <imageobject><imagedata fileref="metadata"/></imageobject>
    1.39 +	  <textobject><phrase>XXX add text</phrase></textobject>
    1.40  	</mediaobject>
    1.41 -      </informalfigure>
    1.42 +      </figure>
    1.43  
    1.44        <para id="x_2f3">As the illustration shows, there is
    1.45  	<emphasis>not</emphasis> a <quote>one to one</quote>
    1.46 @@ -184,13 +184,13 @@
    1.47  	file accumulates, the more revisions you must read, hence the
    1.48  	longer it takes to reconstruct a particular revision.</para>
    1.49  
    1.50 -      <informalfigure id="fig:concepts:snapshot">
    1.51 -	<mediaobject><imageobject><imagedata
    1.52 -				    fileref="snapshot"/></imageobject><textobject><phrase>XXX 
    1.53 -	      add text</phrase></textobject><caption><para id="x_2fb">Snapshot of
    1.54 -	      a revlog, with incremental
    1.55 -	      deltas</para></caption></mediaobject>
    1.56 -      </informalfigure>
    1.57 +      <figure id="fig:concepts:snapshot">
    1.58 +	<title>Snapshot of a revlog, with incremental deltas</title>
    1.59 +	<mediaobject>
    1.60 +	  <imageobject><imagedata fileref="snapshot"/></imageobject>
    1.61 +	  <textobject><phrase>XXX add text</phrase></textobject>
    1.62 +	</mediaobject>
    1.63 +      </figure>
    1.64  
    1.65        <para id="x_2fc">The innovation that Mercurial applies to this problem is
    1.66  	simple but effective.  Once the cumulative amount of delta
    1.67 @@ -288,11 +288,13 @@
    1.68        revision that represents a merge between branches has two normal
    1.69        revision IDs in its parent slots.</para>
    1.70  
    1.71 -    <informalfigure id="fig:concepts:revlog">
    1.72 -      <mediaobject><imageobject><imagedata
    1.73 -				  fileref="revlog"/></imageobject><textobject><phrase>XXX 
    1.74 -	    add text</phrase></textobject></mediaobject>
    1.75 -    </informalfigure>
    1.76 +    <figure id="fig:concepts:revlog">
    1.77 +      <title>The conceptual structure of a revlog</title>
    1.78 +      <mediaobject>
    1.79 +	<imageobject><imagedata fileref="revlog"/></imageobject>
    1.80 +	<textobject><phrase>XXX add text</phrase></textobject>
    1.81 +      </mediaobject>
    1.82 +    </figure>
    1.83  
    1.84    </sect1>
    1.85    <sect1>
    1.86 @@ -337,13 +339,13 @@
    1.87  	dirstate as <emphasis>the parents of a new
    1.88  	  changeset</emphasis> when you perform a commit.</para>
    1.89  
    1.90 -      <informalfigure id="fig:concepts:wdir">
    1.91 -	<mediaobject><imageobject><imagedata
    1.92 -				    fileref="wdir"/></imageobject><textobject><phrase>XXX 
    1.93 -	      add text</phrase></textobject><caption><para id="x_30c">The working
    1.94 -	      directory can have two
    1.95 -	      parents</para></caption></mediaobject>
    1.96 -      </informalfigure>
    1.97 +      <figure id="fig:concepts:wdir">
    1.98 +	<title>The working directory can have two parents</title>
    1.99 +	<mediaobject>
   1.100 +	  <imageobject><imagedata fileref="wdir"/></imageobject>
   1.101 +	  <textobject><phrase>XXX add text</phrase></textobject>
   1.102 +	</mediaobject>
   1.103 +      </figure>
   1.104  
   1.105        <para id="x_30d">Figure <xref linkend="fig:concepts:wdir"/> shows the
   1.106  	normal state of the working directory, where it has a single
   1.107 @@ -351,13 +353,14 @@
   1.108  	<emphasis>tip</emphasis>, the newest changeset in the
   1.109  	repository that has no children.</para>
   1.110  
   1.111 -      <informalfigure id="fig:concepts:wdir-after-commit">
   1.112 -	<mediaobject><imageobject><imagedata
   1.113 -				    fileref="wdir-after-commit"/></imageobject><textobject><phrase>XXX 
   1.114 -	      add text</phrase></textobject><caption><para id="x_30e">The working
   1.115 -	      directory gains new parents after a
   1.116 -	      commit</para></caption></mediaobject>
   1.117 -      </informalfigure>
   1.118 +      <figure id="fig:concepts:wdir-after-commit">
   1.119 +	<title>The working directory gains new parents after a
   1.120 +	  commit</title>
   1.121 +	<mediaobject>
   1.122 +	  <imageobject><imagedata fileref="wdir-after-commit"/></imageobject>
   1.123 +	  <textobject><phrase>XXX add text</phrase></textobject>
   1.124 +	</mediaobject>
   1.125 +      </figure>
   1.126  
   1.127        <para id="x_30f">It's useful to think of the working directory as
   1.128  	<quote>the changeset I'm about to commit</quote>.  Any files
   1.129 @@ -391,13 +394,14 @@
   1.130  	committed that changeset.  The effect of this is shown in
   1.131  	figure <xref linkend="fig:concepts:wdir-pre-branch"/>.</para>
   1.132  
   1.133 -      <informalfigure id="fig:concepts:wdir-pre-branch">
   1.134 -	<mediaobject><imageobject><imagedata
   1.135 -				    fileref="wdir-pre-branch"/></imageobject><textobject><phrase>XXX 
   1.136 -	      add text</phrase></textobject><caption><para id="x_312">The working
   1.137 -	      directory, updated to an older
   1.138 -	      changeset</para></caption></mediaobject>
   1.139 -      </informalfigure>
   1.140 +      <figure id="fig:concepts:wdir-pre-branch">
   1.141 +	<title>The working directory, updated to an older
   1.142 +	  changeset</title>
   1.143 +	<mediaobject>
   1.144 +	  <imageobject><imagedata fileref="wdir-pre-branch"/></imageobject>
   1.145 +	  <textobject><phrase>XXX add text</phrase></textobject>
   1.146 +	</mediaobject>
   1.147 +      </figure>
   1.148  
   1.149        <para id="x_313">Having updated the working directory to an older
   1.150  	changeset, what happens if you make some changes, and then
   1.151 @@ -410,13 +414,14 @@
   1.152  	this creates in figure <xref
   1.153  	  linkend="fig:concepts:wdir-branch"/>.</para>
   1.154  
   1.155 -      <informalfigure id="fig:concepts:wdir-branch">
   1.156 -	<mediaobject><imageobject><imagedata
   1.157 -				    fileref="wdir-branch"/></imageobject><textobject><phrase>XXX 
   1.158 -	      add text</phrase></textobject><caption><para id="x_314">After a
   1.159 -	      commit made while synced to an older
   1.160 -	      changeset</para></caption></mediaobject>
   1.161 -      </informalfigure>
   1.162 +      <figure id="fig:concepts:wdir-branch">
   1.163 +	<title>After a commit made while synced to an older
   1.164 +	  changeset</title>
   1.165 +	<mediaobject>
   1.166 +	  <imageobject><imagedata fileref="wdir-branch"/></imageobject>
   1.167 +	  <textobject><phrase>XXX add text</phrase></textobject>
   1.168 +	</mediaobject>
   1.169 +      </figure>
   1.170  
   1.171        <note>
   1.172  	<para id="x_315">  If you're new to Mercurial, you should keep in mind a
   1.173 @@ -451,12 +456,15 @@
   1.174  	changeset you're merging with, as shown in figure <xref
   1.175  	  linkend="fig:concepts:wdir-merge"/>.</para>
   1.176  
   1.177 -      <informalfigure id="fig:concepts:wdir-merge">
   1.178 -	<mediaobject><imageobject><imagedata
   1.179 -				    fileref="wdir-merge"/></imageobject><textobject><phrase>XXX 
   1.180 -	      add text</phrase></textobject><caption><para id="x_318">Merging two
   1.181 -	      heads</para></caption></mediaobject>
   1.182 -      </informalfigure>
   1.183 +      <figure id="fig:concepts:wdir-merge">
   1.184 +	<title>Merging two heads</title>
   1.185 +	<mediaobject>
   1.186 +	  <imageobject>
   1.187 +	    <imagedata fileref="wdir-merge"/>
   1.188 +	  </imageobject>
   1.189 +	  <textobject><phrase>XXX add text</phrase></textobject>
   1.190 +	</mediaobject>
   1.191 +      </figure>
   1.192  
   1.193        <para id="x_319">Mercurial also has to modify the working directory, to
   1.194  	merge the files managed in the two changesets.  Simplified a