From c4eb28b0625c11117e242d5936f9d4e81a0e5705 Mon Sep 17 00:00:00 2001
From: Stanislav Malyshev <stas@php.net>
Date: Tue, 12 Sep 2000 12:10:29 +0000
Subject: [PATCH] Document new parse_str behaviour

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@32556 c90b9560-bf6c-de11-be94-00142212c4b1
---
 functions/strings.xml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/functions/strings.xml b/functions/strings.xml
index f5f84cc2e0..ab901bff36 100644
--- a/functions/strings.xml
+++ b/functions/strings.xml
@@ -1083,11 +1083,14 @@ if (ord ($str) == 10) {
      <funcprototype>
       <funcdef>void <function>parse_str</function></funcdef>
       <paramdef>string <parameter>str</parameter></paramdef>
+      <paramdef>array <parameter><optional>arr</optional></parameter></paramdef>
      </funcprototype>
     </funcsynopsis>
     <para>
      Parses <parameter>str</parameter> as if it were the query string
-     passed via an URL and sets variables in the current scope.
+     passed via an URL and sets variables in the current scope. If 
+     the second parameter <parameter>arr</parameter> is present, 
+     variables are stored in this variable as an array elements instead. 
     </para>
     <para>
      <example>
@@ -1101,15 +1104,6 @@ echo $second[1]; /* prints "another" */
       </programlisting>
      </example>
     </para>
-     <note>
-      <para>
-       This currently requires 
-       <link linkend="ini.register-globals">register_globals</link>=on 
-       to be set in <filename>php.ini</filename>, this behaviour may 
-       change in the future (After 4.0.2) and this function might well 
-       also return an array of values.
-      </para> 
-     </note>	 
    </refsect1>
   </refentry>