From 3362c2dfd175dbc25dbde7e649eca65d168fa3f4 Mon Sep 17 00:00:00 2001
From: Mehdi Achour <didou@php.net>
Date: Sun, 7 Jan 2007 19:20:43 +0000
Subject: [PATCH] Switch to new style

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@226671 c90b9560-bf6c-de11-be94-00142212c4b1
---
 .../msession/functions/msession-connect.xml   | 33 +++++++------
 .../msession/functions/msession-count.xml     | 31 ++++++------
 .../msession/functions/msession-create.xml    | 31 ++++++------
 .../msession/functions/msession-destroy.xml   | 31 ++++++------
 .../functions/msession-disconnect.xml         | 31 ++++++------
 .../msession/functions/msession-find.xml      | 33 +++++++------
 .../msession/functions/msession-get-array.xml | 31 ++++++------
 .../msession/functions/msession-get-data.xml  | 31 ++++++------
 reference/msession/functions/msession-get.xml | 35 +++++++-------
 reference/msession/functions/msession-inc.xml | 33 +++++++------
 .../msession/functions/msession-list.xml      | 31 ++++++------
 .../msession/functions/msession-listvar.xml   | 47 ++++++++++---------
 .../msession/functions/msession-lock.xml      | 31 ++++++------
 .../msession/functions/msession-plugin.xml    | 35 +++++++-------
 .../msession/functions/msession-randstr.xml   | 31 ++++++------
 .../msession/functions/msession-set-array.xml | 33 +++++++------
 .../msession/functions/msession-set-data.xml  | 33 +++++++------
 reference/msession/functions/msession-set.xml | 35 +++++++-------
 .../msession/functions/msession-timeout.xml   | 33 +++++++------
 .../msession/functions/msession-uniq.xml      | 31 ++++++------
 .../msession/functions/msession-unlock.xml    | 33 +++++++------
 reference/notes/functions/notes-body.xml      | 39 +++++++--------
 reference/notes/functions/notes-copy-db.xml   | 37 +++++++--------
 reference/notes/functions/notes-create-db.xml | 35 +++++++-------
 .../notes/functions/notes-create-note.xml     | 37 +++++++--------
 reference/notes/functions/notes-drop-db.xml   | 35 +++++++-------
 reference/notes/functions/notes-find-note.xml | 39 +++++++--------
 .../notes/functions/notes-header-info.xml     | 39 +++++++--------
 reference/notes/functions/notes-list-msgs.xml | 35 +++++++-------
 reference/notes/functions/notes-mark-read.xml | 39 +++++++--------
 .../notes/functions/notes-mark-unread.xml     | 39 +++++++--------
 .../notes/functions/notes-nav-create.xml      | 37 +++++++--------
 reference/notes/functions/notes-search.xml    | 37 +++++++--------
 reference/notes/functions/notes-unread.xml    | 37 +++++++--------
 reference/notes/functions/notes-version.xml   | 35 +++++++-------
 reference/qtdom/functions/qdom-error.xml      | 35 +++++++-------
 reference/qtdom/functions/qdom-tree.xml       | 35 +++++++-------
 .../vpopmail-add-alias-domain-ex.xml          | 37 +++++++--------
 .../functions/vpopmail-add-alias-domain.xml   | 37 +++++++--------
 .../functions/vpopmail-add-domain-ex.xml      | 43 ++++++++---------
 .../functions/vpopmail-add-domain.xml         | 41 ++++++++--------
 .../vpopmail/functions/vpopmail-add-user.xml  | 43 ++++++++---------
 .../vpopmail/functions/vpopmail-alias-add.xml | 39 +++++++--------
 .../functions/vpopmail-alias-del-domain.xml   | 35 +++++++-------
 .../vpopmail/functions/vpopmail-alias-del.xml | 37 +++++++--------
 .../functions/vpopmail-alias-get-all.xml      | 35 +++++++-------
 .../vpopmail/functions/vpopmail-alias-get.xml | 37 +++++++--------
 .../vpopmail/functions/vpopmail-auth-user.xml | 41 ++++++++--------
 .../functions/vpopmail-del-domain-ex.xml      | 35 +++++++-------
 .../functions/vpopmail-del-domain.xml         | 35 +++++++-------
 .../vpopmail/functions/vpopmail-del-user.xml  | 37 +++++++--------
 .../vpopmail/functions/vpopmail-error.xml     | 35 +++++++-------
 .../vpopmail/functions/vpopmail-passwd.xml    | 41 ++++++++--------
 .../functions/vpopmail-set-user-quota.xml     | 39 +++++++--------
 .../functions/xmlrpc-decode-request.xml       | 39 +++++++--------
 reference/xmlrpc/functions/xmlrpc-decode.xml  | 37 +++++++--------
 .../functions/xmlrpc-encode-request.xml       | 39 +++++++--------
 reference/xmlrpc/functions/xmlrpc-encode.xml  | 35 +++++++-------
 .../xmlrpc/functions/xmlrpc-get-type.xml      | 39 ++++++++-------
 .../xmlrpc/functions/xmlrpc-is-fault.xml      | 39 +++++++--------
 .../xmlrpc-parse-method-descriptions.xml      | 35 +++++++-------
 .../xmlrpc-server-add-introspection-data.xml  | 37 +++++++--------
 .../functions/xmlrpc-server-call-method.xml   | 41 ++++++++--------
 .../xmlrpc/functions/xmlrpc-server-create.xml | 35 +++++++-------
 .../functions/xmlrpc-server-destroy.xml       | 35 +++++++-------
 ...server-register-introspection-callback.xml | 37 +++++++--------
 .../xmlrpc-server-register-method.xml         | 39 +++++++--------
 .../xmlrpc/functions/xmlrpc-set-type.xml      | 37 +++++++--------
 68 files changed, 1149 insertions(+), 1305 deletions(-)

