summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2013-07-02 12:19:37 +0200
committerRemi Collet <remi@php.net>2013-07-02 12:19:37 +0200
commit1aeb2514fe210c99c3e566d59788e76a8b3018d8 (patch)
treefc69f40499f2cc54870b02d0f4e8b7ee54a56bc0 /sapi
parent4d5a2fba16dac42a29145d2dbc074c4ddb87589d (diff)
parent67817a199ca4c8bcff163cb005287c0087db6bf3 (diff)
downloadphp-git-1aeb2514fe210c99c3e566d59788e76a8b3018d8.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: fix typo in php man page
Diffstat (limited to 'sapi')
-rw-r--r--sapi/cli/php.1.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in
index 6f0266d9e5..749baa8a6b 100644
--- a/sapi/cli/php.1.in
+++ b/sapi/cli/php.1.in
@@ -2,7 +2,7 @@
.SH NAME
php \- PHP Command Line Interface 'CLI'
.P
-php-cgi \- PHP Command Gateway Interface 'CGI'
+php-cgi \- PHP Common Gateway Interface 'CGI' command
.SH SYNOPSIS
.B php
[options] [