From c855bc24990c3c5836a6d4ddc4375dbc090059ab Mon Sep 17 00:00:00 2001 From: Daniel Gruno Date: Fri, 4 May 2012 15:19:00 +0000 Subject: [PATCH] Backporting syntax highlighting for remaining pages to 2.4 as well as some updates for mod_version.xml git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1334026 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_unixd.xml | 2 ++ docs/manual/mod/mod_userdir.xml | 18 +++++----- docs/manual/mod/mod_usertrack.xml | 28 +++++++-------- docs/manual/mod/mod_version.xml | 54 +++++++++++++---------------- docs/manual/mod/mod_vhost_alias.xml | 46 ++++++++++++------------ docs/manual/mod/mod_xml2enc.xml | 2 +- docs/manual/mod/mpm_common.xml | 28 ++++++++------- docs/manual/mod/worker.xml | 16 ++++----- 8 files changed, 98 insertions(+), 96 deletions(-) diff --git a/docs/manual/mod/mod_unixd.xml b/docs/manual/mod/mod_unixd.xml index f16541f892..2e8377193e 100644 --- a/docs/manual/mod/mod_unixd.xml +++ b/docs/manual/mod/mod_unixd.xml @@ -55,7 +55,9 @@ requests Example + Group www-group +

It is recommended that you set up a new group specifically for diff --git a/docs/manual/mod/mod_userdir.xml b/docs/manual/mod/mod_userdir.xml index 4937aa9733..5e883c8a3a 100644 --- a/docs/manual/mod/mod_userdir.xml +++ b/docs/manual/mod/mod_userdir.xml @@ -124,24 +124,24 @@ host

To allow a few users to have UserDir directories, but not anyone else, use the following:

- - UserDir disabled
- UserDir enabled user1 user2 user3 - + +UserDir disabled +UserDir enabled user1 user2 user3 +

To allow most users to have UserDir directories, but deny this to a few, use the following:

- + UserDir disabled user4 user5 user6 - +

It is also possible to specify alternative user directories. If you use a command like:

- - Userdir public_html /usr/web http://www.example.com/ - + + UserDir public_html /usr/web http://www.example.com/ +

With a request for http://www.example.com/~bob/one/two.html, will try to diff --git a/docs/manual/mod/mod_usertrack.xml b/docs/manual/mod/mod_usertrack.xml index 173fd1ba75..acaf6b3be8 100644 --- a/docs/manual/mod/mod_usertrack.xml +++ b/docs/manual/mod/mod_usertrack.xml @@ -41,10 +41,10 @@

mod_usertrack sets a cookie which can be logged via mod_log_config configurable logging formats:

- - LogFormat "%{Apache}n %r %t" usertrack
- CustomLog logs/clickstream.log usertrack - + +LogFormat "%{Apache}n %r %t" usertrack +CustomLog logs/clickstream.log usertrack + @@ -83,9 +83,9 @@ level domain (for example .example.co.uk). - + CookieDomain .example.com - + @@ -114,9 +114,9 @@

If this directive is not used, cookies last only for the current browser session.

- + CookieExpires "3 weeks" - + @@ -142,9 +142,9 @@ unpredictable if you use a name containing unusual characters. Valid characters include A-Z, a-z, 0-9, "_", and "-".

- + CookieName clicktrack - + @@ -185,9 +185,9 @@ three of these formats, with Cookie2 being the preferred format.

- + CookieStyle Cookie2 - + @@ -215,9 +215,9 @@ mod_usertrack will not activate cookies.

- + CookieTracking on - + diff --git a/docs/manual/mod/mod_version.xml b/docs/manual/mod/mod_version.xml index 3b6b41a3b1..6110dbe58b 100644 --- a/docs/manual/mod/mod_version.xml +++ b/docs/manual/mod/mod_version.xml @@ -37,17 +37,15 @@ regular expressions.

Examples - <IfVersion 2.1.0>
- - # current httpd version is exactly 2.1.0
- - </IfVersion>
-
- <IfVersion >= 2.2>
- - # use really new features :-)
- - </IfVersion> + +<IfVersion 2.4.2> + # current httpd version is exactly 2.4.2 +</IfVersion> + +<IfVersion >= 2.5> + # use really new features :-) +</IfVersion> +

See below for further possibilities.

@@ -89,12 +87,12 @@ Example - <IfVersion >= 2.1>
- - # this happens only in versions greater or
- # equal 2.1.0.
- - </IfVersion> + +<IfVersion >= 2.3> + # this happens only in versions greater or + # equal 2.3.0. +</IfVersion> +

Besides the numerical comparison it is possible to match a @@ -112,23 +110,21 @@ Example - <IfVersion = /^2.1.[01234]$/>
- - # e.g. workaround for buggy versions - - </IfVersion> + +<IfVersion = /^2.4.[01234]$/> + # e.g. workaround for buggy versions +</IfVersion> +

In order to reverse the meaning, all operators can be preceded by an exclamation mark (!):

- - <IfVersion !~ ^2.1.[01234]$>
- - # not for those versions
- - </IfVersion> - + +<IfVersion !~ ^2.4.[01234]$> + # not for those versions +</IfVersion> +

If the operator is omitted, it is assumed to be =.

