diff --git a/appendices/ini.xml b/appendices/ini.xml
index 78878dda69..8f9c94eb0f 100644
--- a/appendices/ini.xml
+++ b/appendices/ini.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.57 $ -->
+<!-- $Revision: 1.58 $ -->
 
 <appendix xml:id="ini" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>&php.ini; directives</title>
@@ -266,20 +266,20 @@
       <row>
        <entry>cgi.discard_path</entry>
        <entry>"0"</entry>
-       <entry>PHP_INI_ALL</entry>
+       <entry>PHP_INI_SYSTEM</entry>
        <entry>Available since PHP 6.0.0.</entry>
       </row>
       <row>
        <entry><link linkend="ini.cgi.fix-pathinfo">cgi.fix_pathinfo</link></entry>
        <entry>"1"</entry>
-       <entry>PHP_INI_ALL</entry>
-       <entry>Available since PHP 4.3.0.</entry>
+       <entry>PHP_INI_SYSTEM</entry>
+       <entry>Available since PHP 4.3.0. PHP_INI_ALL prior to PHP 5.2.1.</entry>
       </row>
       <row>
        <entry><link linkend="ini.cgi.force-redirect">cgi.force_redirect</link></entry>
        <entry>"1"</entry>
-       <entry>PHP_INI_ALL</entry>
-       <entry>Available since PHP 4.2.0.</entry>
+       <entry>PHP_INI_SYSTEM</entry>
+       <entry>Available since PHP 4.2.0. PHP_INI_ALL prior to PHP 5.2.1.</entry>
       </row>
       <row>
        <entry>cgi.nph</entry>
@@ -290,8 +290,8 @@
       <row>
        <entry><link linkend="ini.cgi.redirect-status-env">cgi.redirect_status_env</link></entry>
        <entry>NULL</entry>
-       <entry>PHP_INI_ALL</entry>
-       <entry>Available since PHP 4.2.0.</entry>
+       <entry>PHP_INI_SYSTEM</entry>
+       <entry>Available since PHP 4.2.0. PHP_INI_ALL prior to PHP 5.2.1.</entry>
       </row>
       <row>
        <entry><link linkend="ini.cgi.rfc2616-headers">cgi.rfc2616_headers</link></entry>
@@ -590,14 +590,14 @@
       <row>
        <entry><link linkend="ini.fastcgi.impersonate">fastcgi.impersonate</link></entry>
        <entry>"0"</entry>
-       <entry>PHP_INI_ALL</entry>
-       <entry>Available since PHP 4.3.0.</entry>
+       <entry>PHP_INI_SYSTEM</entry>
+       <entry>Available since PHP 4.3.0. PHP_INI_ALL prior to PHP 5.2.1.</entry>
       </row>
       <row>
        <entry>fastcgi.logging</entry>
        <entry>"1"</entry>
-       <entry>PHP_INI_ALL</entry>
-       <entry>Available since PHP 4.4.0.</entry>
+       <entry>PHP_INI_SYSTEM</entry>
+       <entry>Available since PHP 4.4.0. PHP_INI_ALL prior to PHP 5.2.1.</entry>
       </row>
       <row>
        <entry>fbsql.allow_persistent</entry>
@@ -3510,26 +3510,26 @@
         <row>
          <entry>cgi.fix_pathinfo</entry>
          <entry>"1"</entry>
-         <entry>PHP_INI_ALL</entry>
-         <entry>Available since PHP 4.3.0.</entry>
+         <entry>PHP_INI_SYSTEM</entry>
+         <entry>Available since PHP 4.3.0. PHP_INI_ALL prior to PHP 5.2.1.</entry>
         </row>
         <row>
          <entry>cgi.force_redirect</entry>
          <entry>"1"</entry>
-         <entry>PHP_INI_ALL</entry>
-         <entry>Available since PHP 4.2.0.</entry>
+         <entry>PHP_INI_SYSTEM</entry>
+         <entry>Available since PHP 4.2.0. PHP_INI_ALL prior to PHP 5.2.1.</entry>
         </row>
         <row>
          <entry>cgi.redirect_status_env</entry>
          <entry>NULL</entry>
-         <entry>PHP_INI_ALL</entry>
-         <entry>Available since PHP 4.2.0.</entry>
+         <entry>PHP_INI_SYSTEM</entry>
+         <entry>Available since PHP 4.2.0. PHP_INI_ALL prior to PHP 5.2.1.</entry>
         </row>
         <row>
          <entry>fastcgi.impersonate</entry>
          <entry>"0"</entry>
-         <entry>PHP_INI_ALL</entry>
-         <entry>Available since PHP 4.3.0.</entry>
+         <entry>PHP_INI_SYSTEM</entry>
+         <entry>Available since PHP 4.3.0. PHP_INI_ALL prior to PHP 5.2.1.</entry>
         </row>
         <row>
          <entry>cgi.rfc2616_headers</entry>