diff --git a/reference/msession/functions/msession-connect.xml b/reference/msession/functions/msession-connect.xml
index 586f129e18..71728f40f9 100644
--- a/reference/msession/functions/msession-connect.xml
+++ b/reference/msession/functions/msession-connect.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-connect">
-   <refnamediv>
-    <refname>msession_connect</refname>
-    <refpurpose>Connect to msession server </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>msession_connect</methodname>
-     <methodparam><type>string</type><parameter>host</parameter></methodparam>
-     <methodparam><type>string</type><parameter>port</parameter></methodparam>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.msession-connect">
+ <refnamediv>
+  <refname>msession_connect</refname>
+  <refpurpose>Connect to msession server</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>msession_connect</methodname>
+   <methodparam><type>string</type><parameter>host</parameter></methodparam>
+   <methodparam><type>string</type><parameter>port</parameter></methodparam>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-count.xml b/reference/msession/functions/msession-count.xml
index bd6df2d0e1..2f24056daa 100644
--- a/reference/msession/functions/msession-count.xml
+++ b/reference/msession/functions/msession-count.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-count">
-   <refnamediv>
-    <refname>msession_count</refname>
-    <refpurpose>Get session count </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>int</type><methodname>msession_count</methodname>
-      <void/>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.msession-count">
+ <refnamediv>
+  <refname>msession_count</refname>
+  <refpurpose>Get session count</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>int</type><methodname>msession_count</methodname>
+   <void/>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-create.xml b/reference/msession/functions/msession-create.xml
index a4cdcc70e6..c4613684a4 100644
--- a/reference/msession/functions/msession-create.xml
+++ b/reference/msession/functions/msession-create.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-create">
-   <refnamediv>
-    <refname>msession_create</refname>
-    <refpurpose>Create a session </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>msession_create</methodname>
-     <methodparam><type>string</type><parameter>session</parameter></methodparam>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.msession-create">
+ <refnamediv>
+  <refname>msession_create</refname>
+  <refpurpose>Create a session</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>msession_create</methodname>
+   <methodparam><type>string</type><parameter>session</parameter></methodparam>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-destroy.xml b/reference/msession/functions/msession-destroy.xml
index ce72965fb9..aa5feab056 100644
--- a/reference/msession/functions/msession-destroy.xml
+++ b/reference/msession/functions/msession-destroy.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-destroy">
-   <refnamediv>
-    <refname>msession_destroy</refname>
-    <refpurpose>Destroy a session </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>msession_destroy</methodname>
-     <methodparam><type>string</type><parameter>name</parameter></methodparam>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.msession-destroy">
+ <refnamediv>
+  <refname>msession_destroy</refname>
+  <refpurpose>Destroy a session</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>msession_destroy</methodname>
+   <methodparam><type>string</type><parameter>name</parameter></methodparam>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-disconnect.xml b/reference/msession/functions/msession-disconnect.xml
index 77a64aa0fa..4b171fd009 100644
--- a/reference/msession/functions/msession-disconnect.xml
+++ b/reference/msession/functions/msession-disconnect.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-disconnect">
-   <refnamediv>
-    <refname>msession_disconnect</refname>
-    <refpurpose>Close connection to msession server </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>void</type><methodname>msession_disconnect</methodname>
-      <void/>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.msession-disconnect">
+ <refnamediv>
+  <refname>msession_disconnect</refname>
+  <refpurpose>Close connection to msession server</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>void</type><methodname>msession_disconnect</methodname>
+   <void/>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-find.xml b/reference/msession/functions/msession-find.xml
index 2c59633eaa..4104fefdc6 100644
--- a/reference/msession/functions/msession-find.xml
+++ b/reference/msession/functions/msession-find.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-find">
-   <refnamediv>
-    <refname>msession_find</refname>
-    <refpurpose>Find all sessions with name and value</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>array</type><methodname>msession_find</methodname>
-     <methodparam><type>string</type><parameter>name</parameter></methodparam>
-     <methodparam><type>string</type><parameter>value</parameter></methodparam>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.msession-find">
+ <refnamediv>
+  <refname>msession_find</refname>
+  <refpurpose>Find all sessions with name and value</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>array</type><methodname>msession_find</methodname>
+   <methodparam><type>string</type><parameter>name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>value</parameter></methodparam>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-get-array.xml b/reference/msession/functions/msession-get-array.xml
index 2355801917..1ed6717831 100644
--- a/reference/msession/functions/msession-get-array.xml
+++ b/reference/msession/functions/msession-get-array.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-get-array">
-   <refnamediv>
-    <refname>msession_get_array</refname>
-    <refpurpose>Get array of msession variables</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>array</type><methodname>msession_get_array</methodname>
-     <methodparam><type>string</type><parameter>session</parameter></methodparam>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.msession-get-array">
+ <refnamediv>
+  <refname>msession_get_array</refname>
+  <refpurpose>Get array of msession variables</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>array</type><methodname>msession_get_array</methodname>
+   <methodparam><type>string</type><parameter>session</parameter></methodparam>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-get-data.xml b/reference/msession/functions/msession-get-data.xml
index 90771d244b..2407cf2327 100644
--- a/reference/msession/functions/msession-get-data.xml
+++ b/reference/msession/functions/msession-get-data.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-get-data">
-   <refnamediv>
-    <refname>msession_get_data</refname>
-    <refpurpose>Get data session unstructured data</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>string</type><methodname>msession_get_data</methodname>
-     <methodparam><type>string</type><parameter>session</parameter></methodparam>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.2 $ -->
+<refentry id="function.msession-get-data">
+ <refnamediv>
+  <refname>msession_get_data</refname>
+  <refpurpose>Get data session unstructured data</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>string</type><methodname>msession_get_data</methodname>
+   <methodparam><type>string</type><parameter>session</parameter></methodparam>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-get.xml b/reference/msession/functions/msession-get.xml
index dcd3175f5d..c5a55599be 100644
--- a/reference/msession/functions/msession-get.xml
+++ b/reference/msession/functions/msession-get.xml
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-get">
-   <refnamediv>
-    <refname>msession_get</refname>
-    <refpurpose>Get value from session </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>string</type><methodname>msession_get</methodname>
-     <methodparam><type>string</type><parameter>session</parameter></methodparam>
-     <methodparam><type>string</type><parameter>name</parameter></methodparam>
-     <methodparam><type>string</type><parameter>value</parameter></methodparam>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.msession-get">
+ <refnamediv>
+  <refname>msession_get</refname>
+  <refpurpose>Get value from session</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>string</type><methodname>msession_get</methodname>
+   <methodparam><type>string</type><parameter>session</parameter></methodparam>
+   <methodparam><type>string</type><parameter>name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>value</parameter></methodparam>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-inc.xml b/reference/msession/functions/msession-inc.xml
index 95dd2de098..6231d17000 100644
--- a/reference/msession/functions/msession-inc.xml
+++ b/reference/msession/functions/msession-inc.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-inc">
-   <refnamediv>
-    <refname>msession_inc</refname>
-    <refpurpose>Increment value in session </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>string</type><methodname>msession_inc</methodname>
-     <methodparam><type>string</type><parameter>session</parameter></methodparam>
-     <methodparam><type>string</type><parameter>name</parameter></methodparam>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.msession-inc">
+ <refnamediv>
+  <refname>msession_inc</refname>
+  <refpurpose>Increment value in session</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>string</type><methodname>msession_inc</methodname>
+   <methodparam><type>string</type><parameter>session</parameter></methodparam>
+   <methodparam><type>string</type><parameter>name</parameter></methodparam>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-list.xml b/reference/msession/functions/msession-list.xml
index 567ac5e816..0b8cf6fb00 100644
--- a/reference/msession/functions/msession-list.xml
+++ b/reference/msession/functions/msession-list.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-list">
-   <refnamediv>
-    <refname>msession_list</refname>
-    <refpurpose>List all sessions</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>array</type><methodname>msession_list</methodname>
-      <void/>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.5 $ -->
+<refentry id="function.msession-list">
+ <refnamediv>
+  <refname>msession_list</refname>
+  <refpurpose>List all sessions</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>array</type><methodname>msession_list</methodname>
+   <void/>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-listvar.xml b/reference/msession/functions/msession-listvar.xml
index d00f625235..b2e31144aa 100644
--- a/reference/msession/functions/msession-listvar.xml
+++ b/reference/msession/functions/msession-listvar.xml
@@ -1,26 +1,29 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-listvar">
-   <refnamediv>
-    <refname>msession_listvar</refname>
-    <refpurpose>List sessions with variable</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>array</type><methodname>msession_listvar</methodname>
-     <methodparam><type>string</type><parameter>name</parameter></methodparam>
-     </methodsynopsis>
-    <para>
-     Returns an associative array of value/session for all sessions
-     with a variable named <parameter>name</parameter>.
-    </para>
-    <para>
-     Used for searching sessions with common attributes.
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.msession-listvar">
+ <refnamediv>
+  <refname>msession_listvar</refname>
+  <refpurpose>List sessions with variable</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>array</type><methodname>msession_listvar</methodname>
+   <methodparam><type>string</type><parameter>name</parameter></methodparam>
+  </methodsynopsis>
+  <para>
+   Used for searching sessions with common attributes.
+  </para>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns an associative array of value/session for all sessions
+   with a variable named <parameter>name</parameter>.
+  </para>
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-lock.xml b/reference/msession/functions/msession-lock.xml
index 2874867a6b..5ebdf26c04 100644
--- a/reference/msession/functions/msession-lock.xml
+++ b/reference/msession/functions/msession-lock.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-lock">
-   <refnamediv>
-    <refname>msession_lock</refname>
-    <refpurpose>Lock a session </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>int</type><methodname>msession_lock</methodname>
-     <methodparam><type>string</type><parameter>name</parameter></methodparam>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.msession-lock">
+ <refnamediv>
+  <refname>msession_lock</refname>
+  <refpurpose>Lock a session</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>int</type><methodname>msession_lock</methodname>
+   <methodparam><type>string</type><parameter>name</parameter></methodparam>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-plugin.xml b/reference/msession/functions/msession-plugin.xml
index 3919730ca9..3bea20adbc 100644
--- a/reference/msession/functions/msession-plugin.xml
+++ b/reference/msession/functions/msession-plugin.xml
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-plugin">
-   <refnamediv>
-    <refname>msession_plugin</refname>
-    <refpurpose>Call an escape function within the msession personality plugin</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>string</type><methodname>msession_plugin</methodname>
-     <methodparam><type>string</type><parameter>session</parameter></methodparam>
-     <methodparam><type>string</type><parameter>val</parameter></methodparam>
-     <methodparam choice="opt"><type>string</type><parameter>param</parameter></methodparam>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.msession-plugin">
+ <refnamediv>
+  <refname>msession_plugin</refname>
+  <refpurpose>Call an escape function within the msession personality plugin</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>string</type><methodname>msession_plugin</methodname>
+   <methodparam><type>string</type><parameter>session</parameter></methodparam>
+   <methodparam><type>string</type><parameter>val</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>param</parameter></methodparam>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-randstr.xml b/reference/msession/functions/msession-randstr.xml
index 703a897957..2282671ece 100644
--- a/reference/msession/functions/msession-randstr.xml
+++ b/reference/msession/functions/msession-randstr.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-randstr">
-   <refnamediv>
-    <refname>msession_randstr</refname>
-    <refpurpose>Get random string </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>string</type><methodname>msession_randstr</methodname>
-     <methodparam><type>int</type><parameter>param</parameter></methodparam>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.msession-randstr">
+ <refnamediv>
+  <refname>msession_randstr</refname>
+  <refpurpose>Get random string</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>string</type><methodname>msession_randstr</methodname>
+   <methodparam><type>int</type><parameter>param</parameter></methodparam>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-set-array.xml b/reference/msession/functions/msession-set-array.xml
index 7aeb40511d..d1bb86172a 100644
--- a/reference/msession/functions/msession-set-array.xml
+++ b/reference/msession/functions/msession-set-array.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-set-array">
-   <refnamediv>
-    <refname>msession_set_array</refname>
-    <refpurpose>Set msession variables from an array</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>void</type><methodname>msession_set_array</methodname>
-     <methodparam><type>string</type><parameter>session</parameter></methodparam>
-     <methodparam><type>array</type><parameter>tuples</parameter></methodparam>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.5 $ -->
+<refentry id="function.msession-set-array">
+ <refnamediv>
+  <refname>msession_set_array</refname>
+  <refpurpose>Set msession variables from an array</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>void</type><methodname>msession_set_array</methodname>
+   <methodparam><type>string</type><parameter>session</parameter></methodparam>
+   <methodparam><type>array</type><parameter>tuples</parameter></methodparam>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-set-data.xml b/reference/msession/functions/msession-set-data.xml
index e9c192b293..714eefb5b4 100644
--- a/reference/msession/functions/msession-set-data.xml
+++ b/reference/msession/functions/msession-set-data.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-set-data">
-   <refnamediv>
-    <refname>msession_set_data</refname>
-    <refpurpose>Set data session unstructured data</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>msession_set_data</methodname>
-     <methodparam><type>string</type><parameter>session</parameter></methodparam>
-     <methodparam><type>string</type><parameter>value</parameter></methodparam>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.2 $ -->
+<refentry id="function.msession-set-data">
+ <refnamediv>
+  <refname>msession_set_data</refname>
+  <refpurpose>Set data session unstructured data</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>msession_set_data</methodname>
+   <methodparam><type>string</type><parameter>session</parameter></methodparam>
+   <methodparam><type>string</type><parameter>value</parameter></methodparam>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-set.xml b/reference/msession/functions/msession-set.xml
index 9fa696c2a7..b4dd5fa7ca 100644
--- a/reference/msession/functions/msession-set.xml
+++ b/reference/msession/functions/msession-set.xml
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-set">
-   <refnamediv>
-    <refname>msession_set</refname>
-    <refpurpose>Set value in session </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>msession_set</methodname>
-     <methodparam><type>string</type><parameter>session</parameter></methodparam>
-     <methodparam><type>string</type><parameter>name</parameter></methodparam>
-     <methodparam><type>string</type><parameter>value</parameter></methodparam>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.msession-set">
+ <refnamediv>
+  <refname>msession_set</refname>
+  <refpurpose>Set value in session</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>msession_set</methodname>
+   <methodparam><type>string</type><parameter>session</parameter></methodparam>
+   <methodparam><type>string</type><parameter>name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>value</parameter></methodparam>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-timeout.xml b/reference/msession/functions/msession-timeout.xml
index ff1c3ef5a0..0271763a6c 100644
--- a/reference/msession/functions/msession-timeout.xml
+++ b/reference/msession/functions/msession-timeout.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-timeout">
-   <refnamediv>
-    <refname>msession_timeout</refname>
-    <refpurpose>Set/get session timeout </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>int</type><methodname>msession_timeout</methodname>
-     <methodparam><type>string</type><parameter>session</parameter></methodparam>
-     <methodparam choice="opt"><type>int</type><parameter>param</parameter></methodparam>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.msession-timeout">
+ <refnamediv>
+  <refname>msession_timeout</refname>
+  <refpurpose>Set/get session timeout</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>int</type><methodname>msession_timeout</methodname>
+   <methodparam><type>string</type><parameter>session</parameter></methodparam>
+   <methodparam choice="opt"><type>int</type><parameter>param</parameter></methodparam>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-uniq.xml b/reference/msession/functions/msession-uniq.xml
index 0788a5dd74..dd596ce5c0 100644
--- a/reference/msession/functions/msession-uniq.xml
+++ b/reference/msession/functions/msession-uniq.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-uniq">
-   <refnamediv>
-    <refname>msession_uniq</refname>
-    <refpurpose>Get unique id </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>string</type><methodname>msession_uniq</methodname>
-     <methodparam><type>int</type><parameter>param</parameter></methodparam>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.msession-uniq">
+ <refnamediv>
+  <refname>msession_uniq</refname>
+  <refpurpose>Get unique id</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>string</type><methodname>msession_uniq</methodname>
+   <methodparam><type>int</type><parameter>param</parameter></methodparam>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/msession/functions/msession-unlock.xml b/reference/msession/functions/msession-unlock.xml
index d651ed27fa..e93950b40e 100644
--- a/reference/msession/functions/msession-unlock.xml
+++ b/reference/msession/functions/msession-unlock.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/msession.xml, last change in rev 1.1 -->
-  <refentry id="function.msession-unlock">
-   <refnamediv>
-    <refname>msession_unlock</refname>
-    <refpurpose>Unlock a session </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>int</type><methodname>msession_unlock</methodname>
-     <methodparam><type>string</type><parameter>session</parameter></methodparam>
-     <methodparam><type>int</type><parameter>key</parameter></methodparam>
-     </methodsynopsis>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.msession-unlock">
+ <refnamediv>
+  <refname>msession_unlock</refname>
+  <refpurpose>Unlock a session</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>int</type><methodname>msession_unlock</methodname>
+   <methodparam><type>string</type><parameter>session</parameter></methodparam>
+   <methodparam><type>int</type><parameter>key</parameter></methodparam>
+  </methodsynopsis>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/notes/functions/notes-body.xml b/reference/notes/functions/notes-body.xml
index 0e42d303aa..d4e61d0eed 100644
--- a/reference/notes/functions/notes-body.xml
+++ b/reference/notes/functions/notes-body.xml
@@ -1,25 +1,22 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/notes.xml, last change in rev 1.1 -->
-  <refentry id="function.notes-body">
-   <refnamediv>
-    <refname>notes_body</refname>
-    <refpurpose>Open the message msg_number in the specified mailbox on the specified server (leave serv</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>array</type><methodname>notes_body</methodname>
-      <methodparam><type>string</type><parameter>server</parameter></methodparam>
-      <methodparam><type>string</type><parameter>mailbox</parameter></methodparam>
-      <methodparam><type>int</type><parameter>msg_number</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.notes-body">
+ <refnamediv>
+  <refname>notes_body</refname>
+  <refpurpose>Open the message msg_number in the specified mailbox on the specified server (leave serv</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>array</type><methodname>notes_body</methodname>
+   <methodparam><type>string</type><parameter>server</parameter></methodparam>
+   <methodparam><type>string</type><parameter>mailbox</parameter></methodparam>
+   <methodparam><type>int</type><parameter>msg_number</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/notes/functions/notes-copy-db.xml b/reference/notes/functions/notes-copy-db.xml
index 7475b6a243..5c79aa1857 100644
--- a/reference/notes/functions/notes-copy-db.xml
+++ b/reference/notes/functions/notes-copy-db.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<!-- splitted from ./en/functions/notes.xml, last change in rev 1.1 -->
-  <refentry id="function.notes-copy-db">
-   <refnamediv>
-    <refname>notes_copy_db</refname>
-    <refpurpose>Copy a Lotus Notes database</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>notes_copy_db</methodname>
-      <methodparam><type>string</type><parameter>from_database_name</parameter></methodparam>
-      <methodparam><type>string</type><parameter>to_database_name</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.5 $ -->
+<refentry id="function.notes-copy-db">
+ <refnamediv>
+  <refname>notes_copy_db</refname>
+  <refpurpose>Copy a Lotus Notes database</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>notes_copy_db</methodname>
+   <methodparam><type>string</type><parameter>from_database_name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>to_database_name</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/notes/functions/notes-create-db.xml b/reference/notes/functions/notes-create-db.xml
index e9c1a8db3b..53cc19fa80 100644
--- a/reference/notes/functions/notes-create-db.xml
+++ b/reference/notes/functions/notes-create-db.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/notes.xml, last change in rev 1.1 -->
-  <refentry id="function.notes-create-db">
-   <refnamediv>
-    <refname>notes_create_db</refname>
-    <refpurpose>Create a Lotus Notes database </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>notes_create_db</methodname>
-      <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.notes-create-db">
+ <refnamediv>
+  <refname>notes_create_db</refname>
+  <refpurpose>Create a Lotus Notes database</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>notes_create_db</methodname>
+   <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/notes/functions/notes-create-note.xml b/reference/notes/functions/notes-create-note.xml
index aa1753d990..8ecac902f4 100644
--- a/reference/notes/functions/notes-create-note.xml
+++ b/reference/notes/functions/notes-create-note.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- splitted from ./en/functions/notes.xml, last change in rev 1.1 -->
-  <refentry id="function.notes-create-note">
-   <refnamediv>
-    <refname>notes_create_note</refname>
-    <refpurpose>Create a note using form form_name </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>notes_create_note</methodname>
-      <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
-      <methodparam><type>string</type><parameter>form_name</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.notes-create-note">
+ <refnamediv>
+  <refname>notes_create_note</refname>
+  <refpurpose>Create a note using form form_name</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>notes_create_note</methodname>
+   <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>form_name</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/notes/functions/notes-drop-db.xml b/reference/notes/functions/notes-drop-db.xml
index 7a0eab6cc2..5fef6eaab5 100644
--- a/reference/notes/functions/notes-drop-db.xml
+++ b/reference/notes/functions/notes-drop-db.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/notes.xml, last change in rev 1.1 -->
-  <refentry id="function.notes-drop-db">
-   <refnamediv>
-    <refname>notes_drop_db</refname>
-    <refpurpose>Drop a Lotus Notes database </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>notes_drop_db</methodname>
-      <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.notes-drop-db">
+ <refnamediv>
+  <refname>notes_drop_db</refname>
+  <refpurpose>Drop a Lotus Notes database</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>notes_drop_db</methodname>
+   <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/notes/functions/notes-find-note.xml b/reference/notes/functions/notes-find-note.xml
index a14583a5c1..d689a5c836 100644
--- a/reference/notes/functions/notes-find-note.xml
+++ b/reference/notes/functions/notes-find-note.xml
@@ -1,25 +1,22 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<!-- splitted from ./en/functions/notes.xml, last change in rev 1.1 -->
-  <refentry id="function.notes-find-note">
-   <refnamediv>
-    <refname>notes_find_note</refname>
-    <refpurpose>Returns a note id found in database_name</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>int</type><methodname>notes_find_note</methodname>
-      <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
-      <methodparam><type>string</type><parameter>name</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>type</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.5 $ -->
+<refentry id="function.notes-find-note">
+ <refnamediv>
+  <refname>notes_find_note</refname>
+  <refpurpose>Returns a note id found in database_name</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>int</type><methodname>notes_find_note</methodname>
+   <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>name</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>type</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/notes/functions/notes-header-info.xml b/reference/notes/functions/notes-header-info.xml
index 43aad24030..622118f885 100644
--- a/reference/notes/functions/notes-header-info.xml
+++ b/reference/notes/functions/notes-header-info.xml
@@ -1,25 +1,22 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/notes.xml, last change in rev 1.1 -->
-  <refentry id="function.notes-header-info">
-   <refnamediv>
-    <refname>notes_header_info</refname>
-    <refpurpose>Open the message msg_number in the specified mailbox on the specified server (leave serv</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>object</type><methodname>notes_header_info</methodname>
-      <methodparam><type>string</type><parameter>server</parameter></methodparam>
-      <methodparam><type>string</type><parameter>mailbox</parameter></methodparam>
-      <methodparam><type>int</type><parameter>msg_number</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.notes-header-info">
+ <refnamediv>
+  <refname>notes_header_info</refname>
+  <refpurpose>Open the message msg_number in the specified mailbox on the specified server (leave serv</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>object</type><methodname>notes_header_info</methodname>
+   <methodparam><type>string</type><parameter>server</parameter></methodparam>
+   <methodparam><type>string</type><parameter>mailbox</parameter></methodparam>
+   <methodparam><type>int</type><parameter>msg_number</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/notes/functions/notes-list-msgs.xml b/reference/notes/functions/notes-list-msgs.xml
index 5a973e21db..9f16bc69d2 100644
--- a/reference/notes/functions/notes-list-msgs.xml
+++ b/reference/notes/functions/notes-list-msgs.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/notes.xml, last change in rev 1.1 -->
-  <refentry id="function.notes-list-msgs">
-   <refnamediv>
-    <refname>notes_list_msgs</refname>
-    <refpurpose>Returns the notes from a selected database_name</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>notes_list_msgs</methodname>
-      <methodparam><type>string</type><parameter>db</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.notes-list-msgs">
+ <refnamediv>
+  <refname>notes_list_msgs</refname>
+  <refpurpose>Returns the notes from a selected database_name</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>notes_list_msgs</methodname>
+   <methodparam><type>string</type><parameter>db</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/notes/functions/notes-mark-read.xml b/reference/notes/functions/notes-mark-read.xml
index 901800f453..7819dc2eab 100644
--- a/reference/notes/functions/notes-mark-read.xml
+++ b/reference/notes/functions/notes-mark-read.xml
@@ -1,25 +1,22 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- splitted from ./en/functions/notes.xml, last change in rev 1.1 -->
-  <refentry id="function.notes-mark-read">
-   <refnamediv>
-    <refname>notes_mark_read</refname>
-    <refpurpose>Mark a note_id as read for the User user_name</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>notes_mark_read</methodname>
-      <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
-      <methodparam><type>string</type><parameter>user_name</parameter></methodparam>
-      <methodparam><type>string</type><parameter>note_id</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.notes-mark-read">
+ <refnamediv>
+  <refname>notes_mark_read</refname>
+  <refpurpose>Mark a note_id as read for the User user_name</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>notes_mark_read</methodname>
+   <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>user_name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>note_id</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/notes/functions/notes-mark-unread.xml b/reference/notes/functions/notes-mark-unread.xml
index 7b795b19f0..004e339fbd 100644
--- a/reference/notes/functions/notes-mark-unread.xml
+++ b/reference/notes/functions/notes-mark-unread.xml
@@ -1,25 +1,22 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- splitted from ./en/functions/notes.xml, last change in rev 1.1 -->
-  <refentry id="function.notes-mark-unread">
-   <refnamediv>
-    <refname>notes_mark_unread</refname>
-    <refpurpose>Mark a note_id as unread for the User user_name</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>notes_mark_unread</methodname>
-      <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
-      <methodparam><type>string</type><parameter>user_name</parameter></methodparam>
-      <methodparam><type>string</type><parameter>note_id</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.notes-mark-unread">
+ <refnamediv>
+  <refname>notes_mark_unread</refname>
+  <refpurpose>Mark a note_id as unread for the User user_name</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>notes_mark_unread</methodname>
+   <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>user_name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>note_id</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/notes/functions/notes-nav-create.xml b/reference/notes/functions/notes-nav-create.xml
index 821e82472f..509c463fc5 100644
--- a/reference/notes/functions/notes-nav-create.xml
+++ b/reference/notes/functions/notes-nav-create.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/notes.xml, last change in rev 1.1 -->
-  <refentry id="function.notes-nav-create">
-   <refnamediv>
-    <refname>notes_nav_create</refname>
-    <refpurpose>Create a navigator name, in database_name  </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>notes_nav_create</methodname>
-      <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
-      <methodparam><type>string</type><parameter>name</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.notes-nav-create">
+ <refnamediv>
+  <refname>notes_nav_create</refname>
+  <refpurpose>Create a navigator name, in database_name</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>notes_nav_create</methodname>
+   <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>name</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/notes/functions/notes-search.xml b/reference/notes/functions/notes-search.xml
index 95903b21b3..e949b0ef96 100644
--- a/reference/notes/functions/notes-search.xml
+++ b/reference/notes/functions/notes-search.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- splitted from ./en/functions/notes.xml, last change in rev 1.1 -->
-  <refentry id="function.notes-search">
-   <refnamediv>
-    <refname>notes_search</refname>
-    <refpurpose>Find notes that match keywords in database_name</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>array</type><methodname>notes_search</methodname>
-      <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
-      <methodparam><type>string</type><parameter>keywords</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.notes-search">
+ <refnamediv>
+  <refname>notes_search</refname>
+  <refpurpose>Find notes that match keywords in database_name</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>array</type><methodname>notes_search</methodname>
+   <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>keywords</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/notes/functions/notes-unread.xml b/reference/notes/functions/notes-unread.xml
index 6c30d7d105..668e5ebc51 100644
--- a/reference/notes/functions/notes-unread.xml
+++ b/reference/notes/functions/notes-unread.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- splitted from ./en/functions/notes.xml, last change in rev 1.1 -->
-  <refentry id="function.notes-unread">
-   <refnamediv>
-    <refname>notes_unread</refname>
-    <refpurpose>Returns the unread note id's for the current User user_name</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>array</type><methodname>notes_unread</methodname>
-      <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
-      <methodparam><type>string</type><parameter>user_name</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.notes-unread">
+ <refnamediv>
+  <refname>notes_unread</refname>
+  <refpurpose>Returns the unread note id's for the current User user_name</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>array</type><methodname>notes_unread</methodname>
+   <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>user_name</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/notes/functions/notes-version.xml b/reference/notes/functions/notes-version.xml
index 217b4799ec..b15ae2b79d 100644
--- a/reference/notes/functions/notes-version.xml
+++ b/reference/notes/functions/notes-version.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- splitted from ./en/functions/notes.xml, last change in rev 1.1 -->
-  <refentry id="function.notes-version">
-   <refnamediv>
-    <refname>notes_version</refname>
-    <refpurpose>Get the version Lotus Notes </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>float</type><methodname>notes_version</methodname>
-      <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.notes-version">
+ <refnamediv>
+  <refname>notes_version</refname>
+  <refpurpose>Get the version Lotus Notes</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>float</type><methodname>notes_version</methodname>
+   <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/qtdom/functions/qdom-error.xml b/reference/qtdom/functions/qdom-error.xml
index 36c02a4980..a0db7c1b1b 100644
--- a/reference/qtdom/functions/qdom-error.xml
+++ b/reference/qtdom/functions/qdom-error.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- splitted from ./en/functions/qtdom.xml, last change in rev 1.1 -->
-  <refentry id="function.qdom-error">
-   <refnamediv>
-    <refname>qdom_error</refname>
-    <refpurpose>Returns the error string from the last QDOM operation or FALSE if no errors occurred</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>string</type><methodname>qdom_error</methodname>
-      <void/>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.qdom-error">
+ <refnamediv>
+  <refname>qdom_error</refname>
+  <refpurpose>Returns the error string from the last QDOM operation or FALSE if no errors occurred</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>string</type><methodname>qdom_error</methodname>
+   <void/>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/qtdom/functions/qdom-tree.xml b/reference/qtdom/functions/qdom-tree.xml
index b53d921c04..34148376f0 100644
--- a/reference/qtdom/functions/qdom-tree.xml
+++ b/reference/qtdom/functions/qdom-tree.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<!-- splitted from ./en/functions/qtdom.xml, last change in rev 1.1 -->
-  <refentry id="function.qdom-tree">
-   <refnamediv>
-    <refname>qdom_tree</refname>
-    <refpurpose>Creates a tree of an XML string</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>QDomDocument</type><methodname>qdom_tree</methodname>
-      <methodparam><type>string</type><parameter>doc</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.6 $ -->
+<refentry id="function.qdom-tree">
+ <refnamediv>
+  <refname>qdom_tree</refname>
+  <refpurpose>Creates a tree of an XML string</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>QDomDocument</type><methodname>qdom_tree</methodname>
+   <methodparam><type>string</type><parameter>doc</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/vpopmail/functions/vpopmail-add-alias-domain-ex.xml b/reference/vpopmail/functions/vpopmail-add-alias-domain-ex.xml
index 141fc39fb4..4782112ef4 100644
--- a/reference/vpopmail/functions/vpopmail-add-alias-domain-ex.xml
+++ b/reference/vpopmail/functions/vpopmail-add-alias-domain-ex.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<!-- splitted from ./en/functions/vpopmail.xml, last change in rev 1.1 -->
-  <refentry id="function.vpopmail-add-alias-domain-ex">
-   <refnamediv>
-    <refname>vpopmail_add_alias_domain_ex</refname>
-    <refpurpose>Add alias to an existing virtual domain</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>vpopmail_add_alias_domain_ex</methodname>
-      <methodparam><type>string</type><parameter>olddomain</parameter></methodparam>
-      <methodparam><type>string</type><parameter>newdomain</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.5 $ -->
+<refentry id="function.vpopmail-add-alias-domain-ex">
+ <refnamediv>
+  <refname>vpopmail_add_alias_domain_ex</refname>
+  <refpurpose>Add alias to an existing virtual domain</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>vpopmail_add_alias_domain_ex</methodname>
+   <methodparam><type>string</type><parameter>olddomain</parameter></methodparam>
+   <methodparam><type>string</type><parameter>newdomain</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/vpopmail/functions/vpopmail-add-alias-domain.xml b/reference/vpopmail/functions/vpopmail-add-alias-domain.xml
index a619728cd0..59abbd11bd 100644
--- a/reference/vpopmail/functions/vpopmail-add-alias-domain.xml
+++ b/reference/vpopmail/functions/vpopmail-add-alias-domain.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<!-- splitted from ./en/functions/vpopmail.xml, last change in rev 1.1 -->
-  <refentry id="function.vpopmail-add-alias-domain">
-   <refnamediv>
-    <refname>vpopmail_add_alias_domain</refname>
-    <refpurpose>Add an alias for a virtual domain</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>vpopmail_add_alias_domain</methodname>
-      <methodparam><type>string</type><parameter>domain</parameter></methodparam>
-      <methodparam><type>string</type><parameter>aliasdomain</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.5 $ -->
+<refentry id="function.vpopmail-add-alias-domain">
+ <refnamediv>
+  <refname>vpopmail_add_alias_domain</refname>
+  <refpurpose>Add an alias for a virtual domain</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>vpopmail_add_alias_domain</methodname>
+   <methodparam><type>string</type><parameter>domain</parameter></methodparam>
+   <methodparam><type>string</type><parameter>aliasdomain</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/vpopmail/functions/vpopmail-add-domain-ex.xml b/reference/vpopmail/functions/vpopmail-add-domain-ex.xml
index 3764b0b3b8..38cfb042e5 100644
--- a/reference/vpopmail/functions/vpopmail-add-domain-ex.xml
+++ b/reference/vpopmail/functions/vpopmail-add-domain-ex.xml
@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<!-- splitted from ./en/functions/vpopmail.xml, last change in rev 1.1 -->
-  <refentry id="function.vpopmail-add-domain-ex">
-   <refnamediv>
-    <refname>vpopmail_add_domain_ex</refname>
-    <refpurpose>Add a new virtual domain</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>vpopmail_add_domain_ex</methodname>
-      <methodparam><type>string</type><parameter>domain</parameter></methodparam>
-      <methodparam><type>string</type><parameter>passwd</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>quota</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>bounce</parameter></methodparam>
-      <methodparam choice="opt"><type>bool</type><parameter>apop</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.5 $ -->
+<refentry id="function.vpopmail-add-domain-ex">
+ <refnamediv>
+  <refname>vpopmail_add_domain_ex</refname>
+  <refpurpose>Add a new virtual domain</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>vpopmail_add_domain_ex</methodname>
+   <methodparam><type>string</type><parameter>domain</parameter></methodparam>
+   <methodparam><type>string</type><parameter>passwd</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>quota</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>bounce</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>apop</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/vpopmail/functions/vpopmail-add-domain.xml b/reference/vpopmail/functions/vpopmail-add-domain.xml
index ec04ae6ff8..50461eefb1 100644
--- a/reference/vpopmail/functions/vpopmail-add-domain.xml
+++ b/reference/vpopmail/functions/vpopmail-add-domain.xml
@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<!-- splitted from ./en/functions/vpopmail.xml, last change in rev 1.1 -->
-  <refentry id="function.vpopmail-add-domain">
-   <refnamediv>
-    <refname>vpopmail_add_domain</refname>
-    <refpurpose>Add a new virtual domain</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>vpopmail_add_domain</methodname>
-      <methodparam><type>string</type><parameter>domain</parameter></methodparam>
-      <methodparam><type>string</type><parameter>dir</parameter></methodparam>
-      <methodparam><type>int</type><parameter>uid</parameter></methodparam>
-      <methodparam><type>int</type><parameter>gid</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.5 $ -->
+<refentry id="function.vpopmail-add-domain">
+ <refnamediv>
+  <refname>vpopmail_add_domain</refname>
+  <refpurpose>Add a new virtual domain</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>vpopmail_add_domain</methodname>
+   <methodparam><type>string</type><parameter>domain</parameter></methodparam>
+   <methodparam><type>string</type><parameter>dir</parameter></methodparam>
+   <methodparam><type>int</type><parameter>uid</parameter></methodparam>
+   <methodparam><type>int</type><parameter>gid</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/vpopmail/functions/vpopmail-add-user.xml b/reference/vpopmail/functions/vpopmail-add-user.xml
index d55e5b5ef4..966d8fb16e 100644
--- a/reference/vpopmail/functions/vpopmail-add-user.xml
+++ b/reference/vpopmail/functions/vpopmail-add-user.xml
@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<!-- splitted from ./en/functions/vpopmail.xml, last change in rev 1.1 -->
-  <refentry id="function.vpopmail-add-user">
-   <refnamediv>
-    <refname>vpopmail_add_user</refname>
-    <refpurpose>Add a new user to the specified virtual domain</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>vpopmail_add_user</methodname>
-      <methodparam><type>string</type><parameter>user</parameter></methodparam>
-      <methodparam><type>string</type><parameter>domain</parameter></methodparam>
-      <methodparam><type>string</type><parameter>password</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>gecos</parameter></methodparam>
-      <methodparam choice="opt"><type>bool</type><parameter>apop</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.5 $ -->
+<refentry id="function.vpopmail-add-user">
+ <refnamediv>
+  <refname>vpopmail_add_user</refname>
+  <refpurpose>Add a new user to the specified virtual domain</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>vpopmail_add_user</methodname>
+   <methodparam><type>string</type><parameter>user</parameter></methodparam>
+   <methodparam><type>string</type><parameter>domain</parameter></methodparam>
+   <methodparam><type>string</type><parameter>password</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>gecos</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>apop</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/vpopmail/functions/vpopmail-alias-add.xml b/reference/vpopmail/functions/vpopmail-alias-add.xml
index ca7c73f090..8a8a0b89c2 100644
--- a/reference/vpopmail/functions/vpopmail-alias-add.xml
+++ b/reference/vpopmail/functions/vpopmail-alias-add.xml
@@ -1,25 +1,22 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<!-- splitted from ./en/functions/vpopmail.xml, last change in rev 1.1 -->
-  <refentry id="function.vpopmail-alias-add">
-   <refnamediv>
-    <refname>vpopmail_alias_add</refname>
-    <refpurpose>Insert a virtual alias</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>vpopmail_alias_add</methodname>
-      <methodparam><type>string</type><parameter>user</parameter></methodparam>
-      <methodparam><type>string</type><parameter>domain</parameter></methodparam>
-      <methodparam><type>string</type><parameter>alias</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.6 $ -->
+<refentry id="function.vpopmail-alias-add">
+ <refnamediv>
+  <refname>vpopmail_alias_add</refname>
+  <refpurpose>Insert a virtual alias</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>vpopmail_alias_add</methodname>
+   <methodparam><type>string</type><parameter>user</parameter></methodparam>
+   <methodparam><type>string</type><parameter>domain</parameter></methodparam>
+   <methodparam><type>string</type><parameter>alias</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/vpopmail/functions/vpopmail-alias-del-domain.xml b/reference/vpopmail/functions/vpopmail-alias-del-domain.xml
index 035b4d10cc..b5191964fe 100644
--- a/reference/vpopmail/functions/vpopmail-alias-del-domain.xml
+++ b/reference/vpopmail/functions/vpopmail-alias-del-domain.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<!-- splitted from ./en/functions/vpopmail.xml, last change in rev 1.1 -->
-  <refentry id="function.vpopmail-alias-del-domain">
-   <refnamediv>
-    <refname>vpopmail_alias_del_domain</refname>
-    <refpurpose>Deletes all virtual aliases of a domain</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>vpopmail_alias_del_domain</methodname>
-      <methodparam><type>string</type><parameter>domain</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.6 $ -->
+<refentry id="function.vpopmail-alias-del-domain">
+ <refnamediv>
+  <refname>vpopmail_alias_del_domain</refname>
+  <refpurpose>Deletes all virtual aliases of a domain</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>vpopmail_alias_del_domain</methodname>
+   <methodparam><type>string</type><parameter>domain</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/vpopmail/functions/vpopmail-alias-del.xml b/reference/vpopmail/functions/vpopmail-alias-del.xml
index c6eed954f1..1b83601f00 100644
--- a/reference/vpopmail/functions/vpopmail-alias-del.xml
+++ b/reference/vpopmail/functions/vpopmail-alias-del.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<!-- splitted from ./en/functions/vpopmail.xml, last change in rev 1.1 -->
-  <refentry id="function.vpopmail-alias-del">
-   <refnamediv>
-    <refname>vpopmail_alias_del</refname>
-    <refpurpose>Deletes all virtual aliases of a user</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>vpopmail_alias_del</methodname>
-      <methodparam><type>string</type><parameter>user</parameter></methodparam>
-      <methodparam><type>string</type><parameter>domain</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.6 $ -->
+<refentry id="function.vpopmail-alias-del">
+ <refnamediv>
+  <refname>vpopmail_alias_del</refname>
+  <refpurpose>Deletes all virtual aliases of a user</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>vpopmail_alias_del</methodname>
+   <methodparam><type>string</type><parameter>user</parameter></methodparam>
+   <methodparam><type>string</type><parameter>domain</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/vpopmail/functions/vpopmail-alias-get-all.xml b/reference/vpopmail/functions/vpopmail-alias-get-all.xml
index dd287682a2..9194f85d68 100644
--- a/reference/vpopmail/functions/vpopmail-alias-get-all.xml
+++ b/reference/vpopmail/functions/vpopmail-alias-get-all.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- splitted from ./en/functions/vpopmail.xml, last change in rev 1.1 -->
-  <refentry id="function.vpopmail-alias-get-all">
-   <refnamediv>
-    <refname>vpopmail_alias_get_all</refname>
-    <refpurpose>Get all lines of an alias for a domain</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>array</type><methodname>vpopmail_alias_get_all</methodname>
-      <methodparam><type>string</type><parameter>domain</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.vpopmail-alias-get-all">
+ <refnamediv>
+  <refname>vpopmail_alias_get_all</refname>
+  <refpurpose>Get all lines of an alias for a domain</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>array</type><methodname>vpopmail_alias_get_all</methodname>
+   <methodparam><type>string</type><parameter>domain</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/vpopmail/functions/vpopmail-alias-get.xml b/reference/vpopmail/functions/vpopmail-alias-get.xml
index f75dc4af4a..1beebd06af 100644
--- a/reference/vpopmail/functions/vpopmail-alias-get.xml
+++ b/reference/vpopmail/functions/vpopmail-alias-get.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- splitted from ./en/functions/vpopmail.xml, last change in rev 1.1 -->
-  <refentry id="function.vpopmail-alias-get">
-   <refnamediv>
-    <refname>vpopmail_alias_get</refname>
-    <refpurpose>Get all lines of an alias for a domain</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>array</type><methodname>vpopmail_alias_get</methodname>
-      <methodparam><type>string</type><parameter>alias</parameter></methodparam>
-      <methodparam><type>string</type><parameter>domain</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.vpopmail-alias-get">
+ <refnamediv>
+  <refname>vpopmail_alias_get</refname>
+  <refpurpose>Get all lines of an alias for a domain</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>array</type><methodname>vpopmail_alias_get</methodname>
+   <methodparam><type>string</type><parameter>alias</parameter></methodparam>
+   <methodparam><type>string</type><parameter>domain</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/vpopmail/functions/vpopmail-auth-user.xml b/reference/vpopmail/functions/vpopmail-auth-user.xml
index 2e8d46e87a..f0f0c9740c 100644
--- a/reference/vpopmail/functions/vpopmail-auth-user.xml
+++ b/reference/vpopmail/functions/vpopmail-auth-user.xml
@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<!-- splitted from ./en/functions/vpopmail.xml, last change in rev 1.1 -->
-  <refentry id="function.vpopmail-auth-user">
-   <refnamediv>
-    <refname>vpopmail_auth_user</refname>
-    <refpurpose>Attempt to validate a username/domain/password</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>vpopmail_auth_user</methodname>
-      <methodparam><type>string</type><parameter>user</parameter></methodparam>
-      <methodparam><type>string</type><parameter>domain</parameter></methodparam>
-      <methodparam><type>string</type><parameter>password</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>apop</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.6 $ -->
+<refentry id="function.vpopmail-auth-user">
+ <refnamediv>
+  <refname>vpopmail_auth_user</refname>
+  <refpurpose>Attempt to validate a username/domain/password</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>vpopmail_auth_user</methodname>
+   <methodparam><type>string</type><parameter>user</parameter></methodparam>
+   <methodparam><type>string</type><parameter>domain</parameter></methodparam>
+   <methodparam><type>string</type><parameter>password</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>apop</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/vpopmail/functions/vpopmail-del-domain-ex.xml b/reference/vpopmail/functions/vpopmail-del-domain-ex.xml
index 92f1b4b1c5..92e0d93a71 100644
--- a/reference/vpopmail/functions/vpopmail-del-domain-ex.xml
+++ b/reference/vpopmail/functions/vpopmail-del-domain-ex.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<!-- splitted from ./en/functions/vpopmail.xml, last change in rev 1.1 -->
-  <refentry id="function.vpopmail-del-domain-ex">
-   <refnamediv>
-    <refname>vpopmail_del_domain_ex</refname>
-    <refpurpose>Delete a virtual domain</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>vpopmail_del_domain_ex</methodname>
-      <methodparam><type>string</type><parameter>domain</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.5 $ -->
+<refentry id="function.vpopmail-del-domain-ex">
+ <refnamediv>
+  <refname>vpopmail_del_domain_ex</refname>
+  <refpurpose>Delete a virtual domain</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>vpopmail_del_domain_ex</methodname>
+   <methodparam><type>string</type><parameter>domain</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/vpopmail/functions/vpopmail-del-domain.xml b/reference/vpopmail/functions/vpopmail-del-domain.xml
index c1632ed90d..d14d9fc21d 100644
--- a/reference/vpopmail/functions/vpopmail-del-domain.xml
+++ b/reference/vpopmail/functions/vpopmail-del-domain.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<!-- splitted from ./en/functions/vpopmail.xml, last change in rev 1.1 -->
-  <refentry id="function.vpopmail-del-domain">
-   <refnamediv>
-    <refname>vpopmail_del_domain</refname>
-    <refpurpose>Delete a virtual domain</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>vpopmail_del_domain</methodname>
-      <methodparam><type>string</type><parameter>domain</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.5 $ -->
+<refentry id="function.vpopmail-del-domain">
+ <refnamediv>
+  <refname>vpopmail_del_domain</refname>
+  <refpurpose>Delete a virtual domain</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>vpopmail_del_domain</methodname>
+   <methodparam><type>string</type><parameter>domain</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/vpopmail/functions/vpopmail-del-user.xml b/reference/vpopmail/functions/vpopmail-del-user.xml
index 1ce2c6fb2b..f99dbea0a6 100644
--- a/reference/vpopmail/functions/vpopmail-del-user.xml
+++ b/reference/vpopmail/functions/vpopmail-del-user.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<!-- splitted from ./en/functions/vpopmail.xml, last change in rev 1.1 -->
-  <refentry id="function.vpopmail-del-user">
-   <refnamediv>
-    <refname>vpopmail_del_user</refname>
-    <refpurpose>Delete a user from a virtual domain</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>vpopmail_del_user</methodname>
-      <methodparam><type>string</type><parameter>user</parameter></methodparam>
-      <methodparam><type>string</type><parameter>domain</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.5 $ -->
+<refentry id="function.vpopmail-del-user">
+ <refnamediv>
+  <refname>vpopmail_del_user</refname>
+  <refpurpose>Delete a user from a virtual domain</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>vpopmail_del_user</methodname>
+   <methodparam><type>string</type><parameter>user</parameter></methodparam>
+   <methodparam><type>string</type><parameter>domain</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/vpopmail/functions/vpopmail-error.xml b/reference/vpopmail/functions/vpopmail-error.xml
index 9e3432a861..bcdf431766 100644
--- a/reference/vpopmail/functions/vpopmail-error.xml
+++ b/reference/vpopmail/functions/vpopmail-error.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<!-- splitted from ./en/functions/vpopmail.xml, last change in rev 1.1 -->
-  <refentry id="function.vpopmail-error">
-   <refnamediv>
-    <refname>vpopmail_error</refname>
-    <refpurpose>Get text message for last vpopmail error</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>string</type><methodname>vpopmail_error</methodname>
-      <void/>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.6 $ -->
+<refentry id="function.vpopmail-error">
+ <refnamediv>
+  <refname>vpopmail_error</refname>
+  <refpurpose>Get text message for last vpopmail error</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>string</type><methodname>vpopmail_error</methodname>
+   <void/>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/vpopmail/functions/vpopmail-passwd.xml b/reference/vpopmail/functions/vpopmail-passwd.xml
index 9f05c79a55..6eaaea2ac7 100644
--- a/reference/vpopmail/functions/vpopmail-passwd.xml
+++ b/reference/vpopmail/functions/vpopmail-passwd.xml
@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<!-- splitted from ./en/functions/vpopmail.xml, last change in rev 1.1 -->
-  <refentry id="function.vpopmail-passwd">
-   <refnamediv>
-    <refname>vpopmail_passwd</refname>
-    <refpurpose>Change a virtual user's password</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>vpopmail_passwd</methodname>
-      <methodparam><type>string</type><parameter>user</parameter></methodparam>
-      <methodparam><type>string</type><parameter>domain</parameter></methodparam>
-      <methodparam><type>string</type><parameter>password</parameter></methodparam>
-      <methodparam choice="opt"><type>bool</type><parameter>apop</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.6 $ -->
+<refentry id="function.vpopmail-passwd">
+ <refnamediv>
+  <refname>vpopmail_passwd</refname>
+  <refpurpose>Change a virtual user's password</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>vpopmail_passwd</methodname>
+   <methodparam><type>string</type><parameter>user</parameter></methodparam>
+   <methodparam><type>string</type><parameter>domain</parameter></methodparam>
+   <methodparam><type>string</type><parameter>password</parameter></methodparam>
+   <methodparam choice="opt"><type>bool</type><parameter>apop</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/vpopmail/functions/vpopmail-set-user-quota.xml b/reference/vpopmail/functions/vpopmail-set-user-quota.xml
index a50aa6abe1..5bf6ccbbac 100644
--- a/reference/vpopmail/functions/vpopmail-set-user-quota.xml
+++ b/reference/vpopmail/functions/vpopmail-set-user-quota.xml
@@ -1,25 +1,22 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<!-- splitted from ./en/functions/vpopmail.xml, last change in rev 1.1 -->
-  <refentry id="function.vpopmail-set-user-quota">
-   <refnamediv>
-    <refname>vpopmail_set_user_quota</refname>
-    <refpurpose>Sets a virtual user's quota</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>vpopmail_set_user_quota</methodname>
-      <methodparam><type>string</type><parameter>user</parameter></methodparam>
-      <methodparam><type>string</type><parameter>domain</parameter></methodparam>
-      <methodparam><type>string</type><parameter>quota</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.5 $ -->
+<refentry id="function.vpopmail-set-user-quota">
+ <refnamediv>
+  <refname>vpopmail_set_user_quota</refname>
+  <refpurpose>Sets a virtual user's quota</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>vpopmail_set_user_quota</methodname>
+   <methodparam><type>string</type><parameter>user</parameter></methodparam>
+   <methodparam><type>string</type><parameter>domain</parameter></methodparam>
+   <methodparam><type>string</type><parameter>quota</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/xmlrpc/functions/xmlrpc-decode-request.xml b/reference/xmlrpc/functions/xmlrpc-decode-request.xml
index c917c2b8af..5b9666eed1 100644
--- a/reference/xmlrpc/functions/xmlrpc-decode-request.xml
+++ b/reference/xmlrpc/functions/xmlrpc-decode-request.xml
@@ -1,25 +1,22 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
-<!-- splitted from ./en/functions/xmlrpc.xml, last change in rev 1.1 -->
-  <refentry id="function.xmlrpc-decode-request">
-   <refnamediv>
-    <refname>xmlrpc_decode_request</refname>
-    <refpurpose>Decodes XML into native PHP types</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>array</type><methodname>xmlrpc_decode_request</methodname>
-      <methodparam><type>string</type><parameter>xml</parameter></methodparam>
-      <methodparam><type>string</type><parameter role="reference">method</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.7 $ -->
+<refentry id="function.xmlrpc-decode-request">
+ <refnamediv>
+  <refname>xmlrpc_decode_request</refname>
+  <refpurpose>Decodes XML into native PHP types</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>array</type><methodname>xmlrpc_decode_request</methodname>
+   <methodparam><type>string</type><parameter>xml</parameter></methodparam>
+   <methodparam><type>string</type><parameter role="reference">method</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/xmlrpc/functions/xmlrpc-decode.xml b/reference/xmlrpc/functions/xmlrpc-decode.xml
index 1dc8d1ef38..e5210e670a 100644
--- a/reference/xmlrpc/functions/xmlrpc-decode.xml
+++ b/reference/xmlrpc/functions/xmlrpc-decode.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/xmlrpc.xml, last change in rev 1.1 -->
-  <refentry id="function.xmlrpc-decode">
-   <refnamediv>
-    <refname>xmlrpc_decode</refname>
-    <refpurpose>Decodes XML into native PHP types</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>array</type><methodname>xmlrpc_decode</methodname>
-      <methodparam><type>string</type><parameter>xml</parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.xmlrpc-decode">
+ <refnamediv>
+  <refname>xmlrpc_decode</refname>
+  <refpurpose>Decodes XML into native PHP types</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>array</type><methodname>xmlrpc_decode</methodname>
+   <methodparam><type>string</type><parameter>xml</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/xmlrpc/functions/xmlrpc-encode-request.xml b/reference/xmlrpc/functions/xmlrpc-encode-request.xml
index fccc7df890..664fcc116c 100644
--- a/reference/xmlrpc/functions/xmlrpc-encode-request.xml
+++ b/reference/xmlrpc/functions/xmlrpc-encode-request.xml
@@ -1,25 +1,22 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- splitted from ./en/functions/xmlrpc.xml, last change in rev 1.1 -->
-  <refentry id="function.xmlrpc-encode-request">
-   <refnamediv>
-    <refname>xmlrpc_encode_request</refname>
-    <refpurpose>Generates XML for a method request</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>string</type><methodname>xmlrpc_encode_request</methodname>
-      <methodparam><type>string</type><parameter>method</parameter></methodparam>
-      <methodparam><type>mixed</type><parameter>params</parameter></methodparam>
-      <methodparam choice="opt"><type>array</type><parameter>output_options</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.xmlrpc-encode-request">
+ <refnamediv>
+  <refname>xmlrpc_encode_request</refname>
+  <refpurpose>Generates XML for a method request</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>string</type><methodname>xmlrpc_encode_request</methodname>
+   <methodparam><type>string</type><parameter>method</parameter></methodparam>
+   <methodparam><type>mixed</type><parameter>params</parameter></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter>output_options</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/xmlrpc/functions/xmlrpc-encode.xml b/reference/xmlrpc/functions/xmlrpc-encode.xml
index 5ddb0b7c8b..534b82f155 100644
--- a/reference/xmlrpc/functions/xmlrpc-encode.xml
+++ b/reference/xmlrpc/functions/xmlrpc-encode.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/xmlrpc.xml, last change in rev 1.1 -->
-  <refentry id="function.xmlrpc-encode">
-   <refnamediv>
-    <refname>xmlrpc_encode</refname>
-    <refpurpose>Generates XML for a PHP value</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>string</type><methodname>xmlrpc_encode</methodname>
-      <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.xmlrpc-encode">
+ <refnamediv>
+  <refname>xmlrpc_encode</refname>
+  <refpurpose>Generates XML for a PHP value</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>string</type><methodname>xmlrpc_encode</methodname>
+   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/xmlrpc/functions/xmlrpc-get-type.xml b/reference/xmlrpc/functions/xmlrpc-get-type.xml
index 9a533b605e..836dfd8d5e 100644
--- a/reference/xmlrpc/functions/xmlrpc-get-type.xml
+++ b/reference/xmlrpc/functions/xmlrpc-get-type.xml
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- splitted from ./en/functions/xmlrpc.xml, last change in rev 1.1 -->
-  <refentry id="function.xmlrpc-get-type">
-   <refnamediv>
-    <refname>xmlrpc_get_type</refname>
-    <refpurpose>Gets xmlrpc type for a PHP value</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>string</type><methodname>xmlrpc_get_type</methodname>
-      <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     This function is especially useful for base64 and datetime strings.
-    </para>
-    &warn.undocumented.func;
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.xmlrpc-get-type">
+ <refnamediv>
+  <refname>xmlrpc_get_type</refname>
+  <refpurpose>Gets xmlrpc type for a PHP value</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>string</type><methodname>xmlrpc_get_type</methodname>
+   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  <para>
+   This function is especially useful for base64 and datetime strings.
+  </para>
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/xmlrpc/functions/xmlrpc-is-fault.xml b/reference/xmlrpc/functions/xmlrpc-is-fault.xml
index b1bfa1da8c..b04ef2fd25 100644
--- a/reference/xmlrpc/functions/xmlrpc-is-fault.xml
+++ b/reference/xmlrpc/functions/xmlrpc-is-fault.xml
@@ -1,25 +1,22 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.3 $ -->
-  <refentry id="function.xmlrpc-is-fault">
-   <refnamediv>
-    <refname>xmlrpc_is_fault</refname>
-    <refpurpose>
-     Determines if an array value represents an XMLRPC fault
-    </refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-    <methodsynopsis>
-     <type>bool</type><methodname>xmlrpc_is_fault</methodname>
-     <methodparam><type>array</type><parameter>arg</parameter></methodparam>
-    </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.xmlrpc-is-fault">
+ <refnamediv>
+  <refname>xmlrpc_is_fault</refname>
+  <refpurpose>
+   Determines if an array value represents an XMLRPC fault
+ </refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>xmlrpc_is_fault</methodname>
+   <methodparam><type>array</type><parameter>arg</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/xmlrpc/functions/xmlrpc-parse-method-descriptions.xml b/reference/xmlrpc/functions/xmlrpc-parse-method-descriptions.xml
index 0186a1b501..c8fa8d22ea 100644
--- a/reference/xmlrpc/functions/xmlrpc-parse-method-descriptions.xml
+++ b/reference/xmlrpc/functions/xmlrpc-parse-method-descriptions.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/xmlrpc.xml, last change in rev 1.1 -->
-  <refentry id="function.xmlrpc-parse-method-descriptions">
-   <refnamediv>
-    <refname>xmlrpc_parse_method_descriptions</refname>
-    <refpurpose>Decodes XML into a list of method descriptions</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>array</type><methodname>xmlrpc_parse_method_descriptions</methodname>
-      <methodparam><type>string</type><parameter>xml</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.xmlrpc-parse-method-descriptions">
+ <refnamediv>
+  <refname>xmlrpc_parse_method_descriptions</refname>
+  <refpurpose>Decodes XML into a list of method descriptions</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>array</type><methodname>xmlrpc_parse_method_descriptions</methodname>
+   <methodparam><type>string</type><parameter>xml</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/xmlrpc/functions/xmlrpc-server-add-introspection-data.xml b/reference/xmlrpc/functions/xmlrpc-server-add-introspection-data.xml
index 723c571a8c..377644e911 100644
--- a/reference/xmlrpc/functions/xmlrpc-server-add-introspection-data.xml
+++ b/reference/xmlrpc/functions/xmlrpc-server-add-introspection-data.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/xmlrpc.xml, last change in rev 1.1 -->
-  <refentry id="function.xmlrpc-server-add-introspection-data">
-   <refnamediv>
-    <refname>xmlrpc_server_add_introspection_data</refname>
-    <refpurpose>Adds introspection documentation</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>int</type><methodname>xmlrpc_server_add_introspection_data</methodname>
-      <methodparam><type>resource</type><parameter>server</parameter></methodparam>
-      <methodparam><type>array</type><parameter>desc</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.xmlrpc-server-add-introspection-data">
+ <refnamediv>
+  <refname>xmlrpc_server_add_introspection_data</refname>
+  <refpurpose>Adds introspection documentation</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>int</type><methodname>xmlrpc_server_add_introspection_data</methodname>
+   <methodparam><type>resource</type><parameter>server</parameter></methodparam>
+   <methodparam><type>array</type><parameter>desc</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/xmlrpc/functions/xmlrpc-server-call-method.xml b/reference/xmlrpc/functions/xmlrpc-server-call-method.xml
index 904445586f..a325047bc1 100644
--- a/reference/xmlrpc/functions/xmlrpc-server-call-method.xml
+++ b/reference/xmlrpc/functions/xmlrpc-server-call-method.xml
@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- splitted from ./en/functions/xmlrpc.xml, last change in rev 1.1 -->
-  <refentry id="function.xmlrpc-server-call-method">
-   <refnamediv>
-    <refname>xmlrpc_server_call_method</refname>
-    <refpurpose>Parses XML requests and call methods</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>string</type><methodname>xmlrpc_server_call_method</methodname>
-      <methodparam><type>resource</type><parameter>server</parameter></methodparam>
-      <methodparam><type>string</type><parameter>xml</parameter></methodparam>
-      <methodparam><type>mixed</type><parameter>user_data</parameter></methodparam>
-      <methodparam choice="opt"><type>array</type><parameter>output_options</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.xmlrpc-server-call-method">
+ <refnamediv>
+  <refname>xmlrpc_server_call_method</refname>
+  <refpurpose>Parses XML requests and call methods</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>string</type><methodname>xmlrpc_server_call_method</methodname>
+   <methodparam><type>resource</type><parameter>server</parameter></methodparam>
+   <methodparam><type>string</type><parameter>xml</parameter></methodparam>
+   <methodparam><type>mixed</type><parameter>user_data</parameter></methodparam>
+   <methodparam choice="opt"><type>array</type><parameter>output_options</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/xmlrpc/functions/xmlrpc-server-create.xml b/reference/xmlrpc/functions/xmlrpc-server-create.xml
index eda154b09c..8149f0bba7 100644
--- a/reference/xmlrpc/functions/xmlrpc-server-create.xml
+++ b/reference/xmlrpc/functions/xmlrpc-server-create.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/xmlrpc.xml, last change in rev 1.1 -->
-  <refentry id="function.xmlrpc-server-create">
-   <refnamediv>
-    <refname>xmlrpc_server_create</refname>
-    <refpurpose>Creates an xmlrpc server</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>resource</type><methodname>xmlrpc_server_create</methodname>
-      <void/>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.xmlrpc-server-create">
+ <refnamediv>
+  <refname>xmlrpc_server_create</refname>
+  <refpurpose>Creates an xmlrpc server</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>resource</type><methodname>xmlrpc_server_create</methodname>
+   <void/>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/xmlrpc/functions/xmlrpc-server-destroy.xml b/reference/xmlrpc/functions/xmlrpc-server-destroy.xml
index 9d1970e0bc..35539a808c 100644
--- a/reference/xmlrpc/functions/xmlrpc-server-destroy.xml
+++ b/reference/xmlrpc/functions/xmlrpc-server-destroy.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- splitted from ./en/functions/xmlrpc.xml, last change in rev 1.1 -->
-  <refentry id="function.xmlrpc-server-destroy">
-   <refnamediv>
-    <refname>xmlrpc_server_destroy</refname>
-    <refpurpose>Destroys server resources</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>int</type><methodname>xmlrpc_server_destroy</methodname>
-      <methodparam><type>resource</type><parameter>server</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.4 $ -->
+<refentry id="function.xmlrpc-server-destroy">
+ <refnamediv>
+  <refname>xmlrpc_server_destroy</refname>
+  <refpurpose>Destroys server resources</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>int</type><methodname>xmlrpc_server_destroy</methodname>
+   <methodparam><type>resource</type><parameter>server</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/xmlrpc/functions/xmlrpc-server-register-introspection-callback.xml b/reference/xmlrpc/functions/xmlrpc-server-register-introspection-callback.xml
index 43d5cb975d..6ba4799eef 100644
--- a/reference/xmlrpc/functions/xmlrpc-server-register-introspection-callback.xml
+++ b/reference/xmlrpc/functions/xmlrpc-server-register-introspection-callback.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/xmlrpc.xml, last change in rev 1.1 -->
-  <refentry id="function.xmlrpc-server-register-introspection-callback">
-   <refnamediv>
-    <refname>xmlrpc_server_register_introspection_callback</refname>
-    <refpurpose>Register a PHP function to generate documentation</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>xmlrpc_server_register_introspection_callback</methodname>
-      <methodparam><type>resource</type><parameter>server</parameter></methodparam>
-      <methodparam><type>string</type><parameter>function</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.xmlrpc-server-register-introspection-callback">
+ <refnamediv>
+  <refname>xmlrpc_server_register_introspection_callback</refname>
+  <refpurpose>Register a PHP function to generate documentation</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>xmlrpc_server_register_introspection_callback</methodname>
+   <methodparam><type>resource</type><parameter>server</parameter></methodparam>
+   <methodparam><type>string</type><parameter>function</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/xmlrpc/functions/xmlrpc-server-register-method.xml b/reference/xmlrpc/functions/xmlrpc-server-register-method.xml
index 9314327410..e33e97125d 100644
--- a/reference/xmlrpc/functions/xmlrpc-server-register-method.xml
+++ b/reference/xmlrpc/functions/xmlrpc-server-register-method.xml
@@ -1,25 +1,22 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- splitted from ./en/functions/xmlrpc.xml, last change in rev 1.1 -->
-  <refentry id="function.xmlrpc-server-register-method">
-   <refnamediv>
-    <refname>xmlrpc_server_register_method</refname>
-    <refpurpose>Register a PHP function to resource method matching method_name</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>xmlrpc_server_register_method</methodname>
-      <methodparam><type>resource</type><parameter>server</parameter></methodparam>
-      <methodparam><type>string</type><parameter>method_name</parameter></methodparam>
-      <methodparam><type>string</type><parameter>function</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.3 $ -->
+<refentry id="function.xmlrpc-server-register-method">
+ <refnamediv>
+  <refname>xmlrpc_server_register_method</refname>
+  <refpurpose>Register a PHP function to resource method matching method_name</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>xmlrpc_server_register_method</methodname>
+   <methodparam><type>resource</type><parameter>server</parameter></methodparam>
+   <methodparam><type>string</type><parameter>method_name</parameter></methodparam>
+   <methodparam><type>string</type><parameter>function</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/xmlrpc/functions/xmlrpc-set-type.xml b/reference/xmlrpc/functions/xmlrpc-set-type.xml
index b88b5b04c8..de44e8e497 100644
--- a/reference/xmlrpc/functions/xmlrpc-set-type.xml
+++ b/reference/xmlrpc/functions/xmlrpc-set-type.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<!-- splitted from ./en/functions/xmlrpc.xml, last change in rev 1.1 -->
-  <refentry id="function.xmlrpc-set-type">
-   <refnamediv>
-    <refname>xmlrpc_set_type</refname>
-    <refpurpose>Sets xmlrpc type, base64 or datetime, for a PHP string value</refpurpose>
-   </refnamediv>
-   <refsect1>
-    <title>Description</title>
-     <methodsynopsis>
-      <type>bool</type><methodname>xmlrpc_set_type</methodname>
-      <methodparam><type>string</type><parameter role="reference">value</parameter></methodparam>
-      <methodparam><type>string</type><parameter>type</parameter></methodparam>
-     </methodsynopsis>
-     &warn.experimental.func;
-    <para>
-     &warn.undocumented.func;
-    </para>
-   </refsect1>
-  </refentry>
+<!-- $Revision: 1.5 $ -->
+<refentry id="function.xmlrpc-set-type">
+ <refnamediv>
+  <refname>xmlrpc_set_type</refname>
+  <refpurpose>Sets xmlrpc type, base64 or datetime, for a PHP string value</refpurpose>
+ </refnamediv>
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>bool</type><methodname>xmlrpc_set_type</methodname>
+   <methodparam><type>string</type><parameter role="reference">value</parameter></methodparam>
+   <methodparam><type>string</type><parameter>type</parameter></methodparam>
+  </methodsynopsis>
+  &warn.experimental.func;
+  &warn.undocumented.func;
+ </refsect1>
+</refentry>
 
 <!-- Keep this comment at the end of the file
 Local variables: