sniper Sat Nov 16 12:44:00 2002 EDT
Modified files:
/phpdoc/en/chapters config.xml
/phpdoc/en/reference/info/functions ini-set.xml
Log:
- Expandedd the explanations for php_value/flag and php_admin_value/flag
to cover the exact behaviour and with what directives they can be used on.
Index: phpdoc/en/chapters/config.xml
diff -u phpdoc/en/chapters/config.xml:1.80 phpdoc/en/chapters/config.xml:1.81
--- phpdoc/en/chapters/config.xml:1.80 Sat Oct 26 11:41:00 2002
+++ phpdoc/en/chapters/config.xml Sat Nov 16 12:44:00 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.80 $ -->
+<!-- $Revision: 1.81 $ -->
<chapter id="configuration">
<title>Configuration</title>
@@ -83,8 +83,8 @@
<para>
With PHP 4.0, there are several Apache directives that allow you
- to change the PHP configuration from within the Apache
- configuration file itself.
+ to change the PHP configuration from within the Apache configuration
+ files.
<variablelist>
<varlistentry>
<term>
@@ -94,7 +94,9 @@
</term>
<listitem>
<para>
- This sets the value of the specified variable.</para>
+ Sets the value of the specified directive.
+ Can be used only with PHP_INI_ALL and PHP_INI_PERDIR type directives.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
@@ -105,7 +107,9 @@
</term>
<listitem>
<para>
- This is used to set a Boolean configuration option.</para>
+ Used to set a Boolean configuration directive.
+ Can be used only with PHP_INI_ALL and PHP_INI_PERDIR type directives.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
@@ -116,10 +120,10 @@
</term>
<listitem>
<para>
- This sets the value of the specified variable. "Admin"
- configuration settings can only be set from within the
- main Apache configuration files, and not from
- <filename>.htaccess</filename> files.
+ Sets the value of the specified directive.
+ This can NOT be used <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.
</para>
</listitem>
</varlistentry>
@@ -131,7 +135,10 @@
</term>
<listitem>
<para>
- This is used to set a Boolean configuration option.
+ 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.
</para>
</listitem>
</varlistentry>
@@ -157,7 +164,7 @@
<note>
<para>
PHP constants do not exist outside of PHP. For example, in
- <filename>httpd.conf</filename> do not use PHP constants
+ <filename>httpd.conf</filename> you can not use PHP constants
such as <constant>E_ALL</constant> or <constant>E_NOTICE</constant>
to set the <link linkend="ini.error-reporting">error_reporting</link>
directive as they will have no meaning and will evaluate to
@@ -197,17 +204,15 @@
<entry>PHP_INI_PERDIR</entry>
<entry>2</entry>
<entry>
- Entry can be set in <filename>.htaccess</filename> and VHost
- directives in httpd.conf.
+ Entry can be set in &php.ini, <filename>.htaccess</filename> or
+ <filename>httpd.conf</filename>
</entry>
</row>
<row>
<entry>PHP_INI_SYSTEM</entry>
<entry>4</entry>
<entry>
- Entry can be set in &php.ini; or
- <filename>httpd.conf</filename> (but not in VHost blocks in
- httpd.conf).
+ Entry can be set in &php.ini; or <filename>httpd.conf</filename>
</entry>
</row>
<row>
@@ -222,7 +227,7 @@
<para>
You can view the settings of the configuration values in
the output of <function>phpinfo</function>. You can also
- access the values of individual configuration settings using
+ access the values of individual configuration directives using
<function>ini_get</function> or <function>get_cfg_var</function>.
</para>
</sect2>
Index: phpdoc/en/reference/info/functions/ini-set.xml
diff -u phpdoc/en/reference/info/functions/ini-set.xml:1.22
phpdoc/en/reference/info/functions/ini-set.xml:1.23
--- phpdoc/en/reference/info/functions/ini-set.xml:1.22 Sun Nov 10 15:26:06 2002
+++ phpdoc/en/reference/info/functions/ini-set.xml Sat Nov 16 12:44:00 2002
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
<!-- splitted from ./en/functions/info.xml, last change in rev 1.23 -->
<refentry id="function.ini-set">
<refnamediv>
@@ -1232,17 +1232,15 @@
<entry>PHP_INI_PERDIR</entry>
<entry>2</entry>
<entry>
- Entry can be set in <filename>.htaccess</filename> and VHost
- directives in httpd.conf.
+ Entry can be set in &php.ini, <filename>.htaccess</filename> or
+ <filename>httpd.conf</filename>
</entry>
</row>
<row>
<entry>PHP_INI_SYSTEM</entry>
<entry>4</entry>
<entry>
- Entry can be set in &php.ini; or
- <filename>httpd.conf</filename> (but not in VHost blocks in
- httpd.conf).
+ Entry can be set in &php.ini; or <filename>httpd.conf</filename>
</entry>
</row>
<row>
--
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
