From f28e682818db8eec70d7d08f8df8f9994c9e05a2 Mon Sep 17 00:00:00 2001
From: Hartmut Holzgraefe <hholzgra@php.net>
Date: Mon, 9 Oct 2000 14:59:45 +0000
Subject: [PATCH] reference to GPL license dropped documentation of phpinfo
 parameters

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@33515 c90b9560-bf6c-de11-be94-00142212c4b1
---
 functions/info.xml | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/functions/info.xml b/functions/info.xml
index 3301cea00d..5d88bd5719 100644
--- a/functions/info.xml
+++ b/functions/info.xml
@@ -484,7 +484,7 @@ echo $dat["ru_utime.tv_sec"];  # user time used (seconds)
 echo $dat["ru_utime.tv_usec"]; # user time used (microseconds)
       </programlisting>
      </example>
-     See your system's man page for more details. 
+     See your system's man page on getrusage(2) for more details. 
     </para>
    </refsect1>
   </refentry>
@@ -726,7 +726,7 @@ phpcredits(CREDITS_GENERAL);
     <funcsynopsis>
      <funcprototype>
       <funcdef>int <function>phpinfo</function></funcdef>
-      <paramdef>void</paramdef>
+      <paramdef>int <parameter><optional>what</optional></parameter></paramdef>
      </funcprototype>
     </funcsynopsis>
     <para>
@@ -735,8 +735,30 @@ phpcredits(CREDITS_GENERAL);
      extensions, the PHP version, server information and environment
      (if compiled as a module), the PHP environment, OS version
      information, paths, master and local values of configuration
-     options, HTTP headers, and the GNU Public License.
+     options, HTTP headers, and the PHP License.
     </para>
+	  <para>
+		 The output may be customized by passing one or more of the
+     following values ored together in the optional parameter
+     <parameter>what</parameter>. 
+		 <itemizedlist>
+		  <listitem><simpara>INFO_GENERAL</simpara></listitem>
+		  <listitem><simpara>INFO_CREDITS</simpara></listitem>
+		  <listitem><simpara>INFO_CONFIGURATION</simpara></listitem>
+		  <listitem><simpara>INFO_MODULES</simpara></listitem>
+		  <listitem><simpara>INFO_ENVIRONMENT</simpara></listitem>
+		  <listitem><simpara>INFO_VARIABLES</simpara></listitem>
+		  <listitem><simpara>INFO_LICENSE</simpara></listitem>
+		  <listitem><simpara>INFO_ALL</simpara></listitem>
+		  <listitem><simpara>CREDITS_GROUP</simpara></listitem>
+		  <listitem><simpara>CREDITS_GENERAL</simpara></listitem>
+		  <listitem><simpara>CREDITS_SAPI</simpara></listitem>
+		  <listitem><simpara>CREDITS_MODULES</simpara></listitem>
+		  <listitem><simpara>CREDITS_DOCS</simpara></listitem>
+		  <listitem><simpara>CREDITS_FULLPAGE</simpara></listitem>
+		  <listitem><simpara>CREDITS_ALL</simpara></listitem>
+		 </itemizedlist>
+	  </para>
     <para>
      See also <function>phpversion</function>,
      <function>phpcredits</function>,