71 lines
4.5 KiB
Plaintext
71 lines
4.5 KiB
Plaintext
$OpenBSD: patch-docs_man_httpd_8,v 1.4 2011/09/01 13:40:09 giovanni Exp $
|
|
--- docs/man/httpd.8.orig Fri Feb 4 16:20:03 2011
|
|
+++ docs/man/httpd.8 Wed Aug 31 11:57:42 2011
|
|
@@ -19,30 +19,30 @@
|
|
.el .ne 3
|
|
.IP "\\$1" \\$2
|
|
..
|
|
-.TH "HTTPD" 8 "2010-09-28" "Apache HTTP Server" "httpd"
|
|
+.TH "HTTPD2" 8 "2010-09-28" "Apache HTTP Server" "httpd"
|
|
|
|
.SH NAME
|
|
-httpd \- Apache Hypertext Transfer Protocol Server
|
|
+httpd2 \- Apache Hypertext Transfer Protocol Server
|
|
|
|
.SH "SYNOPSIS"
|
|
|
|
.PP
|
|
-\fBhttpd\fR [ -\fBd\fR \fIserverroot\fR ] [ -\fBf\fR \fIconfig\fR ] [ -\fBC\fR \fIdirective\fR ] [ -\fBc\fR \fIdirective\fR ] [ -\fBD\fR \fIparameter\fR ] [ -\fBe\fR \fIlevel\fR ] [ -\fBE\fR \fIfile\fR ] [ \fB-k\fR start|restart|graceful|stop|graceful-stop ] [ -\fBR\fR \fIdirectory\fR ] [ -\fBh\fR ] [ -\fBl\fR ] [ -\fBL\fR ] [ -\fBS\fR ] [ -\fBt\fR ] [ -\fBv\fR ] [ -\fBV\fR ] [ -\fBX\fR ] [ -\fBM\fR ] [ -\fBT\fR ]
|
|
+\fBhttpd2\fR [ -\fBd\fR \fIserverroot\fR ] [ -\fBf\fR \fIconfig\fR ] [ -\fBC\fR \fIdirective\fR ] [ -\fBc\fR \fIdirective\fR ] [ -\fBD\fR \fIparameter\fR ] [ -\fBe\fR \fIlevel\fR ] [ -\fBE\fR \fIfile\fR ] [ \fB-k\fR start|restart|graceful|stop|graceful-stop ] [ -\fBR\fR \fIdirectory\fR ] [ -\fBh\fR ] [ -\fBl\fR ] [ -\fBL\fR ] [ -\fBS\fR ] [ -\fBt\fR ] [ -\fBv\fR ] [ -\fBV\fR ] [ -\fBX\fR ] [ -\fBM\fR ] [ -\fBT\fR ]
|
|
|
|
.PP
|
|
On Windows systems, the following additional arguments are available:
|
|
|
|
.PP
|
|
-\fBhttpd\fR [ -\fBk\fR install|config|uninstall ] [ -\fBn\fR \fIname\fR ] [ -\fBw\fR ]
|
|
+\fBhttpd2\fR [ -\fBk\fR install|config|uninstall ] [ -\fBn\fR \fIname\fR ] [ -\fBw\fR ]
|
|
|
|
|
|
.SH "SUMMARY"
|
|
|
|
.PP
|
|
-httpd is the Apache HyperText Transfer Protocol (HTTP) server program\&. It is designed to be run as a standalone daemon process\&. When used like this it will create a pool of child processes or threads to handle requests\&.
|
|
+httpd2 is the Apache HyperText Transfer Protocol (HTTP) server program\&. It is designed to be run as a standalone daemon process\&. When used like this it will create a pool of child processes or threads to handle requests\&.
|
|
|
|
.PP
|
|
-In general, httpd should not be invoked directly, but rather should be invoked via apachectl on Unix-based systems or as a service on Windows NT, 2000 and XP and as a console application on Windows 9x and ME\&.
|
|
+In general, httpd2 should not be invoked directly, but rather should be invoked via apachectl on Unix-based systems or as a service on Windows NT, 2000 and XP and as a console application on Windows 9x and ME\&.
|
|
|
|
|
|
.SH "OPTIONS"
|
|
@@ -53,10 +53,10 @@ In general, httpd should not be invoked directly, but
|
|
Set the initial value for the ServerRoot directive to \fIserverroot\fR\&. This can be overridden by the ServerRoot directive in the configuration file\&. The default is /usr/local/apache2\&.
|
|
.TP
|
|
-f \fIconfig\fR
|
|
-Uses the directives in the file \fIconfig\fR on startup\&. If \fIconfig\fR does not begin with a /, then it is taken to be a path relative to the ServerRoot\&. The default is conf/httpd\&.conf\&.
|
|
+Uses the directives in the file \fIconfig\fR on startup\&. If \fIconfig\fR does not begin with a /, then it is taken to be a path relative to the ServerRoot\&. The default is conf/httpd2\&.conf\&.
|
|
.TP
|
|
-k start|restart|graceful|stop|graceful-stop
|
|
-Signals httpd to start, restart, or stop\&. See Stopping Apache for more information\&.
|
|
+Signals httpd2 to start, restart, or stop\&. See Stopping Apache for more information\&.
|
|
.TP
|
|
-C \fIdirective\fR
|
|
Process the configuration \fIdirective\fR before reading config files\&.
|
|
@@ -98,13 +98,13 @@ Skip document root check at startup/restart\&.
|
|
Run syntax tests for configuration files only\&. The program immediately exits after these syntax parsing tests with either a return code of 0 (Syntax OK) or return code not equal to 0 (Syntax Error)\&. If -D \fIDUMP\fR_\fIVHOSTS \fRis also set, details of the virtual host configuration will be printed\&. If -D \fIDUMP\fR_\fIMODULES \fR is set, all loaded modules will be printed\&.
|
|
.TP
|
|
-v
|
|
-Print the version of httpd, and then exit\&.
|
|
+Print the version of httpd2, and then exit\&.
|
|
.TP
|
|
-V
|
|
-Print the version and build parameters of httpd, and then exit\&.
|
|
+Print the version and build parameters of httpd2, and then exit\&.
|
|
.TP
|
|
-X
|
|
-Run httpd in debug mode\&. Only one worker will be started and the server will not detach from the console\&.
|
|
+Run httpd2 in debug mode\&. Only one worker will be started and the server will not detach from the console\&.
|
|
|
|
.PP
|
|
The following arguments are available only on the Windows platform:
|