Patch submitted by Tim Bannister <isoma AT jellybaby DOT net> to do the

following: • Added French translation for 1.3 obsolescence message • Added lang="en" attribute to main (English) obsolescence message • The top index pages for alternate languages now have obsolescence messages • Style changes for the red box (now "width: 35em" & centred) • Fixed some pages that said the latest version was 2.2 • Updated text for modules that were already obsolete in 1.3 * The include file subdirectory/header.html is replaced with header_l2.html in the top directory, which should simplify any future maintenance work. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@1296031 13f79535-47bb-0310-9956-ffa450edef68
author: Rich Bowen <rbowen@apache.org> 2012-03-02 02:07:06 +0000
committer: Rich Bowen <rbowen@apache.org> 2012-03-02 02:07:06 +0000
commit: 2e264e262d5d2a0e2325759eb9f41a175be69230 (patch)
tree: 6c8c45a444a5af97fc7e5b9ed3aa735f273c33d9
parent: a8156297ba987219aa10cad949ad2e8e3c88e829 (diff)
download: httpd-2e264e262d5d2a0e2325759eb9f41a175be69230.tar.gz
163 files changed, 254 insertions, 317 deletions
diff --git a/htdocs/manual/bind.html.fr b/htdocs/manual/bind.html.fr
index 38c47ac711..4808711cbf 100644
--- a/htdocs/manual/bind.html.fr
+++ b/htdocs/manual/bind.html.fr
@@ -16,7 +16,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="header.html.fr" -->
 
     <h1 align="CENTER">D&eacute;finir quelles adresses et quels
     ports Apache utilise</h1>
diff --git a/htdocs/manual/configuring.html.fr b/htdocs/manual/configuring.html.fr
index 46e13c277c..875040c7a2 100644
--- a/htdocs/manual/configuring.html.fr
+++ b/htdocs/manual/configuring.html.fr
@@ -16,7 +16,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="header.html.fr" -->
 
     <h1 align="CENTER">Fichiers de configuration</h1>
 
diff --git a/htdocs/manual/dns-caveats.html.fr b/htdocs/manual/dns-caveats.html.fr
index 2104dda606..f4961b8a77 100644
--- a/htdocs/manual/dns-caveats.html.fr
+++ b/htdocs/manual/dns-caveats.html.fr
@@ -15,7 +15,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="header.html.fr" -->
 
     <h1 align="CENTER">Apache et le DNS</h1>
 
diff --git a/htdocs/manual/header.html b/htdocs/manual/header.html
index cf3c69b08e..59626cb959 100644
--- a/htdocs/manual/header.html
+++ b/htdocs/manual/header.html
@@ -1,23 +1,12 @@
-<style>
-.obsolete
-{
-  margin: 0;
-  padding: 8px 10px;
-  padding-left: 50px;
-  padding-bottom: 10px;
-  line-height: 1.4em;
-  background: #f99 url(images/warning.png) no-repeat 0px 0px;
-}
-</style>
-
-    <div align="CENTER">
+    <div align="CENTER" lang="en">
       <img src="images/sub.gif" alt="[APACHE DOCUMENTATION]" />
 
       <h3>Apache HTTP Server Version 1.3</h3>
-        <div class="obsolete"><p>You are looking at the documentation for the 
+        <div style="margin: 0; padding: 8px 10px; padding-left: 50px; padding-bottom: 10px; line-height: 1.4em; background: #f99 url(images/warning.png) no-repeat 0px 0px; margin-left: auto; margin-right: auto; width: 35em;">
+        <p>You are looking at the documentation for the 
         1.3 version of the Apache HTTP Server, which is no longer
         maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
+        fact still using the 1.3 version, <strong style="font-weight: inherit;">please consider upgrading</strong>.
         The current version of the server is <a 
         href="http://httpd.apache.org/docs/2.4/">2.4</a>.</p></div>
 
diff --git a/htdocs/manual/header.html.fr b/htdocs/manual/header.html.fr
new file mode 100644
index 0000000000..f42191cfcf
--- /dev/null
+++ b/htdocs/manual/header.html.fr
@@ -0,0 +1,12 @@
+    <div align="CENTER">
+      <img src="images/sub.gif" alt="[Documentation d'Apache]" lang="fr"/>
+
+      <h3>Serveur HTTP Apache Version 1.3</h3>
+        <div style="margin: 0; padding: 8px 10px; padding-left: 50px; padding-bottom: 10px; line-height: 1.4em; background: #f99 url(images/warning.png) no-repeat 0px 0px; margin-left: auto; margin-right: auto; width: 35em;">
+        <p>Vous lisez la documentation de la version 1.3 du serveur Apache, 
+        qui n'est plus maintenu, et a &eacute;t&eacute; d&eacute;clar&eacute; &laquo;en fin de vie&raquo;. Si vous
+        &ecirc;tes toujours en utilisant la version 1.3, <strong style="font-weight: inherit;">s'il vous pla&icirc;t 
+        envisager la mise &agrave; jour</strong>. La version actuelle du logiciel est 
+        <a href="http://httpd.apache.org/docs/2.4/">2.4</a>.</p></div>
+    </div>
+
diff --git a/htdocs/manual/header_l2.html b/htdocs/manual/header_l2.html
new file mode 100644
index 0000000000..4316ddcd08
--- /dev/null
+++ b/htdocs/manual/header_l2.html
@@ -0,0 +1,14 @@
+    <div align="CENTER" lang="en">
+      <img src="../images/sub.gif" alt="[APACHE DOCUMENTATION]" />
+
+      <h3>Apache HTTP Server Version 1.3</h3>
+        <div style="margin: 0; padding: 8px 10px; padding-left: 50px; padding-bottom: 10px; line-height: 1.4em; background: #f99 url(../images/warning.png) no-repeat 0px 0px; margin-left: auto; margin-right: auto; width: 35em;">
+        <p>You are looking at the documentation for the 
+        1.3 version of the Apache HTTP Server, which is no longer
+        maintained, and has been declared "end of life". If you are in
+        fact still using the 1.3 version, <strong style="font-weight: inherit;">please consider upgrading</strong>.
+        The current version of the server is <a 
+        href="http://httpd.apache.org/docs/2.4/">2.4</a>.</p></div>
+
+    </div>
+
diff --git a/htdocs/manual/header_l2.html.fr b/htdocs/manual/header_l2.html.fr
new file mode 100644
index 0000000000..35f4227c31
--- /dev/null
+++ b/htdocs/manual/header_l2.html.fr
@@ -0,0 +1,12 @@
+    <div align="CENTER">
+      <img src="../images/sub.gif" alt="[Documentation d'Apache]" lang="fr"/>
+
+      <h3>Serveur HTTP Apache Version 1.3</h3>
+        <div style="margin: 0; padding: 8px 10px; padding-left: 50px; padding-bottom: 10px; line-height: 1.4em; background: #f99 url(../images/warning.png) no-repeat 0px 0px; margin-left: auto; margin-right: auto; width: 35em;">
+        <p>Vous lisez la documentation de la version 1.3 du serveur Apache, 
+        qui n'est plus maintenu, et a &eacute;t&eacute; d&eacute;clar&eacute; &laquo;en fin de vie&raquo;. Si vous
+        &ecirc;tes toujours en utilisant la version 1.3, <strong style="font-weight: inherit;">s'il vous pla&icirc;t 
+        envisager la mise &agrave; jour</strong>. La version actuelle du logiciel est 
+        <a href="http://httpd.apache.org/docs/2.4/">2.4</a>.</p></div>
+    </div>
+
diff --git a/htdocs/manual/howto/auth.html b/htdocs/manual/howto/auth.html
index 6641852940..ce42e2e4f9 100644
--- a/htdocs/manual/howto/auth.html
+++ b/htdocs/manual/howto/auth.html
@@ -9,7 +9,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
 <h1 align="center">Authentication, Authorization, and Access
 Control</h1>
diff --git a/htdocs/manual/howto/cgi.html.en b/htdocs/manual/howto/cgi.html.en
index d91fc9ace0..5282d35f8f 100644
--- a/htdocs/manual/howto/cgi.html.en
+++ b/htdocs/manual/howto/cgi.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Dynamic Content with CGI</h1>
     <a id="__index__" name="__index__"></a> <!-- INDEX BEGIN -->
diff --git a/htdocs/manual/howto/cgi.html.ja.jis b/htdocs/manual/howto/cgi.html.ja.jis
index d333f16498..0936ec7279 100644
--- a/htdocs/manual/howto/cgi.html.ja.jis
+++ b/htdocs/manual/howto/cgi.html.ja.jis
@@ -12,7 +12,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">CGI $B$K$h$kF0E*%3%s%F%s%D(B</h1>
     <a id="__index__" name="__index__"></a> <!-- INDEX BEGIN -->
diff --git a/htdocs/manual/howto/header.html b/htdocs/manual/howto/header.html
index c2edc356a7..e69de29bb2 100644
--- a/htdocs/manual/howto/header.html
+++ b/htdocs/manual/howto/header.html
@@ -1,25 +0,0 @@
-<style>
-.obsolete
-{
-  margin: 0;
-  padding: 8px 10px;
-  padding-left: 50px;
-  padding-bottom: 10px;
-  line-height: 1.4em;
-  background: #f99 url(../images/warning.png) no-repeat 0px 0px;
-}
-</style>
-
-    <div align="CENTER">
-      <img src="../images/sub.gif" alt="[APACHE DOCUMENTATION]" />
-
-      <h3>Apache HTTP Server Version 1.3</h3>
-        <div class="obsolete"><p>You are looking at the documentation for the 
-        1.3 version of the Apache HTTP Server, which is no longer
-        maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
-        The current version of the server is <a 
-        href="http://httpd.apache.org/docs/2.4/">2.4</a>.</p></div>
-
-    </div>
-
diff --git a/htdocs/manual/howto/htaccess.html b/htdocs/manual/howto/htaccess.html
index 6e58e6bd5a..763ee2984c 100644
--- a/htdocs/manual/howto/htaccess.html
+++ b/htdocs/manual/howto/htaccess.html
@@ -11,7 +11,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#000080"
   alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER"><code>.htaccess</code> files</h1>
     <!-- INDEX BEGIN -->
