Seems I wasn't quite done editing these files after all.

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

27 files changed, 233 insertions, 286 deletions

diff --git a/docs/manual/howto/access.html.en b/docs/manual/howto/access.html.en
index 154821d0d2..acac364e55 100644
--- a/docs/manual/howto/access.html.en
+++ b/docs/manual/howto/access.html.en
@@ -69,8 +69,8 @@
     <p>The usage of these directives is:</p>
 
     <pre class="prettyprint lang-config">
-      Require host <var>address</var>
-      Require ip <var>ip.address</var>
+Require host <var>address</var>
+Require ip <var>ip.address</var>
     </pre>
 
 
@@ -91,25 +91,23 @@
     board, and you want to keep them out, you could do the
     following:</p>
 
-    <div class="example"><p><code>
-      Require not ip 10.252.46.165
-    </code></p></div>
+    <pre class="prettyprint lang-config">Require not ip 10.252.46.165</pre>
+
 
     <p>Visitors coming from that address will not be able to see
     the content covered by this directive. If, instead, you have a
     machine name, rather than an IP address, you can use that.</p>
 
-    <div class="example"><p><code>
-      Require not host <var>host.example.com</var>
-    </code></p></div>
+    <pre class="prettyprint lang-config">Require not host <var>host.example.com</var></pre>
+
 
     <p>And, if you'd like to block access from an entire domain,
     you can specify just part of an address or domain name:</p>
 
     <pre class="prettyprint lang-config">
-      Require not ip <var>192.168.205</var>
-      Require not host <var>phishers.example.com</var> <var>moreidiots.example</var>
-      Require not gov
+Require not ip <var>192.168.205</var>
+Require not host <var>phishers.example.com</var> <var>moreidiots.example</var>
+Require not gov
     </pre>
 
 
@@ -127,9 +125,9 @@
     following:</p>
 
     <pre class="prettyprint lang-config">
-    &lt;If "%{HTTP_USER_AGENT} = 'BadBot'"&gt;
-        Require All Denied
-    &lt;/If&gt;
+&lt;If "%{HTTP_USER_AGENT} = 'BadBot'"&gt;
+    Require All Denied
+&lt;/If&gt;
     </pre>
 
 
@@ -155,10 +153,10 @@
     and 6am, you can do this using <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
 
     <pre class="prettyprint lang-config">
-    RewriteEngine On
-    RewriteCond %{TIME_HOUR} &gt;20 [OR]
-    RewriteCond %{TIME_HOUR} &lt;07
-    RewriteRule ^/fridge - [F]
+RewriteEngine On
+RewriteCond %{TIME_HOUR} &gt;20 [OR]
+RewriteCond %{TIME_HOUR} &lt;07
+RewriteRule ^/fridge - [F]
     </pre>
 
 
diff --git a/docs/manual/howto/access.xml b/docs/manual/howto/access.xml
index 62ffd60075..a24220af1b 100644
--- a/docs/manual/howto/access.xml
+++ b/docs/manual/howto/access.xml
@@ -68,8 +68,8 @@
     <p>The usage of these directives is:</p>
 
     <highlight language="config">
-      Require host <var>address</var>
-      Require ip <var>ip.address</var>
+Require host <var>address</var>
+Require ip <var>ip.address</var>
     </highlight>
 
     <p>In the first form, <var>address</var> is a fully qualified
@@ -89,25 +89,21 @@
     board, and you want to keep them out, you could do the
     following:</p>
 
-    <example>
-      Require not ip 10.252.46.165
-    </example>
+    <highlight language="config">Require not ip 10.252.46.165</highlight>
 
     <p>Visitors coming from that address will not be able to see
     the content covered by this directive. If, instead, you have a
     machine name, rather than an IP address, you can use that.</p>
 
-    <example>
-      Require not host <var>host.example.com</var>
-    </example>
+    <highlight language="config">Require not host <var>host.example.com</var></highlight>
 
     <p>And, if you'd like to block access from an entire domain,
     you can specify just part of an address or domain name:</p>
 
     <highlight language="config">
-      Require not ip <var>192.168.205</var>
-      Require not host <var>phishers.example.com</var> <var>moreidiots.example</var>
-      Require not gov
+Require not ip <var>192.168.205</var>
+Require not host <var>phishers.example.com</var> <var>moreidiots.example</var>
+Require not gov
     </highlight>
 
     <p>Use of the <directive
@@ -127,9 +123,9 @@
     following:</p>
 
     <highlight language="config">
-    &lt;If "%{HTTP_USER_AGENT} = 'BadBot'"&gt;
-        Require All Denied
-    &lt;/If&gt;
+&lt;If "%{HTTP_USER_AGENT} = 'BadBot'"&gt;
+    Require All Denied
+&lt;/If&gt;
     </highlight>
 
     <note><title>Warning:</title>
@@ -155,10 +151,10 @@
     and 6am, you can do this using <module>mod_rewrite</module>.</p>
 
     <highlight language="config">
