- Do not specify image file extensions in documents; the proper extension

  is appended during rendering
- For the same reason, do not specify format either
- Add constraints to enforce this

7 files changed, 85 insertions, 85 deletions

diff --git a/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml b/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
index 5050a6b714..6dacb31790 100755
--- a/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.xml
@@ -360,7 +360,7 @@ host2.ejemplo.com link#1            UC          0        0
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="advanced-networking/net-routing.pic"/>
+	  <imagedata fileref="advanced-networking/net-routing"/>
 	</imageobject>
 
 	<textobject>
@@ -3983,7 +3983,7 @@ host margaux {
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="advanced-networking/isdn-bus.eps"/>
+            <imagedata fileref="advanced-networking/isdn-bus"/>
           </imageobject>
 
 	  <textobject>
@@ -4018,7 +4018,7 @@ ISDN BRI line</literallayout>
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="advanced-networking/isdn-twisted-pair.eps"/>
+            <imagedata fileref="advanced-networking/isdn-twisted-pair"/>
           </imageobject>
 
 	  <textobject>
@@ -7513,7 +7513,7 @@ driftfile /var/db/ntp.drift</programlisting>
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="advanced-networking/natd.eps"/>
+          <imagedata fileref="advanced-networking/natd"/>
         </imageobject>
 
 	<textobject>
diff --git a/es_ES.ISO8859-1/books/handbook/basics/chapter.xml b/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
index 0b8e4ffa5d..b22187d26b 100755
--- a/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/basics/chapter.xml
@@ -1232,7 +1232,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir1.eps" format="EPS"/>
+	  <imagedata fileref="install/example-dir1"/>
 	</imageobject>
 
 	<textobject>
@@ -1254,7 +1254,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir2.eps" format="EPS"/>
+	  <imagedata fileref="install/example-dir2"/>
 	</imageobject>
 
 	<textobject>
@@ -1284,7 +1284,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir3.eps" format="EPS"/>
+	  <imagedata fileref="install/example-dir3"/>
 	</imageobject>
 
 	<textobject>
@@ -1311,7 +1311,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir4.eps" format="EPS"/>
+	  <imagedata fileref="install/example-dir4"/>
 	</imageobject>
 
 	<textobject>
@@ -1337,7 +1337,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/example-dir5.eps" format="EPS"/>
+	  <imagedata fileref="install/example-dir5"/>
 	</imageobject>
 
 	<textobject>
@@ -1681,7 +1681,7 @@ root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="install/disk-layout.eps" format="EPS"/>
+            <imagedata fileref="install/disk-layout"/>
           </imageobject>
 
           <textobject>
diff --git a/es_ES.ISO8859-1/books/handbook/geom/chapter.xml b/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
index 9bf634f68b..fa47c57455 100644
--- a/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/geom/chapter.xml
@@ -151,7 +151,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="geom/striping.pic" align="center"/>
+          <imagedata fileref="geom/striping" align="center"/>
         </imageobject>
 
         <textobject>
diff --git a/es_ES.ISO8859-1/books/handbook/install/chapter.xml b/es_ES.ISO8859-1/books/handbook/install/chapter.xml
index 67c3edc8c8..8e7762ee27 100755
--- a/es_ES.ISO8859-1/books/handbook/install/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/install/chapter.xml
@@ -1301,7 +1301,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/config-country.png" format="PNG"/>
+	    <imagedata fileref="install/config-country"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1311,7 +1311,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/sysinstall-exit.png" format="PNG"/>
+	    <imagedata fileref="install/sysinstall-exit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1369,7 +1369,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/main1.png" format="PNG"/>
+	  <imagedata fileref="install/main1"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1387,7 +1387,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-doc.png" format="PNG"/>
+	    <imagedata fileref="install/main-doc"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1399,7 +1399,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/docmenu1.png" format="PNG"/>
+	    <imagedata fileref="install/docmenu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1429,7 +1429,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-keymap.png" format="PNG"/>
+	    <imagedata fileref="install/main-keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1451,7 +1451,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/keymap.png" format="PNG"/>
+	    <imagedata fileref="install/keymap"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1469,7 +1469,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
         <imageobject>
-	  <imagedata fileref="install/main-options.png" format="PNG"/>
+	  <imagedata fileref="install/main-options"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -1479,7 +1479,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/options.png" format="PNG"/>
+	    <imagedata fileref="install/options"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1519,7 +1519,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/main-std.png" format="PNG"/>
+	    <imagedata fileref="install/main-std"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1719,7 +1719,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive1.png" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1802,7 +1802,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit1.png" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1853,7 +1853,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-edit2.png" format="PNG"/>
+	    <imagedata fileref="install/fdisk-edit2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1896,7 +1896,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/boot-mgr.png" format="PNG"/>
+	    <imagedata fileref="install/boot-mgr"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -1930,7 +1930,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/fdisk-drive2.png" format="PNG"/>
+	    <imagedata fileref="install/fdisk-drive2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2220,7 +2220,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed1.png" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2249,7 +2249,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-auto.png" format="PNG"/>
+	    <imagedata fileref="install/disklabel-auto"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2280,7 +2280,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root1.png" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2301,7 +2301,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root2.png" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2320,7 +2320,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-fs.png" format="PNG"/>
+	    <imagedata fileref="install/disklabel-fs"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2338,7 +2338,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-root3.png" format="PNG"/>
+	    <imagedata fileref="install/disklabel-root3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2364,7 +2364,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/disklabel-ed2.png" format="PNG"/>
+	    <imagedata fileref="install/disklabel-ed2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2431,7 +2431,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set.png" format="PNG"/>
+	    <imagedata fileref="install/dist-set"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2515,7 +2515,7 @@ Mounting root from ufs:/dev/md0c
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/dist-set2.png" format="PNG"/>
+	    <imagedata fileref="install/dist-set2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2550,7 +2550,7 @@ Mounting root from ufs:/dev/md0c
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="install/media.png" format="PNG"/>
+	  <imagedata fileref="install/media"/>
 	</imageobject>
       </mediaobject>
     </figure>
@@ -2808,7 +2808,7 @@ operación que haya fallado.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf.png" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -2855,7 +2855,7 @@ operación que haya fallado.
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ed0-conf2.png" format="PNG"/>
+	    <imagedata fileref="install/ed0-conf2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3050,7 +3050,7 @@ Dicho esto ?desea activar inetd?
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/edit-inetd-conf.png" format="PNG"/>
+	    <imagedata fileref="install/edit-inetd-conf"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3190,7 +3190,7 @@ Upload subdirectory:
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/ftp-anon2.png" format="PNG"/>
+	      <imagedata fileref="install/ftp-anon2"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -3265,7 +3265,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	  <mediaobject>
 	    <imageobject>
-	      <imagedata fileref="install/nfs-server-edit.png" format="PNG"/>
+	      <imagedata fileref="install/nfs-server-edit"/>
 	    </imageobject>
 	  </mediaobject>
 	</figure>
@@ -3320,7 +3320,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver1.png" format="PNG"/>
+	    <imagedata fileref="install/console-saver1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3337,7 +3337,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver2.png" format="PNG"/>
+	    <imagedata fileref="install/console-saver2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3358,7 +3358,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver3.png" format="PNG"/>
+	    <imagedata fileref="install/console-saver3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3372,7 +3372,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/console-saver4.png" format="PNG"/>
+	    <imagedata fileref="install/console-saver4"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3425,7 +3425,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone1.png" format="PNG"/>
+	    <imagedata fileref="install/timezone1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3438,7 +3438,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone2.png" format="PNG"/>
+	    <imagedata fileref="install/timezone2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3451,7 +3451,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/timezone3.png" format="PNG"/>
+	    <imagedata fileref="install/timezone3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3517,7 +3517,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse1.png" format="PNG"/>
+	    <imagedata fileref="install/mouse1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3530,7 +3530,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse2.png" format="PNG"/>
+	    <imagedata fileref="install/mouse2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3547,7 +3547,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse3.png" format="PNG"/>
+	    <imagedata fileref="install/mouse3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3560,7 +3560,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse4.png" format="PNG"/>
+	    <imagedata fileref="install/mouse4"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3575,7 +3575,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse5.png" format="PNG"/>
+	    <imagedata fileref="install/mouse5"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3591,7 +3591,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mouse6.png" format="PNG"/>
+	    <imagedata fileref="install/mouse6"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3638,7 +3638,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-cat.png" format="PNG"/>
+	    <imagedata fileref="install/pkg-cat"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3662,7 +3662,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-sel.png" format="PNG"/>
+	    <imagedata fileref="install/pkg-sel"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3696,7 +3696,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-install.png" format="PNG"/>
+	    <imagedata fileref="install/pkg-install"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3711,7 +3711,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/pkg-confirm.png" format="PNG"/>
+	    <imagedata fileref="install/pkg-confirm"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3769,7 +3769,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser1.png" format="PNG"/>
+	    <imagedata fileref="install/adduser1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3782,7 +3782,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser2.png" format="PNG"/>
+	    <imagedata fileref="install/adduser2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3891,7 +3891,7 @@ Pulse [Intro] para abrir /etc/exports en un editor
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/adduser3.png" format="PNG"/>
+	    <imagedata fileref="install/adduser3"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -3970,7 +3970,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mainexit.png" format="PNG"/>
+	    <imagedata fileref="install/mainexit"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4060,7 +4060,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu1.png" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu1"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4131,7 +4131,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/mta-main.png" format="PNG"/>
+	    <imagedata fileref="install/mta-main"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4189,7 +4189,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/ntp-config.png" format="PNG"/>
+	    <imagedata fileref="install/ntp-config"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
@@ -4217,7 +4217,7 @@ Retype new password :</screen>
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="install/net-config-menu2.png" format="PNG"/>
+	    <imagedata fileref="install/net-config-menu2"/>
 	  </imageobject>
 	</mediaobject>
       </figure>
diff --git a/es_ES.ISO8859-1/books/handbook/mail/chapter.xml b/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
index 040757015a..d045d6c9ac 100755
--- a/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
@@ -2190,7 +2190,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt1.png" format="PNG"/>
+	  <imagedata fileref="mail/mutt1"/>
 	</imageobject>
       </mediaobject>
 
@@ -2201,7 +2201,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt2.png" format="PNG"/>
+	  <imagedata fileref="mail/mutt2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2233,7 +2233,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/mutt3.png" format="PNG"/>
+	  <imagedata fileref="mail/mutt3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2288,7 +2288,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine1.png" format="PNG"/>
+	  <imagedata fileref="mail/pine1"/>
 	</imageobject>
       </mediaobject>
 
@@ -2311,7 +2311,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine2.png" format="PNG"/>
+	  <imagedata fileref="mail/pine2"/>
 	</imageobject>
       </mediaobject>
 
@@ -2322,7 +2322,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine3.png" format="PNG"/>
+	  <imagedata fileref="mail/pine3"/>
 	</imageobject>
       </mediaobject>
 
@@ -2334,7 +2334,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine4.png" format="PNG"/>
+	  <imagedata fileref="mail/pine4"/>
 	</imageobject>
       </mediaobject>
 
@@ -2353,7 +2353,7 @@ EOT</screen>
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="mail/pine5.png" format="PNG"/>
+	  <imagedata fileref="mail/pine5"/>
 	</imageobject>
       </mediaobject>
 
diff --git a/es_ES.ISO8859-1/books/handbook/security/chapter.xml b/es_ES.ISO8859-1/books/handbook/security/chapter.xml
index 628ce81177..6de38d9e3d 100755
--- a/es_ES.ISO8859-1/books/handbook/security/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/security/chapter.xml
@@ -3786,7 +3786,7 @@ options   IPSEC_DEBUG  #debug for IP security
 
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="security/ipsec-network.pic" align="center"/>
+	  <imagedata fileref="security/ipsec-network" align="center"/>
 	</imageobject>
 
 	<textobject>
@@ -4347,7 +4347,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="security/ipsec-out-pkt.pic" align="center"/>
+	    <imagedata fileref="security/ipsec-out-pkt" align="center"/>
 	  </imageobject>
 
 	  <textobject>
@@ -4366,7 +4366,7 @@ ipfw add 1 allow udp from W.X.Y.Z to A.B.C.D isakmp
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="security/ipsec-encap-pkt.pic" align="center"/>
+	    <imagedata fileref="security/ipsec-encap-pkt" align="center"/>
 	  </imageobject>
 
 	  <textobject>
@@ -4513,7 +4513,7 @@ ipfw add 1 allow ipencap from W.X.Y.Z to A.B.C.D
 
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="security/ipsec-crypt-pkt.pic" align="center"/>
+	    <imagedata fileref="security/ipsec-crypt-pkt" align="center"/>
 	  </imageobject>
 
 	  <textobject>
diff --git a/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml b/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
index 0607f61fa9..4d44745af3 100644
--- a/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/vinum/chapter.xml
@@ -63,7 +63,7 @@
     <para>
       <figure id="vinum-concat">
 	<title>Organización Concatenada</title>
-	<graphic fileref="vinum/vinum-concat.pic"/>
+	<graphic fileref="vinum/vinum-concat"/>
       </figure>
     </para>
 
@@ -81,7 +81,7 @@
     <para>
       <figure id="vinum-striped">
         <title>Organización con <quote>Striping</quote></title>
-	<graphic fileref="vinum/vinum-striped.pic"/>
+	<graphic fileref="vinum/vinum-striped"/>
       </figure>
     </para>
   </sect1>
@@ -105,7 +105,7 @@
       <para>
 	<figure id="vinum-raid5-org">
 	  <title>Organización en RAID-5</title>
-	  <graphic fileref="vinum/vinum-raid5-org.pic"/>
+	  <graphic fileref="vinum/vinum-raid5-org"/>
 	</figure>
       </para>
 
@@ -166,7 +166,7 @@
       <para>
 	<figure id="vinum-simple-vol">
 	  <title>Un Volumen Vinum Sencillo</title>
-	  <graphic fileref="vinum/vinum-simple-vol.pic"/>
+	  <graphic fileref="vinum/vinum-simple-vol"/>
 	</figure>
       </para>
 
@@ -179,7 +179,7 @@
       <para>
 	<figure id="vinum-mirrored-vol">
 	  <title>Un Volumen Vinum Replicado</title>
-	  <graphic fileref="vinum/vinum-mirrored-vol.pic"/>
+	  <graphic fileref="vinum/vinum-mirrored-vol"/>
 	</figure>
       </para>
 
@@ -191,7 +191,7 @@
       <para>
 	<figure id="vinum-striped-vol">
 	  <title>Un Volumen Vinum en <quote>Striping</quote></title>
-	  <graphic fileref="vinum/vinum-striped-vol.pic"/>
+	  <graphic fileref="vinum/vinum-striped-vol"/>
 	</figure>
       </para>
 
@@ -207,7 +207,7 @@
 	<figure id="vinum-raid10-vol">
 	  <title>Un Volumen Vinum Replicado y en
             <quote>Striping</quote></title>
-	  <graphic fileref="vinum/vinum-raid10-vol.pic"/>
+	  <graphic fileref="vinum/vinum-raid10-vol"/>
         </figure>
       </para>
     </sect2>