diff --git a/chapters/config.xml b/chapters/config.xml
index 66c5569cd4..cda35fa323 100644
--- a/chapters/config.xml
+++ b/chapters/config.xml
@@ -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 @@ include_path = ".;c:\php\lib"
 
     <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 @@ include_path = ".;c:\php\lib"
        </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 @@ include_path = ".;c:\php\lib"
        </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 @@ include_path = ".;c:\php\lib"
        </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 @@ include_path = ".;c:\php\lib"
        </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 @@ include_path = ".;c:\php\lib"
      <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 @@ include_path = ".;c:\php\lib"
         <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 @@ include_path = ".;c:\php\lib"
     <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>
diff --git a/reference/info/functions/ini-set.xml b/reference/info/functions/ini-set.xml
index d3609d1692..91713d5cb8 100644
--- a/reference/info/functions/ini-set.xml
+++ b/reference/info/functions/ini-set.xml
@@ -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>