-    RewriteEngine On
-    RewriteCond %{TIME_HOUR} &gt;20 [OR]
-    RewriteCond %{TIME_HOUR} &lt;07
-    RewriteRule ^/fridge - [F]
+RewriteEngine On
+RewriteCond %{TIME_HOUR} &gt;20 [OR]
+RewriteCond %{TIME_HOUR} &lt;07
+RewriteRule ^/fridge - [F]
     </highlight>
 
     <p>This will return a 403 Forbidden response for any request after 8pm
diff --git a/docs/manual/howto/auth.html.en b/docs/manual/howto/auth.html.en
index 21aa5daea4..ea9344a2f5 100644
--- a/docs/manual/howto/auth.html.en
+++ b/docs/manual/howto/auth.html.en
@@ -142,9 +142,7 @@ module from each group.</p>
     an <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> directive like the
     following:</p>
 
-    <pre class="prettyprint lang-config">
-      AllowOverride AuthConfig
-    </pre>
+    <pre class="prettyprint lang-config">AllowOverride AuthConfig</pre>
 
 
     <p>Or, if you are just going to put the directives directly in
@@ -218,12 +216,12 @@ module from each group.</p>
     /usr/local/apache/htdocs/secret&gt; section.</p>
 
     <pre class="prettyprint lang-config">
-      AuthType Basic
-      AuthName "Restricted Files"
-      # (Following line optional)
-      AuthBasicProvider file
-      AuthUserFile /usr/local/apache/passwd/passwords
-      Require user rbowen
+AuthType Basic
+AuthName "Restricted Files"
+# (Following line optional)
+AuthBasicProvider file
+AuthUserFile /usr/local/apache/passwd/passwords
+Require user rbowen
     </pre>
 
 
@@ -316,13 +314,13 @@ person in</a></h2>
     look like the following:</p>
 
     <pre class="prettyprint lang-config">
-      AuthType Basic
-      AuthName "By Invitation Only"
-      # Optional line:
-      AuthBasicProvider file
-      AuthUserFile /usr/local/apache/passwd/passwords
-      AuthGroupFile /usr/local/apache/passwd/groups
-      Require group GroupName
+AuthType Basic
+AuthName "By Invitation Only"
+# Optional line:
+AuthBasicProvider file
+AuthUserFile /usr/local/apache/passwd/passwords
+AuthGroupFile /usr/local/apache/passwd/groups
+Require group GroupName
     </pre>
 
 
@@ -334,9 +332,8 @@ person in</a></h2>
     specific. Rather than creating a group file, you can just use
     the following directive:</p>
 
-    <div class="example"><p><code>
-      Require valid-user
-    </code></p></div>
+    <pre class="prettyprint lang-config">Require valid-user</pre>
+
 
     <p>Using that rather than the <code>Require user rbowen</code>
     line will allow anyone in that is listed in the password file,
@@ -383,13 +380,13 @@ person in</a></h2>
     <p>To select a dbd file rather than a text file, for example:</p>
 
     <pre class="prettyprint lang-config">
-    &lt;Directory /www/docs/private&gt;
-        AuthName "Private"
-        AuthType Basic
-        AuthBasicProvider dbm
-        AuthDBMUserFile /www/passwords/passwd.dbm
-        Require valid-user
-    &lt;/Directory&gt;
+&lt;Directory /www/docs/private&gt;
+    AuthName "Private"
+    AuthType Basic
+    AuthBasicProvider dbm
+    AuthDBMUserFile /www/passwords/passwd.dbm
+    Require valid-user
+&lt;/Directory&gt;
     </pre>
 
 
@@ -407,14 +404,14 @@ person in</a></h2>
     file and LDAP based authentication providers are being used.</p>
 
     <pre class="prettyprint lang-config">
-    &lt;Directory /www/docs/private&gt;
-        AuthName "Private"
-        AuthType Basic
-        AuthBasicProvider file ldap
-        AuthUserFile /usr/local/apache/passwd/passwords
-        AuthLDAPURL ldap://ldaphost/o=yourorg
-        Require valid-user
-    &lt;/Directory&gt;
+&lt;Directory /www/docs/private&gt;
+    AuthName "Private"
+    AuthType Basic
+    AuthBasicProvider file ldap
+    AuthUserFile /usr/local/apache/passwd/passwords
+    AuthLDAPURL ldap://ldaphost/o=yourorg
+    Require valid-user
+&lt;/Directory&gt;
     </pre>
 
 
@@ -432,16 +429,16 @@ person in</a></h2>
     authorization as well as LDAP group authorization is being used.</p>
 
     <pre class="prettyprint lang-config">
-    &lt;Directory /www/docs/private&gt;
-        AuthName "Private"
-        AuthType Basic
-        AuthBasicProvider file
-        AuthUserFile /usr/local/apache/passwd/passwords
-        AuthLDAPURL ldap://ldaphost/o=yourorg
-        AuthGroupFile /usr/local/apache/passwd/groups
-        Require group GroupName
-        Require ldap-group cn=mygroup,o=yourorg
-    &lt;/Directory&gt;
+&lt;Directory /www/docs/private&gt;
+    AuthName "Private"
+    AuthType Basic
+    AuthBasicProvider file
+    AuthUserFile /usr/local/apache/passwd/passwords
+    AuthLDAPURL ldap://ldaphost/o=yourorg
+    AuthGroupFile /usr/local/apache/passwd/groups
+    Require group GroupName
+    Require ldap-group cn=mygroup,o=yourorg
+&lt;/Directory&gt;
     </pre>
 
 