diff --git a/htdocs/manual/howto/ssi.html.en b/htdocs/manual/howto/ssi.html.en
index 92dc0d0fa7..de558af14d 100644
--- a/htdocs/manual/howto/ssi.html.en
+++ b/htdocs/manual/howto/ssi.html.en
@@ -13,7 +13,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache Tutorial: Introduction to Server Side
     Includes</h1>
diff --git a/htdocs/manual/howto/ssi.html.ja.jis b/htdocs/manual/howto/ssi.html.ja.jis
index 0b29270d58..3f09ef36f6 100644
--- a/htdocs/manual/howto/ssi.html.ja.jis
+++ b/htdocs/manual/howto/ssi.html.ja.jis
@@ -13,7 +13,7 @@
 
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Apache $B%A%e!<%H%j%"%k(B:
     Server Side Includes $BF~Lg(B</h1>
diff --git a/htdocs/manual/index.html.fr b/htdocs/manual/index.html.fr
index 71af0a779c..7ca1f17d35 100644
--- a/htdocs/manual/index.html.fr
+++ b/htdocs/manual/index.html.fr
@@ -49,8 +49,8 @@
         </tr>
 
         <tr>
-          <td align="center" height="30">
-            <h3>Serveur HTTP Apache version 1.3</h3>
+          <td align="center">
+            <!--#include virtual="header.html.fr" -->
           </td>
         </tr>
       </table>
diff --git a/htdocs/manual/index.html.ja.jis b/htdocs/manual/index.html.ja.jis
index e43f9f1cf4..12ac72bde9 100644
--- a/htdocs/manual/index.html.ja.jis
+++ b/htdocs/manual/index.html.ja.jis
@@ -50,8 +50,9 @@
         </tr>
 
         <tr>
-          <td align="center" height="30">
-            <h3>Apache HTTP Server Version 1.3</h3>
+          <td align="center">
+
+    <!--#include virtual="header.html" -->
           </td>
         </tr>
       </table>
diff --git a/htdocs/manual/invoking.html.fr b/htdocs/manual/invoking.html.fr
index 647c7df3bc..4599436b2b 100644
--- a/htdocs/manual/invoking.html.fr
+++ b/htdocs/manual/invoking.html.fr
@@ -15,7 +15,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="header.html.fr" -->
 
     <h1 align="CENTER">D&eacute;marrage d'Apache</h1>
 
diff --git a/htdocs/manual/misc/API.html b/htdocs/manual/misc/API.html
index c6cd032a6d..82f89b3e70 100644
--- a/htdocs/manual/misc/API.html
+++ b/htdocs/manual/misc/API.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache API notes</h1>
     These are some notes on the Apache API and the data structures
diff --git a/htdocs/manual/misc/FAQ-A.html b/htdocs/manual/misc/FAQ-A.html
index 40f5314a7c..cdcab5c83b 100644
--- a/htdocs/manual/misc/FAQ-A.html
+++ b/htdocs/manual/misc/FAQ-A.html
@@ -29,7 +29,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache Server Frequently Asked
     Questions</h1>
diff --git a/htdocs/manual/misc/FAQ-B.html b/htdocs/manual/misc/FAQ-B.html
index 4bf8590fed..142ffcb270 100644
--- a/htdocs/manual/misc/FAQ-B.html
+++ b/htdocs/manual/misc/FAQ-B.html
@@ -29,7 +29,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache Server Frequently Asked
     Questions</h1>
diff --git a/htdocs/manual/misc/FAQ-C.html b/htdocs/manual/misc/FAQ-C.html
index b599c662f4..45703f4049 100644
--- a/htdocs/manual/misc/FAQ-C.html
+++ b/htdocs/manual/misc/FAQ-C.html
@@ -29,7 +29,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache Server Frequently Asked
     Questions</h1>
diff --git a/htdocs/manual/misc/FAQ-D.html b/htdocs/manual/misc/FAQ-D.html
index 962f840473..8e974a4d2b 100644
--- a/htdocs/manual/misc/FAQ-D.html
+++ b/htdocs/manual/misc/FAQ-D.html
@@ -29,7 +29,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache Server Frequently Asked
     Questions</h1>
diff --git a/htdocs/manual/misc/FAQ-E.html b/htdocs/manual/misc/FAQ-E.html
index 4f6d87259a..902a4a678a 100644
--- a/htdocs/manual/misc/FAQ-E.html
+++ b/htdocs/manual/misc/FAQ-E.html
@@ -29,7 +29,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache Server Frequently Asked
     Questions</h1>
diff --git a/htdocs/manual/misc/FAQ-F.html b/htdocs/manual/misc/FAQ-F.html
index 367fd09ae0..6269461a68 100644
--- a/htdocs/manual/misc/FAQ-F.html
+++ b/htdocs/manual/misc/FAQ-F.html
@@ -29,7 +29,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache Server Frequently Asked
     Questions</h1>
diff --git a/htdocs/manual/misc/FAQ-G.html b/htdocs/manual/misc/FAQ-G.html
index d3ed72e8f0..b401c1e888 100644
--- a/htdocs/manual/misc/FAQ-G.html
+++ b/htdocs/manual/misc/FAQ-G.html
@@ -29,7 +29,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache Server Frequently Asked
     Questions</h1>
diff --git a/htdocs/manual/misc/FAQ-H.html b/htdocs/manual/misc/FAQ-H.html
index cc05585d69..ffe1144a37 100644
--- a/htdocs/manual/misc/FAQ-H.html
+++ b/htdocs/manual/misc/FAQ-H.html
@@ -29,7 +29,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache Server Frequently Asked
     Questions</h1>
diff --git a/htdocs/manual/misc/FAQ-I.html b/htdocs/manual/misc/FAQ-I.html
index 616fb28ccb..5c191d78d8 100644
--- a/htdocs/manual/misc/FAQ-I.html
+++ b/htdocs/manual/misc/FAQ-I.html
@@ -29,7 +29,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache Server Frequently Asked
     Questions</h1>
diff --git a/htdocs/manual/misc/FAQ.html b/htdocs/manual/misc/FAQ.html
index ffcb50ab04..f2f6e7db74 100644
--- a/htdocs/manual/misc/FAQ.html
+++ b/htdocs/manual/misc/FAQ.html
@@ -13,7 +13,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache Server Frequently Asked
     Questions</h1>
diff --git a/htdocs/manual/misc/client_block_api.html b/htdocs/manual/misc/client_block_api.html
index 7917a2c100..bf60a49f4a 100644
--- a/htdocs/manual/misc/client_block_api.html
+++ b/htdocs/manual/misc/client_block_api.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Reading Client Input in Apache 1.2</h1>
     <hr />
diff --git a/htdocs/manual/misc/compat_notes.html b/htdocs/manual/misc/compat_notes.html
index 95574637a1..64f0f88a71 100644
--- a/htdocs/manual/misc/compat_notes.html
+++ b/htdocs/manual/misc/compat_notes.html
@@ -13,7 +13,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Compatibility Notes with NCSA's Server</h1>
     <hr />
diff --git a/htdocs/manual/misc/custom_errordocs.html b/htdocs/manual/misc/custom_errordocs.html
index 050f128925..df698bcd5a 100644
--- a/htdocs/manual/misc/custom_errordocs.html
+++ b/htdocs/manual/misc/custom_errordocs.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Using XSSI and <samp>ErrorDocument</samp> to
     configure customized international server error responses</h1>
diff --git a/htdocs/manual/misc/descriptors.html b/htdocs/manual/misc/descriptors.html
index 4f600ab364..372c23510e 100644
--- a/htdocs/manual/misc/descriptors.html
+++ b/htdocs/manual/misc/descriptors.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Descriptors and Apache</h1>
 
diff --git a/htdocs/manual/misc/fin_wait_2.html b/htdocs/manual/misc/fin_wait_2.html
index 75ed61e3c5..e0e0bed249 100644
--- a/htdocs/manual/misc/fin_wait_2.html
+++ b/htdocs/manual/misc/fin_wait_2.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Connections in the FIN_WAIT_2 state and
     Apache</h1>
diff --git a/htdocs/manual/misc/header.html b/htdocs/manual/misc/header.html
index c2edc356a7..e69de29bb2 100644
--- a/htdocs/manual/misc/header.html
+++ b/htdocs/manual/misc/header.html
@@ -1,25 +0,0 @@
-<style>
-.obsolete
-{
-  margin: 0;
-  padding: 8px 10px;
-  padding-left: 50px;
-  padding-bottom: 10px;
-  line-height: 1.4em;
-  background: #f99 url(../images/warning.png) no-repeat 0px 0px;
-}
-</style>
-
-    <div align="CENTER">
-      <img src="../images/sub.gif" alt="[APACHE DOCUMENTATION]" />
-
-      <h3>Apache HTTP Server Version 1.3</h3>
-        <div class="obsolete"><p>You are looking at the documentation for the 
-        1.3 version of the Apache HTTP Server, which is no longer
-        maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
-        The current version of the server is <a 
-        href="http://httpd.apache.org/docs/2.4/">2.4</a>.</p></div>
-
-    </div>
-
diff --git a/htdocs/manual/misc/howto.html b/htdocs/manual/misc/howto.html
index d5eaa2bbbe..3f73d461b3 100644
--- a/htdocs/manual/misc/howto.html
+++ b/htdocs/manual/misc/howto.html
@@ -16,7 +16,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache HOWTO documentation</h1>
     How to: 
diff --git a/htdocs/manual/misc/index.html b/htdocs/manual/misc/index.html
index bedf922e49..d9baf735f7 100644
--- a/htdocs/manual/misc/index.html
+++ b/htdocs/manual/misc/index.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache Miscellaneous Documentation</h1>
 
diff --git a/htdocs/manual/misc/known_client_problems.html b/htdocs/manual/misc/known_client_problems.html
index 42109ee92f..b39aacfa83 100644
--- a/htdocs/manual/misc/known_client_problems.html
+++ b/htdocs/manual/misc/known_client_problems.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Known Problems in Clients</h1>
 
diff --git a/htdocs/manual/misc/nopgp.html b/htdocs/manual/misc/nopgp.html
index 48f05405f3..17185607ed 100644
--- a/htdocs/manual/misc/nopgp.html
+++ b/htdocs/manual/misc/nopgp.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Why We Took PEM Out of Apache</h1>
     On May 17th, 1995, we were asked by a representative of NCSA to
diff --git a/htdocs/manual/misc/perf-bsd44.html b/htdocs/manual/misc/perf-bsd44.html
index 7391ddedde..0e9c1115fa 100644
--- a/htdocs/manual/misc/perf-bsd44.html
+++ b/htdocs/manual/misc/perf-bsd44.html
@@ -13,7 +13,7 @@
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
     <a id="initial" name="initial">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
     </a> 
 
     <h1 align="CENTER">Running a High-Performance Web Server for
diff --git a/htdocs/manual/misc/perf-dec.html b/htdocs/manual/misc/perf-dec.html
index f19e4882ea..009c650549 100644
--- a/htdocs/manual/misc/perf-dec.html
+++ b/htdocs/manual/misc/perf-dec.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Performance Tuning Tips for Digital
     Unix</h1>
diff --git a/htdocs/manual/misc/perf-hp.html b/htdocs/manual/misc/perf-hp.html
index 356b61c073..6384a09d30 100644
--- a/htdocs/manual/misc/perf-hp.html
+++ b/htdocs/manual/misc/perf-hp.html
@@ -13,7 +13,7 @@
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
     <a id="initial" name="initial">&nbsp;</a> 
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
      
 
     <h1 align="center">Running a High-Performance Web Server for
diff --git a/htdocs/manual/misc/perf-tuning.html b/htdocs/manual/misc/perf-tuning.html
index e970c0231a..003bbb57ce 100644
--- a/htdocs/manual/misc/perf-tuning.html
+++ b/htdocs/manual/misc/perf-tuning.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#000080"
   alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Apache Performance Notes</h1>
 
diff --git a/htdocs/manual/misc/perf.html b/htdocs/manual/misc/perf.html
index 00aaba5f61..9536951e78 100644
--- a/htdocs/manual/misc/perf.html
+++ b/htdocs/manual/misc/perf.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Hints on Running a High-Performance Web
     Server</h1>
diff --git a/htdocs/manual/misc/rewriteguide.html b/htdocs/manual/misc/rewriteguide.html
index 224eefb53e..c113d138f4 100644
--- a/htdocs/manual/misc/rewriteguide.html
+++ b/htdocs/manual/misc/rewriteguide.html
@@ -14,7 +14,7 @@
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
     <blockquote>
-      <!--#include virtual="header.html" -->
+      <!--#include virtual="../header_l2.html" -->
 
       <div align="CENTER">
         <h1>Apache 1.3<br />
diff --git a/htdocs/manual/misc/security_tips.html b/htdocs/manual/misc/security_tips.html
index 3529f277ba..50ab793706 100644
--- a/htdocs/manual/misc/security_tips.html
+++ b/htdocs/manual/misc/security_tips.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Security Tips for Server Configuration</h1>
 
diff --git a/htdocs/manual/misc/tutorials.html b/htdocs/manual/misc/tutorials.html
index d6457c9f13..778d62c22c 100644
--- a/htdocs/manual/misc/tutorials.html
+++ b/htdocs/manual/misc/tutorials.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache Tutorials</h1>
 
diff --git a/htdocs/manual/misc/vif-info.html b/htdocs/manual/misc/vif-info.html
index 299a65ab4b..5a5c322f0f 100644
--- a/htdocs/manual/misc/vif-info.html
+++ b/htdocs/manual/misc/vif-info.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Configuring Multiple IP Addresses</h1>
 <pre>
diff --git a/htdocs/manual/misc/windoz_keepalive.html b/htdocs/manual/misc/windoz_keepalive.html
index 80578b1292..9fda4e7bd5 100644
--- a/htdocs/manual/misc/windoz_keepalive.html
+++ b/htdocs/manual/misc/windoz_keepalive.html
@@ -13,7 +13,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">HTTP/1.1 KeepAlive problems with Netscape
     3.0</h1>
diff --git a/htdocs/manual/mod/core.html.en b/htdocs/manual/mod/core.html.en
index 7ab998499d..4f5fd525c6 100644
--- a/htdocs/manual/mod/core.html.en
+++ b/htdocs/manual/mod/core.html.en
@@ -13,7 +13,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Apache Core Features</h1>
 
diff --git a/htdocs/manual/mod/core.html.fr b/htdocs/manual/mod/core.html.fr
index 9183bb3ef8..f1cd231203 100644
--- a/htdocs/manual/mod/core.html.fr
+++ b/htdocs/manual/mod/core.html.fr
@@ -15,7 +15,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html.fr" -->
 
     <h1 align="center">Noyau d'Apache</h1>
 
diff --git a/htdocs/manual/mod/core.html.ja.jis b/htdocs/manual/mod/core.html.ja.jis
index 6472ae69e2..cdaa3b1734 100644
--- a/htdocs/manual/mod/core.html.ja.jis
+++ b/htdocs/manual/mod/core.html.ja.jis
@@ -11,7 +11,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#000080"
   alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Apache $B%3%"5!G=(B</h1>
 
diff --git a/htdocs/manual/mod/directive-dict.html.en b/htdocs/manual/mod/directive-dict.html.en
index 6700bda254..e6f3882ce4 100644
--- a/htdocs/manual/mod/directive-dict.html.en
+++ b/htdocs/manual/mod/directive-dict.html.en
@@ -13,7 +13,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Terms Used to Describe Apache
     Directives</h1>
diff --git a/htdocs/manual/mod/directive-dict.html.fr b/htdocs/manual/mod/directive-dict.html.fr
index 9405277445..1541b93b29 100644
--- a/htdocs/manual/mod/directive-dict.html.fr
+++ b/htdocs/manual/mod/directive-dict.html.fr
@@ -16,7 +16,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html.fr" -->
 
     <h1 align="CENTER">Termes utilis&eacute;s pour d&eacute;crire
     les directives Apache</h1>
diff --git a/htdocs/manual/mod/directive-dict.html.ja.jis b/htdocs/manual/mod/directive-dict.html.ja.jis
index 96328f8f99..43a611bac4 100644
--- a/htdocs/manual/mod/directive-dict.html.ja.jis
+++ b/htdocs/manual/mod/directive-dict.html.ja.jis
@@ -10,7 +10,7 @@
 <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
 <body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#000080"
 alink="#FF0000">
-<!--#include virtual="header.html" -->
+<!--#include virtual="../header_l2.html" -->
 <h1 align="center">Apache
 $B$N%G%#%l%/%F%#%V$N2r@b$K;H$o$l$kMQ8l(B</h1>
 
diff --git a/htdocs/manual/mod/directives.html.de b/htdocs/manual/mod/directives.html.de
index da94e519f3..9dc35f76d0 100644
--- a/htdocs/manual/mod/directives.html.de
+++ b/htdocs/manual/mod/directives.html.de
@@ -12,7 +12,7 @@
  VLINK="#000080"
  ALINK="#FF0000"
 >
-<!--#include virtual="header.html" -->
+<!--#include virtual="../header_l2.html" -->
 <H1 ALIGN="CENTER">Apache Konfigurationsdirektiven</H1>
 <P>
 Dieses Dokument enth&auml;lt eine vollst&auml;ndige Liste aller
diff --git a/htdocs/manual/mod/directives.html.en b/htdocs/manual/mod/directives.html.en
index 303c76230c..ed4b182eef 100644
--- a/htdocs/manual/mod/directives.html.en
+++ b/htdocs/manual/mod/directives.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache Directives</h1>
 
diff --git a/htdocs/manual/mod/directives.html.fr b/htdocs/manual/mod/directives.html.fr
index 253168fc7a..4cbe3feb03 100644
--- a/htdocs/manual/mod/directives.html.fr
+++ b/htdocs/manual/mod/directives.html.fr
@@ -15,7 +15,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html.fr" -->
 
     <h1 align="CENTER">Directives Apache</h1>
 
diff --git a/htdocs/manual/mod/directives.html.ja.jis b/htdocs/manual/mod/directives.html.ja.jis
index 38307c385f..b000cb4c14 100644
--- a/htdocs/manual/mod/directives.html.ja.jis
+++ b/htdocs/manual/mod/directives.html.ja.jis
@@ -12,7 +12,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Apache $B%G%#%l%/%F%#%V(B</h1>
 
diff --git a/htdocs/manual/mod/header.html b/htdocs/manual/mod/header.html
index 5caadce72a..e69de29bb2 100644
--- a/htdocs/manual/mod/header.html
+++ b/htdocs/manual/mod/header.html
@@ -1,24 +0,0 @@
-    <div align="CENTER">
-      <img src="../images/sub.gif" alt="[APACHE DOCUMENTATION]" />
-
-      <h3>Apache HTTP Server Version 1.3</h3>
-        <div class="obsolete"><p>You are looking at the documentation for the 
-        1.3 version of the Apache HTTP Server, which is no longer
-        maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
-        The current version of the server is <a 
-        href="http://httpd.apache.org/docs/2.4/">2.4</a>.
-
-        This document may be available
-        <a href="http://httpd.apache.org/docs/current/mod/" id="docLink">in the 2.4 docs.</a> 
-        </p>
-      
-        <script language='Javascript' type='text/javascript'>
-       var path = location.pathname;
-       path = path.replace( /1\.3/, 'current' );
-       document.getElementById("docLink").href=(path);
-       </script>
-        </div>
-
-    </div>
-
diff --git a/htdocs/manual/mod/index-bytype.html.en b/htdocs/manual/mod/index-bytype.html.en
index 5bdc93c77f..77e1d2b841 100644
--- a/htdocs/manual/mod/index-bytype.html.en
+++ b/htdocs/manual/mod/index-bytype.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache modules</h1>
 
diff --git a/htdocs/manual/mod/index-bytype.html.fr b/htdocs/manual/mod/index-bytype.html.fr
index 7b5b460acc..6e5b0954ba 100644
--- a/htdocs/manual/mod/index-bytype.html.fr
+++ b/htdocs/manual/mod/index-bytype.html.fr
@@ -15,7 +15,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html.fr" -->
 
     <h1 align="CENTER">Modules Apache</h1>
 
diff --git a/htdocs/manual/mod/index-bytype.html.ja.jis b/htdocs/manual/mod/index-bytype.html.ja.jis
index 3c02037e49..15d528968d 100644
--- a/htdocs/manual/mod/index-bytype.html.ja.jis
+++ b/htdocs/manual/mod/index-bytype.html.ja.jis
@@ -13,7 +13,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Apache $B%b%8%e!<%k(B</h1>
 
diff --git a/htdocs/manual/mod/index.html.en b/htdocs/manual/mod/index.html.en
index e39cdf7da3..731cd5e8e8 100644
--- a/htdocs/manual/mod/index.html.en
+++ b/htdocs/manual/mod/index.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache modules</h1>
 
diff --git a/htdocs/manual/mod/index.html.fr b/htdocs/manual/mod/index.html.fr
index 800f111174..f50a76e1ae 100644
--- a/htdocs/manual/mod/index.html.fr
+++ b/htdocs/manual/mod/index.html.fr
@@ -15,7 +15,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html.fr" -->
 
     <h1 align="CENTER">Modules Apache</h1>
 
diff --git a/htdocs/manual/mod/index.html.ja.jis b/htdocs/manual/mod/index.html.ja.jis
index 3811551c22..ce0aa30eb0 100644
--- a/htdocs/manual/mod/index.html.ja.jis
+++ b/htdocs/manual/mod/index.html.ja.jis
@@ -12,7 +12,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Apache $B%b%8%e!<%k(B</h1>
 
diff --git a/htdocs/manual/mod/mod_access.html.en b/htdocs/manual/mod/mod_access.html.en
index ac98e28aeb..023a5a71a7 100644
--- a/htdocs/manual/mod/mod_access.html.en
+++ b/htdocs/manual/mod/mod_access.html.en
@@ -17,6 +17,9 @@
   padding-bottom: 10px;
   line-height: 1.4em;
   background: #f99 url(../images/warning.png) no-repeat 0px 0px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 35em;
 }
 
 .currentdocs
@@ -40,13 +43,13 @@
         <div class="obsolete"><p>You are looking at the documentation for the 
         1.3 version of the Apache HTTP Server, which is no longer
         maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
+        fact still using the 1.3 version, <strong style="font-weight: inherit;">please consider upgrading</strong>.
         The current version of the server is <a 
-        href="http://httpd.apache.org/docs/2.2/">2.2</a>.
+        href="http://httpd.apache.org/docs/2.4/">2.4</a>.
 
-        In 2.2, the equivalent of this module is now named 
+        In 2.4, the equivalent of this module is now named 
         <a
-        href="http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html"
+        href="http://httpd.apache.org/docs/2.4/mod/mod_authz_host.html"
         >mod_authz_host</a>.</p> 
 
         </div>
diff --git a/htdocs/manual/mod/mod_access.html.ja.jis b/htdocs/manual/mod/mod_access.html.ja.jis
index 741d5f2d73..570e97991d 100644
--- a/htdocs/manual/mod/mod_access.html.ja.jis
+++ b/htdocs/manual/mod/mod_access.html.ja.jis
@@ -12,7 +12,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">mod_access $B%b%8%e!<%k(B</h1>
 
diff --git a/htdocs/manual/mod/mod_actions.html.en b/htdocs/manual/mod/mod_actions.html.en
index 0c32c00c54..8999eac9f5 100644
--- a/htdocs/manual/mod/mod_actions.html.en
+++ b/htdocs/manual/mod/mod_actions.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_actions</h1>
 
diff --git a/htdocs/manual/mod/mod_actions.html.ja.jis b/htdocs/manual/mod/mod_actions.html.ja.jis
index 95e2605585..8484013e71 100644
--- a/htdocs/manual/mod/mod_actions.html.ja.jis
+++ b/htdocs/manual/mod/mod_actions.html.ja.jis
@@ -12,7 +12,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">mod_actions $B%b%8%e!<%k(B</h1>
 
diff --git a/htdocs/manual/mod/mod_alias.html.en b/htdocs/manual/mod/mod_alias.html.en
index f1349301b5..dca67fc5e0 100644
--- a/htdocs/manual/mod/mod_alias.html.en
+++ b/htdocs/manual/mod/mod_alias.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_alias</h1>
 
diff --git a/htdocs/manual/mod/mod_alias.html.ja.jis b/htdocs/manual/mod/mod_alias.html.ja.jis
index c9352cb6e9..2213a471d6 100644
--- a/htdocs/manual/mod/mod_alias.html.ja.jis
+++ b/htdocs/manual/mod/mod_alias.html.ja.jis
@@ -12,7 +12,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">mod_alias $B%b%8%e!<%k(B</h1>
 
diff --git a/htdocs/manual/mod/mod_asis.html.en b/htdocs/manual/mod/mod_asis.html.en
index 77659eb541..f17f428486 100644
--- a/htdocs/manual/mod/mod_asis.html.en
+++ b/htdocs/manual/mod/mod_asis.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_asis</h1>
 
diff --git a/htdocs/manual/mod/mod_asis.html.ja.jis b/htdocs/manual/mod/mod_asis.html.ja.jis
index 45eb692659..39ba2cd4ad 100644
--- a/htdocs/manual/mod/mod_asis.html.ja.jis
+++ b/htdocs/manual/mod/mod_asis.html.ja.jis
@@ -12,7 +12,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">mod_asis $B%b%8%e!<%k(B</h1>
 
diff --git a/htdocs/manual/mod/mod_auth.html.en b/htdocs/manual/mod/mod_auth.html.en
index e677c43415..e0d79be203 100644
--- a/htdocs/manual/mod/mod_auth.html.en
+++ b/htdocs/manual/mod/mod_auth.html.en
@@ -17,6 +17,9 @@
   padding-bottom: 10px;
   line-height: 1.4em;
   background: #f99 url(../images/warning.png) no-repeat 0px 0px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 35em;
 }
 
 .currentdocs
@@ -38,17 +41,17 @@
         <div class="obsolete"><p>You are looking at the documentation for the 
         1.3 version of the Apache HTTP Server, which is no longer
         maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
+        fact still using the 1.3 version, <strong style="font-weight: inherit;">please consider upgrading</strong>.
         The current version of the server is <a 
-        href="http://httpd.apache.org/docs/2.2/">2.2</a>.
+        href="http://httpd.apache.org/docs/2.4/">2.4</a>.
 
-        In 2.2, the equivalent of this module is now named 
+        In 2.4, the equivalent of this module is now named 
         <a
-        href="http://httpd.apache.org/docs/2.2/mod/mod_auth_basic.html"
+        href="http://httpd.apache.org/docs/2.4/mod/mod_auth_basic.html"
         >mod_auth_basic</a>. However, authentication has changed
         enormously in the 2.x versions, and you are encouraged to look
         at the <a
-        href="http://httpd.apache.org/docs/current/howto/auth.html">Authentication
+        href="http://httpd.apache.org/docs/2.4/howto/auth.html">Authentication
         HowTo</a> for an overview of those changes.</p> 
 
         </div>
diff --git a/htdocs/manual/mod/mod_auth.html.ja.jis b/htdocs/manual/mod/mod_auth.html.ja.jis
index 1edb289d3c..bdd08aeb4b 100644
--- a/htdocs/manual/mod/mod_auth.html.ja.jis
+++ b/htdocs/manual/mod/mod_auth.html.ja.jis
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#000080"
   alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">mod_auth $B%b%8%e!<%k(B</h1>
 
diff --git a/htdocs/manual/mod/mod_auth_anon.html b/htdocs/manual/mod/mod_auth_anon.html
index 6164a6d12b..18538954d7 100644
--- a/htdocs/manual/mod/mod_auth_anon.html
+++ b/htdocs/manual/mod/mod_auth_anon.html
@@ -17,6 +17,9 @@
   padding-bottom: 10px;
   line-height: 1.4em;
   background: #f99 url(../images/warning.png) no-repeat 0px 0px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 35em;
 }
 
 .currentdocs
