diff options
| author | Johannes Schlüter <johannes@php.net> | 2012-04-19 00:08:36 +0200 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2012-04-19 00:08:36 +0200 |
| commit | cc85e7c31391de9acdd348c947c9165520a924a2 (patch) | |
| tree | fd0f4fef1a0a09ce19b5ab1ab019d17201d65a1c | |
| parent | 900751e8ae4ed2af3e63e7c355fac59f6f932254 (diff) | |
| parent | 710021d1d4a57941450b7ed482e3c19cfe62fecf (diff) | |
| download | php-git-cc85e7c31391de9acdd348c947c9165520a924a2.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix slight grammar glitch (thanks Dan Brown)
| -rw-r--r-- | php.ini-development | 2 | ||||
| -rw-r--r-- | php.ini-production | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/php.ini-development b/php.ini-development index 867a9f2675..8e70738953 100644 --- a/php.ini-development +++ b/php.ini-development @@ -19,7 +19,7 @@ ; See the PHP docs for more specific information. ; http://php.net/configuration.file -; The syntax of the file is extremely simple. Whitespace and Lines +; The syntax of the file is extremely simple. Whitespace and lines ; beginning with a semicolon are silently ignored (as you probably guessed). ; Section headers (e.g. [Foo]) are also silently ignored, even though ; they might mean something in the future. diff --git a/php.ini-production b/php.ini-production index ee830c3692..e8d1c748e2 100644 --- a/php.ini-production +++ b/php.ini-production @@ -19,7 +19,7 @@ ; See the PHP docs for more specific information. ; http://php.net/configuration.file -; The syntax of the file is extremely simple. Whitespace and Lines +; The syntax of the file is extremely simple. Whitespace and lines ; beginning with a semicolon are silently ignored (as you probably guessed). ; Section headers (e.g. [Foo]) are also silently ignored, even though ; they might mean something in the future. |