From 57ec267b58419f3a4af243b43aa59235ce7bdd96 Mon Sep 17 00:00:00 2001
From: Adam Harvey <aharvey@php.net>
Date: Mon, 12 Nov 2012 02:42:57 +0000
Subject: [PATCH] Clarify the mbstring.func_overload documentation,
 specifically where it can be changed.

Fixes doc bug #49189 (mbstring.func_overload can not be changed out of
php.ini).


git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@328314 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mbstring/ini.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/reference/mbstring/ini.xml b/reference/mbstring/ini.xml
index 731c9cf71a..3359fb2eb5 100644
--- a/reference/mbstring/ini.xml
+++ b/reference/mbstring/ini.xml
@@ -21,7 +21,7 @@
       <entry>"neutral"</entry>
       <entry>PHP_INI_ALL</entry>
       <entry>
-       Available since PHP 4.3.0.; PHP_INI_PERDIR in PHP &lt;= 5.2.6
+       Available since PHP 4.3.0. PHP_INI_PERDIR in PHP &lt;= 5.2.6
       </entry>
      </row>
      <row>
@@ -65,8 +65,8 @@
       <entry>"0"</entry>
       <entry>PHP_INI_SYSTEM</entry>
       <entry>
-       PHP_INI_SYSTEM in PHP &lt;= 4.2.3; PHP_INI_SYSTEM | PHP_INI_PERDIR from PHP 4.3
-       through 5.2.6. Available since PHP 4.2.0.
+       PHP_INI_PERDIR from PHP 4.3 to 5.2.6, otherwise PHP_INI_SYSTEM.
+       Available since PHP 4.2.0.
       </entry>
      </row>
      <row>
@@ -185,6 +185,9 @@
       <link linkend="mbstring.overload">Function overloading</link> for more
       information.
      </para>
+     <para>
+      This setting can only be changed from the &php.ini; file.
+     </para>
     </listitem>
    </varlistentry>
    <varlistentry xml:id="ini.mbstring.strict-detection">