Commits

Bryan O'Sullivan  committed b788b40

Replace uses of <informalfigure> with <figure>

  • Participants
  • Parent commits a2923aa

Comments (0)

Files changed (5)

File en/ch01-tour-basic.xml

       several times in this chapter and the chapter that
       follows.</para>
 
-    <informalfigure id="fig:tour-basic:history">
+    <figure id="fig:tour-basic:history">
+      <title>Graphical history of the <filename
+	  class="directory">hello</filename> repository</title>
       <mediaobject>
 	<imageobject><imagedata fileref="tour-history"/></imageobject>
 	<textobject><phrase>XXX add text</phrase></textobject>
-	<caption><para id="x_24">Graphical history of the <filename
-	      class="directory">hello</filename>
-	    repository</para></caption>
       </mediaobject>
-    </informalfigure>
+    </figure>
 
     <sect2>
       <title>Changesets, revisions, and talking to other

File en/ch02-tour-merge.xml

 
     &interaction.tour.merge.cat;
 
-    <informalfigure id="fig:tour-merge:sep-repos">
+    <figure id="fig:tour-merge:sep-repos">
+      <title>Divergent recent histories of the <filename
+	  class="directory">my-hello</filename> and <filename
+	  class="directory">my-new-hello</filename>
+	repositories</title>
       <mediaobject>
 	<imageobject><imagedata fileref="tour-merge-sep-repos"/></imageobject>
 	<textobject><phrase>XXX add text</phrase></textobject>
-	<caption><para id="x_33e">Divergent recent histories of the <filename
-	      class="directory">my-hello</filename> and <filename
-	      class="directory">my-new-hello</filename>
-	    repositories</para></caption>
       </mediaobject>
-    </informalfigure>
+    </figure>
 
     <para id="x_33f">We already know that pulling changes from our <filename
 	class="directory">my-hello</filename> repository will have no
 	children, but a repository can contain more than one
 	head.</para>
 
-      <informalfigure id="fig:tour-merge:pull">
-	<mediaobject><imageobject><imagedata
-				    fileref="tour-merge-pull"/></imageobject><textobject><phrase>XXX 
-	      add text</phrase></textobject>
-	  <caption><para id="x_342">Repository contents after pulling from
-	      <filename class="directory">my-hello</filename> into
-	      <filename
-		class="directory">my-new-hello</filename></para></caption>
+      <figure id="fig:tour-merge:pull">
+	<title>Repository contents after pulling from <filename
+	    class="directory">my-hello</filename> into <filename
+	    class="directory">my-new-hello</filename></title>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="tour-merge-pull"/>
+	  </imageobject>
+	  <textobject><phrase>XXX add text</phrase></textobject>
 	</mediaobject>
-      </informalfigure>
+      </figure>
 
       <para id="x_343">In figure <xref linkend="fig:tour-merge:pull"/>, you can
 	see the effect of the pull from <filename
 
       &interaction.tour.merge.merge;
 
-      <informalfigure id="fig:tour-merge:merge">
-
-	<mediaobject><imageobject><imagedata
-				    fileref="tour-merge-merge"/></imageobject><textobject><phrase>XXX 
-	      add text</phrase></textobject>
-	  <caption><para id="x_346">Working directory and repository during
-	      merge, and following commit</para></caption>
+      <figure id="fig:tour-merge:merge">
+	<title>Working directory and repository during merge, and
+	  following commit</title>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="tour-merge-merge"/>
+	  </imageobject>
+	  <textobject><phrase>XXX add text</phrase></textobject>
 	</mediaobject>
-      </informalfigure>
+      </figure>
 
       <para id="x_347">This updates the working directory so that it contains
 	changes from <emphasis>both</emphasis> heads, which is
       to decide how to reconcile the different changes into something
       coherent.</para>
 
-    <informalfigure>
-
-      <mediaobject id="fig:tour-merge:conflict">
+    <figure id="fig:tour-merge:conflict">
+      <title>Conflicting changes to a document</title>
+      <mediaobject>
 	<imageobject><imagedata fileref="tour-merge-conflict"/></imageobject>
 	<textobject><phrase>XXX add text</phrase></textobject>
-	<caption><para id="x_34c">Conflicting changes to a
-	    document</para></caption>      </mediaobject>
-    </informalfigure>
+      </mediaobject>
+    </figure>
 
     <para id="x_34d">Figure <xref linkend="fig:tour-merge:conflict"/> illustrates
       an instance of two conflicting changes to a document.  We
 	in any of them, the others are updated to display the
 	corresponding sections of their respective files.</para>
 
