Fixed typo in UPGRADING and modified php.ini-* description for encoding related changes

diff --git a/UPGRADING b/UPGRADING
index eaced08984694c57c97feb3949e7af35256256fa..47c463c9226d15595075bb3d85ce76895255975e 100755 (executable)
--- a/UPGRADING
+++ b/UPGRADING
@@ -161,12 +161,12 @@ PHP 5.6 UPGRADE NOTES
 - Deprecated PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT, an
   undocument constant effectively equivalent to PDO::ATTR_EMULATE_PREPARES.
 
-- Deprecated INIs: Following INIs are deprecated in favor of new
+- Deprecated INIs: Following INIs are deprecated in favour of new
   internal_encoding/input_encoding/output_encoding. Refer to "Changes to
   encodings in PHP 5.6" in "11. Other Changes" section for more details.
 
     iconv.input_encoding
-    iconv.ouput_encoding
+    iconv.output_encoding
     iconv.internal_encoding
     mbstring.http_input
     mbstring.http_output
@@ -397,10 +397,10 @@ PHP 5.6 UPGRADE NOTES
     output_encoding
 
   The values of the following php.ini parameters have become empty in
-  PHP 5.6 (previosuly they were all ISO-8859-1)
+  PHP 5.6 (previously they were all ISO-8859-1)
 
     iconv.input_encoding
-    iconv.ouput_encoding
+    iconv.output_encoding
     iconv.internal_encoding
 
   Changes were made to character set handling in:
@@ -417,7 +417,7 @@ PHP 5.6 UPGRADE NOTES
   empty:
 
     iconv.input_encoding
-    iconv.ouput_encoding
+    iconv.output_encoding
     iconv.internal_encoding
     mbstring.http_input
     mbstring.http_output

diff --git a/php.ini-development b/php.ini-development
index c5196b4c8746ae72e2dec6855603403710dae97d..ac60db901f4167b162a11d832974c3cbfe65b1d7 100644 (file)
--- a/php.ini-development
+++ b/php.ini-development
@@ -950,15 +950,20 @@ cli_server.color = On
 
 [iconv]
 ; Use of this INI entry is deprecated, use global input_encoding instead.
-; If empty, input_encoding is used.
+; If empty, default_charset or input_encoding or iconv.input_encoding is used.
+; The precedence is: default_charset < intput_encoding < iconv.input_encoding
 ;iconv.input_encoding =
 
 ; Use of this INI entry is deprecated, use global internal_encoding instead.
-; If empty, internal_encoding is used.
+; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
+; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
 ;iconv.internal_encoding =
 
 ; Use of this INI entry is deprecated, use global output_encoding instead.
-; If empty, output_encoding is used.
+; If empty, default_charset or output_encoding or iconv.output_encoding is used.
+; The precedence is: default_charset < output_encoding < iconv.output_encoding
+; To use an output encoding conversion, iconv's output handler must be set
+; otherwise output encoding conversion cannot be performed.
 ;iconv.output_encoding =
 
 [intl]
@@ -1729,21 +1734,25 @@ mssql.secure_connection = Off
 ; Use of this INI entry is deprecated, use global internal_encoding instead.
 ; internal/script encoding.
 ; Some encoding cannot work as internal encoding. (e.g. SJIS, BIG5, ISO-2022-*)
-; If empty, default_charset or internal_encoding is used in order.
-; http://php.net/mbstring.internal-encoding
+; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
+; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
 ;mbstring.internal_encoding =
 
 ; Use of this INI entry is deprecated, use global input_encoding instead.
 ; http input encoding.
-; If empty, input_encoding is used.
 ; mbstring.encoding_traslation = On is needed to use this setting.
+; If empty, default_charset or input_encoding or mbstring.input is used.
+; The precedence is: default_charset < intput_encoding < mbsting.http_input
 ; http://php.net/mbstring.http-input
 ;mbstring.http_input =
 
 ; Use of this INI entry is deprecated, use global output_encoding instead.
 ; http output encoding.
 ; mb_output_handler must be registered as output buffer to function.
-; If empty, output_encoding is used.
+; If empty, default_charset or output_encoding or mbstring.http_output is used.
+; The precedence is: default_charset < output_encoding < mbstring.http_output
+; To use an output encoding conversion, mbstring's output handler must be set
+; otherwise output encoding conversion cannot be performed.
 ; http://php.net/mbstring.http-output
 ;mbstring.http_output =
 

diff --git a/php.ini-production b/php.ini-production
index 38c74155ddc4419f8983b5b8154593e7aece8cdd..c5853ca56666071aadbc1219fd763e4717f79b16 100644 (file)
--- a/php.ini-production
+++ b/php.ini-production
@@ -948,15 +948,20 @@ cli_server.color = On
 
 [iconv]
 ; Use of this INI entry is deprecated, use global input_encoding instead.
-; If empty, input_encoding is used.
+; If empty, default_charset or input_encoding or iconv.input_encoding is used.
+; The precedence is: default_charset < intput_encoding < iconv.input_encoding
 ;iconv.input_encoding =
 
 ; Use of this INI entry is deprecated, use global internal_encoding instead.
-; If empty, internal_encoding is used.
+; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
+; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
 ;iconv.internal_encoding =
 
 ; Use of this INI entry is deprecated, use global output_encoding instead.
-; If empty, output_encoding is used.
+; If empty, default_charset or output_encoding or iconv.output_encoding is used.
+; The precedence is: default_charset < output_encoding < iconv.output_encoding
+; To use an output encoding conversion, iconv's output handler must be set
+; otherwise output encoding conversion cannot be performed.
 ;iconv.output_encoding =
 
 [intl]
@@ -1727,21 +1732,25 @@ mssql.secure_connection = Off
 ; Use of this INI entry is deprecated, use global internal_encoding instead.
 ; internal/script encoding.
 ; Some encoding cannot work as internal encoding. (e.g. SJIS, BIG5, ISO-2022-*)
-; If empty, default_charset or internal_encoding is used in order.
-; http://php.net/mbstring.internal-encoding
+; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
+; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
 ;mbstring.internal_encoding =
 
 ; Use of this INI entry is deprecated, use global input_encoding instead.
 ; http input encoding.
-; If empty, input_encoding is used.
 ; mbstring.encoding_traslation = On is needed to use this setting.
+; If empty, default_charset or input_encoding or mbstring.input is used.
+; The precedence is: default_charset < intput_encoding < mbsting.http_input
 ; http://php.net/mbstring.http-input
 ;mbstring.http_input =
 
 ; Use of this INI entry is deprecated, use global output_encoding instead.
 ; http output encoding.
 ; mb_output_handler must be registered as output buffer to function.
-; If empty, output_encoding is used.
+; If empty, default_charset or output_encoding or mbstring.http_output is used.
+; The precedence is: default_charset < output_encoding < mbstring.http_output
+; To use an output encoding conversion, mbstring's output handler must be set
+; otherwise output encoding conversion cannot be performed.
 ; http://php.net/mbstring.http-output
 ;mbstring.http_output =