@@ -521,17 +518,13 @@ person in</a></h2>
         that will be called during the authorization stage of the request
         processing. For example:</p>
 
-        <pre class="prettyprint lang-config">
-          Require ip <var>address</var>
-        </pre>
+        <pre class="prettyprint lang-config">Require ip <var>address</var></pre>
 
 
         <p>where <var>address</var> is an IP address (or a partial IP
         address) or:</p>
 
-        <pre class="prettyprint lang-config">
-          Require host <var>domain_name</var>
-        </pre>
+        <pre class="prettyprint lang-config">Require host <var>domain_name</var></pre>
 
 
         <p>where <var>domain_name</var> is a fully qualified domain name
@@ -543,10 +536,10 @@ person in</a></h2>
         following:</p>
 
         <pre class="prettyprint lang-config">
-          &lt;RequireAll&gt;
-            Require all granted
-            Require not ip 10.252.46.165
-          &lt;/RequireAll&gt;
+&lt;RequireAll&gt;
+    Require all granted
+    Require not ip 10.252.46.165
+&lt;/RequireAll&gt;
         </pre>
 
 
@@ -555,10 +548,10 @@ person in</a></h2>
         machine name, rather than an IP address, you can use that.</p>
 
         <pre class="prettyprint lang-config">
-          &lt;RequireAll&gt;
-            Require all granted
-            Require not host <var>host.example.com</var>
-          &lt;/RequireAll&gt;
+&lt;RequireAll&gt;
+    Require all granted
+    Require not host <var>host.example.com</var>
+&lt;/RequireAll&gt;
         </pre>
 
 
@@ -566,14 +559,14 @@ person in</a></h2>
         you can specify just part of an address or domain name:</p>
 
         <pre class="prettyprint lang-config">
-  &lt;RequireAll&gt;
+&lt;RequireAll&gt;
     Require all granted
     &lt;RequireNone&gt;
-      Require ip 192.168.205
-      Require host phishers.example.com moreidiots.example
-      Require host ke
+        Require ip 192.168.205
+        Require host phishers.example.com moreidiots.example
+        Require host ke
     &lt;/RequireNone&gt;
-  &lt;/RequireAll&gt;
+&lt;/RequireAll&gt;
         </pre>
 
 
diff --git a/docs/manual/howto/auth.xml b/docs/manual/howto/auth.xml
index 01e139818c..d5c5e1134b 100644
--- a/docs/manual/howto/auth.xml
+++ b/docs/manual/howto/auth.xml
@@ -127,9 +127,7 @@ module from each group.</p>
     an <directive module="core">AllowOverride</directive> directive like the
     following:</p>
 
-    <highlight language="config">
-      AllowOverride AuthConfig
-    </highlight>
+    <highlight language="config">AllowOverride AuthConfig</highlight>
 
     <p>Or, if you are just going to put the directives directly in
     your main server configuration file, you will of course need to
@@ -202,12 +200,12 @@ module from each group.</p>
     /usr/local/apache/htdocs/secret&gt; section.</p>
 
     <highlight language="config">
-      AuthType Basic
-      AuthName "Restricted Files"
-      # (Following line optional)
-      AuthBasicProvider file
-      AuthUserFile /usr/local/apache/passwd/passwords
-      Require user rbowen
+AuthType Basic
+AuthName "Restricted Files"
+# (Following line optional)
+AuthBasicProvider file
+AuthUserFile /usr/local/apache/passwd/passwords
+Require user rbowen
     </highlight>
 
     <p>Let's examine each of those directives individually. The <directive
@@ -306,13 +304,13 @@ person in</title>
     look like the following:</p>
 
     <highlight language="config">
-      AuthType Basic
-      AuthName "By Invitation Only"
-      # Optional line:
-      AuthBasicProvider file
-      AuthUserFile /usr/local/apache/passwd/passwords
-      AuthGroupFile /usr/local/apache/passwd/groups
-      Require group GroupName
+AuthType Basic
+AuthName "By Invitation Only"
+# Optional line:
+AuthBasicProvider file
+AuthUserFile /usr/local/apache/passwd/passwords
+AuthGroupFile /usr/local/apache/passwd/groups
+Require group GroupName
     </highlight>
 
     <p>Now, anyone that is listed in the group <code>GroupName</code>,
@@ -323,9 +321,7 @@ person in</title>
     specific. Rather than creating a group file, you can just use
     the following directive:</p>
 
-    <example>
-      Require valid-user
-    </example>
+    <highlight language="config">Require valid-user</highlight>
 
     <p>Using that rather than the <code>Require user rbowen</code>
     line will allow anyone in that is listed in the password file,
@@ -373,13 +369,13 @@ person in</title>
     <p>To select a dbd file rather than a text file, for example:</p>
 
     <highlight language="config">
-    &lt;Directory /www/docs/private&gt;
-        AuthName "Private"
-        AuthType Basic
-        AuthBasicProvider dbm
-        AuthDBMUserFile /www/passwords/passwd.dbm
-        Require valid-user
-    &lt;/Directory&gt;
+&lt;Directory /www/docs/private&gt;
+    AuthName "Private"
+    AuthType Basic
+    AuthBasicProvider dbm
+    AuthDBMUserFile /www/passwords/passwd.dbm
+    Require valid-user
+&lt;/Directory&gt;
     </highlight>
 
     <p>Other options are available. Consult the
