svn: /phpdoc/en/trunk/reference/mbstring/ functions/mb-convert-encoding.xml functions/mb-detect-encoding.xml functions/mb-detect-order.xml ini.xml
| From: | Jakub Vrana | Date: | Thu, 10 Feb 2011 12:52:47 +0000 |
| Subject: | svn: /phpdoc/en/trunk/reference/mbstring/ functions/mb-convert-encoding.xml functions/mb-detect-encoding.xml functions/mb-detect-order.xml ini.xml | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-7729@lists.php.net to get a copy of this message | ||
vrana Thu, 10 Feb 2011 12:52:47 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=308187
Log:
'auto' depends on mbstring.language (doc bug #53783)
Bug: http://bugs.php.net/53783 (Open) Meaning of mbstring
"auto" encoding depends on mbstring.language
Changed paths:
U phpdoc/en/trunk/reference/mbstring/functions/mb-convert-encoding.xml
U phpdoc/en/trunk/reference/mbstring/functions/mb-detect-encoding.xml
U phpdoc/en/trunk/reference/mbstring/functions/mb-detect-order.xml
U phpdoc/en/trunk/reference/mbstring/ini.xml
Modified: phpdoc/en/trunk/reference/mbstring/functions/mb-convert-encoding.xml
===================================================================
--- phpdoc/en/trunk/reference/mbstring/functions/mb-convert-encoding.xml 2011-02-10 12:42:46 UTC
(rev 308186)
+++ phpdoc/en/trunk/reference/mbstring/functions/mb-convert-encoding.xml 2011-02-10 12:52:47 UTC
(rev 308187)
@@ -52,9 +52,8 @@
<!-- link to internal encoding info -->
</para>
<para>
- <!-- can the meaning of auto be altered? -->
- "<literal>auto</literal>" may be used, which expands to
- <emphasis>"ASCII,JIS,UTF-8,EUC-JP,SJIS"</emphasis>.
+ See <link linkend="mbstring.supported-encodings">supported
+ encodings</link>.
</para>
</listitem>
</varlistentry>
Modified: phpdoc/en/trunk/reference/mbstring/functions/mb-detect-encoding.xml
===================================================================
--- phpdoc/en/trunk/reference/mbstring/functions/mb-detect-encoding.xml 2011-02-10 12:42:46 UTC (rev
308186)
+++ phpdoc/en/trunk/reference/mbstring/functions/mb-detect-encoding.xml 2011-02-10 12:52:47 UTC (rev
308187)
@@ -78,7 +78,7 @@
/* Detect character encoding with current detect_order */
echo mb_detect_encoding($str);
-/* "auto" is expanded to "ASCII,JIS,UTF-8,EUC-JP,SJIS" */
+/* "auto" is expanded according to mbstring.language */
echo mb_detect_encoding($str, "auto");
/* Specify encoding_list character encoding by comma separated list */
Modified: phpdoc/en/trunk/reference/mbstring/functions/mb-detect-order.xml
===================================================================
--- phpdoc/en/trunk/reference/mbstring/functions/mb-detect-order.xml 2011-02-10 12:42:46 UTC (rev
308186)
+++ phpdoc/en/trunk/reference/mbstring/functions/mb-detect-order.xml 2011-02-10 12:52:47 UTC (rev
308187)
@@ -27,8 +27,8 @@
<listitem>
<para>
<parameter>encoding_list</parameter> is an <type>array</type> or
- comma separated list of character encoding. ("auto" is expanded to
- "ASCII, JIS, UTF-8, EUC-JP, SJIS")
+ comma separated list of character encoding. See <link
+ linkend="mbstring.supported-encodings">supported encodings</link>.
</para>
<para>
If <parameter>encoding_list</parameter> is omitted, it returns
Modified: phpdoc/en/trunk/reference/mbstring/ini.xml
===================================================================
--- phpdoc/en/trunk/reference/mbstring/ini.xml 2011-02-10 12:42:46 UTC (rev 308186)
+++ phpdoc/en/trunk/reference/mbstring/ini.xml 2011-02-10 12:52:47 UTC (rev 308187)
@@ -237,7 +237,7 @@
;; Note: Script cannot change http_input setting.
mbstring.http_input = pass ; No conversion.
mbstring.http_input = auto ; Set HTTP input to auto
- ; "auto" is expanded to
"ASCII,JIS,UTF-8,EUC-JP,SJIS"
+ ; "auto" is expanded according to mbstring.language
mbstring.http_input = SJIS ; Set HTTP2 input to SJIS
mbstring.http_input = UTF-8,SJIS,EUC-JP ; Specify order