diff --git a/language/predefined/variables/argc.xml b/language/predefined/variables/argc.xml
index 47e74c8ae2..9f4854cf3b 100644
--- a/language/predefined/variables/argc.xml
+++ b/language/predefined/variables/argc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 
-<refentry xml:id="reserved.variables.argc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
+<phpdoc:varentry xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="reserved.variables.argc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
  <refnamediv>
   <refname>$argc</refname>
   <refpurpose>The number of arguments passed to script</refpurpose>
@@ -52,7 +52,7 @@ int(4)
   </para>
  </refsect1>
  
-</refentry>
+</phpdoc:varentry>
  
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/language/predefined/variables/argv.xml b/language/predefined/variables/argv.xml
index 7dd6ee0177..21646e6e42 100644
--- a/language/predefined/variables/argv.xml
+++ b/language/predefined/variables/argv.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 
-<refentry xml:id="reserved.variables.argv" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
+<phpdoc:varentry xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="reserved.variables.argv" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
  <refnamediv>
   <refname>$argv</refname>
   <refpurpose>Array of arguments passed to script</refpurpose>
@@ -61,7 +61,7 @@ array(4) {
   </para>
  </refsect1>
  
-</refentry>
+</phpdoc:varentry>
  
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/language/predefined/variables/cookie.xml b/language/predefined/variables/cookie.xml
index 981689b57b..362397499e 100644
--- a/language/predefined/variables/cookie.xml
+++ b/language/predefined/variables/cookie.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 
-<refentry xml:id="reserved.variables.cookies" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
+<phpdoc:varentry xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="reserved.variables.cookies" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
  <refnamediv>
   <refname>$_COOKIE</refname>
   <refname>$HTTP_COOKIE_VARS [deprecated]</refname>
@@ -91,7 +91,7 @@ Hello Hannes!
   </para>
  </refsect1>
 
-</refentry>
+</phpdoc:varentry>
  
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/language/predefined/variables/env.xml b/language/predefined/variables/env.xml
index 1118b6e14d..fcaa3f9ed1 100644
--- a/language/predefined/variables/env.xml
+++ b/language/predefined/variables/env.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 
-<refentry xml:id="reserved.variables.environment" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
+<phpdoc:varentry xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="reserved.variables.environment" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
  <refnamediv>
   <refname>$_ENV</refname>
   <refname>$HTTP_ENV_VARS [deprecated]</refname>
@@ -105,7 +105,7 @@ My username is bjori!
   </para>
  </refsect1>
 
-</refentry>
+</phpdoc:varentry>
  
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/language/predefined/variables/files.xml b/language/predefined/variables/files.xml
index 4d0ee12a23..3902b87d12 100644
--- a/language/predefined/variables/files.xml
+++ b/language/predefined/variables/files.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 
-<refentry xml:id="reserved.variables.files" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
+<phpdoc:varentry xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="reserved.variables.files" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
  <refnamediv>
   <refname>$_FILES</refname>
   <refname>$HTTP_POST_FILES [deprecated]</refname>
@@ -65,7 +65,7 @@
   </para>
  </refsect1>
 
-</refentry>
+</phpdoc:varentry>
  
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/language/predefined/variables/get.xml b/language/predefined/variables/get.xml
index 6071d6fa14..86e6a9081e 100644
--- a/language/predefined/variables/get.xml
+++ b/language/predefined/variables/get.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 
-<refentry xml:id="reserved.variables.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
+<phpdoc:varentry xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="reserved.variables.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
  <refnamediv>
   <refname>$_GET</refname>
   <refname>$HTTP_GET_VARS [deprecated]</refname>
@@ -90,7 +90,7 @@ Hello Hannes!
   </para>
  </refsect1>
 
-</refentry>
+</phpdoc:varentry>
  
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/language/predefined/variables/globals.xml b/language/predefined/variables/globals.xml
index ed1886ace3..05d7920f32 100644
--- a/language/predefined/variables/globals.xml
+++ b/language/predefined/variables/globals.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 
-<refentry xml:id="reserved.variables.globals" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
+<phpdoc:varentry xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="reserved.variables.globals" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
  <refnamediv>
   <refname>$GLOBALS</refname>
   <refpurpose>References all variables available in global scope</refpurpose>
@@ -59,7 +59,7 @@ $foo in current scope: local variable
   </note>
  </refsect1>
  
-</refentry>
+</phpdoc:varentry>
  
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/language/predefined/variables/httprawpostdata.xml b/language/predefined/variables/httprawpostdata.xml
index d7b8d26868..96ccbf5021 100644
--- a/language/predefined/variables/httprawpostdata.xml
+++ b/language/predefined/variables/httprawpostdata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 
-<refentry xml:id="reserved.variables.httprawpostdata" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
+<phpdoc:varentry xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="reserved.variables.httprawpostdata" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
  <refnamediv>
   <refname>$HTTP_RAW_POST_DATA</refname>
   <refpurpose>Raw POST data</refpurpose>
@@ -14,7 +14,7 @@
    See <link linkend="ini.always-populate-raw-post-data">always_populate_raw_post_data</link>
   </para>
  </refsect1>
-</refentry>
+</phpdoc:varentry>
  
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/language/predefined/variables/httpresponseheader.xml b/language/predefined/variables/httpresponseheader.xml
index 167394379c..7fbac8b76c 100644
--- a/language/predefined/variables/httpresponseheader.xml
+++ b/language/predefined/variables/httpresponseheader.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 
-<refentry xml:id="reserved.variables.httpresponseheader" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
+<phpdoc:varentry xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="reserved.variables.httpresponseheader" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
  <refnamediv>
   <refname>$http_response_header</refname>
   <refpurpose>HTTP response headers</refpurpose>
@@ -60,7 +60,7 @@ array(9) {
   </para>
  </refsect1>
  
-</refentry>
+</phpdoc:varentry>
  
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/language/predefined/variables/phperrormsg.xml b/language/predefined/variables/phperrormsg.xml
index a3e542234d..3c90f9eb4f 100644
--- a/language/predefined/variables/phperrormsg.xml
+++ b/language/predefined/variables/phperrormsg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 
-<refentry xml:id="reserved.variables.phperrormsg" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
+<phpdoc:varentry xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="reserved.variables.phperrormsg" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
  <refnamediv>
   <refname>$php_errormsg</refname>
   <refpurpose>The previous error message</refpurpose>
@@ -55,7 +55,7 @@ Wrong parameter count for strpos()
   </para>
  </refsect1>
  
-</refentry>
+</phpdoc:varentry>
  
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/language/predefined/variables/post.xml b/language/predefined/variables/post.xml
index 77df0cf8e1..00fb015792 100644
--- a/language/predefined/variables/post.xml
+++ b/language/predefined/variables/post.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 
-<refentry xml:id="reserved.variables.post" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
+<phpdoc:varentry xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="reserved.variables.post" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
  <refnamediv>
   <refname>$_POST</refname>
   <refname>$HTTP_POST_VARS [deprecated]</refname>
@@ -90,7 +90,7 @@ Hello Hannes!
   </para>
  </refsect1>
 
-</refentry>
+</phpdoc:varentry>
  
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/language/predefined/variables/request.xml b/language/predefined/variables/request.xml
index f52e46216d..c5aaf8e947 100644
--- a/language/predefined/variables/request.xml
+++ b/language/predefined/variables/request.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 
-<refentry xml:id="reserved.variables.request" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
+<phpdoc:varentry xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="reserved.variables.request" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
  <refnamediv>
   <refname>$_REQUEST</refname>
   <refpurpose>HTTP Request variables</refpurpose>
@@ -89,7 +89,7 @@
   </simplelist>
  </refsect1>
  
-</refentry>
+</phpdoc:varentry>
  
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/language/predefined/variables/server.xml b/language/predefined/variables/server.xml
index 3871c8a333..5719470df0 100644
--- a/language/predefined/variables/server.xml
+++ b/language/predefined/variables/server.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 
-<refentry xml:id="reserved.variables.server" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
+<phpdoc:varentry xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="reserved.variables.server" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
  <refnamediv>
   <refname>$_SERVER</refname>
   <refname>$HTTP_SERVER_VARS [deprecated]</refname>
@@ -533,7 +533,7 @@ www.example.com
   </para>
  </refsect1>
 
-</refentry>
+</phpdoc:varentry>
  
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/language/predefined/variables/session.xml b/language/predefined/variables/session.xml
index 4ad44f3921..00985471fc 100644
--- a/language/predefined/variables/session.xml
+++ b/language/predefined/variables/session.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 
-<refentry xml:id="reserved.variables.session" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
+<phpdoc:varentry xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="reserved.variables.session" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
  <refnamediv>
   <refname>$_SESSION</refname>
   <refname>$HTTP_SESSION_VARS [deprecated]</refname>
@@ -64,7 +64,7 @@
   </para>
  </refsect1>
 
-</refentry>
+</phpdoc:varentry>
  
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/language/predefined/variables/superglobals.xml b/language/predefined/variables/superglobals.xml
index 2cafe77b2f..5e87a213f0 100644
--- a/language/predefined/variables/superglobals.xml
+++ b/language/predefined/variables/superglobals.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 
-<refentry xml:id="language.variables.superglobals" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
+<phpdoc:varentry xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="language.variables.superglobals" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" role="noversion">
  <refnamediv>
   <refname>Superglobals</refname>
   <refpurpose>Superglobals are built-in variables that are always available in all scopes</refpurpose>
@@ -100,7 +100,7 @@
   </para>
  </refsect1>
 
-</refentry>
+</phpdoc:varentry>
  
 <!-- Keep this comment at the end of the file
 Local variables: