--- embedaddon/php/sapi/cli/php.1.in	2012/02/21 23:48:06	1.1.1.1
+++ embedaddon/php/sapi/cli/php.1.in	2014/06/15 20:04:02	1.1.1.5
@@ -1,6 +1,8 @@
-.TH PHP 1 "2010" "The PHP Group" "Scripting Language"
+.TH PHP 1 "2013" "The PHP Group" "Scripting Language"
 .SH NAME
 php \- PHP Command Line Interface 'CLI'
+.P
+php-cgi \- PHP Common Gateway Interface 'CGI' command
 .SH SYNOPSIS
 .B php
 [options] [
@@ -18,21 +20,21 @@ php \- PHP Command Line Interface 'CLI'
 .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
@@ -42,6 +44,12 @@ php \- PHP Command Line Interface 'CLI'
 .LP
 \fBphp \fP[options] \fB\-a\fP
 .LP
+.B php
+[options] \-S
+.IR addr:port
+[\-t
+.IR docroot ]
+.LP
 .SH DESCRIPTION
 \fBPHP\fP is a widely\-used general\-purpose scripting language that is especially suited for 
 Web development and can be embedded into HTML. This is the command line interface
@@ -78,7 +86,13 @@ and therefore reading from 
 .B STDIN 
 explicitly changes the next input line or skips input lines.
 .LP
-If none of \-r \-f \-B \-R \-F or \-E is present but a single parameter is given 
+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
+passed by the \-t option.
+.LP
+If none of \-r \-f \-B \-R \-F \-E or \-S is present but a single parameter is given 
 then this parameter is taken as the filename to parse and execute (same as 
 with \-f). If no parameter is present then the standard input is read and 
 executed.
@@ -164,15 +178,6 @@ Parse and execute 
 .IR file
 .TP
 .PD 0
-.B \-\-global \fIname\fP
-.TP
-.PD 1
-.B \-g \fIname\fP
-Make variable
-.IR name
-global in script.
-.TP
-.PD 0
 .B \-\-help
 .TP
 .PD 1
@@ -223,9 +228,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
@@ -250,9 +255,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
@@ -263,6 +268,20 @@ after processing all input lines
 Output HTML syntax highlighted source
 .TP
 .PD 0
+.B \-\-server \fIaddr:port\fP
+.TP
+.PD 1
+.B \-S \fIaddr:port\fP
+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 built-in web server
+.TP
+.PD 0
 .B \-\-version
 .TP
 .PD 1
@@ -270,7 +289,7 @@ Output HTML syntax highlighted source
 Version number
 .TP
 .PD 0
-.B \-\-stripped
+.B \-\-strip
 .TP
 .PD 1
 .B \-w
@@ -323,6 +342,16 @@ Shows information about extension
 .B name
 .TP
 .PD 0
+.B \-\-rzendextension
+.IR name
+.TP
+.PD 1
+.B \-\-rz
+.IR name
+Shows information about Zend extension
+.B name
+.TP
+.PD 0
 .B \-\-rextinfo
 .IR name
 .TP
@@ -425,7 +454,7 @@ contributors all around the world.
 .SH VERSION INFORMATION
 This manpage describes \fBphp\fP, version @PHP_VERSION@.
 .SH COPYRIGHT
-Copyright \(co 1997\-2010 The PHP Group
+Copyright \(co 1997\-2013 The PHP Group
 .LP
 This source file is subject to version 3.01 of the PHP license,
 that is bundled with this package in the file LICENSE, and is