@@ -39,7 +42,7 @@
         <div class="obsolete"><p>You are looking at the documentation for the 
         1.3 version of the Apache HTTP Server, which is no longer
         maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
+        fact still using the 1.3 version, <strong style="font-weight: inherit;">please consider upgrading</strong>.
         The current version of the server is <a 
         href="http://httpd.apache.org/docs/2.4/">2.4</a>.
 
diff --git a/htdocs/manual/mod/mod_auth_db.html b/htdocs/manual/mod/mod_auth_db.html
index 7ae25c0348..164b86d43e 100644
--- a/htdocs/manual/mod/mod_auth_db.html
+++ b/htdocs/manual/mod/mod_auth_db.html
@@ -17,6 +17,9 @@
   padding-bottom: 10px;
   line-height: 1.4em;
   background: #f99 url(../images/warning.png) no-repeat 0px 0px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 35em;
 }
 
 .currentdocs
@@ -39,7 +42,7 @@
         <div class="obsolete"><p>You are looking at the documentation for the 
         1.3 version of the Apache HTTP Server, which is no longer
         maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
+        fact still using the 1.3 version, <strong style="font-weight: inherit;">please consider upgrading</strong>.
         The current version of the server is <a 
         href="http://httpd.apache.org/docs/2.4/">2.4</a>.
 
