diff options
| author | Jérôme Loyet <fat@php.net> | 2010-07-29 22:07:00 +0000 |
|---|---|---|
| committer | Jérôme Loyet <fat@php.net> | 2010-07-29 22:07:00 +0000 |
| commit | 4445c85d4fc0b1a58acc1f10a7626764f9fa6ecc (patch) | |
| tree | fcb683648f5ed3316034d0a4d7a51c50cf9229c7 /sapi | |
| parent | 444bba79ba886d2ab6af52229afbf6b40b0d556d (diff) | |
| download | php-git-4445c85d4fc0b1a58acc1f10a7626764f9fa6ecc.tar.gz | |
- Fixed bug #52476 (move php-fpm man page from section 1 to section 8)
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/fpm/Makefile.frag | 6 | ||||
| -rw-r--r-- | sapi/fpm/config.m4 | 2 | ||||
| -rw-r--r-- | sapi/fpm/php-fpm.8.in (renamed from sapi/fpm/php-fpm.1.in) | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sapi/fpm/Makefile.frag b/sapi/fpm/Makefile.frag index 0f1964ee67..0859ef10ca 100644 --- 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 0cefd968d9..f32db6a368 100644 --- 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 index 3e940da1da..c7c4823e68 100644 --- 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' |