- Fixed bug #52476 (move php-fpm man page from section 1 to section 8)

diff --git a/sapi/fpm/Makefile.frag b/sapi/fpm/Makefile.frag
index 0f1964ee6750b04758bc03af5bb9547dd421cbfd..0859ef10ca96511935948b7690ab95d2af919fc7 100644 (file)
--- a/sapi/fpm/Makefile.frag
+++ b/sapi/fpm/Makefile.frag
@@ -22,7 +22,7 @@ install-fpm: install-sapi
 
        @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
 
-       @echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man1/"
-       @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
-       @$(INSTALL_DATA) sapi/fpm/php-fpm.1 $(INSTALL_ROOT)$(mandir)/man1/php-fpm$(program_suffix).1
+       @echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
+       @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
+       @$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8
 

diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index 0cefd968d93b6aee098aac26ada218767aecb1fa..f32db6a36809677a61622731cc73b8a31a4b62f6 100644 (file)
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -550,7 +550,7 @@ if test "$PHP_FPM" != "no"; then
   AC_DEFINE_UNQUOTED(PHP_FPM_USER, "$php_fpm_user", [fpm user name])
   AC_DEFINE_UNQUOTED(PHP_FPM_GROUP, "$php_fpm_group", [fpm group name])
 
-  PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.1)
+  PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.8)
   PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag], [$abs_srcdir/sapi/fpm], [sapi/fpm])
 
   SAPI_FPM_PATH=sapi/fpm/php-fpm

diff --git a/sapi/fpm/php-fpm.1.in b/sapi/fpm/php-fpm.8.in
similarity index 98%
rename from sapi/fpm/php-fpm.1.in
rename to sapi/fpm/php-fpm.8.in
index 3e940da1da25f4a0b0fd6f6dd07da4d707a83a67..c7c4823e68f22fa5d063c784edb238a7747e349a 100644 (file)
--- a/sapi/fpm/php-fpm.1.in
+++ b/sapi/fpm/php-fpm.8.in
@@ -1,4 +1,4 @@
-.TH PHP-FPM 1 "2009" "The PHP Group" "Scripting Language"
+.TH PHP-FPM 8 "2009" "The PHP Group" "Scripting Language"
 .SH NAME
 .TP 15
 php-fpm \- PHP FastCGI Process Manager 'PHP-FPM'