diff --git a/reference/filesystem/functions/readfile.xml b/reference/filesystem/functions/readfile.xml
index deb6a990b2..9586e2985a 100644
--- a/reference/filesystem/functions/readfile.xml
+++ b/reference/filesystem/functions/readfile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
 <refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.readfile">
  <refnamediv>
   <refname>readfile</refname>
@@ -92,7 +92,7 @@ if (file_exists($file)) {
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/filesystem.readfile.png"/>
+      <imagedata fileref="en/reference/filesystem/figures/readfile.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/examples.xml b/reference/image/examples.xml
index ade07c19fb..7e626f692a 100644
--- a/reference/image/examples.xml
+++ b/reference/image/examples.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 
 <chapter xml:id="image.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.examples;
@@ -64,7 +64,7 @@ imagedestroy($im);
     </programlisting>
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.watermarks.png" />
+      <imagedata fileref="en/reference/image/figures/watermarks.png" />
      </imageobject>
     </mediaobject>
    </example>
@@ -109,7 +109,7 @@ imagedestroy($im);
     </programlisting>
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.watermark-merged.png" />
+      <imagedata fileref="en/reference/image/figures/watermark-merged.png" />
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imageantialias.xml b/reference/image/functions/imageantialias.xml
index ef08797e4c..f71341361f 100644
--- a/reference/image/functions/imageantialias.xml
+++ b/reference/image/functions/imageantialias.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
 <refentry xml:id="function.imageantialias" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imageantialias</refname>
@@ -87,7 +87,7 @@ imagedestroy($normal);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imageantialias.png"/>
+      <imagedata fileref="en/reference/image/figures/imageantialias.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagearc.xml b/reference/image/functions/imagearc.xml
index 1785e653c2..a59e6721fd 100644
--- a/reference/image/functions/imagearc.xml
+++ b/reference/image/functions/imagearc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
 <refentry xml:id="function.imagearc" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagearc</refname>
@@ -135,7 +135,7 @@ imagedestroy($img);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagearc.png"/>
+      <imagedata fileref="en/reference/image/figures/imagearc.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagechar.xml b/reference/image/functions/imagechar.xml
index 8097a847c6..199eecd254 100644
--- a/reference/image/functions/imagechar.xml
+++ b/reference/image/functions/imagechar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
 <refentry xml:id="function.imagechar" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagechar</refname>
@@ -100,7 +100,7 @@ imagepng($im);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagechar.png"/>
+      <imagedata fileref="en/reference/image/figures/imagechar.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagecharup.xml b/reference/image/functions/imagecharup.xml
index 9c893a6396..6b95bb28ed 100644
--- a/reference/image/functions/imagecharup.xml
+++ b/reference/image/functions/imagecharup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
 <refentry xml:id="function.imagecharup" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagecharup</refname>
@@ -97,7 +97,7 @@ imagepng($im);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagecharup.png"/>
+      <imagedata fileref="en/reference/image/figures/imagecharup.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagecolorallocatealpha.xml b/reference/image/functions/imagecolorallocatealpha.xml
index 2767d4df91..d4eaf1100c 100644
--- a/reference/image/functions/imagecolorallocatealpha.xml
+++ b/reference/image/functions/imagecolorallocatealpha.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
 <refentry xml:id="function.imagecolorallocatealpha" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagecolorallocatealpha</refname>
@@ -141,7 +141,7 @@ imagedestroy($image);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagecolorallocatealpha.png"/>
+      <imagedata fileref="en/reference/image/figures/imagecolorallocatealpha.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagecolortransparent.xml b/reference/image/functions/imagecolortransparent.xml
index 41823dec8c..74fde28600 100644
--- a/reference/image/functions/imagecolortransparent.xml
+++ b/reference/image/functions/imagecolortransparent.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
 <refentry xml:id="function.imagecolortransparent" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagecolortransparent</refname>
@@ -68,7 +68,7 @@ imagedestroy($im);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagecolortransparent.png"/>
+      <imagedata fileref="en/reference/image/figures/imagecolortransparent.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imageconvolution.xml b/reference/image/functions/imageconvolution.xml
index 497b980970..7d7580c406 100644
--- a/reference/image/functions/imageconvolution.xml
+++ b/reference/image/functions/imageconvolution.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <refentry xml:id="function.imageconvolution" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imageconvolution</refname>
@@ -78,7 +78,7 @@ imagepng($image, null, 9);
     &example.outputs;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imageconvolution_emboss.png"/>
+      <imagedata fileref="en/reference/image/figures/imageconvolution_emboss.png"/>
      </imageobject>
     </mediaobject>
    </example>
@@ -105,7 +105,7 @@ imagepng($image, null, 9);
     &example.outputs;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imageconvolution_gaussian.png"/>
+      <imagedata fileref="en/reference/image/figures/imageconvolution_gaussian.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagecopy.xml b/reference/image/functions/imagecopy.xml
index 3394b27dd9..8bb4b67230 100644
--- a/reference/image/functions/imagecopy.xml
+++ b/reference/image/functions/imagecopy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <refentry xml:id="function.imagecopy" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagecopy</refname>
@@ -133,7 +133,7 @@ imagedestroy($src);
    &example.outputs.similar;
    <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagecopy.gif"/>
+      <imagedata fileref="en/reference/image/figures/imagecopy.gif"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagecopyresampled.xml b/reference/image/functions/imagecopyresampled.xml
index 4a64c4b2fa..5c03fda1f0 100644
--- a/reference/image/functions/imagecopyresampled.xml
+++ b/reference/image/functions/imagecopyresampled.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
 <refentry xml:id="function.imagecopyresampled" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagecopyresampled</refname>
@@ -174,7 +174,7 @@ imagejpeg($image_p, null, 100);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagecopyresampled.jpg"/>
+      <imagedata fileref="en/reference/image/figures/imagecopyresampled.jpg"/>
      </imageobject>
     </mediaobject>
    </example>
@@ -223,7 +223,7 @@ imagejpeg($image_p, null, 100);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagecopyresampled_2.jpg"/>
+      <imagedata fileref="en/reference/image/figures/imagecopyresampled_2.jpg"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagecopyresized.xml b/reference/image/functions/imagecopyresized.xml
index 57797f34c1..aac66b06ed 100644
--- a/reference/image/functions/imagecopyresized.xml
+++ b/reference/image/functions/imagecopyresized.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
 <refentry xml:id="function.imagecopyresized" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagecopyresized</refname>
@@ -176,7 +176,7 @@ imagejpeg($thumb);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagecopyresized.jpg"/>
+      <imagedata fileref="en/reference/image/figures/imagecopyresized.jpg"/>
      </imageobject>
     </mediaobject>
     <para>
diff --git a/reference/image/functions/imagecreate.xml b/reference/image/functions/imagecreate.xml
index c57ee35cca..7cb4e54356 100644
--- a/reference/image/functions/imagecreate.xml
+++ b/reference/image/functions/imagecreate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
 <refentry xml:id="function.imagecreate" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagecreate</refname>
@@ -73,7 +73,7 @@ imagedestroy($im);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagecreate.png"/>
+      <imagedata fileref="en/reference/image/figures/imagecreate.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagecreatefromgif.xml b/reference/image/functions/imagecreatefromgif.xml
index b36da9777e..c1a81124ef 100644
--- a/reference/image/functions/imagecreatefromgif.xml
+++ b/reference/image/functions/imagecreatefromgif.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
 <refentry xml:id="function.imagecreatefromgif" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagecreatefromgif</refname>
@@ -79,7 +79,7 @@ imagedestroy($img);
    &example.outputs.similar;
    <mediaobject>
     <imageobject>
-     <imagedata fileref="figures/image.imagecreatefromgif.gif"/>
+     <imagedata fileref="en/reference/image/figures/imagecreatefromgif.gif"/>
     </imageobject>
    </mediaobject>
   </example>
diff --git a/reference/image/functions/imagecreatefromjpeg.xml b/reference/image/functions/imagecreatefromjpeg.xml
index ab787b286b..e42bd5ebef 100644
--- a/reference/image/functions/imagecreatefromjpeg.xml
+++ b/reference/image/functions/imagecreatefromjpeg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
 <refentry xml:id="function.imagecreatefromjpeg" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagecreatefromjpeg</refname>
@@ -79,7 +79,7 @@ imagedestroy($img);
    &example.outputs.similar;
    <mediaobject>
     <imageobject>
-     <imagedata fileref="figures/image.imagecreatefromjpeg.jpg"/>
+     <imagedata fileref="en/reference/image/figures/imagecreatefromjpeg.jpg"/>
     </imageobject>
    </mediaobject>
   </example>
diff --git a/reference/image/functions/imagecreatefromstring.xml b/reference/image/functions/imagecreatefromstring.xml
index 285ba98032..7f1cb2622f 100644
--- a/reference/image/functions/imagecreatefromstring.xml
+++ b/reference/image/functions/imagecreatefromstring.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
 <refentry xml:id="function.imagecreatefromstring" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagecreatefromstring</refname>
@@ -70,7 +70,7 @@ else {
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagecreatefromstring.png"/>
+      <imagedata fileref="en/reference/image/figures/imagecreatefromstring.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagecreatetruecolor.xml b/reference/image/functions/imagecreatetruecolor.xml
index 38b91380cf..452c2715b7 100644
--- a/reference/image/functions/imagecreatetruecolor.xml
+++ b/reference/image/functions/imagecreatetruecolor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
 <refentry xml:id="function.imagecreatetruecolor" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagecreatetruecolor</refname>
@@ -77,7 +77,7 @@ imagedestroy($im);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagecreatetruecolor.png"/>
+      <imagedata fileref="en/reference/image/figures/imagecreatetruecolor.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagedashedline.xml b/reference/image/functions/imagedashedline.xml
index b054df5d4b..bc3e0f0ca2 100644
--- a/reference/image/functions/imagedashedline.xml
+++ b/reference/image/functions/imagedashedline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
 <refentry xml:id="function.imagedashedline" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagedashedline</refname>
@@ -101,7 +101,7 @@ imagedestroy($im);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagedashedline.png"/>
+      <imagedata fileref="en/reference/image/figures/imagedashedline.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imageellipse.xml b/reference/image/functions/imageellipse.xml
index 48c24cb3cd..efe56b82cf 100644
--- a/reference/image/functions/imageellipse.xml
+++ b/reference/image/functions/imageellipse.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
 <refentry xml:id="function.imageellipse" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imageellipse</refname>
@@ -109,7 +109,7 @@ imagepng($image);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imageellipse.png"/>
+      <imagedata fileref="en/reference/image/figures/imageellipse.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagefill.xml b/reference/image/functions/imagefill.xml
index 052f1cf3aa..9f6c4ba53a 100644
--- a/reference/image/functions/imagefill.xml
+++ b/reference/image/functions/imagefill.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
 <refentry xml:id="function.imagefill" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagefill</refname>
@@ -83,7 +83,7 @@ imagedestroy($im);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagefill.png"/>
+      <imagedata fileref="en/reference/image/figures/imagefill.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagefilledarc.xml b/reference/image/functions/imagefilledarc.xml
index b5875ffa52..95fb79c679 100644
--- a/reference/image/functions/imagefilledarc.xml
+++ b/reference/image/functions/imagefilledarc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
 <refentry xml:id="function.imagefilledarc" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagefilledarc</refname>
@@ -163,7 +163,7 @@ imagedestroy($image);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagefilledarc.png"/>
+      <imagedata fileref="en/reference/image/figures/imagefilledarc.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagefilledellipse.xml b/reference/image/functions/imagefilledellipse.xml
index 75e7369be3..9be871a5db 100644
--- a/reference/image/functions/imagefilledellipse.xml
+++ b/reference/image/functions/imagefilledellipse.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.18 $ -->
+<!-- $Revision: 1.19 $ -->
 <refentry xml:id="function.imagefilledellipse" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagefilledellipse</refname>
@@ -107,7 +107,7 @@ imagepng($image);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagefilledellipse.png"/>
+      <imagedata fileref="en/reference/image/figures/imagefilledellipse.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagefilledpolygon.xml b/reference/image/functions/imagefilledpolygon.xml
index bbd3bcca82..2ca1b6c83f 100644
--- a/reference/image/functions/imagefilledpolygon.xml
+++ b/reference/image/functions/imagefilledpolygon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
 <refentry xml:id="function.imagefilledpolygon" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagefilledpolygon</refname>
@@ -100,7 +100,7 @@ imagedestroy($image);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagefilledpolygon.png"/>
+      <imagedata fileref="en/reference/image/figures/imagefilledpolygon.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagefilledrectangle.xml b/reference/image/functions/imagefilledrectangle.xml
index 9ed41479b3..283703834d 100644
--- a/reference/image/functions/imagefilledrectangle.xml
+++ b/reference/image/functions/imagefilledrectangle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <refentry xml:id="function.imagefilledrectangle" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagefilledrectangle</refname>
@@ -101,7 +101,7 @@ imagedestroy($im);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagefilledrectangle.png"/>
+      <imagedata fileref="en/reference/image/figures/imagefilledrectangle.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagefilltoborder.xml b/reference/image/functions/imagefilltoborder.xml
index 0314899b26..2344f562af 100644
--- a/reference/image/functions/imagefilltoborder.xml
+++ b/reference/image/functions/imagefilltoborder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <refentry xml:id="function.imagefilltoborder" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagefilltoborder</refname>
@@ -103,7 +103,7 @@ imagedestroy($im);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagefilltoborder.png" />
+      <imagedata fileref="en/reference/image/figures/imagefilltoborder.png" />
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagefilter.xml b/reference/image/functions/imagefilter.xml
index 9b4d72dfde..fd3dfc8f71 100644
--- a/reference/image/functions/imagefilter.xml
+++ b/reference/image/functions/imagefilter.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
 <refentry xml:id="function.imagefilter" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagefilter</refname>
@@ -396,7 +396,7 @@ imagedestroy($output);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagefilterpixelate.png"/>
+      <imagedata fileref="en/reference/image/figures/imagefilterpixelate.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagejpeg.xml b/reference/image/functions/imagejpeg.xml
index 73497fa6e1..c4dd9a59ed 100644
--- a/reference/image/functions/imagejpeg.xml
+++ b/reference/image/functions/imagejpeg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
 <refentry xml:id="function.imagejpeg" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagejpeg</refname>
@@ -82,7 +82,7 @@ imagedestroy($im);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagejpeg.jpg"/>
+      <imagedata fileref="en/reference/image/figures/imagejpeg.jpg"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagelayereffect.xml b/reference/image/functions/imagelayereffect.xml
index cd7d14b9c9..7a485657be 100755
--- a/reference/image/functions/imagelayereffect.xml
+++ b/reference/image/functions/imagelayereffect.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <refentry xml:id="function.imagelayereffect" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagelayereffect</refname>
@@ -108,7 +108,7 @@ imagedestroy($im);
    &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagelayereffect.png"/>
+      <imagedata fileref="en/reference/image/figures/imagelayereffect.png"/>
      </imageobject>
     </mediaobject>
   </example>
diff --git a/reference/image/functions/imagepolygon.xml b/reference/image/functions/imagepolygon.xml
index 66fa547972..36dce093b7 100644
--- a/reference/image/functions/imagepolygon.xml
+++ b/reference/image/functions/imagepolygon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.17 $ -->
+<!-- $Revision: 1.18 $ -->
 <refentry xml:id="function.imagepolygon" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagepolygon</refname>
@@ -114,7 +114,7 @@ imagedestroy($image);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagepolygon.png"/>
+      <imagedata fileref="en/reference/image/figures/imagepolygon.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagerectangle.xml b/reference/image/functions/imagerectangle.xml
index 4bd2d3506c..638290cada 100644
--- a/reference/image/functions/imagerectangle.xml
+++ b/reference/image/functions/imagerectangle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
 <refentry xml:id="function.imagerectangle" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagerectangle</refname>
@@ -109,7 +109,7 @@ imagedestroy($canvas);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagerectangle.jpg"/>
+      <imagedata fileref="en/reference/image/figures/imagerectangle.jpg"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagerotate.xml b/reference/image/functions/imagerotate.xml
index c97877c1db..1c40320859 100644
--- a/reference/image/functions/imagerotate.xml
+++ b/reference/image/functions/imagerotate.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
 <refentry xml:id="function.imagerotate" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagerotate</refname>
@@ -118,7 +118,7 @@ imagejpeg($rotate);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagerotate.jpg"/>
+      <imagedata fileref="en/reference/image/figures/imagerotate.jpg"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagesetbrush.xml b/reference/image/functions/imagesetbrush.xml
index 4a62f79040..bd77fde34a 100644
--- a/reference/image/functions/imagesetbrush.xml
+++ b/reference/image/functions/imagesetbrush.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
 <refentry xml:id="function.imagesetbrush" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagesetbrush</refname>
@@ -78,7 +78,7 @@ imagedestroy($php);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagesetbrush.png"/>
+      <imagedata fileref="en/reference/image/figures/imagesetbrush.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagesetpixel.xml b/reference/image/functions/imagesetpixel.xml
index 065950a591..59331f2884 100644
--- a/reference/image/functions/imagesetpixel.xml
+++ b/reference/image/functions/imagesetpixel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
 <refentry xml:id="function.imagesetpixel" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagesetpixel</refname>
@@ -97,7 +97,7 @@ imagepng($gd);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagesetpixel.png"/>
+      <imagedata fileref="en/reference/image/figures/imagesetpixel.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagesetstyle.xml b/reference/image/functions/imagesetstyle.xml
index dd8110fc70..57634e2229 100644
--- a/reference/image/functions/imagesetstyle.xml
+++ b/reference/image/functions/imagesetstyle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
 <refentry xml:id="function.imagesetstyle" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagesetstyle</refname>
@@ -82,7 +82,7 @@ imagedestroy($im);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagesetstyle.jpg"/>
+      <imagedata fileref="en/reference/image/figures/imagesetstyle.jpg"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagesetthickness.xml b/reference/image/functions/imagesetthickness.xml
index 594c716369..e6440e3349 100644
--- a/reference/image/functions/imagesetthickness.xml
+++ b/reference/image/functions/imagesetthickness.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
 <refentry xml:id="function.imagesetthickness" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagesetthickness</refname>
@@ -73,7 +73,7 @@ imagedestroy($im);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagesetthickness.png"/>
+      <imagedata fileref="en/reference/image/figures/imagesetthickness.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagesettile.xml b/reference/image/functions/imagesettile.xml
index 3a2f53ccd9..c21cfa4172 100644
--- a/reference/image/functions/imagesettile.xml
+++ b/reference/image/functions/imagesettile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
 <refentry xml:id="function.imagesettile" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagesettile</refname>
@@ -86,7 +86,7 @@ imagedestroy($zend);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagesettile.png"/>
+      <imagedata fileref="en/reference/image/figures/imagesettile.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagestring.xml b/reference/image/functions/imagestring.xml
index f833e6215c..56b5f8d9cc 100644
--- a/reference/image/functions/imagestring.xml
+++ b/reference/image/functions/imagestring.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.18 $ -->
+<!-- $Revision: 1.19 $ -->
 <refentry xml:id="function.imagestring" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagestring</refname>
@@ -97,7 +97,7 @@ imagedestroy($im);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagestring.png"/>
+      <imagedata fileref="en/reference/image/figures/imagestring.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagestringup.xml b/reference/image/functions/imagestringup.xml
index fd12b9fefe..0c0504529b 100644
--- a/reference/image/functions/imagestringup.xml
+++ b/reference/image/functions/imagestringup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <refentry xml:id="function.imagestringup" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>imagestringup</refname>
@@ -93,7 +93,7 @@ imagedestroy($im);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagestringup.png"/>
+      <imagedata fileref="en/reference/image/figures/imagestringup.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/image/functions/imagettftext.xml b/reference/image/functions/imagettftext.xml
index 36b6dae546..44b4678d50 100644
--- a/reference/image/functions/imagettftext.xml
+++ b/reference/image/functions/imagettftext.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Revision: 1.27 $ -->
+<?XML VERSION="1.0" ENCODING="UTF-8"?>
+<!-- $Revision: 1.28 $ -->
 <refentry xml:id="function.imagettftext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
   <refname>imagettftext</refname>
@@ -197,7 +197,7 @@ imagedestroy($im);
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/image.imagettftext.png"/>
+      <imagedata fileref="en/reference/image/figures/imagettftext.png"/>
      </imageobject>
     </mediaobject>
    </example>
diff --git a/reference/imagick/examples.xml b/reference/imagick/examples.xml
index 924fcd2b3f..0ec6c139d6 100644
--- a/reference/imagick/examples.xml
+++ b/reference/imagick/examples.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 
 <chapter xml:id="imagick.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.examples;
@@ -113,7 +113,7 @@ echo $canvas;
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/imagick.hello_world_reflection.png"/>
+      <imagedata fileref="en/reference/imagick/figures/hello_world_reflection.png"/>
      </imageobject>
     </mediaobject>
    </example>
@@ -175,7 +175,7 @@ echo $canvas;
     &example.outputs.similar;
     <mediaobject>
      <imageobject>
-      <imagedata fileref="figures/imagick.hello_world.png"/>
+      <imagedata fileref="en/reference/imagick/figures/hello_world.png"/>
      </imageobject>
     </mediaobject>
    </example>