From: Yasuo Ohgaki <yohgaki@php.net>
Date: Wed, 10 Aug 2016 05:53:27 +0000 (+0900)
Subject: Update NEWS and UPGRADING
X-Git-Tag: php-7.2.0alpha1~1554
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee797e7eccad8ceff11137ea5602099450b486d6;p=php

Update NEWS and UPGRADING
---

diff --git a/NEWS b/NEWS
index 5f0f9f45fa..f3e7307fa1 100644
--- a/NEWS
+++ b/NEWS
@@ -23,7 +23,10 @@ PHP                                                                        NEWS
   . Fixed bug #70896 (gmp_fact() silently ignores non-integer input). (Sara)
 
 - Mbstring:
-  . Implemented reuqest #66024 (chr() and mb_ord()) (Masakielastic, Yasuo)
+  . Implemented request #66024 (chr() and mb_ord()) (Masakielastic, Yasuo)
+  . Implemented request #65081 (mb_scrub()) (Masakielastic, Yasuo)
+  . Implemented request #69086 (enhancement for mb_convert_encoding() that
+    handles multibyte replacement char nicely) (Masakielastic, Yasuo)
 
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>
 
diff --git a/UPGRADING b/UPGRADING
index 12a5ec84ef..b99826d7f8 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -167,6 +167,7 @@ PHP 7.1 UPGRADE NOTES
 
 - Mbstring:
   . Added mb_chr() and mb_ord().
+  . Added mb_scurb() that scrub broken mutilbyte strings.
 
 - Standard:
   . Added is_iterable() that determines if a value will be accepted by the new