cvs: phpdoc /en/reference/mbstring supported-encodings.xml

vrana Fri Nov 7 13:44:41 2008 UTC Modified files: /phpdoc/en/reference/mbstring supported-encodings.xml Log: Some encodings invalid in regexp (bug #44000) http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/mbstring/supported-encodings.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc/en/reference/mbstring/supported-encodings.xml diff -u phpdoc/en/reference/mbstring/supported-encodings.xml:1.2 phpdoc/en/reference/mbstring/supported-encodings.xml:1.3 --- phpdoc/en/reference/mbstring/supported-encodings.xml:1.2 Wed Dec 26 13:18:30 2007 +++ phpdoc/en/reference/mbstring/supported-encodings.xml Fri Nov 7 13:44:40 2008 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <chapter xml:id="mbstring.supported-encodings"> <title>Supported Character Encodings</title> @@ -14,41 +14,41 @@ extension: </para> <itemizedlist> - <listitem><simpara>UCS-4</simpara></listitem> + <listitem><simpara>UCS-4*</simpara></listitem> <listitem><simpara>UCS-4BE</simpara></listitem> - <listitem><simpara>UCS-4LE</simpara></listitem> + <listitem><simpara>UCS-4LE*</simpara></listitem> <listitem><simpara>UCS-2</simpara></listitem> <listitem><simpara>UCS-2BE</simpara></listitem> <listitem><simpara>UCS-2LE</simpara></listitem> - <listitem><simpara>UTF-32</simpara></listitem> - <listitem><simpara>UTF-32BE</simpara></listitem> - <listitem><simpara>UTF-32LE</simpara></listitem> - <listitem><simpara>UTF-16</simpara></listitem> - <listitem><simpara>UTF-16BE</simpara></listitem> - <listitem><simpara>UTF-16LE</simpara></listitem> + <listitem><simpara>UTF-32*</simpara></listitem> + <listitem><simpara>UTF-32BE*</simpara></listitem> + <listitem><simpara>UTF-32LE*</simpara></listitem> + <listitem><simpara>UTF-16*</simpara></listitem> + <listitem><simpara>UTF-16BE*</simpara></listitem> + <listitem><simpara>UTF-16LE*</simpara></listitem> <listitem><simpara>UTF-7</simpara></listitem> <listitem><simpara>UTF7-IMAP</simpara></listitem> - <listitem><simpara>UTF-8</simpara></listitem> - <listitem><simpara>ASCII</simpara></listitem> - <listitem><simpara>EUC-JP</simpara></listitem> - <listitem><simpara>SJIS</simpara></listitem> - <listitem><simpara>eucJP-win</simpara></listitem> - <listitem><simpara>SJIS-win</simpara></listitem> + <listitem><simpara>UTF-8*</simpara></listitem> + <listitem><simpara>ASCII*</simpara></listitem> + <listitem><simpara>EUC-JP*</simpara></listitem> + <listitem><simpara>SJIS*</simpara></listitem> + <listitem><simpara>eucJP-win*</simpara></listitem> + <listitem><simpara>SJIS-win*</simpara></listitem> <listitem><simpara>ISO-2022-JP</simpara></listitem> <listitem><simpara>JIS</simpara></listitem> - <listitem><simpara>ISO-8859-1</simpara></listitem> - <listitem><simpara>ISO-8859-2</simpara></listitem> - <listitem><simpara>ISO-8859-3</simpara></listitem> - <listitem><simpara>ISO-8859-4</simpara></listitem> - <listitem><simpara>ISO-8859-5</simpara></listitem> - <listitem><simpara>ISO-8859-6</simpara></listitem> - <listitem><simpara>ISO-8859-7</simpara></listitem> - <listitem><simpara>ISO-8859-8</simpara></listitem> - <listitem><simpara>ISO-8859-9</simpara></listitem> - <listitem><simpara>ISO-8859-10</simpara></listitem> - <listitem><simpara>ISO-8859-13</simpara></listitem> - <listitem><simpara>ISO-8859-14</simpara></listitem> - <listitem><simpara>ISO-8859-15</simpara></listitem> + <listitem><simpara>ISO-8859-1*</simpara></listitem> + <listitem><simpara>ISO-8859-2*</simpara></listitem> + <listitem><simpara>ISO-8859-3*</simpara></listitem> + <listitem><simpara>ISO-8859-4*</simpara></listitem> + <listitem><simpara>ISO-8859-5*</simpara></listitem> + <listitem><simpara>ISO-8859-6*</simpara></listitem> + <listitem><simpara>ISO-8859-7*</simpara></listitem> + <listitem><simpara>ISO-8859-8*</simpara></listitem> + <listitem><simpara>ISO-8859-9*</simpara></listitem> + <listitem><simpara>ISO-8859-10*</simpara></listitem> + <listitem><simpara>ISO-8859-13*</simpara></listitem> + <listitem><simpara>ISO-8859-14*</simpara></listitem> + <listitem><simpara>ISO-8859-15*</simpara></listitem> <listitem><simpara>byte2be</simpara></listitem> <listitem><simpara>byte2le</simpara></listitem> <listitem><simpara>byte4be</simpara></listitem> @@ -57,21 +57,24 @@ <listitem><simpara>HTML-ENTITIES</simpara></listitem> <listitem><simpara>7bit</simpara></listitem> <listitem><simpara>8bit</simpara></listitem> - <listitem><simpara>EUC-CN</simpara></listitem> + <listitem><simpara>EUC-CN*</simpara></listitem> <listitem><simpara>CP936</simpara></listitem> <listitem><simpara>HZ</simpara></listitem> - <listitem><simpara>EUC-TW</simpara></listitem> + <listitem><simpara>EUC-TW*</simpara></listitem> <listitem><simpara>CP950</simpara></listitem> - <listitem><simpara>BIG-5</simpara></listitem> - <listitem><simpara>EUC-KR</simpara></listitem> + <listitem><simpara>BIG-5*</simpara></listitem> + <listitem><simpara>EUC-KR*</simpara></listitem> <listitem><simpara>UHC (CP949)</simpara></listitem> <listitem><simpara>ISO-2022-KR</simpara></listitem> <listitem><simpara>Windows-1251 (CP1251)</simpara></listitem> <listitem><simpara>Windows-1252 (CP1252)</simpara></listitem> <listitem><simpara>CP866 (IBM866)</simpara></listitem> - <listitem><simpara>KOI8-R</simpara></listitem> + <listitem><simpara>KOI8-R*</simpara></listitem> </itemizedlist> <para> + * denotes encodings usable also in regular expressions. + </para> + <para> Any &php.ini; entry which accepts an encoding name can also use the values &quot;<literal>auto</literal>&quot; and &quot;<literal>pass</literal>&quot;. @@ -113,4 +116,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> -