diff --git a/internals/tsrm/functions/tsrm_error.xml b/internals/tsrm/functions/tsrm_error.xml
index fabd0c85bb..b5c2be27b1 100644
--- a/internals/tsrm/functions/tsrm_error.xml
+++ b/internals/tsrm/functions/tsrm_error.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.tsrm-error">
  <refnamediv>
   <refname>tsrm_error</refname>
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>int</type><methodname>tsrm_error</methodname>
     <methodparam><type>int</type><parameter>level</parameter></methodparam>
-    <methodparam><type>const</type><parameter>char *format</parameter></methodparam>
+    <methodparam><type>const char*</type><parameter>format</parameter></methodparam>
     <methodparam><type></type><parameter>...</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -33,7 +33,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>char *format</parameter></term>
+     <term><parameter>format</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_access.xml b/internals/tsrm/functions/virtual_access.xml
index 1ae3616d89..9cfd24c6f3 100644
--- a/internals/tsrm/functions/virtual_access.xml
+++ b/internals/tsrm/functions/virtual_access.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-access">
  <refnamediv>
   <refname>virtual_access</refname>
@@ -11,8 +11,8 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>int</type><methodname>virtual_access</methodname>
-    <methodparam><type>const</type><parameter>char *pathname</parameter></methodparam>
-    <methodparam><type>int</type><parameter>mode TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>const char*</type><parameter>pathname</parameter></methodparam>
+    <methodparam><type>int mode</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>char *pathname</parameter></term>
+     <term><parameter>pathname</parameter></term>
      <listitem>
       <para>
        ...
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>mode TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_chdir.xml b/internals/tsrm/functions/virtual_chdir.xml
index 6d63728332..43e7402f59 100644
--- a/internals/tsrm/functions/virtual_chdir.xml
+++ b/internals/tsrm/functions/virtual_chdir.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-chdir">
  <refnamediv>
   <refname>virtual_chdir</refname>
@@ -11,7 +11,7 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>int</type><methodname>virtual_chdir</methodname>
-    <methodparam><type>const</type><parameter>char *path TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>const char *path</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>char *path TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_chdir_file.xml b/internals/tsrm/functions/virtual_chdir_file.xml
index a7a6afc0e6..169dc7d765 100644
--- a/internals/tsrm/functions/virtual_chdir_file.xml
+++ b/internals/tsrm/functions/virtual_chdir_file.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-chdir-file">
  <refnamediv>
   <refname>virtual_chdir_file</refname>
@@ -11,8 +11,8 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>int</type><methodname>virtual_chdir_file</methodname>
-    <methodparam><type>const</type><parameter>char *path</parameter></methodparam>
-    <methodparam><type>int</type><parameter>(*p_chdir)(const char *path TSRMLS_DC) TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>const char*</type><parameter>path</parameter></methodparam>
+    <methodparam><type>int (*p_chdir)(const char *path TSRMLS_DC)</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>char *path</parameter></term>
+     <term><parameter>path</parameter></term>
      <listitem>
       <para>
        ...
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>(*p_chdir)(const char *path TSRMLS_DC) TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_chmod.xml b/internals/tsrm/functions/virtual_chmod.xml
index 1742108573..8316b39958 100644
--- a/internals/tsrm/functions/virtual_chmod.xml
+++ b/internals/tsrm/functions/virtual_chmod.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-chmod">
  <refnamediv>
   <refname>virtual_chmod</refname>
@@ -11,8 +11,8 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>int</type><methodname>virtual_chmod</methodname>
-    <methodparam><type>const</type><parameter>char *filename</parameter></methodparam>
-    <methodparam><type>mode_t</type><parameter>mode TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>const char*</type><parameter>filename</parameter></methodparam>
+    <methodparam><type>mode_t mode</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>char *filename</parameter></term>
+     <term><parameter>filename</parameter></term>
      <listitem>
       <para>
        ...
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>mode TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_chown.xml b/internals/tsrm/functions/virtual_chown.xml
index a3a796fd18..b8ba171754 100644
--- a/internals/tsrm/functions/virtual_chown.xml
+++ b/internals/tsrm/functions/virtual_chown.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-chown">
  <refnamediv>
   <refname>virtual_chown</refname>
@@ -11,10 +11,10 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>int</type><methodname>virtual_chown</methodname>
-    <methodparam><type>const</type><parameter>char *filename</parameter></methodparam>
+    <methodparam><type>const char*</type><parameter>filename</parameter></methodparam>
     <methodparam><type>uid_t</type><parameter>owner</parameter></methodparam>
     <methodparam><type>gid_t</type><parameter>group</parameter></methodparam>
-    <methodparam><type>int</type><parameter>link TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>int link</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -26,7 +26,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>char *filename</parameter></term>
+     <term><parameter>filename</parameter></term>
      <listitem>
       <para>
        ...
