From: Christopher Jones <sixd@php.net>
Date: Tue, 6 Mar 2012 23:34:57 +0000 (+0000)
Subject: Sync char set wording with migration doc
X-Git-Tag: PHP-5.4.1-RC1~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6237456caee2168e8a6f8426447110b7e61eb5a2;p=php

Sync char set wording with migration doc
---

diff --git a/UPGRADING b/UPGRADING
index 5837b8bfd0..f83e7543c5 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -36,9 +36,10 @@ PHP 5.4 UPGRADE NOTES
 1. Changes to INI directives
 =============================
 
-- The php.ini default_charset directive now defaults to UTF-8.  If you
-  were relying on the previous default of ISO-88590-1, you will need
-  to add:
+- The default character set is now UTF-8 when the default_charset
+  php.ini directive is not explicitly set. This applies to functions
+  such as htmlentities() and htmlspecialchars(). If you were relying
+  on the previous default of ISO-8859-1 you will need to add:
 
     default_charset = iso-8859-1