diff --git a/functions/filesystem.xml b/functions/filesystem.xml
index 8c9b494d4b..5130414a55 100644
--- a/functions/filesystem.xml
+++ b/functions/filesystem.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.100 $ -->
+<!-- $Revision: 1.101 $ -->
  <reference id="ref.filesystem">
   <title>Filesystem functions</title>
   <titleabbrev>Filesystem</titleabbrev>
@@ -70,11 +70,10 @@ $file = basename ($path,".php"); // $file is set to "index"
      </funcprototype>
     </funcsynopsis>
     <para>
-     Attempts to change the group of the file
-     <parameter>filename</parameter> to
-     <parameter>group</parameter>. Only the superuser may change the
-     group of a file arbitrarily; other users may change the group of
-     a file to any group of which that user is a member.
+     Attempts to change the group of the file <parameter>filename</parameter>
+     to <parameter>group</parameter> (specified by name or number). Only the
+     superuser may change the group of a file arbitrarily; other users may
+     change the group of a file to any group of which that user is a member.
     </para>
     <para>
      Returns &true; on success; otherwise returns &false;.
@@ -83,11 +82,7 @@ $file = basename ($path,".php"); // $file is set to "index"
      See also <function>chown</function> and
      <function>chmod</function>.
     </para>
-    <note>
-     <simpara>
-      This function does not work on Windows systems
-     </simpara>
-    </note>
+    &note.no-windows;
    </refsect1>
   </refentry>
 
@@ -132,11 +127,7 @@ chmod ("/somedir/somefile", 0755);  // octal; correct value of mode
      See also <function>chown</function> and
      <function>chgrp</function>.
     </para>
-    <note>
-     <simpara>
-      This function does not work on Windows systems
-     </simpara>
-    </note>
+    &note.no-windows;
    </refsect1>
   </refentry>
 
@@ -155,8 +146,9 @@ chmod ("/somedir/somefile", 0755);  // octal; correct value of mode
      </funcprototype>
     </funcsynopsis>
     <para>
-     Attempts to change the owner of the file filename to user
-     user. Only the superuser may change the owner of a file.
+     Attempts to change the owner of the file <parameter>filename</parameter>
+     to user <parameter>user</parameter> (specified by name or number).  Only
+     the superuser may change the owner of a file.
     </para>
     <para>
      Returns &true; on success; otherwise returns &false;.
@@ -165,11 +157,7 @@ chmod ("/somedir/somefile", 0755);  // octal; correct value of mode
      See also <function>chown</function> and
      <function>chmod</function>.
     </para>
-    <note>
-     <simpara>
-     This function does not work on Windows systems
-     </simpara>
-    </note>
+    &note.no-windows;
    </refsect1>
   </refentry>
 
@@ -894,15 +882,13 @@ $fcontents = join ('', file ('http://www.php.net/'));
      The results of this function are cached. See
      <function>clearstatcache</function> for more details.
     </para>
+    &note.no-windows;
     <note>
      <simpara>
-     This function does not work on Windows systems
+      This function will not work on <link
+      linkend="features.remote-files">remote files</link>; the file to
+      be examined must be accessible via the server's filesystem.
      </simpara>
-    <simpara>
-     This function will not work on <link
-     linkend="features.remote-files">remote files</link>; the file to
-     be examined must be accessible via the server's filesystem.
-    </simpara>
     </note>
    </refsect1>
   </refentry>
@@ -932,11 +918,7 @@ $fcontents = join ('', file ('http://www.php.net/'));
      linkend="features.remote-files">remote files</link>; the file to
      be examined must be accessible via the server's filesystem.
     </simpara>
-    <note>
-     <simpara>
-     This function does not work on Windows systems
-     </simpara>
-    </note>
+    &note.no-windows;
    </refsect1>
   </refentry>
 
@@ -1002,11 +984,7 @@ $fcontents = join ('', file ('http://www.php.net/'));
      linkend="features.remote-files">remote files</link>; the file to
      be examined must be accessible via the server's filesystem.
     </simpara>
-    <note>
-     <simpara>
-     This function does not work on Windows systems
-     </simpara>
-    </note>
+    &note.no-windows;
    </refsect1>
   </refentry>
 
@@ -1943,11 +1921,7 @@ if($fp){
      linkend="features.remote-files">remote files</link>; the file to
      be examined must be accessible via the server's filesystem.
     </simpara>
-    <note>
-     <simpara>
-     This function does not work on Windows systems
-     </simpara>
-    </note>
+    &note.no-windows;
    </refsect1>
   </refentry>
 
@@ -2109,11 +2083,7 @@ if($fp){
      and <function>readlink</function> along with
      <function>linkinfo</function>.
     </para>
-    <note>
-     <simpara>
-     This function does not work on Windows systems
-     </simpara>
-    </note>
+    &note.no-windows;
    </refsect1>
   </refentry>
 
@@ -2142,11 +2112,7 @@ if($fp){
      See also <function>symlink</function>, <function>link</function>,
      and <function>readlink</function>.
     </para>
-    <note>
-     <simpara>
-     This function does not work on Windows systems
-     </simpara>
-    </note>
+    &note.no-windows;
    </refsect1>
   </refentry>
 
@@ -2575,11 +2541,7 @@ $fp = popen ("/bin/ls", "r");
      <function>readlink</function> and
      <function>linkinfo</function>.
     </para>
-    <note>
-     <simpara>
-     This function does not work on Windows systems
-     </simpara>
-    </note>
+    &note.no-windows;
    </refsect1>
   </refentry>
 
@@ -2818,11 +2780,7 @@ $real_path = realpath ("../../index.php");
      and <function>readlink</function> along with
      <function>linkinfo</function>.
     </para>
-    <note>
-     <simpara>
-      This function does not work on Windows systems.
-     </simpara>
-    </note>
+    &note.no-windows;
    </refsect1>
   </refentry>
 
@@ -3003,11 +2961,7 @@ if (touch ($FileName)) {
      <function>umask</function> without arguments simply returns the
      current umask.
     </para>
-    <note>
-     <simpara>
-      This function may not work on Windows systems.
-     </simpara>
-    </note>
+    &note.no-windows;
    </refsect1>
   </refentry>
 
@@ -3034,11 +2988,6 @@ if (touch ($FileName)) {
     <para>
      See also <function>rmdir</function> for removing directories.
     </para>
-    <note>
-     <simpara>
-      This function may not work on Windows systems.
-     </simpara>
-    </note>
    </refsect1>
   </refentry>