You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@apache.org on 2026/04/14 17:15:48 UTC
svn commit: r1933051 - httpd/httpd/branches/2.4.x/docs/manual/mod
Author: rbowen
Date: Tue Apr 14 17:15:47 2026
New Revision: 1933051
Log:
Uses highlight syntax for example blocks.
Modified:
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_include.html.en
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_include.xml
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_include.html.en
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_include.html.en Tue Apr 14 17:15:12 2026 (r1933050)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_include.html.en Tue Apr 14 17:15:47 2026 (r1933051)
@@ -470,15 +470,13 @@ AddOutputFilter INCLUDES .shtml</pre>
include the onerror path fails, or if onerror is not specified, the
default error message will be included.</p>
- <div class="example"><p><code>
- # Simple example<br />
- <!--#include virtual="/not-exist.html" onerror="/error.html" -->
- </code></p></div>
-
- <div class="example"><p><code>
- # Dedicated onerror paths<br />
- <!--#include virtual="/path-a.html" onerror="/error-a.html" virtual="/path-b.html" onerror="/error-b.html" -->
- </code></p></div>
+ <div class="example"><pre class="prettyprint lang-html"># Simple example
+<!--#include virtual="/not-exist.html" onerror="/error.html" --></pre>
+</div>
+
+ <div class="example"><pre class="prettyprint lang-html"># Dedicated onerror paths
+<!--#include virtual="/path-a.html" onerror="/error-a.html" virtual="/path-b.html" onerror="/error-b.html" --></pre>
+</div>
</dd>
</dl>
@@ -640,12 +638,11 @@ AddOutputFilter INCLUDES .shtml</pre>
<p>The basic flow control elements are:</p>
- <div class="example"><p><code>
- <!--#if expr="<var>test_condition</var>" --><br />
- <!--#elif expr="<var>test_condition</var>" --><br />
- <!--#else --><br />
- <!--#endif -->
- </code></p></div>
+ <div class="example"><pre class="prettyprint lang-html"><!--#if expr="test_condition" -->
+<!--#elif expr="test_condition" -->
+<!--#else -->
+<!--#endif --></pre>
+</div>
<p>The <code>if</code> element works like an if statement in a
programming language. The test condition is evaluated and if
@@ -672,28 +669,20 @@ AddOutputFilter INCLUDES .shtml</pre>
<p>The below example will print "from local net" if client IP address
belongs to the 10.0.0.0/8 subnet.</p>
- <div class="example"><p><code>
- <!--#if expr='-R "10.0.0.0/8"' --><br />
- <span class="indent">
- from local net<br />
- </span>
- <!--#else --><br />
- <span class="indent">
- from somewhere else<br />
- </span>
- <!--#endif -->
- </code></p></div>
+ <div class="example"><pre class="prettyprint lang-html"><!--#if expr='-R "10.0.0.0/8"' -->
+ from local net
+<!--#else -->
+ from somewhere else
+<!--#endif --></pre>
+</div>
<p>The below example will print "foo is bar" if the variable
<code>foo</code> is set to the value "bar".</p>
- <div class="example"><p><code>
- <!--#if expr='v("foo") = "bar"' --><br />
- <span class="indent">
- foo is bar<br />
- </span>
- <!--#endif -->
- </code></p></div>
+ <div class="example"><pre class="prettyprint lang-html"><!--#if expr='v("foo") = "bar"' -->
+ foo is bar
+<!--#endif --></pre>
+</div>
<div class="note"><h3>Reference Documentation</h3>
<p>See also: <a href="../expr.html">Expressions in Apache HTTP Server</a>,
@@ -720,14 +709,11 @@ AddOutputFilter INCLUDES .shtml</pre>
URL, such as a link to that URL. Note that the URL is only tested
for whether access would be granted, not whether the URL exists.</p>
- <div class="example"><h3>Example</h3><p><code>
- <!--#if expr="-A /private" --><br />
- <span class="indent">
- Click <a href="/private">here</a> to access private
- information.<br />
- </span>
- <!--#endif -->
- </code></p></div>
+ <div class="example"><h3>Example</h3><pre class="prettyprint lang-html"><!--#if expr="-A /private" -->
+ Click <a href="/private">here</a> to access private
+ information.
+<!--#endif --></pre>
+</div>
</dd>
<dt><code><var>string1</var> = <var>string2</var><br />
@@ -748,13 +734,10 @@ AddOutputFilter INCLUDES .shtml</pre>
<code>$9</code>. The whole string matched by the regular expression is
stored in the special variable <code>$0</code></p>
- <div class="example"><h3>Example</h3><p><code>
- <!--#if expr="$QUERY_STRING = /^sid=([a-zA-Z0-9]+)/" --><br />
- <span class="indent">
- <!--#set var="session" value="$1" --><br />
- </span>
- <!--#endif -->
- </code></p></div>
+ <div class="example"><h3>Example</h3><pre class="prettyprint lang-html"><!--#if expr="$QUERY_STRING = /^sid=([a-zA-Z0-9]+)/" -->
+ <!--#set var="session" value="$1" -->
+<!--#endif --></pre>
+</div>
</dd>
<dt><code><var>string1</var> < <var>string2</var><br />
@@ -788,10 +771,9 @@ AddOutputFilter INCLUDES .shtml</pre>
"<code>&&</code>" and "<code>||</code>". "<code>!</code>" binds
most tightly. Thus, the following are equivalent:</p>
- <div class="example"><p><code>
- <!--#if expr="$a = test1 && $b = test2" --><br />
- <!--#if expr="($a = test1) && ($b = test2)" -->
- </code></p></div>
+ <div class="example"><pre class="prettyprint lang-html"><!--#if expr="$a = test1 && $b = test2" -->
+<!--#if expr="($a = test1) && ($b = test2)" --></pre>
+</div>
<p>The boolean operators <code>&&</code> and <code>||</code>
share the same priority. So if you want to bind such an operator more
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_include.xml
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_include.xml Tue Apr 14 17:15:12 2026 (r1933050)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_include.xml Tue Apr 14 17:15:47 2026 (r1933051)
@@ -450,13 +450,17 @@ Options +Includes
default error message will be included.</p>
<example>
- # Simple example<br />
- <!--#include virtual="/not-exist.html" onerror="/error.html" -->
+<highlight language="html">
+# Simple example
+<!--#include virtual="/not-exist.html" onerror="/error.html" -->
+</highlight>
</example>
<example>
- # Dedicated onerror paths<br />
- <!--#include virtual="/path-a.html" onerror="/error-a.html" virtual="/path-b.html" onerror="/error-b.html" -->
+<highlight language="html">
+# Dedicated onerror paths
+<!--#include virtual="/path-a.html" onerror="/error-a.html" virtual="/path-b.html" onerror="/error-b.html" -->
+</highlight>
</example>
</dd>
@@ -625,10 +629,12 @@ Options +Includes
<p>The basic flow control elements are:</p>
<example>
- <!--#if expr="<var>test_condition</var>" --><br />
- <!--#elif expr="<var>test_condition</var>" --><br />
- <!--#else --><br />
- <!--#endif -->
+<highlight language="html">
+<!--#if expr="test_condition" -->
+<!--#elif expr="test_condition" -->
+<!--#else -->
+<!--#endif -->
+</highlight>
</example>
<p>The <code>if</code> element works like an if statement in a
@@ -658,26 +664,24 @@ Options +Includes
belongs to the 10.0.0.0/8 subnet.</p>
<example>
- <!--#if expr='-R "10.0.0.0/8"' --><br />
- <indent>
- from local net<br />
- </indent>
- <!--#else --><br />
- <indent>
- from somewhere else<br />
- </indent>
- <!--#endif -->
+<highlight language="html">
+<!--#if expr='-R "10.0.0.0/8"' -->
+ from local net
+<!--#else -->
+ from somewhere else
+<!--#endif -->
+</highlight>
</example>
<p>The below example will print "foo is bar" if the variable
<code>foo</code> is set to the value "bar".</p>
<example>
- <!--#if expr='v("foo") = "bar"' --><br />
- <indent>
- foo is bar<br />
- </indent>
- <!--#endif -->
+<highlight language="html">
+<!--#if expr='v("foo") = "bar"' -->
+ foo is bar
+<!--#endif -->
+</highlight>
</example>
<note><title>Reference Documentation</title>
@@ -706,12 +710,12 @@ Options +Includes
for whether access would be granted, not whether the URL exists.</p>
<example><title>Example</title>
- <!--#if expr="-A /private" --><br />
- <indent>
- Click <a href="/private">here</a> to access private
- information.<br />
- </indent>
- <!--#endif -->
+<highlight language="html">
+<!--#if expr="-A /private" -->
+ Click <a href="/private">here</a> to access private
+ information.
+<!--#endif -->
+</highlight>
</example>
</dd>
@@ -734,11 +738,11 @@ Options +Includes
stored in the special variable <code>$0</code></p>
<example><title>Example</title>
- <!--#if expr="$QUERY_STRING = /^sid=([a-zA-Z0-9]+)/" --><br />
- <indent>
- <!--#set var="session" value="$1" --><br />
- </indent>
- <!--#endif -->
+<highlight language="html">
+<!--#if expr="$QUERY_STRING = /^sid=([a-zA-Z0-9]+)/" -->
+ <!--#set var="session" value="$1" -->
+<!--#endif -->
+</highlight>
</example>
</dd>
@@ -774,8 +778,10 @@ Options +Includes
most tightly. Thus, the following are equivalent:</p>
<example>
- <!--#if expr="$a = test1 && $b = test2" --><br />
- <!--#if expr="($a = test1) && ($b = test2)" -->
+<highlight language="html">
+<!--#if expr="$a = test1 && $b = test2" -->
+<!--#if expr="($a = test1) && ($b = test2)" -->
+</highlight>
</example>
<p>The boolean operators <code>&&</code> and <code>||</code>