-      <informalfigure id="fig:tour-merge:kdiff3">
-	<mediaobject><imageobject><imagedata
-				    fileref="kdiff3"/></imageobject><textobject><phrase>XXX 
-	      add text</phrase></textobject>
-	  <caption><para id="x_356">Using <command>kdiff3</command> to merge
-	      versions of a file</para></caption>
+      <figure id="fig:tour-merge:kdiff3">
+	<title>Using <command>kdiff3</command> to merge versions of a
+	  file</title>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="kdiff3"/></imageobject>
+	  <textobject>
+	    <phrase>XXX add text</phrase>
+	  </textobject>
 	</mediaobject>
-      </informalfigure>
+      </figure>
 
       <para id="x_357">For each conflicting portion of the file, we can choose to
 	resolve the conflict using some combination of text from the

File en/ch03-concepts.xml

 	repository is illustrated in figure <xref
 	  linkend="fig:concepts:filelog"/>.</para>
 
-      <informalfigure id="fig:concepts:filelog">
-	<mediaobject><imageobject><imagedata
-				    fileref="filelog"/></imageobject><textobject><phrase>XXX 
-	      add text</phrase></textobject>
-	  <caption><para id="x_2ed">Relationships between files in working
-	      directory and filelogs in
-	      repository</para></caption></mediaobject>
-      </informalfigure>
+      <figure id="fig:concepts:filelog">
+	<title>Relationships between files in working directory and
+	  filelogs in repository</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="filelog"/></imageobject>
+	  <textobject><phrase>XXX add text</phrase></textobject>
+	</mediaobject>
+      </figure>
 
     </sect2>
     <sect2>
 	was created.  These relationships are illustrated in figure
 	<xref linkend="fig:concepts:metadata"/>.</para>
 
-      <informalfigure id="fig:concepts:metadata">
-	<mediaobject><imageobject><imagedata
-				    fileref="metadata"/></imageobject><textobject><phrase>XXX 
-	      add text</phrase></textobject><caption><para id="x_2f2">Metadata
-	      relationships</para></caption>
+      <figure id="fig:concepts:metadata">
+	<title>Metadata relationships</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="metadata"/></imageobject>
+	  <textobject><phrase>XXX add text</phrase></textobject>
 	</mediaobject>
-      </informalfigure>
+      </figure>
 
       <para id="x_2f3">As the illustration shows, there is
 	<emphasis>not</emphasis> a <quote>one to one</quote>
 	file accumulates, the more revisions you must read, hence the
 	longer it takes to reconstruct a particular revision.</para>
 
-      <informalfigure id="fig:concepts:snapshot">
-	<mediaobject><imageobject><imagedata
-				    fileref="snapshot"/></imageobject><textobject><phrase>XXX 
-	      add text</phrase></textobject><caption><para id="x_2fb">Snapshot of
-	      a revlog, with incremental
-	      deltas</para></caption></mediaobject>
-      </informalfigure>
+      <figure id="fig:concepts:snapshot">
+	<title>Snapshot of a revlog, with incremental deltas</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="snapshot"/></imageobject>
+	  <textobject><phrase>XXX add text</phrase></textobject>
+	</mediaobject>
+      </figure>
 
       <para id="x_2fc">The innovation that Mercurial applies to this problem is
 	simple but effective.  Once the cumulative amount of delta
       revision that represents a merge between branches has two normal
       revision IDs in its parent slots.</para>
 
-    <informalfigure id="fig:concepts:revlog">
-      <mediaobject><imageobject><imagedata
-				  fileref="revlog"/></imageobject><textobject><phrase>XXX 
-	    add text</phrase></textobject></mediaobject>
-    </informalfigure>
+    <figure id="fig:concepts:revlog">
+      <title>The conceptual structure of a revlog</title>
+      <mediaobject>
+	<imageobject><imagedata fileref="revlog"/></imageobject>
+	<textobject><phrase>XXX add text</phrase></textobject>
+      </mediaobject>
+    </figure>
 
   </sect1>
   <sect1>
 	dirstate as <emphasis>the parents of a new
 	  changeset</emphasis> when you perform a commit.</para>
 
-      <informalfigure id="fig:concepts:wdir">
-	<mediaobject><imageobject><imagedata
-				    fileref="wdir"/></imageobject><textobject><phrase>XXX 
-	      add text</phrase></textobject><caption><para id="x_30c">The working
-	      directory can have two
-	      parents</para></caption></mediaobject>
-      </informalfigure>
+      <figure id="fig:concepts:wdir">
+	<title>The working directory can have two parents</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="wdir"/></imageobject>
+	  <textobject><phrase>XXX add text</phrase></textobject>
+	</mediaobject>
+      </figure>
 
       <para id="x_30d">Figure <xref linkend="fig:concepts:wdir"/> shows the
 	normal state of the working directory, where it has a single
 	<emphasis>tip</emphasis>, the newest changeset in the
 	repository that has no children.</para>
 
