Syntax updates for mod_r*.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1331219 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_ratelimit.xml b/docs/manual/mod/mod_ratelimit.xml
index 0128def4596c0ec226797c3478b3380d141fc7f0..e386dd581d9d5c60e7aca94b6924f31be2d022d4 100644 (file)
--- a/docs/manual/mod/mod_ratelimit.xml
+++ b/docs/manual/mod/mod_ratelimit.xml
@@ -38,12 +38,12 @@ The connection speed to be simulated is specified, in KiB/s, using the environme
 variable <code>rate-limit</code>.</p>
 
 <example><title>Example Configuration</title>
-&lt;Location /downloads&gt;<br />
-<indent>
-SetOutputFilter RATE_LIMIT<br />
-SetEnv rate-limit 400 <br />
-</indent>
+<highlight language="config">
+&lt;Location /downloads&gt;
+    SetOutputFilter RATE_LIMIT
+    SetEnv rate-limit 400 
 &lt;/Location&gt;
+</highlight>
 </example>
 
 </summary>

diff --git a/docs/manual/mod/mod_reflector.xml b/docs/manual/mod/mod_reflector.xml
index 880170e8b73f903e2fb8965f70f16becec2ca060..17e5d2c813a320a883b12d6e8fa28e2bc84ae416 100644 (file)
--- a/docs/manual/mod/mod_reflector.xml
+++ b/docs/manual/mod/mod_reflector.xml
@@ -43,23 +43,23 @@
     <dd>Pass the request body through the DEFLATE filter to compress the
     body. This request requires a Content-Encoding request header containing
     "gzip" for the filter to return compressed data.
-    <example>
-      &lt;Location /compress&gt;<br/>
-        SetHandler reflector<br/>
-        SetOutputFilter DEFLATE<br/>
-      &lt;/Location&gt;
-    </example>
+    <highlight language="config">
+&lt;Location /compress&gt;
+    SetHandler reflector
+    SetOutputFilter DEFLATE
+&lt;/Location&gt;
+    </highlight>
     </dd>
 
     <dt>Image downsampling service</dt>
     <dd>Pass the request body through an image downsampling filter, and reflect
     the results to the caller.
-    <example>
-      &lt;Location /downsample&gt;<br/>
-        SetHandler reflector<br/>
-        SetOutputFilter DOWNSAMPLE<br/>
-      &lt;/Location&gt;
-    </example>
+    <highlight language="config">
+&lt;Location /downsample&gt;
+    SetHandler reflector
+    SetOutputFilter DOWNSAMPLE
+&lt;/Location&gt;
+    </highlight>
     </dd>
     </dl>
 </section>

diff --git a/docs/manual/mod/mod_remoteip.xml b/docs/manual/mod/mod_remoteip.xml
index 06b5dd28335aa4300916493d7c6d9378ba7fa1f2..63634e3769ff56d35e46d75e764fe1519888e77e 100644 (file)
--- a/docs/manual/mod/mod_remoteip.xml
+++ b/docs/manual/mod/mod_remoteip.xml
@@ -118,11 +118,15 @@ via the request headers.
     hosts presenting a <directive>RemoteIPHeader</directive> IP value.</p>
 
     <example><title>Internal (Load Balancer) Example</title>
+    <highlight language="config">
         RemoteIPHeader X-Client-IP
+        </highlight>
     </example>
 
     <example><title>Proxy Example</title>
+    <highlight language="config">
         RemoteIPHeader X-Forwarded-For
+        </highlight>
     </example>
 </usage>
 </directivesynopsis>
@@ -142,9 +146,11 @@ via the request headers.
     trusted when passed from these proxies.</p>
 
     <example><title>Internal (Load Balancer) Example</title>
-        RemoteIPHeader X-Client-IP<br/>
-        RemoteIPTrustedProxy 10.0.2.0/24<br/>
-        RemoteIPTrustedProxy gateway.localdomain
+    <highlight language="config">
+RemoteIPHeader X-Client-IP
+RemoteIPTrustedProxy 10.0.2.0/24
+RemoteIPTrustedProxy gateway.localdomain
+        </highlight>
     </example>
 </usage>
 </directivesynopsis>
