diff --git a/reference/array/functions/extract.xml b/reference/array/functions/extract.xml
index 8ccd11613f..38192ef021 100644
--- a/reference/array/functions/extract.xml
+++ b/reference/array/functions/extract.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.extract">
    <refnamediv>
@@ -33,7 +33,7 @@
     </note>
     <note>
      <para>
-      <constant>EXTR_IF_EXISTS</constant> and <constant>EXTR_PREFIX_IF_EXISTS</constant> was introduced in version 4.2.0.
+      <constant>EXTR_IF_EXISTS</constant> and <constant>EXTR_PREFIX_IF_EXISTS</constant> were introduced in version 4.2.0.
      </para>
     </note>
     <note>
@@ -149,14 +149,17 @@
     </para>
     <warning>
      <para>
-      Do not use extract on untrusted data, like user-input ($_GET, ...).
-      If you do it, for example if you want to run old code that relies on
+      Do not use <function>extract</function> on untrusted data, like
+      user-input ($_GET, ...). If you do, for example, if you want to run old
+      code that relies on
       <link linkend="security.registerglobals">register_globals</link>
       temporarily, make sure you use one of the non-overwriting 
-      <parameter>extract_type</parameter> values like EXTR_SKIP, and be aware 
-      that you should now extract <varname>$_SERVER</varname>, 
-      <varname>$_SESSION</varname>, <varname>$_COOKIE</varname>, 
-      <varname>$_POST</varname> and <varname>$_GET</varname> in that order.
+      <parameter>extract_type</parameter> values like <constant>EXTR_SKIP</constant>
+      and be aware that you should extract <varname>$_GET</varname>, 
+      <varname>$_POST</varname>, <varname>$_COOKIE</varname>, 
+      <varname>$_SESSION</varname> and <varname>$_SERVER</varname> in that order
+      when using an overwriting <parameter>extract_type</parameter> or in
+      reverse order when using a non-overwriting type.
      </para>
     </warning>
     <para>
diff --git a/reference/hwapi/functions/hwapi-attribute-key.xml b/reference/hwapi/functions/hwapi-attribute-key.xml
index 71d10fe03a..9a8acb04c4 100644
--- a/reference/hwapi/functions/hwapi-attribute-key.xml
+++ b/reference/hwapi/functions/hwapi-attribute-key.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1' ?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/hwapi.xml, last change in rev 1.1 -->
   <refentry id="function.hwapi-attribute-key">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
     <methodsynopsis>
      <type>string</type><methodname>key</methodname>
-     <methodparam><type>void</type><parameter></parameter></methodparam>
+     <void/>
     </methodsynopsis>
     <para>
      Returns the name of the attribute.
diff --git a/reference/hwapi/functions/hwapi-attribute-value.xml b/reference/hwapi/functions/hwapi-attribute-value.xml
index 0c3410d500..79a986db70 100644
--- a/reference/hwapi/functions/hwapi-attribute-value.xml
+++ b/reference/hwapi/functions/hwapi-attribute-value.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1' ?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/hwapi.xml, last change in rev 1.1 -->
   <refentry id="function.hwapi-attribute-value">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
     <methodsynopsis>
      <type>string</type><methodname>value</methodname>
-     <methodparam><type>void</type><parameter></parameter></methodparam>
+     <void/>
     </methodsynopsis>
     <para>
      Returns the value of the attribute.
diff --git a/reference/hwapi/functions/hwapi-attribute-values.xml b/reference/hwapi/functions/hwapi-attribute-values.xml
index 2d48d56dc0..ae26d8b1b8 100644
--- a/reference/hwapi/functions/hwapi-attribute-values.xml
+++ b/reference/hwapi/functions/hwapi-attribute-values.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1' ?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/hwapi.xml, last change in rev 1.1 -->
   <refentry id="function.hwapi-attribute-values">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
     <methodsynopsis>
      <type>array</type><methodname>values</methodname>
-     <methodparam><type>void</type><parameter></parameter></methodparam>
+     <void/>
     </methodsynopsis>
     <para>
      Returns all values of the attribute as an array of strings.
diff --git a/reference/hwapi/functions/hwapi-content-mimetype.xml b/reference/hwapi/functions/hwapi-content-mimetype.xml
index 72802104ac..78f2245fec 100644
--- a/reference/hwapi/functions/hwapi-content-mimetype.xml
+++ b/reference/hwapi/functions/hwapi-content-mimetype.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1' ?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/hwapi.xml, last change in rev 1.1 -->
   <refentry id="function.hwapi-content-mimetype">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
     <methodsynopsis>
      <type>string</type><methodname>mimetype</methodname>
-     <methodparam><type>void</type><parameter></parameter></methodparam>
+     <void/>
     </methodsynopsis>
     <para>
      Returns the mimetype of the content.
diff --git a/reference/hwapi/functions/hwapi-error-count.xml b/reference/hwapi/functions/hwapi-error-count.xml
index ad794872d2..cd4ac4a353 100644
--- a/reference/hwapi/functions/hwapi-error-count.xml
+++ b/reference/hwapi/functions/hwapi-error-count.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1' ?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/hwapi.xml, last change in rev 1.1 -->
   <refentry id="function.hwapi-error-count">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
     <methodsynopsis>
      <type>int</type><methodname>count</methodname>
-     <methodparam><type>void</type><parameter></parameter></methodparam>
+     <void/>
     </methodsynopsis>
     <para>
      Returns the number of error reasons.
diff --git a/reference/hwapi/functions/hwapi-error-reason.xml b/reference/hwapi/functions/hwapi-error-reason.xml
index 4b67a32b06..38b05a4ad9 100644
--- a/reference/hwapi/functions/hwapi-error-reason.xml
+++ b/reference/hwapi/functions/hwapi-error-reason.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1' ?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/hwapi.xml, last change in rev 1.1 -->
   <refentry id="function.hwapi-error-reason">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
     <methodsynopsis>
      <type>object</type><methodname>reason</methodname>
