diff --git a/functions/dir.xml b/functions/dir.xml
index b242204d4b..a8ca29a944 100644
--- a/functions/dir.xml
+++ b/functions/dir.xml
@@ -11,7 +11,7 @@
     <title>Description</title>
     <funcsynopsis>
      <funcprototype>
-      <funcdef>int <function>chroot</function></funcdef>
+      <funcdef>bool <function>chroot</function></funcdef>
       <paramdef>string <parameter>directory</parameter></paramdef>
      </funcprototype>
     </funcsynopsis>
@@ -40,7 +40,7 @@
     <title>Description</title>
     <funcsynopsis>
      <funcprototype>
-      <funcdef>int <function>chdir</function></funcdef>
+      <funcdef>bool <function>chdir</function></funcdef>
       <paramdef>string <parameter>directory</parameter></paramdef>
      </funcprototype>
     </funcsynopsis>
@@ -100,7 +100,7 @@ $d->close();
     <funcsynopsis>
      <funcprototype>
       <funcdef>void <function>closedir</function></funcdef>
-      <paramdef>int <parameter>dir_handle</parameter></paramdef>
+      <paramdef>resource <parameter>dir_handle</parameter></paramdef>
      </funcprototype>
     </funcsynopsis>
     <para>
@@ -139,7 +139,7 @@ $d->close();
     <title>Description</title>
     <funcsynopsis>
      <funcprototype>
-      <funcdef>int <function>opendir</function></funcdef>
+      <funcdef>resource <function>opendir</function></funcdef>
       <paramdef>string <parameter>path</parameter></paramdef>
      </funcprototype>
     </funcsynopsis>
@@ -186,7 +186,7 @@ if ($dir = @opendir("/tmp")) {
     <funcsynopsis>
      <funcprototype>
       <funcdef>string <function>readdir</function></funcdef>
-      <paramdef>int <parameter>dir_handle</parameter></paramdef>
+      <paramdef>resource <parameter>dir_handle</parameter></paramdef>
      </funcprototype>
     </funcsynopsis>
     <para>
@@ -209,12 +209,14 @@ closedir($handle);
      </example>
     </para>
     <para>
-     Note that <function>readdir</function> will return the . and
-     .. entries.  If you don't want these, simply strip them out:
+     Note that <function>readdir</function> will return the <literal>.</literal> 
+     and
+     <literal>..</literal> entries.  If you don't want these, simply strip 
+     them out:
      <example>
       <title>
-       List all files in the current directory and strip out . and
-       ..
+       List all files in the current directory and strip out <literal>.</literal> 
+       and <literal>..</literal>
       </title>
       <programlisting role="php">
 &lt;?php 
@@ -242,7 +244,7 @@ closedir($handle);
     <funcsynopsis>
      <funcprototype>
       <funcdef>void <function>rewinddir</function></funcdef>
-      <paramdef>int <parameter>dir_handle</parameter></paramdef>
+      <paramdef>resource <parameter>dir_handle</parameter></paramdef>
      </funcprototype>
     </funcsynopsis>
     <para>