summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2014-11-19 16:46:51 +0100
committerRemi Collet <remi@php.net>2014-11-19 16:46:51 +0100
commit858c9d86faf6acbc9cbd4a8e4aecf9147690df57 (patch)
tree9a137b3e15a02ae7e1b7873ba87cfdf2eb476cc2 /sapi
parent5674827eaded0390a6447babd9d9eae450bb4d00 (diff)
downloadphp-git-858c9d86faf6acbc9cbd4a8e4aecf9147690df57.tar.gz
Fixed bug #68452 php-fpm man page is oudated (-g, -R, -z)
Diffstat (limited to 'sapi')
-rw-r--r--sapi/fpm/php-fpm.8.in14
1 files changed, 10 insertions, 4 deletions
diff --git a/sapi/fpm/php-fpm.8.in b/sapi/fpm/php-fpm.8.in
index b02aa25ba7..f6ad963aed 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