From 07501dc1a28d66cb1c2c28cc4c997250e6bb22bc Mon Sep 17 00:00:00 2001
From: Lior Kaplan <kaplanlior@gmail.com>
Date: Sat, 6 Jul 2013 14:28:42 +0300
Subject: 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(-)

(limited to 'sapi/cli/php.1.in')

diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in
index 749baa8a6b..533903e6f9 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
-- 
cgit v1.2.1


From bcef0ebc2d30fb7ac763f2b0354b96852d9c87d6 Mon Sep 17 00:00:00 2001
From: Lior Kaplan <kaplanlior@gmail.com>
Date: Sat, 6 Jul 2013 14:30:21 +0300
Subject: 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(-)

(limited to 'sapi/cli/php.1.in')

diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in
index 533903e6f9..c113030d14 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
-- 
cgit v1.2.1