@@ -50,7 +50,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>link TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_creat.xml b/internals/tsrm/functions/virtual_creat.xml
index 0674966f00..004de8d340 100644
--- a/internals/tsrm/functions/virtual_creat.xml
+++ b/internals/tsrm/functions/virtual_creat.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-creat">
  <refnamediv>
   <refname>virtual_creat</refname>
@@ -11,8 +11,8 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>int</type><methodname>virtual_creat</methodname>
-    <methodparam><type>const</type><parameter>char *path</parameter></methodparam>
-    <methodparam><type>mode_t</type><parameter>mode TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>const char*</type><parameter>path</parameter></methodparam>
+    <methodparam><type>mode_t mode</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>char *path</parameter></term>
+     <term><parameter>path</parameter></term>
      <listitem>
       <para>
        ...
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>mode TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_file_ex.xml b/internals/tsrm/functions/virtual_file_ex.xml
index 59c105082b..212a503e39 100644
--- a/internals/tsrm/functions/virtual_file_ex.xml
+++ b/internals/tsrm/functions/virtual_file_ex.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-file-ex">
  <refnamediv>
   <refname>virtual_file_ex</refname>
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>int</type><methodname>virtual_file_ex</methodname>
     <methodparam><type>cwd_state*</type><parameter>state</parameter></methodparam>
-    <methodparam><type>const</type><parameter>char *path</parameter></methodparam>
+    <methodparam><type>const char*</type><parameter>path</parameter></methodparam>
     <methodparam><type>verify_path_func</type><parameter>verify_path</parameter></methodparam>
     <methodparam><type>int</type><parameter>use_realpath</parameter></methodparam>
   </methodsynopsis>
@@ -34,7 +34,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>char *path</parameter></term>
+     <term><parameter>path</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_filepath.xml b/internals/tsrm/functions/virtual_filepath.xml
index 5d5d411797..0966c64c90 100644
--- a/internals/tsrm/functions/virtual_filepath.xml
+++ b/internals/tsrm/functions/virtual_filepath.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-filepath">
  <refnamediv>
   <refname>virtual_filepath</refname>
@@ -11,8 +11,8 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>int</type><methodname>virtual_filepath</methodname>
-    <methodparam><type>const</type><parameter>char *path</parameter></methodparam>
-    <methodparam><type>char**</type><parameter>filepath TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>const char*</type><parameter>path</parameter></methodparam>
+    <methodparam><type>char **filepath</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>char *path</parameter></term>
+     <term><parameter>path</parameter></term>
      <listitem>
       <para>
        ...
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>filepath TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_filepath_ex.xml b/internals/tsrm/functions/virtual_filepath_ex.xml
index fc4775dacc..d85165d47a 100644
--- a/internals/tsrm/functions/virtual_filepath_ex.xml
+++ b/internals/tsrm/functions/virtual_filepath_ex.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-filepath-ex">
  <refnamediv>
   <refname>virtual_filepath_ex</refname>
@@ -11,9 +11,9 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>int</type><methodname>virtual_filepath_ex</methodname>
-    <methodparam><type>const</type><parameter>char *path</parameter></methodparam>
+    <methodparam><type>const char*</type><parameter>path</parameter></methodparam>
     <methodparam><type>char**</type><parameter>filepath</parameter></methodparam>
-    <methodparam><type>verify_path_func</type><parameter>verify_path TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>verify_path_func verify_path</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -25,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>char *path</parameter></term>
+     <term><parameter>path</parameter></term>
      <listitem>
       <para>
        ...
@@ -41,7 +41,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>verify_path TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_fopen.xml b/internals/tsrm/functions/virtual_fopen.xml
index b09e15a7a4..7fa38f5732 100644
--- a/internals/tsrm/functions/virtual_fopen.xml
+++ b/internals/tsrm/functions/virtual_fopen.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-fopen">
  <refnamediv>
   <refname>virtual_fopen</refname>
@@ -11,8 +11,8 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>FILE*</type><methodname>virtual_fopen</methodname>
-    <methodparam><type>const</type><parameter>char *path</parameter></methodparam>
-    <methodparam><type>const</type><parameter>char *mode TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>const char*</type><parameter>path</parameter></methodparam>
+    <methodparam><type>const char *mode</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>char *path</parameter></term>
+     <term><parameter>path</parameter></term>
      <listitem>
       <para>
        ...
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>char *mode TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_getcwd.xml b/internals/tsrm/functions/virtual_getcwd.xml
index a41fe5ee49..708098c08e 100644
--- a/internals/tsrm/functions/virtual_getcwd.xml
+++ b/internals/tsrm/functions/virtual_getcwd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-getcwd">
  <refnamediv>
   <refname>virtual_getcwd</refname>
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>char*</type><methodname>virtual_getcwd</methodname>
     <methodparam><type>char*</type><parameter>buf</parameter></methodparam>
