summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2012-03-06 23:34:57 +0000
committerChristopher Jones <sixd@php.net>2012-03-06 23:34:57 +0000
commit6237456caee2168e8a6f8426447110b7e61eb5a2 (patch)
treef5cb9380aad570145d0cf187bec8dbe657daa185
parent82234fc6076abe6c6119107f1bf06aa3d6d40f76 (diff)
downloadphp-git-6237456caee2168e8a6f8426447110b7e61eb5a2.tar.gz
Sync char set wording with migration doc
-rwxr-xr-xUPGRADING7
1 files changed, 4 insertions, 3 deletions
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