@@ -170,9 +176,11 @@ via the request headers.
     </example>
 
     <example><title>conf/trusted-proxies.lst contents</title>
-         # Our internally trusted proxies;<br/>
-         10.0.2.0/24         #Everyone in the testing group<br/>
-         gateway.localdomain #The front end balancer
+    <example><pre>
+# Our internally trusted proxies;
+10.0.2.0/24         #Everyone in the testing group
+gateway.localdomain #The front end balancer
+         </pre></example>
     </example>
 </usage>
 </directivesynopsis>
@@ -193,8 +201,10 @@ via the request headers.
     <directive>RemoteIPInternalProxy</directive> addresses are discarded.</p>
 
     <example><title>Example</title>
-        RemoteIPHeader X-Forwarded-For<br/>
-        RemoteIPProxiesHeader X-Forwarded-By
+    <highlight language="config">
+RemoteIPHeader X-Forwarded-For
+RemoteIPProxiesHeader X-Forwarded-By
+    </highlight>
     </example>
 </usage>
 </directivesynopsis>
@@ -216,9 +226,11 @@ via the request headers.
     <directive>RemoteIPHeader</directive> header's value.</p>
 
     <example><title>Trusted (Load Balancer) Example</title>
-        RemoteIPHeader X-Forwarded-For<br/>
-        RemoteIPTrustedProxy 10.0.2.16/28<br/>
-        RemoteIPTrustedProxy proxy.example.com
+        <highlight language="config">
+RemoteIPHeader X-Forwarded-For
+RemoteIPTrustedProxy 10.0.2.16/28
+RemoteIPTrustedProxy proxy.example.com
+        </highlight>
     </example>
 </usage>
 </directivesynopsis>
@@ -239,8 +251,10 @@ via the request headers.
     the <directive>RemoteIPTrustedProxy</directive> directive.</p>
 
     <example><title>Trusted (Load Balancer) Example</title>
-        RemoteIPHeader X-Forwarded-For<br/>
-        RemoteIPTrustedProxyList conf/trusted-proxies.lst
+    <highlight language="config">
+RemoteIPHeader X-Forwarded-For
+RemoteIPTrustedProxyList conf/trusted-proxies.lst
+        </highlight>
     </example>
 
     <example><title>conf/trusted-proxies.lst contents</title>

diff --git a/docs/manual/mod/mod_reqtimeout.xml b/docs/manual/mod/mod_reqtimeout.xml
index 5697a7f6e2beb4af876a98310379d9b5f58cf3af..cb5d5c89b2ed162606d3422ac77ea2f536d279ba 100644 (file)
--- a/docs/manual/mod/mod_reqtimeout.xml
+++ b/docs/manual/mod/mod_reqtimeout.xml
@@ -37,9 +37,9 @@
         Allow 10 seconds to receive the request including the headers and
         30 seconds for receiving the request body:
 
-        <example>
+        <highlight language="config">
           RequestReadTimeout header=10 body=30
-        </example>
+        </highlight>
       </li>
 
       <li>
@@ -49,9 +49,9 @@
         the limit given indirectly by
         <directive module="core">LimitRequestBody</directive>):
 
-        <example>
+        <highlight language="config">
           RequestReadTimeout body=10,MinRate=1000
-        </example>
+        </highlight>
       </li>
 
       <li>
@@ -60,9 +60,9 @@
         500 bytes received. But do not allow more than 30 seconds for the
         request including the headers:
 
-        <example>
+        <highlight language="config">
           RequestReadTimeout header=10-30,MinRate=500
-        </example>
+        </highlight>
       </li>
 
       <li>
@@ -70,9 +70,9 @@
         If a common configuration is used for http and https virtual hosts, the
         timeouts should not be set too low:
 
-        <example>
+        <highlight language="config">
           RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500