-    <methodparam><type>size_t</type><parameter>size TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>size_t size</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>size TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_getcwd_ex.xml b/internals/tsrm/functions/virtual_getcwd_ex.xml
index 23f6eee99b..a1cb01965a 100644
--- a/internals/tsrm/functions/virtual_getcwd_ex.xml
+++ b/internals/tsrm/functions/virtual_getcwd_ex.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-getcwd-ex">
  <refnamediv>
   <refname>virtual_getcwd_ex</refname>
@@ -11,7 +11,7 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>char*</type><methodname>virtual_getcwd_ex</methodname>
-    <methodparam><type>size_t*</type><parameter>length TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>size_t *length</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>length TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_lstat.xml b/internals/tsrm/functions/virtual_lstat.xml
index f81c6ff538..069b6f8a43 100644
--- a/internals/tsrm/functions/virtual_lstat.xml
+++ b/internals/tsrm/functions/virtual_lstat.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-lstat">
  <refnamediv>
   <refname>virtual_lstat</refname>
@@ -11,8 +11,8 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>int</type><methodname>virtual_lstat</methodname>
-    <methodparam><type>const</type><parameter>char *path</parameter></methodparam>
-    <methodparam><type>struct</type><parameter>stat *buf TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>const char*</type><parameter>path</parameter></methodparam>
+    <methodparam><type>struct stat *buf</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>char *path</parameter></term>
+     <term><parameter>path</parameter></term>
      <listitem>
       <para>
        ...
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>stat *buf TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_mkdir.xml b/internals/tsrm/functions/virtual_mkdir.xml
index ba71236edc..ac095d4c80 100644
--- a/internals/tsrm/functions/virtual_mkdir.xml
+++ b/internals/tsrm/functions/virtual_mkdir.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-mkdir">
  <refnamediv>
   <refname>virtual_mkdir</refname>
@@ -11,8 +11,8 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>int</type><methodname>virtual_mkdir</methodname>
-    <methodparam><type>const</type><parameter>char *pathname</parameter></methodparam>
-    <methodparam><type>mode_t</type><parameter>mode TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>const char*</type><parameter>pathname</parameter></methodparam>
+    <methodparam><type>mode_t mode</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>char *pathname</parameter></term>
+     <term><parameter>pathname</parameter></term>
      <listitem>
       <para>
        ...
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>mode TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_open.xml b/internals/tsrm/functions/virtual_open.xml
index 3b6bf57e8b..134b181714 100644
--- a/internals/tsrm/functions/virtual_open.xml
+++ b/internals/tsrm/functions/virtual_open.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-open">
  <refnamediv>
   <refname>virtual_open</refname>
@@ -11,7 +11,7 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>int</type><methodname>virtual_open</methodname>
-    <methodparam><type>const</type><parameter>char *path TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>const char *path</type><parameter>TSRMLS_DC</parameter></methodparam>
     <methodparam><type>int</type><parameter>flags</parameter></methodparam>
     <methodparam><type></type><parameter>...</parameter></methodparam>
   </methodsynopsis>
@@ -25,7 +25,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>char *path TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_opendir.xml b/internals/tsrm/functions/virtual_opendir.xml
index 4a6f5cca86..4735c340f3 100644
--- a/internals/tsrm/functions/virtual_opendir.xml
+++ b/internals/tsrm/functions/virtual_opendir.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-opendir">
  <refnamediv>
   <refname>virtual_opendir</refname>
@@ -11,7 +11,7 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>DIR*</type><methodname>virtual_opendir</methodname>
-    <methodparam><type>const</type><parameter>char *pathname TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>const char *pathname</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>char *pathname TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_popen.xml b/internals/tsrm/functions/virtual_popen.xml
index f80be75922..515c5871be 100644
--- a/internals/tsrm/functions/virtual_popen.xml
+++ b/internals/tsrm/functions/virtual_popen.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-popen">
  <refnamediv>
   <refname>virtual_popen</refname>
@@ -11,8 +11,8 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>FILE*</type><methodname>virtual_popen</methodname>
-    <methodparam><type>const</type><parameter>char *command</parameter></methodparam>
-    <methodparam><type>const</type><parameter>char *type TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>const char*</type><parameter>command</parameter></methodparam>
+    <methodparam><type>const char *type</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>char *command</parameter></term>
+     <term><parameter>command</parameter></term>
      <listitem>
       <para>
        ...
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>char *type TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_realpath.xml b/internals/tsrm/functions/virtual_realpath.xml
index 4de83a81e3..a4e5ee1062 100644
--- a/internals/tsrm/functions/virtual_realpath.xml
+++ b/internals/tsrm/functions/virtual_realpath.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-realpath">
  <refnamediv>
   <refname>virtual_realpath</refname>
