From 0037813fdd3ecafd63bddcfb83a58bd9d8278754 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikic@php.net>
Date: Thu, 8 Dec 2011 21:49:09 +0000
Subject: [PATCH] Fix Doc Bug #60047: allow_url_fopen has inconsistent
 'Changable' locations

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@320701 c90b9560-bf6c-de11-be94-00142212c4b1
---
 appendices/ini.xml           | 3 +--
 reference/filesystem/ini.xml | 9 ---------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/appendices/ini.xml b/appendices/ini.xml
index 6b70c59a7b..4b6d6843b1 100644
--- a/appendices/ini.xml
+++ b/appendices/ini.xml
@@ -33,11 +33,10 @@
        <entry>PHP_INI_PERDIR</entry>
        <entry>PHP_INI_ALL in PHP 4.0.0. Removed in PHP 5.4.0.</entry>
       </row>
-      <!-- FIXME PHP_6 PHP_INI_SYSTEM in PHP &lt; 6. -->
       <row>
        <entry><link linkend="ini.allow-url-fopen">allow_url_fopen</link></entry>
        <entry>"1"</entry>
-       <entry>PHP_INI_ALL</entry>
+       <entry>PHP_INI_SYSTEM</entry>
        <entry>PHP_INI_ALL in PHP &lt;= 4.3.4.</entry>
       </row>
       <row>
diff --git a/reference/filesystem/ini.xml b/reference/filesystem/ini.xml
index 09ceaaf1ef..8a1409b04f 100644
--- a/reference/filesystem/ini.xml
+++ b/reference/filesystem/ini.xml
@@ -21,10 +21,6 @@
       <entry>"1"</entry>
       <entry>PHP_INI_SYSTEM</entry>
       <entry>PHP_INI_ALL in PHP &lt;= 4.3.4. Available since PHP 4.0.4.</entry>
-      <!-- FIXME PHP_6
-      <entry>PHP_INI_ALL</entry>
-      <entry>PHP_INI_ALL in PHP &lt;= 4.3.4. PHP_INI_SYSTEM in PHP &lt; 6. Available since PHP 4.0.4.</entry>
-      -->
      </row>
      <row>
       <entry><link linkend="ini.allow-url-include">allow_url_include</link></entry>
@@ -79,11 +75,6 @@
       <link linkend="ref.zlib">zlib</link> may register additional
       wrappers. 
      </para>
-     <note>
-      <para>
-       This setting can only be set in php.ini due to security reasons.
-      </para>
-     </note>
      <note>
       <para>
        This option was introduced immediately after the release of version