Merge branch 'gawk-4.1-stable'

3 files changed, 52 insertions, 24 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index e6cac13b..c2bb54c8 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-10         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* gawktexi.in: Update docbook figure markup.
+
 2014-06-09         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* gawktexi.in: More "Summary" sections.
diff --git a/doc/gawk.texi b/doc/gawk.texi
index 7fac492a..a1bc73b2 100644
--- a/doc/gawk.texi
+++ b/doc/gawk.texi
@@ -15113,9 +15113,11 @@ as shown in @inlineraw{docbook, <xref linkend="figure-array-elements"/>}:
 @end ifnotdocbook
 
 @docbook
-<figure id="figure-array-elements">
+<figure id="figure-array-elements" float="0">
 <title>A Contiguous Array</title>
-<graphic fileref="array-elements.eps"/>
+<mediaobject>
+<imageobject role="web"><imagedata fileref="array-elements.png" format="PNG"/></imageobject>
+</mediaobject>
 </figure>
 @end docbook
 
@@ -30638,9 +30640,11 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-load-extension"/>}.
 @end ifnotdocbook
 
 @docbook
-<figure id="figure-load-extension">
+<figure id="figure-load-extension" float="0">
 <title>Loading The Extension</title>
-<graphic fileref="api-figure1.eps"/>
+<mediaobject>
+<imageobject role="web"><imagedata fileref="api-figure1.png" format="PNG"/></imageobject>
+</mediaobject>
 </figure>
 @end docbook
 
@@ -30668,9 +30672,11 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-load-new-function"/>}
 @end ifnotdocbook
 
 @docbook
-<figure id="figure-load-new-function">
+<figure id="figure-load-new-function" float="0">
 <title>Loading The New Function</title>
-<graphic fileref="api-figure2.eps"/>
+<mediaobject>
+<imageobject role="web"><imagedata fileref="api-figure2.png" format="PNG"/></imageobject>
+</mediaobject>
 </figure>
 @end docbook
 
@@ -30699,9 +30705,11 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-call-new-function"/>}
 @end ifnotdocbook
 
 @docbook
-<figure id="figure-call-new-function">
+<figure id="figure-call-new-function" float="0">
 <title>Calling The New Function</title>
-<graphic fileref="api-figure3.eps"/>
+<mediaobject>
+<imageobject role="web"><imagedata fileref="api-figure3.png" format="PNG"/></imageobject>
+</mediaobject>
 </figure>
 @end docbook
 
@@ -38598,9 +38606,11 @@ See @inlineraw{docbook, <xref linkend="figure-general-flow"/>}.
 @end ifnotdocbook
 
 @docbook
-<figure id="figure-general-flow">
+<figure id="figure-general-flow" float="0">
 <title>General Program Flow</title>
-<graphic fileref="general-program.eps"/>
+<mediaobject>
+<imageobject role="web"><imagedata fileref="general-program.png" format="PNG"/></imageobject>
+</mediaobject>
 </figure>
 @end docbook
 
@@ -38639,9 +38649,11 @@ as shown in @inlineraw{docbook, <xref linkend="figure-process-flow"/>}:
 @end ifnotdocbook
 
 @docbook
-<figure id="figure-process-flow">
+<figure id="figure-process-flow" float="0">
 <title>Basic Program Stages</title>
-<graphic fileref="process-flow.eps"/>
+<mediaobject>
+<imageobject role="web"><imagedata fileref="process-flow.png" format="PNG"/></imageobject>
+</mediaobject>
 </figure>
 @end docbook
 
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index 9989c4a0..af9c67a9 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -14447,9 +14447,11 @@ as shown in @inlineraw{docbook, <xref linkend="figure-array-elements"/>}:
 @end ifnotdocbook
 
 @docbook
-<figure id="figure-array-elements">
+<figure id="figure-array-elements" float="0">
 <title>A Contiguous Array</title>
-<graphic fileref="array-elements.eps"/>
+<mediaobject>
+<imageobject role="web"><imagedata fileref="array-elements.png" format="PNG"/></imageobject>
+</mediaobject>
 </figure>
 @end docbook
 
@@ -29782,9 +29784,11 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-load-extension"/>}.
 @end ifnotdocbook
 
 @docbook
-<figure id="figure-load-extension">
+<figure id="figure-load-extension" float="0">
 <title>Loading The Extension</title>
-<graphic fileref="api-figure1.eps"/>
+<mediaobject>
+<imageobject role="web"><imagedata fileref="api-figure1.png" format="PNG"/></imageobject>
+</mediaobject>
 </figure>
 @end docbook
 
@@ -29812,9 +29816,11 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-load-new-function"/>}
 @end ifnotdocbook
 
 @docbook
-<figure id="figure-load-new-function">
+<figure id="figure-load-new-function" float="0">
 <title>Loading The New Function</title>
-<graphic fileref="api-figure2.eps"/>
+<mediaobject>
+<imageobject role="web"><imagedata fileref="api-figure2.png" format="PNG"/></imageobject>
+</mediaobject>
 </figure>
 @end docbook
 
@@ -29843,9 +29849,11 @@ This is shown in @inlineraw{docbook, <xref linkend="figure-call-new-function"/>}
 @end ifnotdocbook
 
 @docbook
-<figure id="figure-call-new-function">
+<figure id="figure-call-new-function" float="0">
 <title>Calling The New Function</title>
-<graphic fileref="api-figure3.eps"/>
+<mediaobject>
+<imageobject role="web"><imagedata fileref="api-figure3.png" format="PNG"/></imageobject>
+</mediaobject>
 </figure>
 @end docbook
 
@@ -37742,9 +37750,11 @@ See @inlineraw{docbook, <xref linkend="figure-general-flow"/>}.
 @end ifnotdocbook
 
 @docbook
-<figure id="figure-general-flow">
+<figure id="figure-general-flow" float="0">
 <title>General Program Flow</title>
-<graphic fileref="general-program.eps"/>
+<mediaobject>
+<imageobject role="web"><imagedata fileref="general-program.png" format="PNG"/></imageobject>
+</mediaobject>
 </figure>
 @end docbook
 
@@ -37783,9 +37793,11 @@ as shown in @inlineraw{docbook, <xref linkend="figure-process-flow"/>}:
 @end ifnotdocbook
 
 @docbook
-<figure id="figure-process-flow">
+<figure id="figure-process-flow" float="0">
 <title>Basic Program Stages</title>
-<graphic fileref="process-flow.eps"/>
+<mediaobject>
+<imageobject role="web"><imagedata fileref="process-flow.png" format="PNG"/></imageobject>
+</mediaobject>
 </figure>
 @end docbook