@@ -11,8 +11,8 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>char*</type><methodname>virtual_realpath</methodname>
-    <methodparam><type>const</type><parameter>char *path</parameter></methodparam>
-    <methodparam><type>char*</type><parameter>real_path TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>const char*</type><parameter>path</parameter></methodparam>
+    <methodparam><type>char *real_path</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>char *path</parameter></term>
+     <term><parameter>path</parameter></term>
      <listitem>
       <para>
        ...
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>real_path TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_rename.xml b/internals/tsrm/functions/virtual_rename.xml
index f92547c7c5..7427b229ca 100644
--- a/internals/tsrm/functions/virtual_rename.xml
+++ b/internals/tsrm/functions/virtual_rename.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-rename">
  <refnamediv>
   <refname>virtual_rename</refname>
@@ -12,7 +12,7 @@
   <methodsynopsis>
    <type>int</type><methodname>virtual_rename</methodname>
     <methodparam><type>char*</type><parameter>oldname</parameter></methodparam>
-    <methodparam><type>char*</type><parameter>newname TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>char *newname</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>newname TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_rmdir.xml b/internals/tsrm/functions/virtual_rmdir.xml
index 18b32eae74..4c51d16ba1 100644
--- a/internals/tsrm/functions/virtual_rmdir.xml
+++ b/internals/tsrm/functions/virtual_rmdir.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-rmdir">
  <refnamediv>
   <refname>virtual_rmdir</refname>
@@ -11,7 +11,7 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>int</type><methodname>virtual_rmdir</methodname>
-    <methodparam><type>const</type><parameter>char *pathname TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>const char *pathname</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>char *pathname TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_stat.xml b/internals/tsrm/functions/virtual_stat.xml
index 48266a80e2..14403aaba5 100644
--- a/internals/tsrm/functions/virtual_stat.xml
+++ b/internals/tsrm/functions/virtual_stat.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-stat">
  <refnamediv>
   <refname>virtual_stat</refname>
@@ -11,8 +11,8 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>int</type><methodname>virtual_stat</methodname>
-    <methodparam><type>const</type><parameter>char *path</parameter></methodparam>
-    <methodparam><type>struct</type><parameter>stat *buf TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>const char*</type><parameter>path</parameter></methodparam>
+    <methodparam><type>struct stat *buf</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>char *path</parameter></term>
+     <term><parameter>path</parameter></term>
      <listitem>
       <para>
        ...
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>stat *buf TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_unlink.xml b/internals/tsrm/functions/virtual_unlink.xml
index f366b8a9f1..7cbb1710f9 100644
--- a/internals/tsrm/functions/virtual_unlink.xml
+++ b/internals/tsrm/functions/virtual_unlink.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-unlink">
  <refnamediv>
   <refname>virtual_unlink</refname>
@@ -11,7 +11,7 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>int</type><methodname>virtual_unlink</methodname>
-    <methodparam><type>const</type><parameter>char *path TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>const char *path</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -23,7 +23,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>char *path TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...
diff --git a/internals/tsrm/functions/virtual_utime.xml b/internals/tsrm/functions/virtual_utime.xml
index 58c7a8caa6..5878ae26e9 100644
--- a/internals/tsrm/functions/virtual_utime.xml
+++ b/internals/tsrm/functions/virtual_utime.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 <refentry id="zend-api.virtual-utime">
  <refnamediv>
   <refname>virtual_utime</refname>
@@ -11,8 +11,8 @@
   <literallayout>#include &lt;tsrm_virtual_cwd.h&gt;</literallayout>
   <methodsynopsis>
    <type>int</type><methodname>virtual_utime</methodname>
-    <methodparam><type>const</type><parameter>char *filename</parameter></methodparam>
-    <methodparam><type>struct</type><parameter>utimbuf *buf TSRMLS_DC</parameter></methodparam>
+    <methodparam><type>const char*</type><parameter>filename</parameter></methodparam>
+    <methodparam><type>struct utimbuf *buf</type><parameter>TSRMLS_DC</parameter></methodparam>
   </methodsynopsis>
   <para>
    ...
@@ -24,7 +24,7 @@
   <para>
    <variablelist>
     <varlistentry>
-     <term><parameter>char *filename</parameter></term>
+     <term><parameter>filename</parameter></term>
      <listitem>
       <para>
        ...
@@ -32,7 +32,7 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>utimbuf *buf TSRMLS_DC</parameter></term>
+     <term><parameter>TSRMLS_DC</parameter></term>
      <listitem>
       <para>
        ...