Module Name: src
Committed By: jmmv
Date: Sun Apr 24 07:17:02 UTC 2011
Modified Files:
src/libexec/httpd: bozohttpd.8
Log Message:
Remove the "This option..." sentence prefix for all option definitions.
Adjust some sentences so that the new text makes sense. OK mrg@.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/libexec/httpd/bozohttpd.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.27 src/libexec/httpd/bozohttpd.8:1.28
--- src/libexec/httpd/bozohttpd.8:1.27 Sat Apr 2 07:44:15 2011
+++ src/libexec/httpd/bozohttpd.8 Sun Apr 24 07:17:02 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: bozohttpd.8,v 1.27 2011/04/02 07:44:15 mbalmer Exp $
+.\" $NetBSD: bozohttpd.8,v 1.28 2011/04/24 07:17:02 jmmv Exp $
.\"
.\" $eterna: bozohttpd.8,v 1.99 2010/09/20 22:26:28 mrg Exp $
.\"
@@ -26,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd April 2, 2011
+.Dd April 23, 2011
.Dt HTTPD 8
.Os
.Sh NAME
@@ -79,12 +79,12 @@
The following options are available:
.Bl -tag -width xxxcgibin
.It Fl b
-This option enables daemon mode, where
+Enables daemon mode, where
.Nm
detaches from the current terminal, running in the background and
servicing HTTP requests.
.It Fl C Ar suffix cgihandler
-This option adds a new CGI handler program for a particular file type.
+Adds a new CGI handler program for a particular file type.
The
.Ar suffix
should be any normal file suffix, and the
@@ -96,7 +96,7 @@
.Fl C
options may be passed.
.It Fl c Ar cgibin
-This option enables the CGI/1.1 interface.
+Enables the CGI/1.1 interface.
The
.Ar cgibin
directory is expected to contain the CGI programs to be used.
@@ -114,7 +114,7 @@
.Em ~user
translation.
.It Fl e
-This option causes
+Causes
.Nm
to not clear the environment when used with either the
.Fl t
@@ -122,32 +122,29 @@
.Fl U
options.
.It Fl f
-This option stops the
+Stops the
.Fl b
flag from
.Nm
detaching from the tty and going into the background.
.It Fl H
-This option causes directory index mode to hide files and directories
+Causes directory index mode to hide files and directories
that start with a period, except for
.Pa .. .
Also see
.Fl X .
.It Fl I Ar port
-This option is only valid with the
-.Fl b
-option.
-It causes
+Causes
.Ar port
to use used as the port to bind daemon mode.
The default is the
.Dq http
port.
-.It Fl i Ar address
This option is only valid with the
.Fl b
option.
-It causes
+.It Fl i Ar address
+Causes
.Ar address
to use used as the address to bind daemon mode.
If otherwise unspecified, the address used to bind is derived from the
@@ -157,8 +154,11 @@
Only the last
.Fl i
option is used.
+This option is only valid with the
+.Fl b
+option.
.It Fl M Ar suffix type encoding encoding11
-This option adds a new entry to the table that converts file suffixes to
+Adds a new entry to the table that converts file suffixes to
content type and encoding.
This option takes four additional arguments containing
the file prefix, its
@@ -174,7 +174,7 @@
.Fl M
options may be passed.
.It Fl n
-This option stops
+Stops
.Nm
from doing IP address to name resolution of hosts for setting the
.Ev REMOTE_HOST
@@ -183,7 +183,7 @@
.Fl c
option.
.It Fl P Ar pidfile
-This option causes
+Causes
.Nm
to create a pid file in
.Ar pidfile
@@ -191,14 +191,14 @@
.Fl b
option.
.It Fl p Ar pubdir
-This option changes the default user directory for
+Changes the default user directory for
.Em /~user/
translations from
.Dq public_html
to
.Ar pubdir .
.It Fl r
-This option forces pages besides the
+Forces pages besides the
.Dq index.html
(see the
.Fl X
@@ -207,14 +207,14 @@
.Dq index.html
page will be returned instead.
.It Fl S Ar server_software
-This option sets the internal server version to
+Sets the internal server version to
.Ar server_software .
.It Fl s
-This option forces logging to be set to stderr always.
+Forces logging to be set to stderr always.
.It Fl t Ar chrootdir
-When this option is used,
+Makes
.Nm
-will chroot to the specified directory
+chroot to the specified directory
before answering requests.
Every other path should be specified relative
to the new root, if this option is used.
@@ -223,7 +223,7 @@
.Fl e
option is also used.
.It Fl U Ar username
-This option causes
+Causes
.Nm
to switch to the user and the groups of
.Ar username
@@ -236,7 +236,7 @@
.Fl e
option is given.
.It Fl u
-This option enables the transformation of Uniform Resource Locators of
+Enables the transformation of Uniform Resource Locators of
the form
.Em /~user/
into the directory
@@ -245,7 +245,7 @@
.Fl p
option above).
.It Fl V
-This option sets the default virtual host directory to
+Sets the default virtual host directory to
.Ar slashdir .
If no directory exists in
.Ar virtualroot
@@ -254,7 +254,7 @@
will be used.
The default behaviour is to return 404 (Not Found.)
.It Fl v Ar virtualroot
-This option enables virtual hosting support.
+Enables virtual hosting support.
Directories in
.Ar virtualroot
will be searched for a matching virtual host name, when parsing
@@ -268,17 +268,17 @@
.Sx EXAMPLES
section for an example of using this option.
.It Fl X
-This option enables directory indexing.
+Enables directory indexing.
A directory index will be generated only when the default file (i.e.
.Pa index.html
normally) is not present.
.It Fl x Ar index
-This option changes the default file read for directories from
+Changes the default file read for directories from
.Dq index.html
to
.Ar index .
.It Fl Z Ar certificate_path privatekey_path
-This option sets the path to the server certificate file and the private key file
+Sets the path to the server certificate file and the private key file
in pem format.
It also causes
.Nm
