diff options
| author | Lior Kaplan <kaplanlior@gmail.com> | 2014-03-09 23:07:48 +0200 |
|---|---|---|
| committer | Lior Kaplan <kaplanlior@gmail.com> | 2014-03-09 23:07:48 +0200 |
| commit | 7cf0931f1813fef901f741cd6669defeac5e1316 (patch) | |
| tree | c2e0008854b0c9187a5b612e7295bcb3fbe06c56 /php.ini-development | |
| parent | c1732700db3c59f3bce7c1a3073c537efde7a58c (diff) | |
| parent | 6e16cc3528cbf36437aa037e7b98ec41ace7eb72 (diff) | |
| download | php-git-7cf0931f1813fef901f741cd6669defeac5e1316.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix typo: entory -> entry
Diffstat (limited to 'php.ini-development')
| -rw-r--r-- | php.ini-development | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/php.ini-development b/php.ini-development index 987cd21af7..070d7db649 100644 --- a/php.ini-development +++ b/php.ini-development @@ -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. |