From 68cf31ab49815c7f66cfa71e68268b7d423ad195 Mon Sep 17 00:00:00 2001
From: Rui Hirokawa <hirokawa@php.net>
Date: Sun, 30 Oct 2011 08:45:09 +0000
Subject: [PATCH] added new encodings since 5.4.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@318577 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mbstring/supported-encodings.xml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/reference/mbstring/supported-encodings.xml b/reference/mbstring/supported-encodings.xml
index 54b91bfecf..f74ac3109f 100644
--- a/reference/mbstring/supported-encodings.xml
+++ b/reference/mbstring/supported-encodings.xml
@@ -39,13 +39,15 @@
   <listitem><simpara>CP932</simpara></listitem>
   <listitem><simpara>CP51932</simpara></listitem>
   <listitem><simpara>SJIS-mac**</simpara></listitem>
-  <listitem><simpara>SJIS-Mobile#DOCOMO**</simpara></listitem>
-  <listitem><simpara>SJIS-Mobile#KDDI**</simpara></listitem>
-  <listitem><simpara>SJIS-Mobile#SOFTBANK**</simpara></listitem>
-  <listitem><simpara>SJIS-Mobile#DOCOMO-PUA**</simpara></listitem>
-  <listitem><simpara>SJIS-Mobile#KDDI-PUA**</simpara></listitem>
-  <listitem><simpara>SJIS-Mobile#DOCOMO-PUA-B**</simpara></listitem>
-  <listitem><simpara>SJIS-Mobile#SOFTBANK-PUA**</simpara></listitem>
+  <listitem><simpara>SJIS-Mobile#DOCOMO**</simpara>(alias:<simpara>SJIS-DOCOMO</simpara>)</listitem>
+  <listitem><simpara>SJIS-Mobile#KDDI**</simpara>(alias:<simpara>SJIS-KDDI</simpara>)</listitem>
+  <listitem><simpara>SJIS-Mobile#SOFTBANK**</simpara>(alias:<simpara>SJIS-SOFTBANK</simpara>)</listitem>
+  <listitem><simpara>UTF-8-Mobile#DOCOMO**</simpara>(alias:<simpara>UTF-8-DOCOMO</simpara>)</listitem>
+  <listitem><simpara>UTF-8-Mobile#KDDI-A**</simpara></listitem>
+  <listitem><simpara>UTF-8-Mobile#KDDI-B**</simpara>(alias:<simpara>UTF-8-KDDI</simpara>)</listitem>
+  <listitem><simpara>UTF-8-Mobile#SOFTBANK**</simpara>(alias:<simpara>UTF-8-SOFTBANK</simpara>)</listitem>
+  <listitem><simpara>ISO-2022-JP-MOBILE#KDDI**</simpara>(alias:<simpara>ISO-2022-JP-KDDI</simpara>)</listitem>
+  <listitem><simpara>SJIS-mac**</simpara>(alias:<simpara>MacJapanese</simpara>)</listitem>
   <listitem><simpara>JIS</simpara></listitem>
   <listitem><simpara>JIS-ms</simpara></listitem>
   <listitem><simpara>CP50220</simpara></listitem>
@@ -75,6 +77,7 @@
   <listitem><simpara>8bit</simpara></listitem>
   <listitem><simpara>EUC-CN*</simpara></listitem>
   <listitem><simpara>CP936</simpara></listitem>
+  <listitem><simpara>GB18030**</simpara></listitem>
   <listitem><simpara>HZ</simpara></listitem>
   <listitem><simpara>EUC-TW*</simpara></listitem>
   <listitem><simpara>CP950</simpara></listitem>