diff options
| author | Hannes Magnusson <bjori@php.net> | 2009-04-09 10:08:14 +0000 |
|---|---|---|
| committer | Hannes Magnusson <bjori@php.net> | 2009-04-09 10:08:14 +0000 |
| commit | 053c91d1ce918ffe6497b905172f1764f871f4a5 (patch) | |
| tree | c46a3ad94b1105f4544f2d87a334d051e882c04d | |
| parent | 9f9266cd88789c344c72635828408bd62efbd795 (diff) | |
| download | php-git-053c91d1ce918ffe6497b905172f1764f871f4a5.tar.gz | |
MFH: Fixed bug#47427 (-s outputs, not displays)
| -rw-r--r-- | sapi/cli/php.1.in | 4 | ||||
| -rw-r--r-- | sapi/cli/php_cli.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in index a212399421..c81684a151 100644 --- a/sapi/cli/php.1.in +++ b/sapi/cli/php.1.in @@ -233,7 +233,7 @@ after processing all input lines .TP .PD 1 .B \-s -Display colour syntax highlighted source +Outputs HTML syntax highlighted source .TP .PD 0 .B \-\-version @@ -247,7 +247,7 @@ Version number .TP .PD 1 .B \-w -Display source with stripped comments and whitespace +Outputs source with stripped comments and whitespace .TP .PD 0 .B \-\-zend\-extension \fIfile\fP diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index d3598efa83..09fe406c54 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -485,9 +485,9 @@ static void php_cli_usage(char *argv0) " -F <file> Parse and execute <file> for every input line\n" " -E <end_code> Run PHP <end_code> after processing all input lines\n" " -H Hide any passed arguments from external tools.\n" - " -s Display colour syntax highlighted source.\n" + " -s Outputs HTML syntax highlighted source.\n" " -v Version number\n" - " -w Display source with stripped comments and whitespace.\n" + " -w Outputs source with stripped comments and whitespace.\n" " -z <file> Load Zend extension <file>.\n" "\n" " args... Arguments passed to script. Use -- args when first argument\n" |