Merge of r4001, r4002, r4008:

Manpage changes:

*) Support link.

*) Commented out reference to non-existing nginx.conf(5).

*) Rebuild manpage only if needed.

diff --git a/auto/install b/auto/install
index 6e8ccda6023daea1e5f8f400786a370211c8e675..d77efbf74cea36f13fd05bfc78861a3b986b54d5 100644 (file)
--- a/auto/install
+++ b/auto/install
@@ -74,7 +74,9 @@ esac
 
 cat << END                                                    >> $NGX_MAKEFILE
 
-manpage:
+manpage:       $NGX_OBJS/nginx.8
+
+$NGX_OBJS/nginx.8:     man/nginx.8 $NGX_AUTO_CONFIG_H
        sed -e "s|%%PREFIX%%|$NGX_PREFIX|" \\
                -e "s|%%PID_PATH%%|$NGX_PID_PATH|" \\
                -e "s|%%CONF_PATH%%|$NGX_CONF_PATH|" \\

diff --git a/docs/man/nginx.8 b/docs/man/nginx.8
index 4111fe1666180050204c66853b68dc6e9d07594f..aba20c1a3c4c6d90910035c50cd3ad460839da78 100644 (file)
--- a/docs/man/nginx.8
+++ b/docs/man/nginx.8
@@ -24,7 +24,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"
-.Dd November 14, 2010
+.Dd August 10, 2011
 .Dt NGINX 8
 .Os
 .Sh NAME
@@ -177,25 +177,25 @@ Test configuration file
 .Pa ~/mynginx.conf
 with global directives for PID and quantity of worker processes.
 .Sh SEE ALSO
-.Xr nginx.conf 5
+.\"Xr nginx.conf 5
+.\"Pp
+Documentation at
+.Pa http://nginx.org/
+and
+.Pa http://sysoev.ru/nginx/ .
+.Pp
+For questions and technical support, please refer to
+.Pa http://nginx.org/en/support.html .
 .Sh HISTORY
 Development of
 .Nm
 started in 2002, with the first public release on October 4, 2004.
 .Sh AUTHORS
+.An -nosplit
 .An Igor Sysoev Aq igor@sysoev.ru
 .Pp
-Documentation available on
-.Pa http://nginx.org/
-and
-.Pa http://sysoev.ru/nginx/ .
-.Pp
 This manual page was written by
 .An Sergey A. Osokin Aq osa@FreeBSD.org.ru
 as a result of compilation of many
 .Nm
 documents all over the world.
-.Sh BUGS
-Report to mailing list
-.Aq Li nginx@nginx.org
-if you found one.