From: Eric Covener Date: Fri, 29 Aug 2025 12:21:10 +0000 (+0000) Subject: Merge r1928084 from trunk: X-Git-Tag: 2.4.66-rc1-candidate~45 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cde0ccaa0ca6fbcddc9484b070b8016f9f322c6;p=thirdparty%2Fapache%2Fhttpd.git Merge r1928084 from trunk: helps to re-read the PR. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1928086 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/configuring.html.en b/docs/manual/configuring.html.en index ff6d2dd929..9b7a567991 100644 --- a/docs/manual/configuring.html.en +++ b/docs/manual/configuring.html.en @@ -68,19 +68,26 @@ 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. Commented lines may also be continued, meaning + the next physical line is also interpreted as a comment because the + logical line begins with a hash character. +

+ +

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 of or shell environment variables can be used in configuration file lines using the syntax ${VAR}. diff --git a/docs/manual/configuring.xml b/docs/manual/configuring.xml index 8d3acb1791..266d5caf74 100644 --- a/docs/manual/configuring.xml +++ b/docs/manual/configuring.xml @@ -74,7 +74,9 @@ Server.

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. + preceding pargraph. Commented lines may also be continued, meaning + the next physical line is also interpreted as a comment because the + logical line begins with a hash character.

White space occurring before a directive is ignored, so diff --git a/docs/manual/configuring.xml.de b/docs/manual/configuring.xml.de index 4fd784db90..2ed8146f61 100644 --- a/docs/manual/configuring.xml.de +++ b/docs/manual/configuring.xml.de @@ -1,7 +1,7 @@ - + - + + + + + + + diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja index 4820e3b66c..1021ced940 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.xml.ja @@ -1,7 +1,7 @@ - + +