-        </example>
+        </highlight>
       </li>
 
     </ol>

diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml
index 45fb0d80957223e15341e5d00739416a363c236b..7ba1eddd3f598fc38a3341a56f50aa148554d590 100644 (file)
--- a/docs/manual/mod/mod_rewrite.xml
+++ b/docs/manual/mod/mod_rewrite.xml
@@ -69,7 +69,9 @@ URLs on the fly</description>
     </note>
 
     <example><title>Example</title>
+    <highlight language="config">
       LogLevel alert rewrite:trace3
+      </highlight>
     </example>
 
     <note><title>RewriteLog</title>
@@ -234,16 +236,16 @@ Apache HTTP Server 2.0.41 and later</compatibility>
       <p>For example, you might define a
       <directive>RewriteMap</directive> as:</p>
 
-      <example>
+      <highlight language="config">
       RewriteMap examplemap txt:/path/to/file/map.txt
-      </example>
+      </highlight>
 
       <p>You would then be able to use this map in a
       <directive>RewriteRule</directive> as follows:</p>
 
-      <example>
+      <highlight language="config">
       RewriteRule ^/ex/(.*) ${examplemap:$1}
-      </example>
+      </highlight>
 
       <p>The following combinations for <em>MapType</em> and
       <em>MapSource</em> can be used:</p>
@@ -316,17 +318,15 @@ Apache HTTP Server 2.0.41 and later</compatibility>
     since the resource was not relative to the document root.  This 
     misconfiguration would normally cause the server to look for an "opt"
     directory under the document root.</p>
-<example>
-<pre>
+<highlight language="config">
 DocumentRoot /var/www/example.com
 Alias /myapp /opt/myapp-1.2.3
 &lt;Directory /opt/myapp-1.2.3&gt;
-RewriteEngine On
-RewriteBase /myapp/
-RewriteRule ^index\.html$  welcome.html 
+    RewriteEngine On
+    RewriteBase /myapp/
+    RewriteRule ^index\.html$  welcome.html 
 &lt;/Directory&gt;
-</pre>
-</example>
+</highlight>
 </usage>
 
 </directivesynopsis>
@@ -803,10 +803,10 @@ RewriteRule ^index\.html$  welcome.html
             to block unwanted hotlinking.
            </p>
 
-           <example>
+           <highlight language="config">
            RewriteCond expr "! %{HTTP_REFERER} -strmatch '*://%{HTTP_HOST}/*'"<br />
            RewriteRule ^/images - [F]
-           </example>
+           </highlight>
         </li>
 
         <li>You can also set special flags for
@@ -832,14 +832,12 @@ RewriteRule ^index\.html$  welcome.html
           Use this to combine rule conditions with a local OR
           instead of the implicit AND. Typical example:
 
-<example>
-<pre>
+<highlight language="config">
 RewriteCond %{REMOTE_HOST}  ^host1  [OR]
 RewriteCond %{REMOTE_HOST}  ^host2  [OR]
 RewriteCond %{REMOTE_HOST}  ^host3
 RewriteRule ...some special stuff for any of these hosts...
-</pre>
-</example>
+</highlight>
 
           Without this flag you would have to write the condition/rule
           pair three times.
@@ -864,8 +862,7 @@ RewriteRule ...some special stuff for any of these hosts...
         ``<code>User-Agent:</code>'' header of the request, you can
         use the following: </p>
 
-<example>
-<pre>
+<highlight language="config">
 RewriteCond  %{HTTP_USER_AGENT}  ^Mozilla
 RewriteRule  ^/$                 /homepage.max.html  [L]
 
@@ -873,8 +870,7 @@ RewriteCond  %{HTTP_USER_AGENT}  ^Lynx
 RewriteRule  ^/$                 /homepage.min.html  [L]
 
 RewriteRule  ^/$                 /homepage.std.html  [L]
-</pre>
-</example>
+</highlight>
 
         <p>Explanation: If you use a browser which identifies itself
         as 'Mozilla' (including Netscape Navigator, Mozilla etc), then you