philip          Tue Jan 21 04:17:51 2003 EDT

  Modified files:              
    /phpdoc/en/chapters config.xml 
  Log:
  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
  
  
Index: phpdoc/en/chapters/config.xml
diff -u phpdoc/en/chapters/config.xml:1.89 phpdoc/en/chapters/config.xml:1.90
--- phpdoc/en/chapters/config.xml:1.89  Thu Jan  2 21:26:43 2003
+++ phpdoc/en/chapters/config.xml       Tue Jan 21 04:17:48 2003
@@ -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 @@
      "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 @@
          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 @@
          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>



-- 
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to