diff --git a/htdocs/manual/mod/mod_auth_dbm.html b/htdocs/manual/mod/mod_auth_dbm.html
index fe898fd118..7421419fbd 100644
--- a/htdocs/manual/mod/mod_auth_dbm.html
+++ b/htdocs/manual/mod/mod_auth_dbm.html
@@ -16,6 +16,9 @@
   padding-bottom: 10px;
   line-height: 1.4em;
   background: #f99 url(../images/warning.png) no-repeat 0px 0px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 35em;
 }
 
 .currentdocs
@@ -37,7 +40,7 @@
         <div class="obsolete"><p>You are looking at the documentation for the 
         1.3 version of the Apache HTTP Server, which is no longer
         maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
+        fact still using the 1.3 version, <strong style="font-weight: inherit;">please consider upgrading</strong>.
         The current version of the server is <a 
         href="http://httpd.apache.org/docs/2.4/">2.4</a>.
 
diff --git a/htdocs/manual/mod/mod_autoindex.html.en b/htdocs/manual/mod/mod_autoindex.html.en
index 802621e83c..6f75b66c8d 100644
--- a/htdocs/manual/mod/mod_autoindex.html.en
+++ b/htdocs/manual/mod/mod_autoindex.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_autoindex</h1>
     This module provides for automatic directory indexing. 
