From: Eric Covener
Date: Fri, 29 Aug 2025 12:12:07 +0000 (+0000)
Subject: xforms
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3024cfb031cb004fc9de9339f81911d0335ef0c8;p=thirdparty%2Fapache%2Fhttpd.git
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1928079 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/docs/man/httpd.8 b/docs/man/httpd.8
index c38869127c4..2b43a922ebf 100644
--- a/docs/man/httpd.8
+++ b/docs/man/httpd.8
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "HTTPD" 8 "2018-09-27" "Apache HTTP Server" "httpd"
+.TH "HTTPD" 8 "2025-08-29" "Apache HTTP Server" "httpd"
.SH NAME
httpd \- Apache Hypertext Transfer Protocol Server
@@ -92,7 +92,7 @@ Show the settings as parsed from the config file (currently only shows the virtu
Skip document root check at startup/restart\&.
.TP
\fB-t\fR
-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\&. If -D \fIDUMP\fR_\fICERTS \fR is set and mod_ssl is used, configured SSL certificates will be printed\&. If -D \fIDUMP\fR_\fICA\fR_\fI_CERTS \fR is set and mod_ssl is used, configured SSL CA certificates and configured directories containing SSL CA certificates will be printed\&.
+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)\&. This option can be combined with various \fI-D DUMP_\&.\&.\&.\fR arguments to print information about the configuration, as listed below\&.
.TP
\fB-v\fR
Print the version of \fBhttpd\fR, and then exit\&.
@@ -117,3 +117,22 @@ The \fIname\fR of the Apache httpd service to signal\&.
\fB-w\fR
Keep the console window open on error so that the error message can be read\&.
+.SH "DUMPING CONFIGURATION DATA"
+
+.PP
+The following options can be combined with \fI-t\fR to show information about the configuration:
+
+
+.TP
+\fI-D DUMP_VHOSTS\fR
+print details of the virtual host configuration\&.
+.TP
+\fI-D DUMP_MODULES\fR
+print (human-readable) details of all loaded modules\&.
+.TP
+\fI-D DUMP_MODULES\fR \fI-D DUMP_MODULE_DATA\fR
+print details of all loaded modules in a structured (TOML) format\&.
+.TP
+\fI-D DUMP_CERTS\fR
+If mod_ssl is loaded, print details of configured SSL/TLS certificates\&.
+
diff --git a/docs/manual/configuring.html.en.utf8 b/docs/manual/configuring.html.en.utf8
index c8fc5a08daa..38f240c2632 100644
--- a/docs/manual/configuring.html.en.utf8
+++ b/docs/manual/configuring.html.en.utf8
@@ -68,19 +68,24 @@ Server.
httpd configuration files contain one directive per line.
The backslash "\" may be used as the last character on a line
to indicate that the directive continues onto the next line.
- There must be no other characters or white space between the
- backslash and the end of the line.
+ To be interpreted as such a continuation, there must be no
+ other characters or white space between the backslash and the
+ end of the line.
- Arguments to directives are separated by whitespace. If an
+
Lines that begin with the hash character "#" are considered
+ comments, and are ignored. Comments may not be
+ included on the same line as a configuration directive, including
+ at the start of a line that has been continued as described in the
+ preceding pargraph.
+
+
+ White space occurring before a directive is ignored, so
+ you may indent directives for clarity. Blank lines are also ignored.
+ Arguments to directives are separated by whitespace. If an
argument contains spaces, you must enclose that argument in quotes.
Directives in the configuration files are case-insensitive,
- but arguments to directives are often case sensitive. Lines
- that begin with the hash character "#" are considered
- comments, and are ignored. Comments may not be
- included on the same line as a configuration directive.
- White space occurring before a directive is ignored, so
- you may indent directives for clarity. Blank lines are also ignored.
+ but arguments to directives are often case sensitive.
The values of variables defined with the Define
or of shell environment variables can
be used in configuration file lines using the syntax
@@ -234,7 +239,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/trunk/configuring.html';
}
})(window, document);
//-->