Permalink
Browse files

Merge branch 'PHP-5.6'

* PHP-5.6:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
  • Loading branch information...
remicollet committed Feb 28, 2014
2 parents 79063d1 + 06feb15 commit 0821d3942ea1d5315d176d94c727e9fbdb420881
Showing with 1 addition and 10 deletions.
  1. +1 −10 sapi/cli/php.1.in
View
@@ -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

0 comments on commit 0821d39

Please sign in to comment.