diff --git a/docs/manual/mod/mod_vhost_alias.xml b/docs/manual/mod/mod_vhost_alias.xml index 4296b62a69..6c27b9685a 100644 --- a/docs/manual/mod/mod_vhost_alias.xml +++ b/docs/manual/mod/mod_vhost_alias.xml @@ -44,10 +44,10 @@ hosting /cgi-bin/script.pl to /usr/local/apache2/cgi-bin/script.pl in all cases:

- - ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/
- VirtualScriptAlias /never/found/%0/cgi-bin/ - + +ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/ +VirtualScriptAlias /never/found/%0/cgi-bin/ + @@ -126,10 +126,10 @@ hosting

For simple name-based virtual hosts you might use the following directives in your server configuration file:

- - UseCanonicalName Off
- VirtualDocumentRoot /usr/local/apache/vhosts/%0 - + +UseCanonicalName Off +VirtualDocumentRoot /usr/local/apache/vhosts/%0 +

A request for http://www.example.com/directory/file.html will be @@ -142,10 +142,10 @@ hosting vhosts directory. To do this you might use the following in your configuration file:

- - UseCanonicalName Off
- VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2 - + +UseCanonicalName Off +VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2 +

A request for http://www.domain.example.com/directory/file.html @@ -155,18 +155,18 @@ hosting

A more even spread of files can be achieved by hashing from the end of the name, for example:

- + VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.-1/%2.-2/%2.-3/%2 - +

The example request would come from /usr/local/apache/vhosts/example.com/n/i/a/domain/directory/file.html.

Alternatively you might use:

- + VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2.4+ - +

The example request would come from /usr/local/apache/vhosts/example.com/d/o/m/ain/directory/file.html.

@@ -174,11 +174,11 @@ hosting

For IP-based virtual hosting you might use the following in your configuration file:

- - UseCanonicalName DNS
- VirtualDocumentRootIP /usr/local/apache/vhosts/%1/%2/%3/%4/docs
- VirtualScriptAliasIP /usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin - + +UseCanonicalName DNS +VirtualDocumentRootIP /usr/local/apache/vhosts/%1/%2/%3/%4/docs +VirtualScriptAliasIP /usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin +

A request for http://www.domain.example.com/directory/file.html @@ -195,9 +195,9 @@ hosting a % directive, you can work around the problem in the following way:

- + VirtualDocumentRoot /usr/local/apache/vhosts/%2.0.%3.0 - +

A request for http://www.domain.example.com/directory/file.html diff --git a/docs/manual/mod/mod_xml2enc.xml b/docs/manual/mod/mod_xml2enc.xml index 82bd50dffa..1d4f23c6f4 100644 --- a/docs/manual/mod/mod_xml2enc.xml +++ b/docs/manual/mod/mod_xml2enc.xml @@ -132,7 +132,7 @@ module for earlier versions. information, you can set this default to help mod_xml2enc process the data correctly. For example, to work with the default value of Latin1 (iso-8859-1 specified in HTTP/1.0, use

- xml2EncDefault iso-8859-1 + xml2EncDefault iso-8859-1 diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml index 92413c3d26..bf2b1bdde8 100644 --- a/docs/manual/mod/mpm_common.xml +++ b/docs/manual/mod/mpm_common.xml @@ -143,7 +143,9 @@ of the daemon ServerRoot.

Example + PidFile /var/run/apache.pid +

It is often useful to be able to send the server a signal, @@ -202,25 +204,25 @@ The protocol argument was added in 2.1.5

For example, to make the server accept connections on both port 80 and port 8000, use:

- - Listen 80
- Listen 8000 - + +Listen 80 +Listen 8000 +

To make the server accept connections on two specified interfaces and port numbers, use

- - Listen 192.170.2.1:80
- Listen 192.170.2.5:8000 - + +Listen 192.170.2.1:80 +Listen 192.170.2.5:8000 +

IPv6 addresses must be surrounded in square brackets, as in the following example:

- + Listen [2001:db8::a00:20ff:fea7:ccea]:80 - +

The optional protocol argument is not required for most configurations. If not specified, https is the default for @@ -232,9 +234,9 @@ The protocol argument was added in 2.1.5

You only need to set the protocol if you are running on non-standard ports. For example, running an https site on port 8443:

- + Listen 192.170.2.1:8443 https - + Error condition Multiple Listen directives for the same ip @@ -469,7 +471,9 @@ the child processes Apache httpd to always create the file on the disk.

Example + ScoreBoardFile /var/run/apache_status +

File-based shared memory is useful for third-party applications diff --git a/docs/manual/mod/worker.xml b/docs/manual/mod/worker.xml index f95f4c21f7..3fec7cf92a 100644 --- a/docs/manual/mod/worker.xml +++ b/docs/manual/mod/worker.xml @@ -110,14 +110,14 @@

A typical configuration of the process-thread controls in the worker MPM could look as follows:

- - ServerLimit 16
- StartServers 2
- MaxRequestWorkers 150
- MinSpareThreads 25
- MaxSpareThreads 75
- ThreadsPerChild 25 - + +ServerLimit 16 +StartServers 2 +MaxRequestWorkers 150 +MinSpareThreads 25 +MaxSpareThreads 75 +ThreadsPerChild 25 +

While the parent process is usually started as root under Unix in order to bind to port 80, the child processes and threads -- 2.40.0