diff --git a/reference/stream/constants.xml b/reference/stream/constants.xml
index ac50847863..804a3e560e 100644
--- a/reference/stream/constants.xml
+++ b/reference/stream/constants.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
 <section id="stream.constants">
  &reftitle.constants;
  &extension.constants;
@@ -95,7 +95,9 @@
       <entry><constant>STREAM_SERVER_LISTEN</constant> *</entry>
       <entry>Tells a stream created with <function>stream_socket_server</function>
        and bound using the <constant>STREAM_SERVER_BIND</constant> flag to start
-       listening on the socket. TCP Server sockets should always include this flag.
+       listening on the socket. Connection-orientated transports (such as TCP)
+       must use this flag, otherwise the server socket will not be enabled.
+       Using this flag for connect-less transports (such as UDP) is an error.
       </entry>
      </row>
      <row>
diff --git a/reference/stream/functions/stream-socket-accept.xml b/reference/stream/functions/stream-socket-accept.xml
index 9ca394aaef..d920c55272 100644
--- a/reference/stream/functions/stream-socket-accept.xml
+++ b/reference/stream/functions/stream-socket-accept.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
   <refentry id="function.stream-socket-accept">
    <refnamediv>
     <refname>stream_socket_accept</refname>
@@ -31,13 +31,13 @@
     <simpara>
      If the call fails, it will return &false;.
     </simpara>
-    <note>
+    <warning>
      <para>
-      This function doens't work with UDP server sockets. Use
+      Using this function with UDP server sockets is an error. You should use
       <function>stream_socket_recvfrom</function> and
       <function>stream_socket_sendto</function> instead.
      </para>
-    </note>
+   </warning>
     <para>
      See also <function>stream_socket_server</function>, 
      <function>stream_socket_get_name</function>,
diff --git a/reference/stream/functions/stream-socket-recvfrom.xml b/reference/stream/functions/stream-socket-recvfrom.xml
index 49958ca5a3..08a3ed8363 100644
--- a/reference/stream/functions/stream-socket-recvfrom.xml
+++ b/reference/stream/functions/stream-socket-recvfrom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
   <refentry id="function.stream-socket-recvfrom">
    <refnamediv>
     <refname>stream_socket_recvfrom</refname>
@@ -73,6 +73,13 @@ fclose($server);
 ]]>
      </programlisting>
     </example>
+    <note>
+     <para>
+      If a message received is longer than the <parameter>length</parameter>
+      parameter, excess bytes may be discarded depending on the type of socket
+      the message is received from (such as UDP).
+     </para>
+    </note>
     <para>
      See also 
      <function>stream_socket_sendto</function>,