diff options
| author | Remi Collet <remi@php.net> | 2014-02-28 08:12:26 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-02-28 08:12:26 +0100 |
| commit | 06feb15a160eccc7ca880c1828c09462b16603ba (patch) | |
| tree | c3300c433f1014daf866c0ad9be4895ab25ea989 /sapi | |
| parent | 2c1385b7f5c1dac5e8027804a564a9b22ef8a4f6 (diff) | |
| parent | 5fc7382a57550c8997cf00c0839916c78766bfe5 (diff) | |
| download | php-git-06feb15a160eccc7ca880c1828c09462b16603ba.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
man page: long option name is --strip, not --stripped
--global have be removed in 5.2
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/cli/php.1.in | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in index c113030d14..8672b3ba33 100644 --- a/sapi/cli/php.1.in +++ b/sapi/cli/php.1.in @@ -178,15 +178,6 @@ Parse and execute .IR file .TP .PD 0 -.B \-\-global \fIname\fP -.TP -.PD 1 -.B \-g \fIname\fP -Make variable -.IR name -global in script. -.TP -.PD 0 .B \-\-help .TP .PD 1 @@ -298,7 +289,7 @@ Specify the document root to be used by the built-in web server Version number .TP .PD 0 -.B \-\-stripped +.B \-\-strip .TP .PD 1 .B \-w |