From: Christophe Jaillet Date: Tue, 28 Jun 2016 04:39:22 +0000 (+0000) Subject: Be more consistent in block layout in XML. X-Git-Tag: 2.5.0-alpha~1456 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49754a6641f9e2c4f46efb2eb1d0fdd0bb26ac0f;p=thirdparty%2Fapache%2Fhttpd.git Be more consistent in block layout in XML. No visual change git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1750441 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index 609dcf8181e..daf28e94bf9 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -860,7 +860,7 @@ named file-system directory, sub-directories, and their contents. <Directory ~ "^/www/[0-9]{3}"> </Directory> - +

would match directories in /www/ that consisted of three numbers.

@@ -966,7 +966,7 @@ the contents of file-system directories matching a regular expression. +

matches directories in /www/ (or any subdirectory thereof) that consist of three numbers.

@@ -992,11 +992,11 @@ the contents of file-system directories matching a regular expression.mod_rewrite. In order to prevent confusion, numbered (unnamed) backreferences are ignored. Use named groups instead.

- + <DirectoryMatch "^/var/www/combined/(?<sitename>[^/]+)"> Require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example </DirectoryMatch> - + Directory for a description of how regular expressions are mixed in with normal @@ -1012,7 +1012,7 @@ sections are combined when a request is received Directory that forms the main document tree visible from the web DocumentRoot directory-path -DocumentRoot /usr/local/apache/htdocs +DocumentRoot "/usr/local/apache/htdocs" server configvirtual host @@ -1643,7 +1643,7 @@ ErrorLogFormat "[%{u}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] %M% 

This would result in error messages such as:

- + [Thu May 12 08:28:57.652118 2011] [core:error] [pid 8777:tid 4326490112] [client ::1:58619] File does not exist: /usr/local/apache2/htdocs/favicon.ico @@ -1814,7 +1814,7 @@ filenames <Files "?at.*"> # This would apply to cat.html, bat.html, hat.php and so on. </Files> - +

Regular expressions can also be used, with the addition of the ~ character. For example:

@@ -1823,7 +1823,7 @@ filenames <Files ~ "\.(gif|jpe?g|png)$"> #... </Files> - +

would match most common Internet graphics formats. FilesMatch is preferred, @@ -1859,11 +1859,11 @@ filenames does. However, it accepts a regular expression. For example:

- + <FilesMatch ".+\.(gif|jpe?g|png)$"> # ... </FilesMatch> - +

would match most common Internet graphics formats.

@@ -1878,11 +1878,11 @@ filenames mod_rewrite. In order to prevent confusion, numbered (unnamed) backreferences are ignored. Use named groups instead.

- + <FilesMatch "^(?<sitename>[^/]+)"> require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example </FilesMatch> - + How <Directory>, <Location> @@ -2812,7 +2812,7 @@ URLs <Location ~ "/(extra|special)/data"> #... </Location> - +

would match URLs that contained the substring /extra/data or /special/data. The directive <LocationMatch "/(extra|special)/data"> # ... </LocationMatch> - +

would match URLs that contained the substring /extra/data or /special/data.

@@ -2894,7 +2894,7 @@ matching URLs regular expression with a ^ to require this.

- <LocationMatch "^/(extra|special)/data"> +<LocationMatch "^/(extra|special)/data"> @@ -2905,11 +2905,11 @@ matching URLs mod_rewrite. In order to prevent confusion, numbered (unnamed) backreferences are ignored. Use named groups instead.

- + <LocationMatch "^/combined/(?<sitename>[^/]+)"> require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example </LocationMatch> - + How <Directory>, <Location> @@ -3779,7 +3779,7 @@ Protocol https specify:

- Protocols h2 http/1.1 +Protocols h2 http/1.1

Valid protocols are http/1.1 for http and https connections, @@ -3950,11 +3950,15 @@ scripts by the shebang line (first line, starting with #!) in the script. On Win32 systems this line usually looks like:

- #!C:/Perl/bin/perl.exe + +#!C:/Perl/bin/perl.exe +

or, if perl is in the PATH, simply:

- #!perl + +#!perl +

Setting ScriptInterpreterSource Registry will cause the Windows Registry tree HKEY_CLASSES_ROOT to be @@ -4852,7 +4856,7 @@ for external processing, e.g. to a CGI script.

QualifyRedirectURL -Controls whether the REDIRECT_URL environment variable is +Controls whether the REDIRECT_URL environment variable is fully qualified QualifyRedirectURL ON|OFF QualifyRedirectURL OFF