diff --git a/htdocs/manual/mod/mod_autoindex.html.ja.jis b/htdocs/manual/mod/mod_autoindex.html.ja.jis
index 6caa889101..d1a822bfe0 100644
--- a/htdocs/manual/mod/mod_autoindex.html.ja.jis
+++ b/htdocs/manual/mod/mod_autoindex.html.ja.jis
@@ -13,7 +13,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_autoindex</h1>
     $B<+F0E*$K%G%#%l%/%H%j$N%$%s%G%C%/%9$r:n$k5!G=$rDs6!$9$k%b%8%e!<%k!#(B
diff --git a/htdocs/manual/mod/mod_browser.html b/htdocs/manual/mod/mod_browser.html
index 02083b91ef..8b23055ddb 100644
--- a/htdocs/manual/mod/mod_browser.html
+++ b/htdocs/manual/mod/mod_browser.html
@@ -17,6 +17,9 @@
   padding-bottom: 10px;
   line-height: 1.4em;
   background: #f99 url(../images/warning.png) no-repeat 0px 0px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 35em;
 }
 
 .currentdocs
@@ -39,7 +42,7 @@
         <div class="obsolete"><p>You are looking at the documentation for the 
         1.3 version of the Apache HTTP Server, which is no longer
         maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
+        fact still using the 1.3 version, <strong style="font-weight: inherit;">please consider upgrading</strong>.
         The current version of the server is <a 
         href="http://httpd.apache.org/docs/2.4/">2.4</a>.
 
diff --git a/htdocs/manual/mod/mod_cern_meta.html b/htdocs/manual/mod/mod_cern_meta.html
index 3952c5a0db..c1e7574db7 100644
--- a/htdocs/manual/mod/mod_cern_meta.html
+++ b/htdocs/manual/mod/mod_cern_meta.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Apache module mod_cern_meta</h1>
 
diff --git a/htdocs/manual/mod/mod_cgi.html.en b/htdocs/manual/mod/mod_cgi.html.en
index d333f46ab3..860776cd60 100644
--- a/htdocs/manual/mod/mod_cgi.html.en
+++ b/htdocs/manual/mod/mod_cgi.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_cgi</h1>
 
diff --git a/htdocs/manual/mod/mod_cgi.html.ja.jis b/htdocs/manual/mod/mod_cgi.html.ja.jis
index f001ddab6b..fa2f643f98 100644
--- a/htdocs/manual/mod/mod_cgi.html.ja.jis
+++ b/htdocs/manual/mod/mod_cgi.html.ja.jis
@@ -12,7 +12,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">mod_cgi $B%b%8%e!<%k(B</h1>
 
diff --git a/htdocs/manual/mod/mod_cookies.html b/htdocs/manual/mod/mod_cookies.html
index 7f65492bb9..d888dd646e 100644
--- a/htdocs/manual/mod/mod_cookies.html
+++ b/htdocs/manual/mod/mod_cookies.html
@@ -16,6 +16,9 @@
   padding-bottom: 10px;
   line-height: 1.4em;
   background: #f99 url(../images/warning.png) no-repeat 0px 0px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 35em;
 }
 
 .currentdocs
@@ -37,11 +40,12 @@
         <div class="obsolete"><p>You are looking at the documentation for the 
         1.3 version of the Apache HTTP Server, which is no longer
         maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
+        fact still using the 1.3 version, <strong style="font-weight: inherit;">please consider upgrading</strong>.
         The current version of the server is <a 
-        href="http://httpd.apache.org/docs/2.4/">2.4</a>.
+        href="http://httpd.apache.org/docs/2.4/">2.4</a>.</p>
 
-        In more recent versions of the server, you should use 
+        <p>
+        This module is obsolete. As of version 1.2 of Apache, it has been replaced with
         <a
         href="http://httpd.apache.org/docs/2.4/mod/mod_usertrack.html"
         >mod_usertrack</a>.</p> 
@@ -51,9 +55,6 @@
     </div>
 
     <h1 align="CENTER">Module mod_cookies</h1>
-    <strong><font color="red">This module is obsolete. As of
-    version 1.2 of Apache, it has been replaced with <a
-    href="mod_usertrack.html">mod_usertrack</a>.</font></strong> 
 
     <p>This module is contained in the <code>mod_cookies.c</code>
     file, and is not compiled in by default. It provides for
diff --git a/htdocs/manual/mod/mod_digest.html b/htdocs/manual/mod/mod_digest.html
index 80386ace9a..1782170690 100644
--- a/htdocs/manual/mod/mod_digest.html
+++ b/htdocs/manual/mod/mod_digest.html
@@ -17,6 +17,9 @@
   padding-bottom: 10px;
   line-height: 1.4em;
   background: #f99 url(../images/warning.png) no-repeat 0px 0px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 35em;
 }
 
 .currentdocs
@@ -38,7 +41,7 @@
         <div class="obsolete"><p>You are looking at the documentation for the 
         1.3 version of the Apache HTTP Server, which is no longer
         maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
+        fact still using the 1.3 version, <strong style="font-weight: inherit;">please consider upgrading</strong>.
         The current version of the server is <a 
         href="http://httpd.apache.org/docs/2.4/">2.4</a>.
 
diff --git a/htdocs/manual/mod/mod_dir.html.en b/htdocs/manual/mod/mod_dir.html.en
index 08402220bc..556c4151a4 100644
--- a/htdocs/manual/mod/mod_dir.html.en
+++ b/htdocs/manual/mod/mod_dir.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_dir</h1>
 
diff --git a/htdocs/manual/mod/mod_dir.html.ja.jis b/htdocs/manual/mod/mod_dir.html.ja.jis
index ac0f1f36ee..508033483e 100644
--- a/htdocs/manual/mod/mod_dir.html.ja.jis
+++ b/htdocs/manual/mod/mod_dir.html.ja.jis
@@ -12,7 +12,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">mod_dir $B%b%8%e!<%k(B</h1>
 
diff --git a/htdocs/manual/mod/mod_dld.html b/htdocs/manual/mod/mod_dld.html
index bf27ae5b21..7517847f68 100644
--- a/htdocs/manual/mod/mod_dld.html
+++ b/htdocs/manual/mod/mod_dld.html
@@ -17,6 +17,9 @@
   padding-bottom: 10px;
   line-height: 1.4em;
   background: #f99 url(../images/warning.png) no-repeat 0px 0px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 35em;
 }
 
 .currentdocs
@@ -39,11 +42,10 @@
         <div class="obsolete"><p>You are looking at the documentation for the 
         1.3 version of the Apache HTTP Server, which is no longer
         maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
+        fact still using the 1.3 version, <strong style="font-weight: inherit;">please consider upgrading</strong>.
         The current version of the server is <a 
-        href="http://httpd.apache.org/docs/2.4/">2.4</a>.
-
-        In the current version of the server, the equivalent of this module is now named 
+        href="http://httpd.apache.org/docs/2.4/">2.4</a>.</p>
+        <p>This module is obsolete. As of version 1.3 of Apache, it has been replaced with
         <a
         href="http://httpd.apache.org/docs/2.4/mod/mod_so.html"
         >mod_so</a>.</p> 
@@ -53,9 +55,7 @@
     </div>
 
     <h1 align="CENTER">Module mod_dld</h1>
-    <strong><font color="red">This module is obsolete. As of
-    version 1.3 of Apache, it has been replaced with <a
-    href="mod_so.html">mod_so</a>.</font></strong> This module is
+    This module is
     contained in the <code>mod_dld.c</code> file, and is not
     compiled in by default. It provides for loading of executable
     code and modules into the server at start-up time, using the
diff --git a/htdocs/manual/mod/mod_env.html.en b/htdocs/manual/mod/mod_env.html.en
index 86a16a8cef..30dedb816e 100644
--- a/htdocs/manual/mod/mod_env.html.en
+++ b/htdocs/manual/mod/mod_env.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache module mod_env</h1>
 
diff --git a/htdocs/manual/mod/mod_env.html.ja.jis b/htdocs/manual/mod/mod_env.html.ja.jis
index 85474c8d37..67b957ad6b 100644
--- a/htdocs/manual/mod/mod_env.html.ja.jis
+++ b/htdocs/manual/mod/mod_env.html.ja.jis
@@ -12,7 +12,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">mod_env $B%b%8%e!<%k(B</h1>
 
diff --git a/htdocs/manual/mod/mod_example.html b/htdocs/manual/mod/mod_example.html
index 77798f223d..cd463cf762 100644
--- a/htdocs/manual/mod/mod_example.html
+++ b/htdocs/manual/mod/mod_example.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_example</h1>
 
diff --git a/htdocs/manual/mod/mod_expires.html b/htdocs/manual/mod/mod_expires.html
index 72223ed9a2..db35dec111 100644
--- a/htdocs/manual/mod/mod_expires.html
+++ b/htdocs/manual/mod/mod_expires.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_expires</h1>
 
diff --git a/htdocs/manual/mod/mod_headers.html b/htdocs/manual/mod/mod_headers.html
index 05972b5896..aa6f3eb064 100644
--- a/htdocs/manual/mod/mod_headers.html
+++ b/htdocs/manual/mod/mod_headers.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_headers</h1>
 
diff --git a/htdocs/manual/mod/mod_imap.html b/htdocs/manual/mod/mod_imap.html
index 620c26cbba..5a68de45c6 100644
--- a/htdocs/manual/mod/mod_imap.html
+++ b/htdocs/manual/mod/mod_imap.html
@@ -16,6 +16,9 @@
   padding-bottom: 10px;
   line-height: 1.4em;
   background: #f99 url(../images/warning.png) no-repeat 0px 0px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 35em;
 }
 
 .currentdocs
@@ -37,7 +40,7 @@
         <div class="obsolete"><p>You are looking at the documentation for the 
         1.3 version of the Apache HTTP Server, which is no longer
         maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
+        fact still using the 1.3 version, <strong style="font-weight: inherit;">please consider upgrading</strong>.
         The current version of the server is <a 
         href="http://httpd.apache.org/docs/2.4/">2.4</a>.
 
diff --git a/htdocs/manual/mod/mod_include.html b/htdocs/manual/mod/mod_include.html
index 49b419dba3..8f02668dfd 100644
--- a/htdocs/manual/mod/mod_include.html
+++ b/htdocs/manual/mod/mod_include.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_include</h1>
 
