From 841bdea9ac53b61ff5229a86149a151241ea0eab Mon Sep 17 00:00:00 2001
From: Philip Olson <philip@php.net>
Date: Fri, 2 Mar 2012 04:20:18 +0000
Subject: [PATCH] Help clarify the default_charset change, of sorts. Feel free
 to clarify further.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@323790 c90b9560-bf6c-de11-be94-00142212c4b1
---
 appendices/migration54.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/appendices/migration54.xml b/appendices/migration54.xml
index f92b9b72bd..8fe7499e63 100644
--- a/appendices/migration54.xml
+++ b/appendices/migration54.xml
@@ -1322,11 +1322,6 @@
    The following ini directives have been changed:
   </simpara>
   <itemizedlist>
-   <listitem>
-    <simpara>
-     <literal>default_charset</literal> now defaults to UTF-8 instead of ISO-8859-1.
-    </simpara>
-   </listitem>
    <listitem>
     <simpara>
      <literal>session.entropy_file</literal> now defaults to /dev/random or /dev/urandom depending on
@@ -1422,6 +1417,15 @@
      constructor in the base class.
     </simpara>
    </listitem>
+   <listitem>
+    <simpara>
+     The default character set is now <literal>UTF-8</literal>, instead of <literal>ISO-8859-1</literal>,
+     when the <link linkend="ini.default-charset">default_charset</link> configuration setting is not set
+     ("", which is the default). This applies to functions such as <function>htmlentities</function> and
+     <function>htmlspecialchars</function>, or any code that relies on <literal>determine_charset(NULL)</literal>
+     internally.
+    </simpara>
+   </listitem>
   </itemizedlist>
  </section>
 </appendix>