From 4311740cde008b3819296137dfd99a42c6ea4ace Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20B=C3=BChler?= <stbuehler@web.de>
Date: Sat, 7 Mar 2009 21:05:41 +0000
Subject: [PATCH] New lighttpd man page (moved it to section 8) (fixes #1875)

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2415 152afb58-edef-0310-8abb-c4023f1b3aa9
---
 NEWS            |  1 +
 doc/Makefile.am |  4 +--
 doc/lighttpd.1  | 18 -------------
 doc/lighttpd.8  | 70 +++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 73 insertions(+), 20 deletions(-)
 delete mode 100644 doc/lighttpd.1
 create mode 100644 doc/lighttpd.8

diff --git a/NEWS b/NEWS
index 2fed9612..4babbd5b 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ NEWS
 
 - 1.4.23 -
   * Added some extra warning options in cmake and fix the resulting warnings (unused/static functions)
+  * New lighttpd man page (moved it to section 8) (fixes #1875)
 
 - 1.4.22 - 2009-03-07
   * Fix wrong lua type for CACHE_MISS/CACHE_HIT in mod_cml (fixes #533)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index cfe4033c..85fdb0aa 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
-dist_man1_MANS=lighttpd.1 spawn-fcgi.1
-
+dist_man1_MANS=spawn-fcgi.1
+dist_man8_MANS=lighttpd.8
 
 DOCS=accesslog.txt \
 authentication.txt \
diff --git a/doc/lighttpd.1 b/doc/lighttpd.1
deleted file mode 100644
index 308ed96e..00000000
--- a/doc/lighttpd.1
+++ /dev/null
@@ -1,18 +0,0 @@
-.TH LIGHTTPD 1 2003-12-21
-.SH NAME
-lighttpd - a fast, secure and flexible webserver
-.SH SYNOPSIS
-lighttpd -D -f <configfile>
-.SH DESCRIPTION
-.SH FILES
-/etc/lighttpd/lighttpd.conf
-.SH CONFORMING TO
-HTTP/1.0
-HTTP/1.0
-HTTP-Authentification - Basic, Digest
-FastCGI
-CGI/1.1
-.SH SEE ALSO
-spawn-fcgi(1)
-.SH AUTHOR
-jan@kneschke.de
diff --git a/doc/lighttpd.8 b/doc/lighttpd.8
new file mode 100644
index 00000000..a5954ed9
--- /dev/null
+++ b/doc/lighttpd.8
@@ -0,0 +1,70 @@
+.TH LIGHTTPD "8" "2009-03-07" "" ""
+.
+.SH NAME
+lighttpd \- a fast, secure and flexible web server
+.
+.SH SYNOPSIS
+\fBlighttpd\fP [\fB\-ptDvVh\fP] \fB\-f\fP \fIconfigfile\fP [\fB\-m\fP \fImoduledir\fP]
+.
+.SH DESCRIPTION
+\fBlighttpd\fP (pronounced 'lighty') is an advanced HTTP daemon that aims
+to be secure, fast, compliant and very flexible.  It has been optimized for
+high performance.  Its feature set includes, but is not limited to, FastCGI,
+CGI, basic and digest HTTP authentication, output compression, URL rewriting.
+.PP
+This manual page only lists the command line arguments.  For details
+on how to configure \fBlighttpd\fP and its modules see the files in the
+doc-directory.
+.
+.SH OPTIONS
+The following options are supported:
+.TP 8
+\fB\-f\ \fP \fIconfigfile\fP
+Load configuration file \fIconfigfile\fP.
+.TP 8
+\fB\-m\ \fP \fImoduledir\fP
+Use
+\fImoduledir\fP
+as the directory that contains modules, instead of the default.
+.TP 8
+\fB\-p\fP
+Print the parsed configuration file in its internal form and exit.
+.TP 8
+\fB\-t\fP
+Test the configuration file for syntax errors and exit.
+.TP 8
+\fB\-D\fP
+Do not daemonize (go into background). The default is to daemonize.
+.TP 8
+\fB\-v\fP
+Show version and exit.
+.TP 8
+\fB\-V\fP
+Show compile-time features and exit.
+.TP 8
+\fB\-h\fP
+Show a brief help message and exit.
+.
+.SH FILES
+.TP 8
+/etc/lighttpd/lighttpd.conf
+The standard location for the configuration file.
+.TP 8
+/var/run/lighttpd.pid
+The standard location for the PID of the running \fBlighttpd\fP process.
+.
+.SH SEE ALSO
+Online Documentation: http://wiki.lighttpd.net/
+.PP
+spawn-fcgi(1)
+.PP
+\fIHypertext Transfer Protocol -- HTTP/1.1\fP, RFC 2616.
+.PP
+\fIHTTP Authentication: Basic and Digest Access Authentication\fP, RFC 2617.
+.PP
+\fIThe Common Gateway Interface Version 1.1\fP, RFC 3875.
+.PP
+\fIThe FastCGI specification\fP.
+.
+.SH AUTHOR
+Jan Kneschke <jan@kneschke.de>