summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/man/apachectl.84
-rw-r--r--docs/man/httpd.827
2 files changed, 6 insertions, 25 deletions
diff --git a/docs/man/apachectl.8 b/docs/man/apachectl.8
index 96452cf798..307b062444 100644
--- a/docs/man/apachectl.8
+++ b/docs/man/apachectl.8
@@ -77,7 +77,7 @@ script returns a 0 exit value on success, and >0 if an error
occurs. For more details, view the comments in the script.
.PP
Full documentation for Apache is available at
-.B http://www.apache.org/
+.B http://httpd.apache.org/
.
.SH OPTIONS
The \fIcommand\fP can be any one or more of the following options:
@@ -109,7 +109,7 @@ Displays a brief status report. Similar to the fullstatus option,
except that the list of requests currently being served is omitted.
.TP
.BI graceful
-Gracefully restarts the Apache daemon by sending it a SIGUSR1. If
+Gracefully restarts the Apache daemon by sending it a SIGWINCH. If
the daemon is not running, it is started. This differs from a
normal restart in that currently open connections are not aborted.
A side effect is that old log files will not be closed immediately.
diff --git a/docs/man/httpd.8 b/docs/man/httpd.8
index 1b0ea97171..bf529f1f99 100644
--- a/docs/man/httpd.8
+++ b/docs/man/httpd.8
@@ -55,8 +55,6 @@ httpd \- Apache hypertext transfer protocol server
.SH SYNOPSIS
.B httpd
[
-.B \-X
-] [
.BI \-R " libexecdir"
] [
.BI \-d " serverroot"
@@ -87,9 +85,6 @@ httpd \- Apache hypertext transfer protocol server
.B \-V
]
[
-.B \-S
-]
-[
.B \-t
]
[
@@ -103,17 +98,13 @@ designed to be run as a standalone daemon process. When used like this
it will create a pool of child processes to handle requests. To stop
it, send a TERM signal to the initial (parent) process. The PID of
this process is written to a file as given in the configuration file.
-Alternatively
-.B httpd
-may be invoked by the Internet daemon inetd(8) each
-time a connection to the HTTP service is made.
.PP
This manual page only lists the command line arguments. For details
of the directives necessary to configure
.B httpd
see the Apache manual,
which is part of the Apache distribution or can be found at
-http://www.apache.org/. Paths in this manual may not reflect those
+http://httpd.apache.org/. Paths in this manual may not reflect those
compiled into
.B httpd.
.SH OPTIONS
@@ -165,18 +156,15 @@ virtualhost settings).
.B \-t
Run syntax tests for configuration files only. The program immediately exits
after these syntax parsing with either a return code of 0 (Syntax OK) or
-return code not equal to 0 (Syntax Error).
+return code not equal to 0 (Syntax Error). If
+.BI \-D " DUMP_VHOSTS"
+is also set, details of the virtual host configuration will be printed.
.TP
.B \-T
Same as option
.B \-t
but does not check the configured document roots.
.TP
-.B \-X
-Run in single-process mode, for internal debugging purposes only; the daemon
-does not detach from the terminal or fork any children. Do NOT use this mode
-to provide ordinary web service.
-.TP
.B \-v
Print the version of
.B httpd
@@ -190,10 +178,6 @@ Print the version and build parameters of
.PD 0
.B /usr/local/apache/conf/httpd.conf
.br
-.B /usr/local/apache/conf/srm.conf
-.br
-.B /usr/local/apache/conf/access.conf
-.br
.B /usr/local/apache/conf/mime.types
.br
.B /usr/local/apache/conf/magic
@@ -203,6 +187,3 @@ Print the version and build parameters of
.B /usr/local/apache/logs/access_log
.br
.B /usr/local/apache/logs/httpd.pid
-.PD
-.SH SEE ALSO
-.BR inetd (8).