From 9783140e21709d8d6dca3417f7215bcb51e29051 Mon Sep 17 00:00:00 2001 From: Lior Kaplan Date: Sat, 6 Jul 2013 14:28:42 +0300 Subject: [PATCH 1/4] Align -B and -E parameter names with cli usage (begin_code and end_code) --- sapi/cli/php.1.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in index 749baa8a6b7cd..533903e6f97d9 100644 --- a/sapi/cli/php.1.in +++ b/sapi/cli/php.1.in @@ -20,21 +20,21 @@ php-cgi \- PHP Common Gateway Interface 'CGI' command .LP .B php [options] [\-B -.IR code ] +.IR begin_code ] .B \-R .IR code [\-E -.IR code ] +.IR end_code ] [[\-\-] .IR args.\|.\|. ] .LP .B php [options] [\-B -.IR code ] +.IR begin_code ] .B \-F .IR file [\-E -.IR code ] +.IR end_code ] [[\-\-] .IR args.\|.\|. ] .LP @@ -237,9 +237,9 @@ without using script tags .B \-\-process\-begin \fIcode\fP .TP .PD 1 -.B \-B \fIcode\fP +.B \-B \fIbegin_code\fP Run PHP -.IR code +.IR begin_code before processing input lines .TP .PD 0 @@ -264,9 +264,9 @@ for every input line .B \-\-process\-end \fIcode\fP .TP .PD 1 -.B \-E \fIcode\fP +.B \-E \fIend_code\fP Run PHP -.IR code +.IR end_code after processing all input lines .TP .PD 0 From 0a7bd32da615993e2cbcb028dd58291a1905f5c4 Mon Sep 17 00:00:00 2001 From: Lior Kaplan Date: Sat, 6 Jul 2013 14:30:21 +0300 Subject: [PATCH 2/4] Terminology: change embedded web server to built-in web server to align with cli usage --- sapi/cli/php.1.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in index 533903e6f97d9..c113030d14dd4 100644 --- a/sapi/cli/php.1.in +++ b/sapi/cli/php.1.in @@ -86,7 +86,7 @@ and therefore reading from .B STDIN explicitly changes the next input line or skips input lines. .LP -PHP also contains an embedded web server for application development purpose. By using the \-S option where +PHP also contains an built-in web server for application development purpose. By using the \-S option where .B addr:port point to a local address and port PHP will listen to HTTP requests on that address and port and serve files from the current working directory or the .B docroot @@ -281,14 +281,14 @@ Output HTML syntax highlighted source .TP .PD 1 .B \-S \fIaddr:port\fP -Start embedded Webserver on the given local address and port +Start built-in web server on the given local address and port .TP .PD 0 .B \-\-docroot \fIdocroot\fP .TP .PD 1 .B \-t \fIdocroot\fP -Specify the document root to be used by the embedded web server +Specify the document root to be used by the built-in web server .TP .PD 0 .B \-\-version From 76c7a5ba7dfe2bf340c731ba7d88d814c677273b Mon Sep 17 00:00:00 2001 From: Lior Kaplan Date: Sat, 6 Jul 2013 14:44:15 +0300 Subject: [PATCH 3/4] Add built-in web server to invocation list --- sapi/cli/php_cli.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 729052334d6c9..dfde0d00036f6 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -503,6 +503,7 @@ static void php_cli_usage(char *argv0) " %s [options] -r [--] [args...]\n" " %s [options] [-B ] -R [-E ] [--] [args...]\n" " %s [options] [-B ] -F [-E ] [--] [args...]\n" + " %s [options] -S : [-t docroot]\n" " %s [options] -- [args...]\n" " %s [options] -a\n" "\n" From 089790172a0e8325a40a20baf0a9e65c5a760d56 Mon Sep 17 00:00:00 2001 From: Lior Kaplan Date: Mon, 15 Jul 2013 09:41:54 +0300 Subject: [PATCH 4/4] Add missing parameter to printf --- sapi/cli/php_cli.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index dfde0d00036f6..9f3fc4b5b73a9 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -545,7 +545,7 @@ static void php_cli_usage(char *argv0) " --rz Show information about Zend extension .\n" " --ri Show configuration for extension .\n" "\n" - , prog, prog, prog, prog, prog, prog); + , prog, prog, prog, prog, prog, prog, prog); } /* }}} */