diff --git a/htdocs/manual/mod/mod_info.html.en b/htdocs/manual/mod/mod_info.html.en
index 7437c6175e..12b91444df 100644
--- a/htdocs/manual/mod/mod_info.html.en
+++ b/htdocs/manual/mod/mod_info.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_info</h1>
 
diff --git a/htdocs/manual/mod/mod_info.html.ja.jis b/htdocs/manual/mod/mod_info.html.ja.jis
index b1e614b515..be630b2d6d 100644
--- a/htdocs/manual/mod/mod_info.html.ja.jis
+++ b/htdocs/manual/mod/mod_info.html.ja.jis
@@ -12,7 +12,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">mod_info $B%b%8%e!<%k(B</h1>
 
diff --git a/htdocs/manual/mod/mod_isapi.html b/htdocs/manual/mod/mod_isapi.html
index 29a9afb0bb..b29fc3bffc 100644
--- a/htdocs/manual/mod/mod_isapi.html
+++ b/htdocs/manual/mod/mod_isapi.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_isapi</h1>
 
diff --git a/htdocs/manual/mod/mod_log_agent.html b/htdocs/manual/mod/mod_log_agent.html
index 045bdc21f7..62f4b08511 100644
--- a/htdocs/manual/mod/mod_log_agent.html
+++ b/htdocs/manual/mod/mod_log_agent.html
@@ -16,6 +16,9 @@
   padding-bottom: 10px;
   line-height: 1.4em;
   background: #f99 url(../images/warning.png) no-repeat 0px 0px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 35em;
 }
 
 .currentdocs
@@ -38,7 +41,7 @@
         <div class="obsolete"><p>You are looking at the documentation for the 
         1.3 version of the Apache HTTP Server, which is no longer
         maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
+        fact still using the 1.3 version, <strong style="font-weight: inherit;">please consider upgrading</strong>.
         The current version of the server is <a 
         href="http://httpd.apache.org/docs/2.4/">2.4</a>.
 
diff --git a/htdocs/manual/mod/mod_log_common.html b/htdocs/manual/mod/mod_log_common.html
index 3e591f12ce..297874e661 100644
--- a/htdocs/manual/mod/mod_log_common.html
+++ b/htdocs/manual/mod/mod_log_common.html
@@ -16,6 +16,9 @@
   padding-bottom: 10px;
   line-height: 1.4em;
   background: #f99 url(../images/warning.png) no-repeat 0px 0px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 35em;
 }
 
 .currentdocs
@@ -37,7 +40,7 @@
         <div class="obsolete"><p>You are looking at the documentation for the 
         1.3 version of the Apache HTTP Server, which is no longer
         maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
+        fact still using the 1.3 version, <strong style="font-weight: inherit;">please consider upgrading</strong>.
         The current version of the server is <a 
         href="http://httpd.apache.org/docs/2.4/">2.4</a>.
 
diff --git a/htdocs/manual/mod/mod_log_config.html.en b/htdocs/manual/mod/mod_log_config.html.en
index d1b017f8d0..623863ce98 100644
--- a/htdocs/manual/mod/mod_log_config.html.en
+++ b/htdocs/manual/mod/mod_log_config.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_log_config</h1>
 
diff --git a/htdocs/manual/mod/mod_log_config.html.ja.jis b/htdocs/manual/mod/mod_log_config.html.ja.jis
index 01f7b26df6..738ae7514b 100644
--- a/htdocs/manual/mod/mod_log_config.html.ja.jis
+++ b/htdocs/manual/mod/mod_log_config.html.ja.jis
@@ -10,7 +10,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#000080"
   alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">mod_log_config $B%b%8%e!<%k(B</h1>
 
diff --git a/htdocs/manual/mod/mod_log_forensic.html.en b/htdocs/manual/mod/mod_log_forensic.html.en
index 2720cc2cc2..8a7321269c 100644
--- a/htdocs/manual/mod/mod_log_forensic.html.en
+++ b/htdocs/manual/mod/mod_log_forensic.html.en
@@ -11,7 +11,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Module mod_log_forensic</h1>
 
diff --git a/htdocs/manual/mod/mod_log_referer.html b/htdocs/manual/mod/mod_log_referer.html
index edb76ad450..0bc5ac34fe 100644
--- a/htdocs/manual/mod/mod_log_referer.html
+++ b/htdocs/manual/mod/mod_log_referer.html
@@ -16,6 +16,9 @@
   padding-bottom: 10px;
   line-height: 1.4em;
   background: #f99 url(../images/warning.png) no-repeat 0px 0px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 35em;
 }
 
 .currentdocs
@@ -37,7 +40,7 @@
         <div class="obsolete"><p>You are looking at the documentation for the 
         1.3 version of the Apache HTTP Server, which is no longer
         maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
+        fact still using the 1.3 version, <strong style="font-weight: inherit;">please consider upgrading</strong>.
         The current version of the server is <a 
         href="http://httpd.apache.org/docs/2.4/">2.4</a>.
 
diff --git a/htdocs/manual/mod/mod_mime.html.en b/htdocs/manual/mod/mod_mime.html.en
index b538140ef1..c560ef9e53 100644
--- a/htdocs/manual/mod/mod_mime.html.en
+++ b/htdocs/manual/mod/mod_mime.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Module mod_mime</h1>
 
diff --git a/htdocs/manual/mod/mod_mime.html.ja.jis b/htdocs/manual/mod/mod_mime.html.ja.jis
index b56d119830..c219195309 100644
--- a/htdocs/manual/mod/mod_mime.html.ja.jis
+++ b/htdocs/manual/mod/mod_mime.html.ja.jis
@@ -12,7 +12,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">mod_mime $B%b%8%e!<%k(B</h1>
 
diff --git a/htdocs/manual/mod/mod_mime_magic.html b/htdocs/manual/mod/mod_mime_magic.html
index a82a5eddf8..fa331bf03d 100644
--- a/htdocs/manual/mod/mod_mime_magic.html
+++ b/htdocs/manual/mod/mod_mime_magic.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_mime_magic</h1>
 
diff --git a/htdocs/manual/mod/mod_mmap_static.html b/htdocs/manual/mod/mod_mmap_static.html
index 97e0d91456..e9ca19ee10 100644
--- a/htdocs/manual/mod/mod_mmap_static.html
+++ b/htdocs/manual/mod/mod_mmap_static.html
@@ -16,6 +16,9 @@
   padding-bottom: 10px;
   line-height: 1.4em;
   background: #f99 url(../images/warning.png) no-repeat 0px 0px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 35em;
 }
 
 .currentdocs
@@ -37,7 +40,7 @@
         <div class="obsolete"><p>You are looking at the documentation for the 
         1.3 version of the Apache HTTP Server, which is no longer
         maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
+        fact still using the 1.3 version, <strong style="font-weight: inherit;">please consider upgrading</strong>.
         The current version of the server is <a 
         href="http://httpd.apache.org/docs/2.4/">2.4</a>.
 
diff --git a/htdocs/manual/mod/mod_negotiation.html.en b/htdocs/manual/mod/mod_negotiation.html.en
index 8290ce1f92..c972419b82 100644
--- a/htdocs/manual/mod/mod_negotiation.html.en
+++ b/htdocs/manual/mod/mod_negotiation.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_negotiation</h1>
 
diff --git a/htdocs/manual/mod/mod_negotiation.html.ja.jis b/htdocs/manual/mod/mod_negotiation.html.ja.jis
index 7f80e8a167..f897c49ca0 100644
--- a/htdocs/manual/mod/mod_negotiation.html.ja.jis
+++ b/htdocs/manual/mod/mod_negotiation.html.ja.jis
@@ -12,7 +12,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">mod_negotiation $B%b%8%e!<%k(B</h1>
 
diff --git a/htdocs/manual/mod/mod_proxy.html b/htdocs/manual/mod/mod_proxy.html
index 6ff8406cb3..0529093e4b 100644
--- a/htdocs/manual/mod/mod_proxy.html
+++ b/htdocs/manual/mod/mod_proxy.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache module mod_proxy</h1>
 
diff --git a/htdocs/manual/mod/mod_rewrite.html.en b/htdocs/manual/mod/mod_rewrite.html.en
index fcf0455699..31797a3324 100644
--- a/htdocs/manual/mod/mod_rewrite.html.en
+++ b/htdocs/manual/mod/mod_rewrite.html.en
@@ -18,7 +18,7 @@
   vlink="#000080" alink="#FF0000">
     <blockquote>
       <!-- page indentation -->
-      <!--#include virtual="header.html" -->
+      <!--#include virtual="../header_l2.html" -->
       <br />
        
 
diff --git a/htdocs/manual/mod/mod_rewrite.html.ja.jis b/htdocs/manual/mod/mod_rewrite.html.ja.jis
index 539f8c143c..f6ccc28674 100644
--- a/htdocs/manual/mod/mod_rewrite.html.ja.jis
+++ b/htdocs/manual/mod/mod_rewrite.html.ja.jis
@@ -17,7 +17,7 @@
   vlink="#000080" alink="#FF0000">
     <blockquote>
       <!-- page indentation -->
