diff --git a/reference/exif/functions/exif-imagetype.xml b/reference/exif/functions/exif-imagetype.xml
index 6528c99945..95bddcd302 100644
--- a/reference/exif/functions/exif-imagetype.xml
+++ b/reference/exif/functions/exif-imagetype.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.81 -->
  <refentry id="function.exif-imagetype">
   <refnamediv>
    <refname>exif_imagetype</refname>
    <refpurpose>Determine the type of an image</refpurpose>
   </refnamediv>
-  <refsect1>
+  <refsect1 role="description">
    &reftitle.description;
    <methodsynopsis>
     <type>int</type><methodname>exif_imagetype</methodname>
@@ -23,7 +23,7 @@
     whether or not the viewer is able to see a specific image in the browser.
    </para>
   </refsect1>
-  <refsect1>
+  <refsect1 role="parameters">
    &reftitle.parameters;
    <para>
     <variablelist>
@@ -38,7 +38,7 @@
     </variablelist>
    </para>
   </refsect1>
-  <refsect1>
+  <refsect1 role="returnvalues">
    &reftitle.returnvalues;
    <para>
     When a correct signature is found, the appropriate constant value will be
@@ -47,7 +47,7 @@
     <function>exif_imagetype</function> is much faster.
    </para>
   </refsect1>
-  <refsect1>
+  <refsect1 role="changelog">
    &reftitle.changelog;
    <para>
     <informaltable>
@@ -76,7 +76,7 @@
     </informaltable>
    </para>
   </refsect1>
-  <refsect1>
+  <refsect1 role="constants">
    &reftitle.constants;
    <para>
     The following constants are defined, and represent possible 
@@ -162,7 +162,7 @@
     </table>       
    </para>
   </refsect1>
-  <refsect1>
+  <refsect1 role="examples">
    &reftitle.examples;
    <para>
     <example>
@@ -179,10 +179,12 @@ if (exif_imagetype('image.gif') != IMAGETYPE_GIF) {
     </example>
    </para>
   </refsect1>
-  <refsect1>
+  <refsect1 role="seealso">
    &reftitle.seealso;
    <para>
-    <function>getimagesize</function>
+    <simplelist>
+     <member><function>getimagesize</function></member>
+    </simplelist>
    </para>
   </refsect1>
  </refentry>
diff --git a/reference/exif/functions/exif-read-data.xml b/reference/exif/functions/exif-read-data.xml
index f8032333c1..a1681dcfcf 100644
--- a/reference/exif/functions/exif-read-data.xml
+++ b/reference/exif/functions/exif-read-data.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.78 -->
 <refentry id="function.exif-read-data">
  <refnamediv>
   <refname>exif_read_data</refname>
-  <refpurpose>
-   Reads the <acronym>EXIF</acronym> headers from <acronym>JPEG</acronym> or <acronym>TIFF</acronym>
-  </refpurpose>
+  <refpurpose>Reads the <acronym>EXIF</acronym> headers from <acronym>JPEG</acronym> or <acronym>TIFF</acronym></refpurpose>
  </refnamediv>
- <refsect1>
+ <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
    <type>array</type><methodname>exif_read_data</methodname>
@@ -62,7 +60,7 @@
    </para>
   </note>
  </refsect1>
- <refsect1>
+ <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
    <variablelist>
@@ -160,7 +158,7 @@
    </variablelist>
   </para>
  </refsect1>    
- <refsect1>
+ <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
    It returns an associative <type>array</type> where the array indexes are 
@@ -169,7 +167,7 @@
    <function>exif_read_data</function> will return &false;.
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
    <informaltable>
@@ -217,7 +215,7 @@
    </informaltable>
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="examples">
   &reftitle.examples;
   <para>
    <example>
@@ -242,6 +240,7 @@ foreach ($exif as $key => $section) {
     <para>
      The first call fails because the image has no header information.
     </para>
+    &example.outputs.similar;
     <screen role="php">
 <![CDATA[
 test1.jpg:
@@ -280,8 +279,10 @@ THUMBNAIL.Thumbnail.Height: 1
  <refsect1>
   &reftitle.seealso;
   <para>
-   <function>exif_thumbnail</function>&listendand;
-   <function>getimagesize</function>
+   <simplelist>
+    <member><function>exif_thumbnail</function></member>
+    <member><function>getimagesize</function></member>
+   </simplelist>
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/exif/functions/exif-tagname.xml b/reference/exif/functions/exif-tagname.xml
index c8e80f47b2..8d0a09e529 100644
--- a/reference/exif/functions/exif-tagname.xml
+++ b/reference/exif/functions/exif-tagname.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <refentry id="function.exif-tagname">
  <refnamediv>
   <refname>exif_tagname</refname>
   <refpurpose>Get the header name for an index</refpurpose>
  </refnamediv>
- <refsect1>
+ <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
    <type>string</type><methodname>exif_tagname</methodname>     
@@ -15,7 +15,7 @@
   &warn.undocumented.func;
 
  </refsect1>
- <refsect1>
+ <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
    <variablelist>
@@ -30,17 +30,19 @@
    </variablelist>
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
    Returns the header name, or &false; if <parameter>index</parameter> is
    undefined.
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
-   <function>exif_imagetype</function> 
+   <simplelist>
+    <member><function>exif_imagetype</function></member>
+   </simplelist>
   </para>
  </refsect1>
 </refentry>
diff --git a/reference/exif/functions/exif-thumbnail.xml b/reference/exif/functions/exif-thumbnail.xml
index acbce2e338..6708020e5a 100644
--- a/reference/exif/functions/exif-thumbnail.xml
+++ b/reference/exif/functions/exif-thumbnail.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/image.xml, last change in rev 1.78 -->
 <refentry id="function.exif-thumbnail">
  <refnamediv>
   <refname>exif_thumbnail</refname>
   <refpurpose>Retrieve the embedded thumbnail of a TIFF or JPEG image</refpurpose>
  </refnamediv>
- <refsect1>
+ <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
    <type>string</type><methodname>exif_thumbnail</methodname>
@@ -30,7 +30,7 @@
    are set.
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="parameters">
   &reftitle.parameters;
   <para>
    <variablelist>
@@ -71,14 +71,14 @@
    </variablelist>
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
    Returns the embedded thumbnail, or &false; if the image contains no 
    thumbnail.
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="changelog">
   &reftitle.changelog;
   <para>
    <informaltable>
@@ -109,7 +109,7 @@
    </informaltable>
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="examples">
   &reftitle.examples;
   <para>
    <example>
@@ -136,11 +136,13 @@ if ($image!==false) {
    </example>
   </para>
  </refsect1>
- <refsect1>
+ <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
-   <function>exif_read_data</function>&listendand;
-   <function>image_type_to_mime_type</function>
+   <simplelist>
+    <member><function>exif_read_data</function></member>
+    <member><function>image_type_to_mime_type</function></member>
+   </simplelist>
   </para>
  </refsect1>
 </refentry>