diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-07-14 17:01:43 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-07-14 17:01:43 -0700 |
| commit | 9cc9d32e6a1236cd55ab3bb1bf660932d3721f18 (patch) | |
| tree | 5cc85398f10944b90cb9ad57e2e7d958f91ee3df /sapi/cli/php.1.in | |
| parent | 168a5bb6dfe7de976e2372d3c5d8773f3bf03727 (diff) | |
| parent | f4b9b20b354c059d7246a250953e73365558f5e6 (diff) | |
| download | php-git-9cc9d32e6a1236cd55ab3bb1bf660932d3721f18.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Add built-in web server to invocation list
Terminology: change embedded web server to built-in web server to align with cli usage
Align -B and -E parameter names with cli usage (begin_code and end_code)
Fix Bug #65219 DBSETLDBNAME should be called before login to set DBNAME in login record
Diffstat (limited to 'sapi/cli/php.1.in')
| -rw-r--r-- | sapi/cli/php.1.in | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in index 749baa8a6b..c113030d14 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 @@ -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 @@ -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 @@ -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 |