com php-src: Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z): sapi/fpm/php-fpm.8.in

From: Date: Wed, 19 Nov 2014 15:46:51 +0000
Subject: com php-src: Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z): sapi/fpm/php-fpm.8.in
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83150@lists.php.net to get a copy of this message
Commit: 858c9d86faf6acbc9cbd4a8e4aecf9147690df57 Author: Remi Collet <remi@php.net> Wed, 19 Nov 2014 16:46:51 +0100 Parents: 5674827eaded0390a6447babd9d9eae450bb4d00 Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=858c9d86faf6acbc9cbd4a8e4aecf9147690df57 Log: Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z) Bugs: https://bugs.php.net/68452 Changed paths: M sapi/fpm/php-fpm.8.in Diff: diff --git a/sapi/fpm/php-fpm.8.in b/sapi/fpm/php-fpm.8.in index b02aa25..f6ad963 100644 --- a/sapi/fpm/php-fpm.8.in +++ b/sapi/fpm/php-fpm.8.in @@ -84,6 +84,13 @@ Version number Specify alternative prefix path (the default is @php_fpm_prefix@) .TP .PD 0 +.B \-\-pid \fIfile\fP +.TP +.PD 1 +.B \-g +Specify the PID file location. +.TP +.PD 0 .B \-\-fpm\-config \fIfile\fP .TP .PD 1 @@ -113,12 +120,11 @@ Force to run in background and ignore daemonize option from configuration file. Force to stay in foreground and ignore daemonize option from configuration file. .TP .PD 0 -.B \-\-zend\-extension \fIfile\fP +.B \-\-allow\-to\-run\-as\-root .TP .PD 1 -.B \-z \fIfile\fP -Load Zend extension -..IR file +.B \-R +Allow pool to run as root (disabled by default) .SH FILES .TP 15 .B php-fpm.conf

« previous php.cvs (#83150) next »