Merge branch 'PHP-5.4' into PHP-5.5

remicollet · remicollet · commit 1aeb2514fe21 · 2013-07-02T12:19:37.000+02:00
* PHP-5.4:
  fix typo in php man page
diff --git 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] [
