From 73e8e37698a2bf15427433b1f9e3f2002709e336 Mon Sep 17 00:00:00 2001
From: Rui Hirokawa <hirokawa@php.net>
Date: Thu, 28 Aug 2003 15:04:19 +0000
Subject: [PATCH] added not for PHP 4.3.3.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@138954 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mbstring/ini.xml       |  5 ++--
 reference/mbstring/reference.xml | 39 ++++++++++++++++++++++++--------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/reference/mbstring/ini.xml b/reference/mbstring/ini.xml
index 9308edafe0..4415ee1fd1 100644
--- a/reference/mbstring/ini.xml
+++ b/reference/mbstring/ini.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <section id="mbstring.configuration">
  &reftitle.runtime;
  &extension.runtime;
@@ -159,7 +159,8 @@
    <programlisting>
 <![CDATA[
 ; Set default language
-mbstring.language        = English; Set default language to English (default)
+mbstring.language        = Neutral; Set default language to Neutral(UTF-8) (default)
+mbstring.language        = English; Set default language to English 
 mbstring.language        = Japanese; Set default language to Japanese
 
 ;; Set default internal encoding
diff --git a/reference/mbstring/reference.xml b/reference/mbstring/reference.xml
index 7ca22a2fdc..0d11e20024 100644
--- a/reference/mbstring/reference.xml
+++ b/reference/mbstring/reference.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
  <reference id="ref.mbstring">
   <title>Multi-Byte String Functions</title> 
   <titleabbrev>Multi-Byte String</titleabbrev>
@@ -28,8 +28,11 @@
     <para>
      Since PHP is basically designed for ISO-8859-1, some multi-byte
      character encoding does not work well with PHP. Therefore, it is
-     important to set <literal>mbstring.internal_encoding</literal> to
-     a character encoding that works with PHP.
+     important to set 
+     <literal>mbstring.language</literal> to appropriate language 
+     (i.e. "Japanese" for japanese) and
+     <literal>mbstring.internal_encoding</literal> to a character
+     encoding that works with PHP.
     </para>
     <para>
      PHP4 Character Encoding Requirements 
@@ -114,13 +117,29 @@ JIS, SJIS
       encoding conversion if binary data is used for HTTP
       input/output.
      </para>
-     <para>
-      If <literal>enctype</literal> for HTML form is set to
-      <literal>multipart/form-data</literal>,
-      <literal>mbstring</literal> does not convert character encoding
-      in POST data. If it is the case, strings are needed to be
-      converted to internal character encoding.
-     </para>
+     <note>
+      <para>
+       For PHP 4.3.2 or earlier, 
+       if <literal>enctype</literal> for HTML form is set to
+       <literal>multipart/form-data</literal>,
+       <literal>mbstring</literal> does not convert character encoding
+        in POST data. If it is the case, strings are needed to be
+       converted to internal character encoding.
+      </para>
+     </note>
+     <note>
+      <para>
+       Since PHP 4.3.3,
+       if <literal>enctype</literal> for HTML form is set to
+       <literal>multipart/form-data</literal>, and, 
+       <literal>mbstring.encoding_translation</literal> is set to 
+       On in &php.ini:
+       POST variables and uploaded filename will be converted to
+       internal character encoding.
+       But, characters specified in 'name' of HTML form will not be
+       converted.
+      </para>
+     </note>
      <para>
       <itemizedlist>
        <listitem>