-     <methodparam><type>void</type><parameter></parameter></methodparam>
+     <void/>
     </methodsynopsis>
     <para>
      Returns the first error reason.
diff --git a/reference/hwapi/functions/hwapi-reason-description.xml b/reference/hwapi/functions/hwapi-reason-description.xml
index 5eebb08daf..5b1386bc3f 100644
--- a/reference/hwapi/functions/hwapi-reason-description.xml
+++ b/reference/hwapi/functions/hwapi-reason-description.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1' ?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/hwapi.xml, last change in rev 1.1 -->
   <refentry id="function.hwapi-reason-description">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
     <methodsynopsis>
      <type>string</type><methodname>description</methodname>
-     <methodparam><type>void</type><parameter></parameter></methodparam>
+     <void/>
     </methodsynopsis>
     <para>
      Returns the description of a reason
diff --git a/reference/hwapi/functions/hwapi-reason-type.xml b/reference/hwapi/functions/hwapi-reason-type.xml
index 1e2ee97ee2..82f3fe5f14 100644
--- a/reference/hwapi/functions/hwapi-reason-type.xml
+++ b/reference/hwapi/functions/hwapi-reason-type.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1' ?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/hwapi.xml, last change in rev 1.1 -->
   <refentry id="function.hwapi-reason-type">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
     <methodsynopsis>
      <type>object</type><methodname>type</methodname>
-     <methodparam><type>void</type><parameter></parameter></methodparam>
+     <void/>
     </methodsynopsis>
     <para>
      Returns the type of a reason.
diff --git a/reference/soap/functions/SoapClient-getFunctions.xml b/reference/soap/functions/SoapClient-getFunctions.xml
index 7081976784..5f47b27183 100644
--- a/reference/soap/functions/SoapClient-getFunctions.xml
+++ b/reference/soap/functions/SoapClient-getFunctions.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
   <refentry id="function.SoapClient-getFunctions">
    <refnamediv>
     <refname>SoapClient::__getFunctions</refname>
@@ -11,7 +11,7 @@
     <title>Description</title>
     <methodsynopsis>
      <type>array</type><methodname>SoapClient::__getFunctions</methodname>
-     <methodparam><type>void</type><parameter></parameter></methodparam>
+     <void/>
     </methodsynopsis>
     <para>
      This function works only in WSDL mode.
diff --git a/reference/soap/functions/SoapClient-getLastRequest.xml b/reference/soap/functions/SoapClient-getLastRequest.xml
index 1d413f83fa..c72a86f719 100644
--- a/reference/soap/functions/SoapClient-getLastRequest.xml
+++ b/reference/soap/functions/SoapClient-getLastRequest.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
   <refentry id="function.SoapClient-getLastRequest">
    <refnamediv>
     <refname>SoapClient::__getLastRequest</refname>
@@ -11,7 +11,7 @@
     <title>Description</title>
     <methodsynopsis>
      <type>string</type><methodname>SoapClient::__getLastRequest</methodname>
-     <methodparam><type>void</type><parameter></parameter></methodparam>
+     <void/>
     </methodsynopsis>
     <para>
      This function works only with SoapClient which was created with
diff --git a/reference/soap/functions/SoapClient-getLastResponse.xml b/reference/soap/functions/SoapClient-getLastResponse.xml
index cabb6a8f2b..fe96eb213f 100644
--- a/reference/soap/functions/SoapClient-getLastResponse.xml
+++ b/reference/soap/functions/SoapClient-getLastResponse.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
   <refentry id="function.SoapClient-getLastResponse">
    <refnamediv>
     <refname>SoapClient::__getLastResponse</refname>
@@ -11,7 +11,7 @@
     <title>Description</title>
     <methodsynopsis>
      <type>object</type><methodname>SoapClient::__getLastResponse</methodname>
-     <methodparam><type>void</type><parameter></parameter></methodparam>
+     <void/>
     </methodsynopsis>
     <para>
      This function works only with SoapClient which was created with
diff --git a/reference/soap/functions/SoapClient-getTypes.xml b/reference/soap/functions/SoapClient-getTypes.xml
index 9caa2feddd..0ce3421643 100644
--- a/reference/soap/functions/SoapClient-getTypes.xml
+++ b/reference/soap/functions/SoapClient-getTypes.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
   <refentry id="function.SoapClient-getTypes">
    <refnamediv>
     <refname>SoapClient::__getTypes</refname>
@@ -11,7 +11,7 @@
     <title>Description</title>
     <methodsynopsis>
      <type>array</type><methodname>SoapClient::__getTypes</methodname>
-     <methodparam><type>void</type><parameter></parameter></methodparam>
+     <void/>
     </methodsynopsis>
     <para>
      This function works only in WSDL mode.
diff --git a/reference/soap/functions/SoapServer-getFunctions.xml b/reference/soap/functions/SoapServer-getFunctions.xml
index fe834229cb..2c999afeb7 100644
--- a/reference/soap/functions/SoapServer-getFunctions.xml
+++ b/reference/soap/functions/SoapServer-getFunctions.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
   <refentry id="function.SoapServer-getFunctions">
    <refnamediv>
     <refname>SoapServer::getFunctions</refname>
@@ -11,7 +11,7 @@
     <title>Description</title>
     <methodsynopsis>
      <type>array</type><methodname>SoapServer::getFunctions</methodname>
-     <methodparam><type>void</type><parameter></parameter></methodparam>
+     <void/>
     </methodsynopsis>
     <para>
      This functions returns the list of all functions which was added by