diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-06-10 13:36:41 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-06-10 13:36:41 -0700 |
| commit | 84e35fb2e0fcd7400d289e06395c975fc7a77816 (patch) | |
| tree | 7a40baf0694a4d6d7d69b809b467c83e12408ea7 /sapi/fpm | |
| parent | cf5b3fb16641b6389137cbabbb4fb0f39e409ee0 (diff) | |
| parent | 04145dc2aa6eea37f7cd27ffa69ad3b2f52a65da (diff) | |
| download | php-git-84e35fb2e0fcd7400d289e06395c975fc7a77816.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
typo fixes (argument)
typo fixes (accommodate, parameter)
Diffstat (limited to 'sapi/fpm')
| -rw-r--r-- | sapi/fpm/php-fpm.conf.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in index f4d6e06c3b..e0d80970af 100644 --- a/sapi/fpm/php-fpm.conf.in +++ b/sapi/fpm/php-fpm.conf.in @@ -10,7 +10,7 @@ ; files from a glob(3) pattern. This directive can be used everywhere in the ; file. ; Relative path can also be used. They will be prefixed by: -; - the global prefix if it's been set (-p arguement) +; - the global prefix if it's been set (-p argument) ; - @prefix@ otherwise ;include=etc/fpm.d/*.conf |