@@ -396,14 +392,14 @@ person in</title>
     file and LDAP based authentication providers are being used.</p>
 
     <highlight language="config">
-    &lt;Directory /www/docs/private&gt;
-        AuthName "Private"
-        AuthType Basic
-        AuthBasicProvider file ldap
-        AuthUserFile /usr/local/apache/passwd/passwords
-        AuthLDAPURL ldap://ldaphost/o=yourorg
-        Require valid-user
-    &lt;/Directory&gt;
+&lt;Directory /www/docs/private&gt;
+    AuthName "Private"
+    AuthType Basic
+    AuthBasicProvider file ldap
+    AuthUserFile /usr/local/apache/passwd/passwords
+    AuthLDAPURL ldap://ldaphost/o=yourorg
+    Require valid-user
+&lt;/Directory&gt;
     </highlight>
 
     <p>In this example the file provider will attempt to authenticate
@@ -420,16 +416,16 @@ person in</title>
     authorization as well as LDAP group authorization is being used.</p>
 
     <highlight language="config">
-    &lt;Directory /www/docs/private&gt;
-        AuthName "Private"
-        AuthType Basic
-        AuthBasicProvider file
-        AuthUserFile /usr/local/apache/passwd/passwords
-        AuthLDAPURL ldap://ldaphost/o=yourorg
-        AuthGroupFile /usr/local/apache/passwd/groups
-        Require group GroupName
-        Require ldap-group cn=mygroup,o=yourorg
-    &lt;/Directory&gt;
+&lt;Directory /www/docs/private&gt;
+    AuthName "Private"
+    AuthType Basic
+    AuthBasicProvider file
+    AuthUserFile /usr/local/apache/passwd/passwords
+    AuthLDAPURL ldap://ldaphost/o=yourorg
+    AuthGroupFile /usr/local/apache/passwd/groups
+    Require group GroupName
+    Require ldap-group cn=mygroup,o=yourorg
+&lt;/Directory&gt;
     </highlight>
 
     <p>To take authorization a little further, authorization container
@@ -508,16 +504,12 @@ person in</title>
         that will be called during the authorization stage of the request
         processing. For example:</p>
 
-        <highlight language="config">
-          Require ip <var>address</var>
-        </highlight>
+        <highlight language="config">Require ip <var>address</var></highlight>
 
         <p>where <var>address</var> is an IP address (or a partial IP
         address) or:</p>
 
-        <highlight language="config">
-          Require host <var>domain_name</var>
-        </highlight>
+        <highlight language="config">Require host <var>domain_name</var></highlight>
 
         <p>where <var>domain_name</var> is a fully qualified domain name
         (or a partial domain name); you may provide multiple addresses or
@@ -528,10 +520,10 @@ person in</title>
         following:</p>
 
         <highlight language="config">
-          &lt;RequireAll&gt;
-            Require all granted
-            Require not ip 10.252.46.165
-          &lt;/RequireAll&gt;
+&lt;RequireAll&gt;
+    Require all granted
+    Require not ip 10.252.46.165
+&lt;/RequireAll&gt;
         </highlight>
 
         <p>Visitors coming from that address will not be able to see
@@ -539,24 +531,24 @@ person in</title>
         machine name, rather than an IP address, you can use that.</p>
 
         <highlight language="config">
-          &lt;RequireAll&gt;
-            Require all granted
-            Require not host <var>host.example.com</var>
-          &lt;/RequireAll&gt;
+&lt;RequireAll&gt;
+    Require all granted
+    Require not host <var>host.example.com</var>
+&lt;/RequireAll&gt;
         </highlight>
 
         <p>And, if you'd like to block access from an entire domain,
         you can specify just part of an address or domain name:</p>
 
         <highlight language="config">
-  &lt;RequireAll&gt;
+&lt;RequireAll&gt;
     Require all granted
     &lt;RequireNone&gt;
-      Require ip 192.168.205
-      Require host phishers.example.com moreidiots.example
-      Require host ke
+        Require ip 192.168.205
+        Require host phishers.example.com moreidiots.example
+        Require host ke
     &lt;/RequireNone&gt;
-  &lt;/RequireAll&gt;
+&lt;/RequireAll&gt;
         </highlight>
 
         <p>The above example uses the <directive module="mod_authz_core"
