diff --git a/reference/filesystem/functions/basename.xml b/reference/filesystem/functions/basename.xml
index abedf2bcb2..fed4d3e95e 100644
--- a/reference/filesystem/functions/basename.xml
+++ b/reference/filesystem/functions/basename.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.basename">
    <refnamediv>
@@ -45,7 +45,7 @@ $file = basename($path, ".php"); // $file is set to "index"
      </para>
     </note>
     <para>
-     See also: <function>dirname</function>
+     See also <function>dirname</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/filesystem/functions/chmod.xml b/reference/filesystem/functions/chmod.xml
index 3b81c4cb2e..dbb1c29ae0 100644
--- a/reference/filesystem/functions/chmod.xml
+++ b/reference/filesystem/functions/chmod.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.chmod">
    <refnamediv>
@@ -82,7 +82,7 @@ chmod("/somedir/somefile", 0750);
     &note.no-remote;
     <note>
      <simpara>
-      When <link linkend="features.safe-mode">safe mode</link> is enabled, PHP
+      When &safemode; is enabled, PHP
       checks whether the files or directories you are about to operate on have
       the same UID (owner) as the script that is being executed. In addition,
       you cannot set the SUID, SGID and sticky bits
diff --git a/reference/filesystem/functions/delete.xml b/reference/filesystem/functions/delete.xml
index 8eac96ed54..c851b7ff96 100644
--- a/reference/filesystem/functions/delete.xml
+++ b/reference/filesystem/functions/delete.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.delete">
    <refnamediv>
@@ -18,7 +18,7 @@
      <function>unset</function> in the wrong place.
     </para>
     <para>
-     See also: <function>unlink</function> to delete files,
+     See also <function>unlink</function> to delete files,
      <function>unset</function> to delete variables.
     </para>
    </refsect1>
diff --git a/reference/filesystem/functions/file-get-contents.xml b/reference/filesystem/functions/file-get-contents.xml
index c97bc4d6c1..c65bed05c2 100644
--- a/reference/filesystem/functions/file-get-contents.xml
+++ b/reference/filesystem/functions/file-get-contents.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.130 -->
   <refentry id="function.file-get-contents">
    <refnamediv>
@@ -29,7 +29,7 @@
     &note.context-support;
     &warn.ssl-non-standard;
     <simpara>
-     See also: <function>fgets</function>, <function>file</function>, 
+     See also <function>fgets</function>, <function>file</function>, 
      <function>fread</function>, <function>include</function>, 
      and <function>readfile</function>.
     </simpara>
diff --git a/reference/filesystem/functions/file-put-contents.xml b/reference/filesystem/functions/file-put-contents.xml
index 750c1e6e2b..4003c3fd8f 100644
--- a/reference/filesystem/functions/file-put-contents.xml
+++ b/reference/filesystem/functions/file-put-contents.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
   <refentry id="function.file-put-contents">
    <refnamediv>
     <refname>file_put_contents</refname> 
@@ -27,7 +27,7 @@
     &note.bin-safe;
     &tip.fopen-wrapper;
     <simpara>
-     See also: 
+     See also 
      <function>fopen</function>,
      <function>fwrite</function>,
      <function>fclose</function>, and
diff --git a/reference/filesystem/functions/fscanf.xml b/reference/filesystem/functions/fscanf.xml
index b7a4e5c529..b60772f403 100644
--- a/reference/filesystem/functions/fscanf.xml
+++ b/reference/filesystem/functions/fscanf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.fscanf">
    <refnamediv>
@@ -47,15 +47,15 @@ fclose($handle);
       </programlisting>
      </example>
      <example>
-      <title>users.txt</title>
-      <screen>
+      <title>Contenu du fichier users.txt</title>
+     <programlisting role="txt">
 <![CDATA[
 javier  argonaut        pe
 hiroshi sculptor        jp
 robert  slacker us
 luigi   florist it
 ]]>
-      </screen>
+      </programlisting>
      </example>
     </para>
     <note>
diff --git a/reference/filesystem/functions/is-executable.xml b/reference/filesystem/functions/is-executable.xml
index 530a4416e1..8d1a8e46de 100644
--- a/reference/filesystem/functions/is-executable.xml
+++ b/reference/filesystem/functions/is-executable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.is-executable">
    <refnamediv>
@@ -16,8 +16,8 @@
      Returns &true; if the filename exists and is executable.
     </para>
     <para>
-     <function>is_executable</function> became available with Windows in PHP
-     version 5.0.0.
+     <function>is_executable</function> became available with 
+     <productname>Windows</productname> in PHP version 5.0.0.
     </para>
     <para>
      <example>
