mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 03:44:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.6'

Browse Source 
* PHP-5.6:
  Fix typo: entory -> entry
This commit is contained in:
Lior Kaplan 2014-03-09 23:07:48 +02:00
commit 7cf0931f18
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
php.ini-development
View File

@ -942,15 +942,15 @@ cli_server.color = On
;filter.default_flags =
[iconv]
; Use of this INI entory is deprecated, use global input_encoding instead.
; Use of this INI entry is deprecated, use global input_encoding instead.
; If empty, input_encoding is used.
;iconv.input_encoding =
; Use of this INI entory is deprecated, use global internal_encoding instead.
; Use of this INI entry is deprecated, use global internal_encoding instead.
; If empty, internal_encoding is used.
;iconv.internal_encoding =
; Use of this INI entory is deprecated, use global output_encoding instead.
; Use of this INI entry is deprecated, use global output_encoding instead.
; If empty, output_encoding is used.
;iconv.output_encoding =
@ -1719,21 +1719,21 @@ mssql.secure_connection = Off
; http://php.net/mbstring.language
;mbstring.language = Japanese
; Use of this INI entory is deprecated, use global internal_encoding instead.
; 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
;mbstring.internal_encoding =
; Use of this INI entory is deprecated, use global input_encoding instead.
; 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.
; http://php.net/mbstring.http-input
;mbstring.http_input =
; Use of this INI entory is deprecated, use global output_encoding instead.
; 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.

12
php.ini-production
View File

@ -940,15 +940,15 @@ cli_server.color = On
;filter.default_flags =
[iconv]
; Use of this INI entory is deprecated, use global input_encoding instead.
; Use of this INI entry is deprecated, use global input_encoding instead.
; If empty, input_encoding is used.
;iconv.input_encoding =
; Use of this INI entory is deprecated, use global internal_encoding instead.
; Use of this INI entry is deprecated, use global internal_encoding instead.
; If empty, internal_encoding is used.
;iconv.internal_encoding =
; Use of this INI entory is deprecated, use global output_encoding instead.
; Use of this INI entry is deprecated, use global output_encoding instead.
; If empty, output_encoding is used.
;iconv.output_encoding =
@ -1717,21 +1717,21 @@ mssql.secure_connection = Off
; http://php.net/mbstring.language
;mbstring.language = Japanese
; Use of this INI entory is deprecated, use global internal_encoding instead.
; 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
;mbstring.internal_encoding =
; Use of this INI entory is deprecated, use global input_encoding instead.
; 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.
; http://php.net/mbstring.http-input
;mbstring.http_input =
; Use of this INI entory is deprecated, use global output_encoding instead.
; 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.