diff --git a/docs/manual/howto/auth.xml.fr b/docs/manual/howto/auth.xml.fr
index 757f36130b..3ff0ffc686 100644
--- a/docs/manual/howto/auth.xml.fr
+++ b/docs/manual/howto/auth.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1328337 -->
+<!-- English Revision: 1328337:1330260 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviwed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/howto/auth.xml.ja b/docs/manual/howto/auth.xml.ja
index b4c5a9ed0e..3b4083eea9 100644
--- a/docs/manual/howto/auth.xml.ja
+++ b/docs/manual/howto/auth.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 479777:1328337 (outdated) -->
+<!-- English Revision: 479777:1330260 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/auth.xml.ko b/docs/manual/howto/auth.xml.ko
index f6cf06ec16..e0bf89f5a5 100644
--- a/docs/manual/howto/auth.xml.ko
+++ b/docs/manual/howto/auth.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1328337 (outdated) -->
+<!-- English Revision: 105989:1330260 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/auth.xml.meta b/docs/manual/howto/auth.xml.meta
index b0b2e95d63..641334dcd6 100644
--- a/docs/manual/howto/auth.xml.meta
+++ b/docs/manual/howto/auth.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>
diff --git a/docs/manual/howto/auth.xml.tr b/docs/manual/howto/auth.xml.tr
index ae4e08ccec..493a28b400 100644
--- a/docs/manual/howto/auth.xml.tr
+++ b/docs/manual/howto/auth.xml.tr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1070891:1328337 (outdated) -->
+<!-- English Revision: 1070891:1330260 (outdated) -->
 <!-- =====================================================
  Translated by: Umut Samuk <umut belgeler.org>
    Reviewed by: Nilgün Belma Bugüner <nilgun belgeler.org>
diff --git a/docs/manual/howto/htaccess.html.en b/docs/manual/howto/htaccess.html.en
index 5f1c171931..9643ddd938 100644
--- a/docs/manual/howto/htaccess.html.en
+++ b/docs/manual/howto/htaccess.html.en
@@ -65,9 +65,8 @@ changes on a per-directory basis.</p>
       if you would rather call the file <code>.config</code> then you
       can put the following in your server configuration file:</p>
 
-      <div class="example"><p><code>
-        AccessFileName .config
-      </code></p></div>
+      <pre class="prettyprint lang-config">AccessFileName .config</pre>
+
     </div>
 
     <p>In general, <code>.htaccess</code> files use the same syntax as
@@ -195,16 +194,18 @@ changes on a per-directory basis.</p>
 
     <div class="example"><h3>Contents of .htaccess file in
     <code>/www/htdocs/example</code></h3><p><code>
-        AddType text/example .exm
+    <pre class="prettyprint lang-config">AddType text/example .exm</pre>
+
     </code></p></div>
 
     <div class="example"><h3>Section from your <code>httpd.conf</code>
     file</h3><p><code>
-      &lt;Directory /www/htdocs/example&gt;<br />
-      <span class="indent">
-        AddType text/example .exm<br />
-      </span>
-      &lt;/Directory&gt;
+    <pre class="prettyprint lang-config">
+&lt;Directory /www/htdocs/example&gt;<br />
+    AddType text/example .exm<br />
+&lt;/Directory&gt;
+    </pre>
+
     </code></p></div>
 
     <p>However, putting this configuration in your server configuration
@@ -216,9 +217,8 @@ changes on a per-directory basis.</p>
     by setting the <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
     directive to <code>none</code>:</p>
 
-    <div class="example"><p><code>
-      AllowOverride None
-    </code></p></div>
+    <pre class="prettyprint lang-config">AllowOverride None</pre>
+
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="how" id="how">How directives are applied</a></h2>
@@ -239,9 +239,8 @@ changes on a per-directory basis.</p>
     <p>In the directory <code>/www/htdocs/example1</code> we have a
     <code>.htaccess</code> file containing the following:</p>
 
