From c7e37ca576b6e8ea406a2c668c422aefd19be87b Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Mon, 20 Aug 2018 19:48:59 +0000 Subject: [PATCH] Backport r1786113 (Wording/formatting/typo fixes.) + s/require/Require/ to help syntax color highlight work correctly. (r1838458 + r1838459 in trunk) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838466 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/core.xml | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index 279f006918..ad94bfe3d2 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -2005,7 +2005,7 @@ filenames <FilesMatch "^(?<sitename>[^/]+)"> - require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example + Require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example </FilesMatch> @@ -2397,8 +2397,8 @@ presence or absence of a specific directive

In the former case, the directives between the start and end markers are only processed if a directive of the given name is available at the time of processing. The second format reverses the test, - and only processes the directives if the directive-name is - not defined.

+ and only processes the directives if directive-name is + not available.

This section should only be used if you need to have one configuration file that works across multiple versions of @@ -2427,30 +2427,31 @@ presence or absence of a specific section directive test>...</IfSection> section is used to mark directives that are conditional on the presence of a specific section directive. A section directive is any directive - such as virtualhost which + such as VirtualHost which encloses other directives, and has a directive name with a leading - "<". The sec + "<".

- The directives within an The directives within an IfSection section are only processed if the test is true. If test is false, everything between the start and end markers is ignored.

-

The section-name specified must not include the - leading "<". The test in the IfSection section can be one of two - forms:

+

The section-name must be specified without either + the leading "<" or closing ">". The test in the + IfSection section can be one + of two forms:

  • section-name
  • !section-name
-

In the former case, the directives between the start and - end markers are only processed if a section directive of the given +

In the former case, the directives between the start and end + markers are only processed if a section directive of the given name is available at the time of processing. The second format - reverses the test, and only processes the directives if the - section-name is not defined.

+ reverses the test, and only processes the directives if + section-name is not an available + section directive.

For example:

@@ -3169,7 +3170,7 @@ matching URLs <LocationMatch "^/combined/(?<sitename>[^/]+)"> - require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example + Require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example </LocationMatch> -- 2.50.1