jimw            Tue Jan  1 19:52:22 2002 EDT

  Modified files:              
    /phpdoc/en/functions        info.xml 
  Log:
  phpinfo: fix formatting, document that parts of the display are disabled when 
expose_php is set to off
  
Index: phpdoc/en/functions/info.xml
diff -u phpdoc/en/functions/info.xml:1.81 phpdoc/en/functions/info.xml:1.82
--- phpdoc/en/functions/info.xml:1.81   Mon Dec 17 17:14:18 2001
+++ phpdoc/en/functions/info.xml        Tue Jan  1 19:52:22 2002
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.81 $ -->
+<!-- $Revision: 1.82 $ -->
  <reference id="ref.info">
   <title>PHP options &amp; information</title>
   <titleabbrev>PHP options/info</titleabbrev>
@@ -1498,22 +1498,30 @@
      information, paths, master and local values of configuration
      options, HTTP headers, and the PHP License.
     </para>
-   <para>
+    <para>
      The output may be customized by passing one or more of the
      following values sumed together in the optional parameter
      <parameter>what</parameter> (one can also combine them together
      with the <link linkend="language.operators.bitwise">or</link> operator.
-   <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>
-   </itemizedlist>
-   </para>
+     <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>
+     </itemizedlist>
+    </para>
+    <note>
+     <para>
+      Parts of the information displayed are disabled when the
+      <literal>expose_php</literal> configuration setting is set to
+      <literal>off</literal>. This includes the PHP and Zend logos, and the
+      credits.
+     </para>
+    </note>
     <para>
      See also <function>phpversion</function>,
      <function>phpcredits</function>,


Reply via email to