-    <div class="example"><p><code>
-       Options +ExecCGI
-    </code></p></div>
+    <pre class="prettyprint lang-config">Options +ExecCGI</pre>
+
 
     <p>(Note: you must have "<code>AllowOverride Options</code>" in effect
     to permit the use of the "<code class="directive"><a href="../mod/core.html#options">Options</a></code>" directive in
@@ -250,9 +249,8 @@ changes on a per-directory basis.</p>
     <p>In the directory <code>/www/htdocs/example1/example2</code> we have
     a <code>.htaccess</code> file containing:</p>
 
-    <div class="example"><p><code>
-       Options Includes
-    </code></p></div>
+    <pre class="prettyprint lang-config">Options Includes</pre>
+
 
     <p>Because of this second <code>.htaccess</code> file, in the directory
     <code>/www/htdocs/example1/example2</code>, CGI execution is not
@@ -308,11 +306,11 @@ changes on a per-directory basis.</p>
     <p><code>.htaccess</code> file contents:</p>
 
     <pre class="prettyprint lang-config">
-      AuthType Basic
-      AuthName "Password Required"
-      AuthUserFile /www/passwords/password.file
-      AuthGroupFile /www/passwords/group.file
-      Require Group admins
+AuthType Basic
+AuthName "Password Required"
+AuthUserFile /www/passwords/password.file
+AuthGroupFile /www/passwords/group.file
+Require Group admins
     </pre>
 
 
@@ -331,9 +329,9 @@ changes on a per-directory basis.</p>
     <code>.htaccess</code> file in the desired directory:</p>
 
     <pre class="prettyprint lang-config">
-       Options +Includes
-       AddType text/html shtml
-       AddHandler server-parsed shtml
+Options +Includes
+AddType text/html shtml
+AddHandler server-parsed shtml
     </pre>
 
 
@@ -352,8 +350,8 @@ changes on a per-directory basis.</p>
     implemented with the following configuration:</p>
 
     <pre class="prettyprint lang-config">
-       Options +ExecCGI<br />
-       AddHandler cgi-script cgi pl
+Options +ExecCGI
+AddHandler cgi-script cgi pl
     </pre>
 
 
@@ -362,8 +360,8 @@ changes on a per-directory basis.</p>
     configuration:</p>
 
     <pre class="prettyprint lang-config">
-       Options +ExecCGI<br />
-       SetHandler cgi-script
+Options +ExecCGI
+SetHandler cgi-script
     </pre>
 
 
diff --git a/docs/manual/howto/htaccess.xml b/docs/manual/howto/htaccess.xml
index debdc1d55c..e4c7e194f3 100644
--- a/docs/manual/howto/htaccess.xml
+++ b/docs/manual/howto/htaccess.xml
@@ -77,9 +77,7 @@ changes on a per-directory basis.</p>
       if you would rather call the file <code>.config</code> then you
       can put the following in your server configuration file:</p>
 
-      <example>
-        AccessFileName .config
-      </example>
+      <highlight language="config">AccessFileName .config</highlight>
     </note>
 
     <p>In general, <code>.htaccess</code> files use the same syntax as
@@ -218,16 +216,16 @@ changes on a per-directory basis.</p>
 
     <example><title>Contents of .htaccess file in
     <code>/www/htdocs/example</code></title>
-        AddType text/example .exm
+    <highlight language="config">AddType text/example .exm</highlight>
     </example>
 
     <example><title>Section from your <code>httpd.conf</code>
     file</title>
-      &lt;Directory /www/htdocs/example&gt;<br />
-      <indent>
-        AddType text/example .exm<br />
-      </indent>
-      &lt;/Directory&gt;
+    <highlight language="config">
+&lt;Directory /www/htdocs/example&gt;<br />
+    AddType text/example .exm<br />
+&lt;/Directory&gt;
+    </highlight>
     </example>
 
     <p>However, putting this configuration in your server configuration
@@ -239,9 +237,7 @@ changes on a per-directory basis.</p>
     by setting the <directive module="core">AllowOverride</directive>
     directive to <code>none</code>:</p>
 
-    <example>
-      AllowOverride None
-    </example>
+    <highlight language="config">AllowOverride None</highlight>
 </section>
 
 <section id="how"><title>How directives are applied</title>
@@ -262,9 +258,7 @@ changes on a per-directory basis.</p>
     <p>In the directory <code>/www/htdocs/example1</code> we have a
     <code>.htaccess</code> file containing the following:</p>
 
-    <example>
-       Options +ExecCGI
-    </example>
+    <highlight language="config">Options +ExecCGI</highlight>
 
     <p>(Note: you must have "<code>AllowOverride Options</code>" in effect
     to permit the use of the "<directive
@@ -274,9 +268,7 @@ changes on a per-directory basis.</p>
     <p>In the directory <code>/www/htdocs/example1/example2</code> we have
     a <code>.htaccess</code> file containing:</p>
 
-    <example>
-       Options Includes
-    </example>
+    <highlight language="config">Options Includes</highlight>
 
     <p>Because of this second <code>.htaccess</code> file, in the directory
     <code>/www/htdocs/example1/example2</code>, CGI execution is not
@@ -336,11 +328,11 @@ changes on a per-directory basis.</p>
     <p><code>.htaccess</code> file contents:</p>
 
     <highlight language="config">
-      AuthType Basic
-      AuthName "Password Required"
-      AuthUserFile /www/passwords/password.file
-      AuthGroupFile /www/passwords/group.file
-      Require Group admins
+AuthType Basic
+AuthName "Password Required"
+AuthUserFile /www/passwords/password.file
+AuthGroupFile /www/passwords/group.file
+Require Group admins
     </highlight>
 
     <p>Note that <code>AllowOverride AuthConfig</code> must be in effect
@@ -358,9 +350,9 @@ changes on a per-directory basis.</p>
     <code>.htaccess</code> file in the desired directory:</p>
 
     <highlight language="config">
-       Options +Includes
-       AddType text/html shtml
-       AddHandler server-parsed shtml
+Options +Includes
+AddType text/html shtml
+AddHandler server-parsed shtml
     </highlight>
 
     <p>Note that <code>AllowOverride Options</code> and <code>AllowOverride
@@ -378,8 +370,8 @@ changes on a per-directory basis.</p>
     implemented with the following configuration:</p>
 
     <highlight language="config">
-       Options +ExecCGI<br />
-       AddHandler cgi-script cgi pl
+Options +ExecCGI
+AddHandler cgi-script cgi pl
     </highlight>
 
     <p>Alternately, if you wish to have all files in the given directory be
@@ -387,8 +379,8 @@ changes on a per-directory basis.</p>
     configuration:</p>
 
     <highlight language="config">
-       Options +ExecCGI<br />
-       SetHandler cgi-script
+Options +ExecCGI
+SetHandler cgi-script
     </highlight>
 
     <p>Note that <code>AllowOverride Options</code> and <code>AllowOverride
diff --git a/docs/manual/howto/htaccess.xml.fr b/docs/manual/howto/htaccess.xml.fr
index 912906afb8..9010fbf6ba 100644
--- a/docs/manual/howto/htaccess.xml.fr
+++ b/docs/manual/howto/htaccess.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1326216 -->
+<!-- English Revision: 1326216:1330260 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/howto/htaccess.xml.ja b/docs/manual/howto/htaccess.xml.ja
index 0c4238756a..19ad0c61a2 100644
--- a/docs/manual/howto/htaccess.xml.ja
+++ b/docs/manual/howto/htaccess.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 574882:1326216 (outdated) -->
+<!-- English Revision: 574882:1330260 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/htaccess.xml.ko b/docs/manual/howto/htaccess.xml.ko
index 371eafeef8..f9c5fe2ddf 100644
--- a/docs/manual/howto/htaccess.xml.ko
+++ b/docs/manual/howto/htaccess.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408:1326216 (outdated) -->
+<!-- English Revision: 151408:1330260 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/htaccess.xml.meta b/docs/manual/howto/htaccess.xml.meta
index a962e7243c..aba40c04ac 100644
--- a/docs/manual/howto/htaccess.xml.meta
+++ b/docs/manual/howto/htaccess.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">pt-br</variant>
diff --git a/docs/manual/howto/htaccess.xml.pt-br b/docs/manual/howto/htaccess.xml.pt-br
index 9ad178b200..13b1f3f253 100644
--- a/docs/manual/howto/htaccess.xml.pt-br
+++ b/docs/manual/howto/htaccess.xml.pt-br
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.pt-br.xsl"?>
-<!-- English Revision: 151408:1326216 (outdated) -->
+<!-- English Revision: 151408:1330260 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/public_html.html.en b/docs/manual/howto/public_html.html.en
index 7b9c2b3742..2b75e3ff2b 100644
--- a/docs/manual/howto/public_html.html.en
+++ b/docs/manual/howto/public_html.html.en
@@ -68,9 +68,8 @@
     assumed to be a directory path relative to the home directory of the
     specified user. Given this configuration:</p>
 
-    <div class="example"><p><code>
-      UserDir public_html
-    </code></p></div>
+    <pre class="prettyprint lang-config">UserDir public_html</pre>
+
 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
     translated to the file path
@@ -80,9 +79,7 @@
     constructed using that path, plus the username specified. Given this
     configuration:</p>
 
-    <pre class="prettyprint lang-config">
-      UserDir /var/html
-    </pre>
+    <pre class="prettyprint lang-config">UserDir /var/html</pre>
 
 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
@@ -92,9 +89,7 @@
     in which the asterisk is replaced with the username. Given this
     configuration:</p>
 
-    <pre class="prettyprint lang-config">
-      UserDir /var/www/*/docs
-    </pre>
+    <pre class="prettyprint lang-config">UserDir /var/www/*/docs</pre>
 
 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
@@ -103,9 +98,8 @@
 
     <p>Multiple directories or directory paths can also be set.</p>
 
-    <div class="example"><p><code>
-      UserDir public_html /var/html
-    </code></p></div>
+    <pre class="prettyprint lang-config">UserDir public_html /var/html</pre>
+
 
     <p>For the URL <code>http://example.com/~rbowen/file.html</code>,
     Apache will search for <code>~rbowen</code>. If it isn't found,
@@ -120,9 +114,7 @@
     <p>The <code class="directive"><a href="../mod/mod_userdir.html#userdir">UserDir</a></code> directive can be
       used to redirect user directory requests to external URLs.</p>
 
-    <pre class="prettyprint lang-config">
-      UserDir http://example.org/users/*/
-    </pre>
+    <pre class="prettyprint lang-config">UserDir http://example.org/users/*/</pre>
 
 
     <p>The above example will redirect a request for
@@ -137,9 +129,7 @@
     <p>Using the syntax shown in the UserDir documentation, you can restrict
     what users are permitted to use this functionality:</p>
 
-    <pre class="prettyprint lang-config">
-      UserDir disabled root jro fish
-    </pre>
+    <pre class="prettyprint lang-config">UserDir disabled root jro fish</pre>
 
 
     <p>The configuration above will enable the feature for all users
@@ -167,10 +157,10 @@
     cgi-enabled.</p>
 
     <pre class="prettyprint lang-config">
-      &lt;Directory /home/*/public_html/cgi-bin/&gt;
-       Options ExecCGI
-       SetHandler cgi-script
-       &lt;/Directory&gt;
+&lt;Directory /home/*/public_html/cgi-bin/&gt;
+    Options ExecCGI
+    SetHandler cgi-script
+&lt;/Directory&gt;
     </pre>
 
 
diff --git a/docs/manual/howto/public_html.xml b/docs/manual/howto/public_html.xml
index d72c19fc69..456601151b 100644
--- a/docs/manual/howto/public_html.xml
+++ b/docs/manual/howto/public_html.xml
@@ -72,9 +72,7 @@
     assumed to be a directory path relative to the home directory of the
     specified user. Given this configuration:</p>
 
-    <example>
-      UserDir public_html
-    </example>
+    <highlight language="config">UserDir public_html</highlight>
 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
     translated to the file path
@@ -84,9 +82,7 @@
     constructed using that path, plus the username specified. Given this
     configuration:</p>
 
-    <highlight language="config">
-      UserDir /var/html
-    </highlight>
+    <highlight language="config">UserDir /var/html</highlight>
 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
     translated to the file path <code>/var/html/rbowen/file.html</code></p>
@@ -95,9 +91,7 @@
     in which the asterisk is replaced with the username. Given this
     configuration:</p>
 
-    <highlight language="config">
-      UserDir /var/www/*/docs
-    </highlight>
+    <highlight language="config">UserDir /var/www/*/docs</highlight>
 
     <p>the URL <code>http://example.com/~rbowen/file.html</code> will be
     translated to the file path
@@ -105,9 +99,7 @@
 
     <p>Multiple directories or directory paths can also be set.</p>
 
-    <example>
-      UserDir public_html /var/html
-    </example>
+    <highlight language="config">UserDir public_html /var/html</highlight>
 
     <p>For the URL <code>http://example.com/~rbowen/file.html</code>,
     Apache will search for <code>~rbowen</code>. If it isn't found,
@@ -122,9 +114,7 @@
     <p>The <directive module="mod_userdir">UserDir</directive> directive can be
       used to redirect user directory requests to external URLs.</p>
 
-    <highlight language="config">
-      UserDir http://example.org/users/*/
-    </highlight>
+    <highlight language="config">UserDir http://example.org/users/*/</highlight>
 
     <p>The above example will redirect a request for
     <code>http://example.com/~bob/abc.html</code> to
@@ -138,9 +128,7 @@
     <p>Using the syntax shown in the UserDir documentation, you can restrict
     what users are permitted to use this functionality:</p>
 
-    <highlight language="config">
-      UserDir disabled root jro fish
-    </highlight>
+    <highlight language="config">UserDir disabled root jro fish</highlight>
 
     <p>The configuration above will enable the feature for all users
     except for those listed in the <code>disabled</code> statement.
@@ -166,10 +154,10 @@
     cgi-enabled.</p>
 
     <highlight language="config">
-      &lt;Directory /home/*/public_html/cgi-bin/&gt;
-       Options ExecCGI
-       SetHandler cgi-script
-       &lt;/Directory&gt;
+&lt;Directory /home/*/public_html/cgi-bin/&gt;
+    Options ExecCGI
+    SetHandler cgi-script
+&lt;/Directory&gt;
     </highlight>
 
     <p>Then, presuming that <code>UserDir</code> is set to
diff --git a/docs/manual/howto/public_html.xml.fr b/docs/manual/howto/public_html.xml.fr
index 59bcd468d4..555b9712be 100644
--- a/docs/manual/howto/public_html.xml.fr
+++ b/docs/manual/howto/public_html.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1174747 -->
+<!-- English Revision: 1174747:1330260 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/howto/public_html.xml.ja b/docs/manual/howto/public_html.xml.ja
index fc823a6403..730554c429 100644
--- a/docs/manual/howto/public_html.xml.ja
+++ b/docs/manual/howto/public_html.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 659902:1174747 (outdated) -->
+<!-- English Revision: 659902:1330260 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/public_html.xml.ko b/docs/manual/howto/public_html.xml.ko
index acd9f4c264..d9c30bbd62 100644
--- a/docs/manual/howto/public_html.xml.ko
+++ b/docs/manual/howto/public_html.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408:1174747 (outdated) -->
+<!-- English Revision: 151408:1330260 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/public_html.xml.meta b/docs/manual/howto/public_html.xml.meta
index 30c006edff..cae6f7cca8 100644
--- a/docs/manual/howto/public_html.xml.meta
+++ b/docs/manual/howto/public_html.xml.meta
@@ -8,9 +8,9 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
-    <variant>tr</variant>
+    <variant outdated="yes">tr</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/howto/public_html.xml.tr b/docs/manual/howto/public_html.xml.tr
index 083ffd7f3d..220408ce01 100644
--- a/docs/manual/howto/public_html.xml.tr
+++ b/docs/manual/howto/public_html.xml.tr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1174747 -->
+<!-- English Revision: 1174747:1330260 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/howto/ssi.xml.fr b/docs/manual/howto/ssi.xml.fr
index fb68a72148..4a5bbec57a 100644
--- a/docs/manual/howto/ssi.xml.fr
+++ b/docs/manual/howto/ssi.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1174747 -->
+<!-- English Revision: 1174747:1330260 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/howto/ssi.xml.ja b/docs/manual/howto/ssi.xml.ja
index c63aa7826c..65e8fdb378 100644
--- a/docs/manual/howto/ssi.xml.ja
+++ b/docs/manual/howto/ssi.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 659902:1174747 (outdated) -->
+<!-- English Revision: 659902:1330260 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/ssi.xml.ko b/docs/manual/howto/ssi.xml.ko
index 72e2ebff46..0f86750c7d 100644
--- a/docs/manual/howto/ssi.xml.ko
+++ b/docs/manual/howto/ssi.xml.ko
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 659902:1174747 (outdated) -->
+<!-- English Revision: 659902:1330260 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/howto/ssi.xml.meta b/docs/manual/howto/ssi.xml.meta
index 0d8deb802c..1c020635eb 100644
--- a/docs/manual/howto/ssi.xml.meta
+++ b/docs/manual/howto/ssi.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>