From d207e6551b11e5fb0a0fad154048203ac73f8fe2 Mon Sep 17 00:00:00 2001
From: Adam Harvey <aharvey@php.net>
Date: Fri, 16 Nov 2012 04:34:10 +0000
Subject: [PATCH] Put the new php.ini directives together.

(And make colon usage more consistent.)
---
 UPGRADING | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/UPGRADING b/UPGRADING
index c0f1f9bcf9f..41ec330e110 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -231,19 +231,23 @@ PHP X.Y UPGRADE NOTES
 
 - Intl:
   - This extension now requires ICU 4.0+.
-  - Added intl.use_exceptions INI directive, which controls what happens when
-    global errors are set together with intl.error_level.
 
 ========================================
 9. New Global Constants
 ========================================
-- mysqli
+
+- mysqli:
   - Added MYSQLI_SERVER_PUBLIC_KEY constant to be used with mysqli_options()
 
 ========================================
 10. Changes to INI File Handling
 ========================================
-- mysqlnd
+
+- Intl:
+  - Added intl.use_exceptions INI directive, which controls what happens when
+    global errors are set together with intl.error_level.
+
+- mysqlnd:
   - Added mysqlnd.sha256_server_public_key INI PERDIR setting that affects all
     APIs which use(are built) for mysqlnd. This allows ext/mysqli to be used
 	with the new auth protocol, although at coarser level.