-      <informalfigure id="fig:concepts:wdir-after-commit">
-	<mediaobject><imageobject><imagedata
-				    fileref="wdir-after-commit"/></imageobject><textobject><phrase>XXX 
-	      add text</phrase></textobject><caption><para id="x_30e">The working
-	      directory gains new parents after a
-	      commit</para></caption></mediaobject>
-      </informalfigure>
+      <figure id="fig:concepts:wdir-after-commit">
+	<title>The working directory gains new parents after a
+	  commit</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="wdir-after-commit"/></imageobject>
+	  <textobject><phrase>XXX add text</phrase></textobject>
+	</mediaobject>
+      </figure>
 
       <para id="x_30f">It's useful to think of the working directory as
 	<quote>the changeset I'm about to commit</quote>.  Any files
 	committed that changeset.  The effect of this is shown in
 	figure <xref linkend="fig:concepts:wdir-pre-branch"/>.</para>
 
-      <informalfigure id="fig:concepts:wdir-pre-branch">
-	<mediaobject><imageobject><imagedata
-				    fileref="wdir-pre-branch"/></imageobject><textobject><phrase>XXX 
-	      add text</phrase></textobject><caption><para id="x_312">The working
-	      directory, updated to an older
-	      changeset</para></caption></mediaobject>
-      </informalfigure>
+      <figure id="fig:concepts:wdir-pre-branch">
+	<title>The working directory, updated to an older
+	  changeset</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="wdir-pre-branch"/></imageobject>
+	  <textobject><phrase>XXX add text</phrase></textobject>
+	</mediaobject>
+      </figure>
 
       <para id="x_313">Having updated the working directory to an older
 	changeset, what happens if you make some changes, and then
 	this creates in figure <xref
 	  linkend="fig:concepts:wdir-branch"/>.</para>
 
-      <informalfigure id="fig:concepts:wdir-branch">
-	<mediaobject><imageobject><imagedata
-				    fileref="wdir-branch"/></imageobject><textobject><phrase>XXX 
-	      add text</phrase></textobject><caption><para id="x_314">After a
-	      commit made while synced to an older
-	      changeset</para></caption></mediaobject>
-      </informalfigure>
+      <figure id="fig:concepts:wdir-branch">
+	<title>After a commit made while synced to an older
+	  changeset</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="wdir-branch"/></imageobject>
+	  <textobject><phrase>XXX add text</phrase></textobject>
+	</mediaobject>
+      </figure>
 
       <note>
 	<para id="x_315">  If you're new to Mercurial, you should keep in mind a
 	changeset you're merging with, as shown in figure <xref
 	  linkend="fig:concepts:wdir-merge"/>.</para>
 
-      <informalfigure id="fig:concepts:wdir-merge">
-	<mediaobject><imageobject><imagedata
-				    fileref="wdir-merge"/></imageobject><textobject><phrase>XXX 
-	      add text</phrase></textobject><caption><para id="x_318">Merging two
-	      heads</para></caption></mediaobject>
-      </informalfigure>
+      <figure id="fig:concepts:wdir-merge">
+	<title>Merging two heads</title>
+	<mediaobject>
+	  <imageobject>
+	    <imagedata fileref="wdir-merge"/>
+	  </imageobject>
+	  <textobject><phrase>XXX add text</phrase></textobject>
+	</mediaobject>
+      </figure>
 
       <para id="x_319">Mercurial also has to modify the working directory, to
 	merge the files managed in the two changesets.  Simplified a

File en/ch05-collab.xml

 	People working on an individual branch are typically quite
 	isolated from developments on other branches.</para>
 
-      <informalfigure id="fig:collab:feature-branches">
-	<mediaobject><imageobject><imagedata
-				    fileref="feature-branches"/></imageobject><textobject><phrase>XXX 
-	      add text</phrase></textobject><caption><para id="x_46a">Feature
-	      branches</para></caption></mediaobject>
-      </informalfigure>
+      <figure id="fig:collab:feature-branches">
+	<title>Feature branches</title>
+	<mediaobject>
+	  <imageobject><imagedata fileref="feature-branches"/></imageobject>
+	  <textobject><phrase>XXX add text</phrase></textobject>
+	</mediaobject>
+      </figure>
 
       <para id="x_46b">When a particular feature is deemed to be in suitable
 	shape, someone on that feature team pulls and merges from the

File en/ch08-undo.xml

 	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>
       <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
 	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
 	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>