You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by hu...@apache.org on 2012/05/04 17:19:01 UTC
svn commit: r1334026 - in /httpd/httpd/branches/2.4.x/docs/manual/mod:
mod_unixd.xml mod_userdir.xml mod_usertrack.xml mod_version.xml
mod_vhost_alias.xml mod_xml2enc.xml mpm_common.xml worker.xml
Author: humbedooh
Date: Fri May 4 15:19:00 2012
New Revision: 1334026
URL: http://svn.apache.org/viewvc?rev=1334026&view=rev
Log:
Backporting syntax highlighting for remaining pages to 2.4 as well as some updates for mod_version.xml
Modified:
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_unixd.xml
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_userdir.xml
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_usertrack.xml
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_version.xml
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_vhost_alias.xml
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_xml2enc.xml
httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml
httpd/httpd/branches/2.4.x/docs/manual/mod/worker.xml
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_unixd.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_unixd.xml?rev=1334026&r1=1334025&r2=1334026&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_unixd.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_unixd.xml Fri May 4 15:19:00 2012
@@ -55,7 +55,9 @@ requests</description>
</dl>
<example><title>Example</title>
+ <highlight language="config">
Group www-group
+ </highlight>
</example>
<p>It is recommended that you set up a new group specifically for
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_userdir.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_userdir.xml?rev=1334026&r1=1334025&r2=1334026&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_userdir.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_userdir.xml Fri May 4 15:19:00 2012
@@ -124,24 +124,24 @@ host</context></contextlist>
<p>To allow a few users to have <code>UserDir</code> directories, but
not anyone else, use the following:</p>
- <example>
- UserDir disabled<br />
- UserDir enabled user1 user2 user3
- </example>
+ <highlight language="config">
+UserDir disabled
+UserDir enabled user1 user2 user3
+ </highlight>
<p>To allow most users to have <code>UserDir</code> directories, but
deny this to a few, use the following:</p>
- <example>
+ <highlight language="config">
UserDir disabled user4 user5 user6
- </example>
+ </highlight>
<p>It is also possible to specify alternative user directories.
If you use a command like:</p>
- <example>
- Userdir public_html /usr/web http://www.example.com/
- </example>
+ <highlight language="config">
+ UserDir public_html /usr/web http://www.example.com/
+ </highlight>
<p>With a request for
<code>http://www.example.com/~bob/one/two.html</code>, will try to
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_usertrack.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_usertrack.xml?rev=1334026&r1=1334025&r2=1334026&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_usertrack.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_usertrack.xml Fri May 4 15:19:00 2012
@@ -41,10 +41,10 @@
<p><module>mod_usertrack</module> sets a cookie which can be logged
via <module>mod_log_config</module> configurable logging formats:</p>
- <example>
- LogFormat "%{Apache}n %r %t" usertrack<br />
- CustomLog logs/clickstream.log usertrack
- </example>
+ <highlight language="config">
+LogFormat "%{Apache}n %r %t" usertrack
+CustomLog logs/clickstream.log usertrack
+ </highlight>
</section>
@@ -83,9 +83,9 @@
level domain (for example <code>.example.co.uk</code>).
</note>
- <example>
+ <highlight language="config">
CookieDomain .example.com
- </example>
+ </highlight>
</usage>
</directivesynopsis>
@@ -114,9 +114,9 @@
<p>If this directive is not used, cookies last only for the
current browser session.</p>
- <example>
+ <highlight language="config">
CookieExpires "3 weeks"
- </example>
+ </highlight>
</usage>
</directivesynopsis>
@@ -142,9 +142,9 @@
unpredictable if you use a name containing unusual characters.
Valid characters include A-Z, a-z, 0-9, "_", and "-".</p>
- <example>
+ <highlight language="config">
CookieName clicktrack
- </example>
+ </highlight>
</usage>
</directivesynopsis>
@@ -185,9 +185,9 @@
three of these formats, with <code>Cookie2</code> being the
preferred format.</p>
- <example>
+ <highlight language="config">
CookieStyle Cookie2
- </example>
+ </highlight>
</usage>
</directivesynopsis>
@@ -215,9 +215,9 @@
<module>mod_usertrack</module> will <strong>not</strong>
activate cookies. </p>
- <example>
+ <highlight language="config">
CookieTracking on
- </example>
+ </highlight>
</usage>
</directivesynopsis>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_version.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_version.xml?rev=1334026&r1=1334025&r2=1334026&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_version.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_version.xml Fri May 4 15:19:00 2012
@@ -37,17 +37,15 @@
regular expressions.</p>
<example><title>Examples</title>
- <IfVersion 2.1.0><br />
- <indent>
- # current httpd version is exactly 2.1.0<br />
- </indent>
- </IfVersion><br />
- <br />
- <IfVersion >= 2.2><br />
- <indent>
- # use really new features :-)<br />
- </indent>
- </IfVersion>
+ <highlight language="config">
+<IfVersion 2.4.2>
+ # current httpd version is exactly 2.4.2
+</IfVersion>
+
+<IfVersion >= 2.5>
+ # use really new features :-)
+</IfVersion>
+ </highlight>
</example>
<p>See below for further possibilities.</p>
@@ -89,12 +87,12 @@
</table>
<example><title>Example</title>
- <IfVersion >= 2.1><br />
- <indent>
- # this happens only in versions greater or<br />
- # equal 2.1.0.<br />
- </indent>
- </IfVersion>
+ <highlight language="config">
+<IfVersion >= 2.3>
+ # this happens only in versions greater or
+ # equal 2.3.0.
+</IfVersion>
+ </highlight>
</example>
<p>Besides the numerical comparison it is possible to match a
@@ -112,23 +110,21 @@
</table>
<example><title>Example</title>
- <IfVersion = /^2.1.[01234]$/><br />
- <indent>
- # e.g. workaround for buggy versions
- </indent>
- </IfVersion>
+ <highlight language="config">
+<IfVersion = /^2.4.[01234]$/>
+ # e.g. workaround for buggy versions
+</IfVersion>
+ </highlight>
</example>
<p>In order to reverse the meaning, all operators can be preceded by an
exclamation mark (<code>!</code>):</p>
- <example>
- <IfVersion !~ ^2.1.[01234]$><br />
- <indent>
- # not for those versions<br />
- </indent>
- </IfVersion>
- </example>
+ <highlight language="config">
+<IfVersion !~ ^2.4.[01234]$>
+ # not for those versions
+</IfVersion>
+ </highlight>
<p>If the <var>operator</var> is omitted, it is assumed to be
<code>=</code>.</p>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_vhost_alias.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_vhost_alias.xml?rev=1334026&r1=1334025&r2=1334026&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_vhost_alias.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_vhost_alias.xml Fri May 4 15:19:00 2012
@@ -44,10 +44,10 @@ hosting</description>
/cgi-bin/script.pl</code> to <code>
/usr/local/apache2/cgi-bin/script.pl</code> in all cases:</p>
- <example>
- ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/<br />
- VirtualScriptAlias /never/found/%0/cgi-bin/
- </example>
+ <highlight language="config">
+ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/
+VirtualScriptAlias /never/found/%0/cgi-bin/
+ </highlight>
</note>
</summary>
@@ -126,10 +126,10 @@ hosting</description>
<p>For simple name-based virtual hosts you might use the
following directives in your server configuration file:</p>
- <example>
- UseCanonicalName Off<br />
- VirtualDocumentRoot /usr/local/apache/vhosts/%0
- </example>
+ <highlight language="config">
+UseCanonicalName Off
+VirtualDocumentRoot /usr/local/apache/vhosts/%0
+ </highlight>
<p>A request for
<code>http://www.example.com/directory/file.html</code> will be
@@ -142,10 +142,10 @@ hosting</description>
<code>vhosts</code> directory. To do this you might use the
following in your configuration file:</p>
- <example>
- UseCanonicalName Off<br />
- VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2
- </example>
+ <highlight language="config">
+UseCanonicalName Off
+VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2
+ </highlight>
<p>A request for
<code>http://www.domain.example.com/directory/file.html</code>
@@ -155,18 +155,18 @@ hosting</description>
<p>A more even spread of files can be achieved by hashing from the
end of the name, for example: </p>
-<example>
+<highlight language="config">
VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.-1/%2.-2/%2.-3/%2
-</example>
+</highlight>
<p>The example request would come from
<code>/usr/local/apache/vhosts/example.com/n/i/a/domain/directory/file.html</code>.</p>
<p>Alternatively you might use: </p>
-<example>
+<highlight language="config">
VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2.4+
-</example>
+</highlight>
<p>The example request would come from
<code>/usr/local/apache/vhosts/example.com/d/o/m/ain/directory/file.html</code>.</p>
@@ -174,11 +174,11 @@ hosting</description>
<p>For IP-based virtual hosting you might use the following in
your configuration file:</p>
- <example>
- UseCanonicalName DNS<br />
- VirtualDocumentRootIP /usr/local/apache/vhosts/%1/%2/%3/%4/docs<br />
- VirtualScriptAliasIP /usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin
- </example>
+ <highlight language="config">
+UseCanonicalName DNS
+VirtualDocumentRootIP /usr/local/apache/vhosts/%1/%2/%3/%4/docs
+VirtualScriptAliasIP /usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin
+ </highlight>
<p>A request for
<code>http://www.domain.example.com/directory/file.html</code>
@@ -195,9 +195,9 @@ hosting</description>
a <code>%</code> directive, you can work around the problem in
the following way:</p>
-<example>
+<highlight language="config">
VirtualDocumentRoot /usr/local/apache/vhosts/%2.0.%3.0
-</example>
+</highlight>
<p>A request for
<code>http://www.domain.example.com/directory/file.html</code>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_xml2enc.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_xml2enc.xml?rev=1334026&r1=1334025&r2=1334026&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_xml2enc.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_xml2enc.xml Fri May 4 15:19:00 2012
@@ -132,7 +132,7 @@ module for earlier versions.</compatibil
information, you can set this default to help mod_xml2enc process
the data correctly. For example, to work with the default value
of Latin1 (<var>iso-8859-1</var> specified in HTTP/1.0, use</p>
- <example>xml2EncDefault iso-8859-1</example>
+ <highlight language="config">xml2EncDefault iso-8859-1</highlight>
</usage>
</directivesynopsis>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml?rev=1334026&r1=1334025&r2=1334026&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mpm_common.xml Fri May 4 15:19:00 2012
@@ -143,7 +143,9 @@ of the daemon</description>
<directive module="core">ServerRoot</directive>.</p>
<example><title>Example</title>
+ <highlight language="config">
PidFile /var/run/apache.pid
+ </highlight>
</example>
<p>It is often useful to be able to send the server a signal,
@@ -202,25 +204,25 @@ The <var>protocol</var> argument was add
<p>For example, to make the server accept connections on both
port 80 and port 8000, use:</p>
- <example>
- Listen 80<br />
- Listen 8000
- </example>
+ <highlight language="config">
+Listen 80
+Listen 8000
+ </highlight>
<p>To make the server accept connections on two specified
interfaces and port numbers, use </p>
- <example>
- Listen 192.170.2.1:80<br />
- Listen 192.170.2.5:8000
- </example>
+ <highlight language="config">
+Listen 192.170.2.1:80
+Listen 192.170.2.5:8000
+ </highlight>
<p>IPv6 addresses must be surrounded in square brackets, as in the
following example:</p>
- <example>
+ <highlight language="config">
Listen [2001:db8::a00:20ff:fea7:ccea]:80
- </example>
+ </highlight>
<p>The optional <var>protocol</var> argument is not required for most
configurations. If not specified, <code>https</code> is the default for
@@ -232,9 +234,9 @@ The <var>protocol</var> argument was add
<p>You only need to set the protocol if you are running on non-standard
ports. For example, running an <code>https</code> site on port 8443:</p>
- <example>
+ <highlight language="config">
Listen 192.170.2.1:8443 https
- </example>
+ </highlight>
<note><title>Error condition</title>
Multiple <directive>Listen</directive> directives for the same ip
@@ -469,7 +471,9 @@ the child processes</description>
Apache httpd to always create the file on the disk.</p>
<example><title>Example</title>
+ <highlight language="config">
ScoreBoardFile /var/run/apache_status
+ </highlight>
</example>
<p>File-based shared memory is useful for third-party applications
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/worker.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/worker.xml?rev=1334026&r1=1334025&r2=1334026&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/worker.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/worker.xml Fri May 4 15:19:00 2012
@@ -110,14 +110,14 @@
<p>A typical configuration of the process-thread controls in
the <module>worker</module> MPM could look as follows:</p>
- <example>
- ServerLimit 16<br />
- StartServers 2<br />
- MaxRequestWorkers 150<br />
- MinSpareThreads 25<br />
- MaxSpareThreads 75<br />
- ThreadsPerChild 25
- </example>
+ <highlight language="config">
+ServerLimit 16
+StartServers 2
+MaxRequestWorkers 150
+MinSpareThreads 25
+MaxSpareThreads 75
+ThreadsPerChild 25
+ </highlight>
<p>While the parent process is usually started as <code>root</code>
under Unix in order to bind to port 80, the child processes and threads