From cc6a977a2d038fe7e17fb0a63d0a410fae0e6f3d Mon Sep 17 00:00:00 2001
From: Philip Olson <philip@php.net>
Date: Tue, 21 Jan 2003 09:17:48 +0000
Subject: [PATCH] Refer to the ini_set docs; move php3 info into a note; note
 that virtualhost directives can't overwrite php_admin_*; this closes bug
 #19578

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@112921 c90b9560-bf6c-de11-be94-00142212c4b1
---
 chapters/config.xml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/chapters/config.xml b/chapters/config.xml
index bc37ddb6f0..f6bdaecc7a 100644
--- a/chapters/config.xml
+++ b/chapters/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.89 $ -->
+<!-- $Revision: 1.90 $ -->
  <chapter id="configuration">
   <title>Configuration</title>
 
@@ -75,16 +75,24 @@ include_path = ".;c:\php\lib"
      "AllowOverride Options" or "AllowOverride All" privileges)
     </simpara>
 
-    <simpara>
-     With PHP 3.0, there are Apache directives that correspond to each
-     configuration setting in the <filename>php3.ini</filename> name,
-     except the name is prefixed by "php3_".
-    </simpara>
-
     <para>
      With PHP 4.0, there are several Apache directives that allow you
      to change the PHP configuration from within the Apache configuration
-     files.
+     files.  For a listing of which directives are 
+     <constant>PHP_INI_ALL</constant>, <constant>PHP_INI_PERDIR</constant>, 
+     or <constant>PHP_INI_SYSTEM</constant>, have a look at the table
+     found within the <function>ini_set</function> documentation.
+    </para>
+    
+    <note>
+     <simpara>
+      With PHP 3.0, there are Apache directives that correspond to each
+      configuration setting in the <filename>php3.ini</filename> name,
+      except the name is prefixed by "php3_".
+     </simpara>
+    </note>
+
+    <para>
      <variablelist>
       <varlistentry>
        <term>
@@ -132,7 +140,7 @@ php_value auto_prepend_file none
          Sets the value of the specified directive.
          This can NOT be used in <filename>.htaccess</filename> files.
          Any directive type set with <systemitem role="directive">php_admin_value</systemitem>
-         can not be overridden in <filename>.htaccess</filename> files.
+         can not be overridden by <filename>.htaccess</filename> or virtualhost directives.
         </para>
        </listitem>
       </varlistentry>
@@ -147,7 +155,7 @@ php_value auto_prepend_file none
          Used to set a Boolean configuration directive.
          This can NOT be used in <filename>.htaccess</filename> files.
          Any directive type set with <systemitem role="directive">php_admin_flag</systemitem>
-         can not be overridden in <filename>.htaccess</filename> files.
+         can not be overridden by <filename>.htaccess</filename> or virtualhost directives.
         </para>
        </listitem>
       </varlistentry>