MFH: Fixed bug#47427 (-s outputs, not displays)

diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in
index a21239942138f3a75c11a14a7476e541044eaae4..c81684a15107ba2014cbb5b4f14d9ad1919bc52d 100644 (file)
--- 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 d3598efa83c556184ef293dc047766299e1571b1..09fe406c54b9e20289a600035ad5a09a4f7bc24e 100644 (file)
--- 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"