diff --git a/reference/stream/streamwrapper/dir-readdir.xml b/reference/stream/streamwrapper/dir-readdir.xml
index d65f508066..3686900151 100644
--- a/reference/stream/streamwrapper/dir-readdir.xml
+++ b/reference/stream/streamwrapper/dir-readdir.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 
 <refentry xml:id="streamwrapper.dir-readdir" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -27,10 +27,21 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Should return <type>string</type> representing the next filename.
+   Should return <type>string</type> representing the next filename, or
+   &false; if there is no next file.
   </para>
+  <note>
+   <para>
+    The return value will be casted to <type>string</type>.
+   </para>
+  </note>
  </refsect1>
 
+ <refsect1 role="errors"><!-- {{{ -->
+  &reftitle.errors;
+  &userstream.not.implemented.warning;
+ </refsect1><!-- }}} -->
+ 
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/stream/streamwrapper/mkdir.xml b/reference/stream/streamwrapper/mkdir.xml
index c1eb2da995..8cbca1a050 100644
--- a/reference/stream/streamwrapper/mkdir.xml
+++ b/reference/stream/streamwrapper/mkdir.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 
 <refentry xml:id="streamwrapper.mkdir" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -66,6 +66,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors"><!-- {{{ -->
+  &reftitle.errors;
+  &userstream.not.implemented.warning;
+ </refsect1><!-- }}} -->
+ 
 <!--
  <refsect1 role="examples">
   &reftitle.examples;
@@ -90,6 +95,11 @@
  </refsect1>
 -->
 
+ <refsect1 role="notes"><!-- {{{ -->
+  &reftitle.notes;
+  &userstream.updates.context;
+ </refsect1><!-- }}} -->
+ 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/stream/streamwrapper/rename.xml b/reference/stream/streamwrapper/rename.xml
index e1cc43e3fa..0f613969cb 100644
--- a/reference/stream/streamwrapper/rename.xml
+++ b/reference/stream/streamwrapper/rename.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 
 <refentry xml:id="streamwrapper.rename" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -61,6 +61,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors"><!-- {{{ -->
+  &reftitle.errors;
+  &userstream.not.implemented.warning;
+ </refsect1><!-- }}} -->
+ 
 <!--
  <refsect1 role="examples">
   &reftitle.examples;
@@ -85,6 +90,11 @@
  </refsect1>
 -->
 
+ <refsect1 role="notes"><!-- {{{ -->
+  &reftitle.notes;
+  &userstream.updates.context;
+ </refsect1><!-- }}} -->
+ 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/stream/streamwrapper/rmdir.xml b/reference/stream/streamwrapper/rmdir.xml
index 62dde59c8f..ec27c34a16 100644
--- a/reference/stream/streamwrapper/rmdir.xml
+++ b/reference/stream/streamwrapper/rmdir.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 
 <refentry xml:id="streamwrapper.rmdir" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -57,6 +57,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors"><!-- {{{ -->
+  &reftitle.errors;
+  &userstream.not.implemented.warning;
+ </refsect1><!-- }}} -->
+
 <!--
  <refsect1 role="examples">
   &reftitle.examples;
@@ -81,6 +86,11 @@
  </refsect1>
 -->
 
+ <refsect1 role="notes"><!-- {{{ -->
+  &reftitle.notes;
+  &userstream.updates.context;
+ </refsect1><!-- }}} -->
+
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>
diff --git a/reference/stream/streamwrapper/stream-open.xml b/reference/stream/streamwrapper/stream-open.xml
index 87cf481a6e..7508538d85 100644
--- a/reference/stream/streamwrapper/stream-open.xml
+++ b/reference/stream/streamwrapper/stream-open.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 
 <refentry xml:id="streamwrapper.stream-open" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -116,7 +116,7 @@
  </refsect1><!-- }}} -->
  
 
-<!--
+<!-- {{{
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
@@ -138,7 +138,7 @@
    </example>
   </para>
  </refsect1>
--->
+}}}-->
 
  <refsect1 role="notes"><!-- {{{ -->
   &reftitle.notes;
diff --git a/reference/stream/streamwrapper/unlink.xml b/reference/stream/streamwrapper/unlink.xml
index 11a776a6d0..47db438675 100644
--- a/reference/stream/streamwrapper/unlink.xml
+++ b/reference/stream/streamwrapper/unlink.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
 
 <refentry xml:id="streamwrapper.unlink" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <refnamediv>
@@ -48,6 +48,11 @@
   </para>
  </refsect1>
 
+ <refsect1 role="errors"><!-- {{{ -->
+  &reftitle.errors;
+  &userstream.not.implemented.warning;
+ </refsect1><!-- }}} -->
+ 
 <!--
  <refsect1 role="examples">
   &reftitle.examples;
@@ -72,6 +77,11 @@
  </refsect1>
 -->
 
+ <refsect1 role="notes"><!-- {{{ -->
+  &reftitle.notes;
+  &userstream.updates.context;
+ </refsect1><!-- }}} -->
+ 
  <refsect1 role="seealso">
   &reftitle.seealso;
   <para>