diff --git a/reference/filesystem/functions/is-uploaded-file.xml b/reference/filesystem/functions/is-uploaded-file.xml
index e545729658..4f0c2ce53f 100644
--- a/reference/filesystem/functions/is-uploaded-file.xml
+++ b/reference/filesystem/functions/is-uploaded-file.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.39 -->
   <refentry id="function.is-uploaded-file">
    <refnamediv>
@@ -37,6 +37,9 @@
        functionality of PHP which changed after that version.
       </para>
      </note>
+    </para>
+     <example>
+      <title><function>is_uploaded_file</function> example</title>
      <programlisting role="php">
 <![CDATA[
 <?php
@@ -61,7 +64,7 @@ if (is_uploaded_file($HTTP_POST_FILES['userfile'])) {
 ?>
 ]]>
      </programlisting>
-    </para>
+    </example>
     <para>
      See also <function>move_uploaded_file</function>, and the section
      <link linkend="features.file-upload">Handling file uploads</link>
diff --git a/reference/filesystem/functions/linkinfo.xml b/reference/filesystem/functions/linkinfo.xml
index 018eae83b3..963cb9c200 100644
--- a/reference/filesystem/functions/linkinfo.xml
+++ b/reference/filesystem/functions/linkinfo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.linkinfo">
    <refnamediv>
@@ -13,11 +13,12 @@
       <methodparam><type>string</type><parameter>path</parameter></methodparam>
      </methodsynopsis>
     <para>
-     <function>linkinfo</function> returns the st_dev field of the
-     Unix C stat structure returned by the lstat system call.  This
-     function is used to verify if a link (pointed to by
+     <function>linkinfo</function> returns the <literal>st_dev</literal> 
+     field of the Unix C stat structure returned by the <literal>lstat</literal> 
+     system call.  This function is used to verify if a link (pointed to by
      <parameter>path</parameter>) really exists (using the same method
-     as the S_ISLNK macro defined in stat.h).  Returns 0 or &false; in
+     as the S_ISLNK macro defined in <filename>stat.h</filename>). 
+     Returns 0 or &false; in
      case of error.
     </para>
     <para>
diff --git a/reference/filesystem/functions/mkdir.xml b/reference/filesystem/functions/mkdir.xml
index 9cbe924ecc..3517437e22 100644
--- a/reference/filesystem/functions/mkdir.xml
+++ b/reference/filesystem/functions/mkdir.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.39 -->
   <refentry id="function.mkdir">
    <refnamediv>
@@ -35,7 +35,8 @@
      The mode is 0777 by default, which means the widest possible
      access. For more information on modes, read the details
      on the <function>chmod</function> page.
-     <informalexample>
+     <example>
+     <title><function>mkdir</function> example</title>
       <programlisting role="php">
 <![CDATA[
 <?php
@@ -43,7 +44,7 @@ mkdir("/path/to/my/dir", 0700);
 ?>
 ]]>
       </programlisting>
-     </informalexample>
+     </example>
     </para>
     <para>
      &return.success;
diff --git a/reference/filesystem/functions/pathinfo.xml b/reference/filesystem/functions/pathinfo.xml
index fe0c913f40..9dda6d0ee2 100644
--- a/reference/filesystem/functions/pathinfo.xml
+++ b/reference/filesystem/functions/pathinfo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.61 -->
   <refentry id="function.pathinfo">
    <refnamediv>
@@ -16,8 +16,8 @@
      <function>pathinfo</function> returns an associative array
      containing information about <parameter>path</parameter>.  The
      following array elements are returned:
-     <parameter>dirname</parameter>, <parameter>basename</parameter>
-     and <parameter>extension</parameter>.
+     <literal>dirname</literal>, <literal>basename</literal>
+     and <literal>extension</literal>.
     </para>
     <para>
      <example>
diff --git a/reference/filesystem/functions/realpath.xml b/reference/filesystem/functions/realpath.xml
index b7cdf34a58..5102443984 100644
--- a/reference/filesystem/functions/realpath.xml
+++ b/reference/filesystem/functions/realpath.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.23 -->
   <refentry id="function.realpath">
    <refnamediv>
@@ -36,7 +36,7 @@ $real_path = realpath("../../index.php");
      </example>
     </para>
     <para>
-     See also: <function>basename</function>, 
+     See also <function>basename</function>, 
      <function>dirname</function>, and 
      <function>pathinfo</function>.
     </para>
diff --git a/reference/filesystem/functions/stat.xml b/reference/filesystem/functions/stat.xml
index 962976052e..a77626addf 100644
--- a/reference/filesystem/functions/stat.xml
+++ b/reference/filesystem/functions/stat.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
   <refentry id="function.stat">
    <refnamediv>
@@ -97,7 +97,7 @@
         <row>
          <entry>10</entry>
          <entry>ctime</entry>
-         <entry>time of last change (Unix timestamp)</entry>
+         <entry>time of creation (Unix timestamp)</entry>
         </row>
         <row>
          <entry>11</entry>