cvs: php-src(PHP_5_2) /sapi/cli php.1.in php_cli.c

bjori Thu Apr 9 10:08:14 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/sapi/cli php_cli.c php.1.in Log: MFH: Fixed bug#47427 (-s outputs, not displays) http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13.2.32&r2=1.129.2.13.2.33&diff_format=u Index: php-src/sapi/cli/php_cli.c diff -u php-src/sapi/cli/php_cli.c:1.129.2.13.2.32 php-src/sapi/cli/php_cli.c:1.129.2.13.2.33 --- php-src/sapi/cli/php_cli.c:1.129.2.13.2.32 Wed Apr 8 00:16:50 2009 +++ php-src/sapi/cli/php_cli.c Thu Apr 9 10:08:14 2009 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_cli.c,v 1.129.2.13.2.32 2009/04/08 00:16:50 felipe Exp $ */ +/* $Id: php_cli.c,v 1.129.2.13.2.33 2009/04/09 10:08:14 bjori Exp $ */ #include "php.h" #include "php_globals.h" @@ -485,9 +485,9 @@ " -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" http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php.1.in?r1=1.12.2.3.2.6&r2=1.12.2.3.2.7&diff_format=u Index: php-src/sapi/cli/php.1.in diff -u php-src/sapi/cli/php.1.in:1.12.2.3.2.6 php-src/sapi/cli/php.1.in:1.12.2.3.2.7 --- php-src/sapi/cli/php.1.in:1.12.2.3.2.6 Wed Dec 31 11:17:49 2008 +++ php-src/sapi/cli/php.1.in Thu Apr 9 10:08:14 2009 @@ -233,7 +233,7 @@ .TP .PD 1 .B \-s -Display colour syntax highlighted source +Outputs HTML syntax highlighted source .TP .PD 0 .B \-\-version @@ -247,7 +247,7 @@ .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