From ce96635a58557a289d875de0f17e576d5e113630 Mon Sep 17 00:00:00 2001
From: jim winstead <jimw@php.net>
Date: Wed, 2 Jan 2002 00:52:22 +0000
Subject: [PATCH] phpinfo: fix formatting, document that parts of the display
 are disabled when expose_php is set to off

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

diff --git a/functions/info.xml b/functions/info.xml
index 98d8aa7941..357eaf8d0c 100644
--- a/functions/info.xml
+++ b/functions/info.xml
@@ -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 @@ phpcredits(CREDITS_GROUP + CREDITS_DOCS + CREDITS_FULLPAGE);
      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>,