Syntax updates for mod_v*.xml

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

diff --git a/docs/manual/mod/mod_version.xml b/docs/manual/mod/mod_version.xml
index 3b6b41a3b17887df365f14cc3cc1d813a270fef4..6110dbe58b999649be30d68a352a1908e7b99778 100644 (file)
--- a/docs/manual/mod/mod_version.xml
+++ b/docs/manual/mod/mod_version.xml
@@ -37,17 +37,15 @@
     regular expressions.</p>
 
     <example><title>Examples</title>
-      &lt;IfVersion 2.1.0&gt;<br />
-      <indent>
-        # current httpd version is exactly 2.1.0<br />
-      </indent>
-      &lt;/IfVersion&gt;<br />
-      <br />
-      &lt;IfVersion >= 2.2&gt;<br />
-      <indent>
-        # use really new features :-)<br />
-      </indent>
-      &lt;/IfVersion&gt;
+    <highlight language="config">
+&lt;IfVersion 2.4.2&gt;
+    # current httpd version is exactly 2.4.2
+&lt;/IfVersion&gt;
+
+&lt;IfVersion >= 2.5&gt;
+    # use really new features :-)
+&lt;/IfVersion&gt;
+      </highlight>
     </example>
 
     <p>See below for further possibilities.</p>
@@ -89,12 +87,12 @@
     </table>
 
     <example><title>Example</title>
-      &lt;IfVersion >= 2.1&gt;<br />
-      <indent>
-        # this happens only in versions greater or<br />
-        # equal 2.1.0.<br />
-      </indent>
-      &lt;/IfVersion&gt;
+    <highlight language="config">
+&lt;IfVersion >= 2.3&gt;
+    # this happens only in versions greater or
+    # equal 2.3.0.
+&lt;/IfVersion&gt;
+      </highlight>
     </example>
 
     <p>Besides the numerical comparison it is possible to match a
@@ -112,23 +110,21 @@
     </table>
 
     <example><title>Example</title>
-      &lt;IfVersion = /^2.1.[01234]$/&gt;<br />
-      <indent>
-        # e.g. workaround for buggy versions
-      </indent>
-      &lt;/IfVersion&gt;
+    <highlight language="config">
+&lt;IfVersion = /^2.4.[01234]$/&gt;
+    # e.g. workaround for buggy versions
+&lt;/IfVersion&gt;
+      </highlight>
     </example>
 
     <p>In order to reverse the meaning, all operators can be preceded by an
     exclamation mark (<code>!</code>):</p>
 
-    <example>
-      &lt;IfVersion !~ ^2.1.[01234]$&gt;<br />
-      <indent>
-        # not for those versions<br />
-      </indent>
-      &lt;/IfVersion&gt;
-    </example>
+    <highlight language="config">
+&lt;IfVersion !~ ^2.4.[01234]$&gt;
+    # not for those versions
+&lt;/IfVersion&gt;
+    </highlight>
 
     <p>If the <var>operator</var> is omitted, it is assumed to be
     <code>=</code>.</p>

diff --git a/docs/manual/mod/mod_vhost_alias.xml b/docs/manual/mod/mod_vhost_alias.xml
index 4296b62a693808062ab3628239f076120ec945cd..6c27b9685a863fe71178282a269a6daf103bf0df 100644 (file)
--- a/docs/manual/mod/mod_vhost_alias.xml
+++ b/docs/manual/mod/mod_vhost_alias.xml
@@ -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>