-      <!--#include virtual="header.html" -->
+      <!--#include virtual="../header_l2.html" -->
       <br />
 
       <h1 align="center">mod_rewrite $B%b%8%e!<%k(B<br />
diff --git a/htdocs/manual/mod/mod_setenvif.html.en b/htdocs/manual/mod/mod_setenvif.html.en
index dacdb21e70..a8d9b4d17f 100644
--- a/htdocs/manual/mod/mod_setenvif.html.en
+++ b/htdocs/manual/mod/mod_setenvif.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_setenvif</h1>
 
diff --git a/htdocs/manual/mod/mod_setenvif.html.ja.jis b/htdocs/manual/mod/mod_setenvif.html.ja.jis
index c4c73280b0..4d9d70831c 100644
--- a/htdocs/manual/mod/mod_setenvif.html.ja.jis
+++ b/htdocs/manual/mod/mod_setenvif.html.ja.jis
@@ -12,7 +12,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">mod_setenvif $B%b%8%e!<%k(B</h1>
 
diff --git a/htdocs/manual/mod/mod_so.html.en b/htdocs/manual/mod/mod_so.html.en
index a005e27e10..7b8514184e 100644
--- a/htdocs/manual/mod/mod_so.html.en
+++ b/htdocs/manual/mod/mod_so.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_so</h1>
 
diff --git a/htdocs/manual/mod/mod_so.html.ja.jis b/htdocs/manual/mod/mod_so.html.ja.jis
index 11ab03678a..d1401245c2 100644
--- a/htdocs/manual/mod/mod_so.html.ja.jis
+++ b/htdocs/manual/mod/mod_so.html.ja.jis
@@ -12,7 +12,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">mod_so $B%b%8%e!<%k(B</h1>
 
diff --git a/htdocs/manual/mod/mod_speling.html.en b/htdocs/manual/mod/mod_speling.html.en
index d5509ed1dd..a85560edd7 100644
--- a/htdocs/manual/mod/mod_speling.html.en
+++ b/htdocs/manual/mod/mod_speling.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_speling</h1>
 
diff --git a/htdocs/manual/mod/mod_speling.html.ja.jis b/htdocs/manual/mod/mod_speling.html.ja.jis
index 2a9b0645b5..2d7b064e44 100644
--- a/htdocs/manual/mod/mod_speling.html.ja.jis
+++ b/htdocs/manual/mod/mod_speling.html.ja.jis
@@ -12,7 +12,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">mod_speling $B%b%8%e!<%k(B</h1>
 
diff --git a/htdocs/manual/mod/mod_status.html b/htdocs/manual/mod/mod_status.html
index 857de6b79c..5bcaf2f44f 100644
--- a/htdocs/manual/mod/mod_status.html
+++ b/htdocs/manual/mod/mod_status.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_status</h1>
 
diff --git a/htdocs/manual/mod/mod_unique_id.html.en b/htdocs/manual/mod/mod_unique_id.html.en
index e42ef21953..616fe87341 100644
--- a/htdocs/manual/mod/mod_unique_id.html.en
+++ b/htdocs/manual/mod/mod_unique_id.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_unique_id</h1>
 
diff --git a/htdocs/manual/mod/mod_unique_id.html.ja.jis b/htdocs/manual/mod/mod_unique_id.html.ja.jis
index 43d4225b05..9c6f5ee925 100644
--- a/htdocs/manual/mod/mod_unique_id.html.ja.jis
+++ b/htdocs/manual/mod/mod_unique_id.html.ja.jis
@@ -12,7 +12,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">mod_unique_id $B%b%8%e!<%k(B</h1>
 
diff --git a/htdocs/manual/mod/mod_userdir.html.en b/htdocs/manual/mod/mod_userdir.html.en
index 9dc84d7354..9beb1c2851 100644
--- a/htdocs/manual/mod/mod_userdir.html.en
+++ b/htdocs/manual/mod/mod_userdir.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_userdir</h1>
 
diff --git a/htdocs/manual/mod/mod_userdir.html.ja.jis b/htdocs/manual/mod/mod_userdir.html.ja.jis
index ed6d98e299..480592413f 100644
--- a/htdocs/manual/mod/mod_userdir.html.ja.jis
+++ b/htdocs/manual/mod/mod_userdir.html.ja.jis
@@ -13,7 +13,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">mod_userdir $B%b%8%e!<%k(B</h1>
 
diff --git a/htdocs/manual/mod/mod_usertrack.html b/htdocs/manual/mod/mod_usertrack.html
index 42dc537b46..bf3a48a453 100644
--- a/htdocs/manual/mod/mod_usertrack.html
+++ b/htdocs/manual/mod/mod_usertrack.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_usertrack</h1>
 
diff --git a/htdocs/manual/mod/mod_vhost_alias.html b/htdocs/manual/mod/mod_vhost_alias.html
index 54ba447744..ac8c673fb7 100644
--- a/htdocs/manual/mod/mod_vhost_alias.html
+++ b/htdocs/manual/mod/mod_vhost_alias.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Module mod_vhost_alias</h1>
 
diff --git a/htdocs/manual/mod/module-dict.html.en b/htdocs/manual/mod/module-dict.html.en
index 03f369178d..1262c73cc7 100644
--- a/htdocs/manual/mod/module-dict.html.en
+++ b/htdocs/manual/mod/module-dict.html.en
@@ -13,7 +13,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Terms Used to Describe Apache Modules</h1>
 
diff --git a/htdocs/manual/mod/module-dict.html.ja.jis b/htdocs/manual/mod/module-dict.html.ja.jis
index ef53ce717a..b51c6903aa 100644
--- a/htdocs/manual/mod/module-dict.html.ja.jis
+++ b/htdocs/manual/mod/module-dict.html.ja.jis
@@ -13,7 +13,7 @@
 
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Apache $B%b%8%e!<%k$N2r@b$G;HMQ$9$kMQ8l(B</h1>
 
diff --git a/htdocs/manual/netware.html b/htdocs/manual/netware.html
index 1528440959..59e3ce0ea8 100644
--- a/htdocs/manual/netware.html
+++ b/htdocs/manual/netware.html
@@ -11,11 +11,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <div align="CENTER">
-      <img src="images/sub.gif" alt="[APACHE DOCUMENTATION]" /> 
-
-      <h3>Apache HTTP Server Version 1.3</h3>
-    </div>
+    <!--#include virtual="header.html" -->
 
     <h1 align="CENTER">Using Apache With Novell NetWare</h1>
 
diff --git a/htdocs/manual/programs/ab.html b/htdocs/manual/programs/ab.html
index 7528203f63..8d5737e145 100644
--- a/htdocs/manual/programs/ab.html
+++ b/htdocs/manual/programs/ab.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Manual Page: ab</h1>
     <!-- This document was autogenerated from the man page -->
diff --git a/htdocs/manual/programs/apachectl.html.en b/htdocs/manual/programs/apachectl.html.en
index c790e5c4db..1b398174ef 100644
--- a/htdocs/manual/programs/apachectl.html.en
+++ b/htdocs/manual/programs/apachectl.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Manual Page: apachectl</h1>
     <!-- This document was autogenerated from the man page -->
diff --git a/htdocs/manual/programs/apachectl.html.ja.jis b/htdocs/manual/programs/apachectl.html.ja.jis
index b39851d5ea..d1cfe7d35e 100644
--- a/htdocs/manual/programs/apachectl.html.ja.jis
+++ b/htdocs/manual/programs/apachectl.html.ja.jis
@@ -13,7 +13,7 @@
   <!-- English revision: 1.5 -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Manual Page: apachectl</h1>
     <!-- This document was autogenerated from the man page -->
diff --git a/htdocs/manual/programs/apxs.html b/htdocs/manual/programs/apxs.html
index 927ab25779..c75dc830c4 100644
--- a/htdocs/manual/programs/apxs.html
+++ b/htdocs/manual/programs/apxs.html
@@ -11,7 +11,7 @@
 
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Manual Page: apxs</h1>
     <!-- This document was autogenerated from the man page -->
diff --git a/htdocs/manual/programs/dbmmanage.html b/htdocs/manual/programs/dbmmanage.html
index 6a01fe29b6..9af87b0f05 100644
--- a/htdocs/manual/programs/dbmmanage.html
+++ b/htdocs/manual/programs/dbmmanage.html
@@ -11,7 +11,7 @@
 
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Manual Page: dbmmanage</h1>
     <!-- This document was autogenerated from the man page -->
diff --git a/htdocs/manual/programs/header.html b/htdocs/manual/programs/header.html
index c2edc356a7..e69de29bb2 100644
--- a/htdocs/manual/programs/header.html
+++ b/htdocs/manual/programs/header.html
@@ -1,25 +0,0 @@
-<style>
-.obsolete
-{
-  margin: 0;
-  padding: 8px 10px;
-  padding-left: 50px;
-  padding-bottom: 10px;
-  line-height: 1.4em;
-  background: #f99 url(../images/warning.png) no-repeat 0px 0px;
-}
-</style>
-
-    <div align="CENTER">
-      <img src="../images/sub.gif" alt="[APACHE DOCUMENTATION]" />
-
-      <h3>Apache HTTP Server Version 1.3</h3>
-        <div class="obsolete"><p>You are looking at the documentation for the 
-        1.3 version of the Apache HTTP Server, which is no longer
-        maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
-        The current version of the server is <a 
-        href="http://httpd.apache.org/docs/2.4/">2.4</a>.</p></div>
-
-    </div>
-
diff --git a/htdocs/manual/programs/htdigest.html b/htdocs/manual/programs/htdigest.html
index 48030c4559..73b1723304 100644
--- a/htdocs/manual/programs/htdigest.html
+++ b/htdocs/manual/programs/htdigest.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Manual Page: htdigest</h1>
     <!-- This document was autogenerated from the man page -->
diff --git a/htdocs/manual/programs/htpasswd.html.en b/htdocs/manual/programs/htpasswd.html.en
index ea8e498bb8..5ce53e9df6 100644
--- a/htdocs/manual/programs/htpasswd.html.en
+++ b/htdocs/manual/programs/htpasswd.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Manual Page: htpasswd</h1>
     <!-- This document was autogenerated from the man page -->
diff --git a/htdocs/manual/programs/htpasswd.html.ja.jis b/htdocs/manual/programs/htpasswd.html.ja.jis
index 59d18335a8..2b776634b6 100644
--- a/htdocs/manual/programs/htpasswd.html.ja.jis
+++ b/htdocs/manual/programs/htpasswd.html.ja.jis
@@ -13,7 +13,7 @@
   <!-- English revision: 1.3 -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Manual Page: htpasswd</h1>
     <!-- This document was autogenerated from the man page -->
diff --git a/htdocs/manual/programs/httpd.html.en b/htdocs/manual/programs/httpd.html.en
index 8fda43bea5..3da8365d72 100644
--- a/htdocs/manual/programs/httpd.html.en
+++ b/htdocs/manual/programs/httpd.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Manual Page: httpd</h1>
     <!-- This document was autogenerated from the man page -->
diff --git a/htdocs/manual/programs/httpd.html.ja.jis b/htdocs/manual/programs/httpd.html.ja.jis
index bc9ed6f289..e95da01808 100644
--- a/htdocs/manual/programs/httpd.html.ja.jis
+++ b/htdocs/manual/programs/httpd.html.ja.jis
@@ -13,7 +13,7 @@
   <!-- English revision: 1.3 -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Manual Page: httpd</h1>
     <!-- This document was autogenerated from the man page -->
diff --git a/htdocs/manual/programs/index.html.en b/htdocs/manual/programs/index.html.en
index 97f250cb02..11fad00d40 100644
--- a/htdocs/manual/programs/index.html.en
+++ b/htdocs/manual/programs/index.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Server and Supporting Programs</h1>
 
diff --git a/htdocs/manual/programs/index.html.ja.jis b/htdocs/manual/programs/index.html.ja.jis
index 2923850631..ccc9218bf7 100644
--- a/htdocs/manual/programs/index.html.ja.jis
+++ b/htdocs/manual/programs/index.html.ja.jis
@@ -13,7 +13,7 @@
   <!-- English revision: 1.3 -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">$B%5!<%P$H%5%]!<%H%W%m%0%i%`(B</h1>
 
diff --git a/htdocs/manual/programs/logresolve.html b/htdocs/manual/programs/logresolve.html
index c14fd814c7..db5288d6ce 100644
--- a/htdocs/manual/programs/logresolve.html
+++ b/htdocs/manual/programs/logresolve.html
@@ -11,7 +11,7 @@
 
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
     <!-- This document was autogenerated from the man page -->
 
     <h1 align="center">Manual Page: logresolve</h1>
diff --git a/htdocs/manual/programs/other.html b/htdocs/manual/programs/other.html
index 3718a4e40a..a52bd35bd8 100644
--- a/htdocs/manual/programs/other.html
+++ b/htdocs/manual/programs/other.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Other Programs</h1>
 
diff --git a/htdocs/manual/programs/rotatelogs.html b/htdocs/manual/programs/rotatelogs.html
index b403d22f43..cdf9bef93a 100644
--- a/htdocs/manual/programs/rotatelogs.html
+++ b/htdocs/manual/programs/rotatelogs.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Manual Page: rotatelogs</h1>
     <!-- This document was autogenerated from the man page -->
diff --git a/htdocs/manual/programs/suexec.html.en b/htdocs/manual/programs/suexec.html.en
index 80733aed6f..2f58b4194b 100644
--- a/htdocs/manual/programs/suexec.html.en
+++ b/htdocs/manual/programs/suexec.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Manual Page: suexec</h1>
     <!-- This document was autogenerated from the man page -->
diff --git a/htdocs/manual/programs/suexec.html.ja.jis b/htdocs/manual/programs/suexec.html.ja.jis
index 30d35bced0..ff218708f8 100644
--- a/htdocs/manual/programs/suexec.html.ja.jis
+++ b/htdocs/manual/programs/suexec.html.ja.jis
@@ -13,7 +13,7 @@
   <!-- English revision: 1.4 -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Manual Page: suexec</h1>
     <!-- This document was autogenerated from the man page -->
diff --git a/htdocs/manual/vhosts/details.html b/htdocs/manual/vhosts/details.html
index e63800af37..cfe08af44c 100644
--- a/htdocs/manual/vhosts/details.html
+++ b/htdocs/manual/vhosts/details.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">An In-Depth Discussion of Virtual Host
     Matching</h1>
diff --git a/htdocs/manual/vhosts/details_1_2.html b/htdocs/manual/vhosts/details_1_2.html
index 9d35030b7f..474954fa4c 100644
--- a/htdocs/manual/vhosts/details_1_2.html
+++ b/htdocs/manual/vhosts/details_1_2.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">An In-Depth Discussion of VirtualHost
     Matching</h1>
diff --git a/htdocs/manual/vhosts/examples.html b/htdocs/manual/vhosts/examples.html
index 2b21d6cc12..cf9b274ff5 100644
--- a/htdocs/manual/vhosts/examples.html
+++ b/htdocs/manual/vhosts/examples.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Virtual Host examples for common setups</h1>
 
diff --git a/htdocs/manual/vhosts/fd-limits.html.en b/htdocs/manual/vhosts/fd-limits.html.en
index 553c887416..7e52bc4c9a 100644
--- a/htdocs/manual/vhosts/fd-limits.html.en
+++ b/htdocs/manual/vhosts/fd-limits.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">File Descriptor Limits</h1>
 
diff --git a/htdocs/manual/vhosts/fd-limits.html.ja.jis b/htdocs/manual/vhosts/fd-limits.html.ja.jis
index e0bad5028e..e37141ea5d 100644
--- a/htdocs/manual/vhosts/fd-limits.html.ja.jis
+++ b/htdocs/manual/vhosts/fd-limits.html.ja.jis
@@ -12,7 +12,7 @@
 
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">$B%U%!%$%k5-=R;R$N8B3&(B</h1>
 
diff --git a/htdocs/manual/vhosts/header.html b/htdocs/manual/vhosts/header.html
index c2edc356a7..e69de29bb2 100644
--- a/htdocs/manual/vhosts/header.html
+++ b/htdocs/manual/vhosts/header.html
@@ -1,25 +0,0 @@
-<style>
-.obsolete
-{
-  margin: 0;
-  padding: 8px 10px;
-  padding-left: 50px;
-  padding-bottom: 10px;
-  line-height: 1.4em;
-  background: #f99 url(../images/warning.png) no-repeat 0px 0px;
-}
-</style>
-
-    <div align="CENTER">
-      <img src="../images/sub.gif" alt="[APACHE DOCUMENTATION]" />
-
-      <h3>Apache HTTP Server Version 1.3</h3>
-        <div class="obsolete"><p>You are looking at the documentation for the 
-        1.3 version of the Apache HTTP Server, which is no longer
-        maintained, and has been declared "end of life". If you are in
-        fact still using the 1.3 version, please consider upgrading.
-        The current version of the server is <a 
-        href="http://httpd.apache.org/docs/2.4/">2.4</a>.</p></div>
-
-    </div>
-
diff --git a/htdocs/manual/vhosts/host.html b/htdocs/manual/vhosts/host.html
index e49c4cff29..895e7e2d5e 100644
--- a/htdocs/manual/vhosts/host.html
+++ b/htdocs/manual/vhosts/host.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache non-IP Virtual Hosts</h1>
     <strong>See Also:</strong> <a href="virtual-host.html">Virtual
diff --git a/htdocs/manual/vhosts/index.html.en b/htdocs/manual/vhosts/index.html.en
index 583bb188a0..7c6e4324c3 100644
--- a/htdocs/manual/vhosts/index.html.en
+++ b/htdocs/manual/vhosts/index.html.en
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache Virtual Host documentation</h1>
 
diff --git a/htdocs/manual/vhosts/index.html.ja.jis b/htdocs/manual/vhosts/index.html.ja.jis
index fa2cf94442..3c218e9adb 100644
--- a/htdocs/manual/vhosts/index.html.ja.jis
+++ b/htdocs/manual/vhosts/index.html.ja.jis
@@ -12,7 +12,7 @@
   <!-- Background white, links blue (unvisited), navy (visited), red (active) -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="center">Apache $B%P!<%A%c%k%[%9%H@bL@=q(B</h1>
 
diff --git a/htdocs/manual/vhosts/ip-based.html b/htdocs/manual/vhosts/ip-based.html
index ccfb286305..8269e42fd4 100644
--- a/htdocs/manual/vhosts/ip-based.html
+++ b/htdocs/manual/vhosts/ip-based.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Apache IP-based Virtual Host Support</h1>
     <strong>See also:</strong> <a href="name-based.html">Name-based
diff --git a/htdocs/manual/vhosts/mass.html b/htdocs/manual/vhosts/mass.html
index d2ad50b916..f64d8bf697 100644
--- a/htdocs/manual/vhosts/mass.html
+++ b/htdocs/manual/vhosts/mass.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Dynamically configured mass virtual
     hosting</h1>
diff --git a/htdocs/manual/vhosts/name-based.html.en b/htdocs/manual/vhosts/name-based.html.en
index a048d9c79c..bfd2b7ce81 100644
--- a/htdocs/manual/vhosts/name-based.html.en
+++ b/htdocs/manual/vhosts/name-based.html.en
@@ -10,7 +10,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Name-based Virtual Host Support</h1>
 
diff --git a/htdocs/manual/vhosts/name-based.html.ja.jis b/htdocs/manual/vhosts/name-based.html.ja.jis
index 4034362d79..51c59e7de8 100644
--- a/htdocs/manual/vhosts/name-based.html.ja.jis
+++ b/htdocs/manual/vhosts/name-based.html.ja.jis
@@ -10,7 +10,7 @@
   <!-- English revision: 1.21 -->
   <body bgcolor="#ffffff" text="#000000" link="#0000ff"
   vlink="#000080" alink="#ff0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <p>$B$3$NJ8=q$G$OL>A0%Y!<%9$N%P!<%A%c%k%[%9%H$r$I$s$J$H$-!"(B
     $B$^$?$I$&$d$C$F;H$&$N$+$H$$$&$3$H$r@bL@$7$^$9!#(B</p>
diff --git a/htdocs/manual/vhosts/vhosts-in-depth.html b/htdocs/manual/vhosts/vhosts-in-depth.html
index 9d35030b7f..474954fa4c 100644
--- a/htdocs/manual/vhosts/vhosts-in-depth.html
+++ b/htdocs/manual/vhosts/vhosts-in-depth.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">An In-Depth Discussion of VirtualHost
     Matching</h1>
diff --git a/htdocs/manual/vhosts/virtual-host.html b/htdocs/manual/vhosts/virtual-host.html
index 1aefcf9b17..01ea5a5692 100644
--- a/htdocs/manual/vhosts/virtual-host.html
+++ b/htdocs/manual/vhosts/virtual-host.html
@@ -12,7 +12,7 @@
 
   <body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
   vlink="#000080" alink="#FF0000">
-    <!--#include virtual="header.html" -->
+    <!--#include virtual="../header_l2.html" -->
 
     <h1 align="CENTER">Virtual Host Support</h1>
     <strong>See Also:</strong> <a href="host.html">Non-IP based
author	Rich Bowen <rbowen@apache.org>	2012-03-02 02:07:06 +0000
committer	Rich Bowen <rbowen@apache.org>	2012-03-02 02:07:06 +0000
commit	2e264e262d5d2a0e2325759eb9f41a175be69230 (patch)
tree	6c8c45a444a5af97fc7e5b9ed3aa735f273c33d9
parent	a8156297ba987219aa10cad949ad2e8e3c88e829 (diff)
download	httpd-2e264e262d5d2a0e2325759eb9f41a175be69230.tar.gz