backport copyright and layout changes

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

diff --git a/docs/manual/style/css/manual.css b/docs/manual/style/css/manual.css
index e111996d11ccf17668c8b6d2f74819a73bbd2b16..6dcd04fdd1cf3f63a51b3273199b80f3da8cf51c 100644 (file)
--- a/docs/manual/style/css/manual.css
+++ b/docs/manual/style/css/manual.css
@@ -825,7 +825,6 @@ div#footer p.apache {
     text-align: left;
     padding: 0 0 1em 0;
     margin-top: 0;
-    font-weight: bold;
 }
 
 div#footer p.menu {

diff --git a/docs/manual/style/lang/de.xml b/docs/manual/style/lang/de.xml
index 0bbdf793bb8bee2a55a746cc696692857e96e1a3..f5b1ba208a6f9573449c601aedffcc4412d3dffa 100644 (file)
--- a/docs/manual/style/lang/de.xml
+++ b/docs/manual/style/lang/de.xml
@@ -100,6 +100,6 @@
  <message name="sitemap">Seitenindex</message>
 
  <!-- footer line -->
- <message name="maintainedby">Gepflegt durch das</message>
+ <message name="licensed">Lizenziert unter der</message>
  <message name="langavail">Verfügbare Sprachen</message>
 </messages>

diff --git a/docs/manual/style/lang/en.xml b/docs/manual/style/lang/en.xml
index d60e73e2ee067035ea222571c4a36cc23d231217..65cef285b6c5a2628222b1f0f7e6e047adb4bdfa 100644 (file)
--- a/docs/manual/style/lang/en.xml
+++ b/docs/manual/style/lang/en.xml
@@ -96,6 +96,6 @@
  <message name="sitemap">Sitemap</message>
 
  <!-- footer line -->
- <message name="maintainedby">Maintained by the</message>
+ <message name="licensed">Licensed under the</message>
  <message name="langavail">Available Languages</message>
 </messages>

diff --git a/docs/manual/style/lang/ja.xml b/docs/manual/style/lang/ja.xml
index 5d56171015a8c3a4e730e15aeb5de09231661520..029b70dcfb6ff428662c750e9d0553fde6ab4dd4 100644 (file)
--- a/docs/manual/style/lang/ja.xml
+++ b/docs/manual/style/lang/ja.xml
@@ -91,6 +91,6 @@
  <message name="sitemap">\e$B%5%$%H%^%C%W\e(B</message>
 
  <!-- footer line -->
- <message name="maintainedby">Maintained by the</message>
+ <message name="licensed">Licensed under the</message>
  <message name="langavail">Available Languages</message>
 </messages>

diff --git a/docs/manual/style/lang/ko.xml b/docs/manual/style/lang/ko.xml
index 0cd10e74b90c482383f83c103d2ab340bafee3ff..4281c7f9a6333c4f30e03539ad9834102649b625 100644 (file)
--- a/docs/manual/style/lang/ko.xml
+++ b/docs/manual/style/lang/ko.xml
@@ -100,6 +100,6 @@
  <message name="sitemap">»çÀÌÆ®¸Ê</message>
 
  <!-- footer line -->
- <message name="maintainedby">Maintained by the</message>
+ <message name="licensed">Licensed under the</message>
  <message name="langavail">°¡´ÉÇÑ ¾ð¾î</message>
 </messages>

diff --git a/docs/manual/style/lang/ru.xml b/docs/manual/style/lang/ru.xml
index 739dfa183f5acb31e002ee270e5164002922dd7a..a3285154060d172375d5ff6bffa67c0ba34cae13 100644 (file)
--- a/docs/manual/style/lang/ru.xml
+++ b/docs/manual/style/lang/ru.xml
@@ -93,6 +93,6 @@
  <message name="sitemap">ëÁÒÔÁ ÓÁÊÔÁ</message>
 
  <!-- footer line -->
- <message name="maintainedby">ðÏÄÄÅÒÖËÁ ÏÓÕÝÅÓÔ×ÌÑÅÔÓÑ</message>
+ <message name="licensed">Licensed under the</message>
  <message name="langavail">äÏÓÔÕÐÎÙÅ ÑÚÙËÉ</message>
 </messages>

diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
index 8a00695b500efbe8b77f2bb9ad75f2810016de54..7517dfd205a12cac78f04c0f9f0e676a9b0622ab 100644 (file)
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -257,14 +257,18 @@
 
 <div id="footer">&lf;
     <p class="apache">
-        <xsl:value-of select="$messages/message[@name='maintainedby']"/>
+        <xsl:text>Copyright 1999-2004 The Apache Software </xsl:text>
+        <xsl:text>Foundation.</xsl:text><br />
+        <xsl:value-of select="$messages/message[@name='licensed']"/>
         <xsl:text> </xsl:text>
-        <a href="http://httpd.apache.org/docs-project/">
+
+        <a href="http://www.apache.org/licenses/LICENSE-2.0">
             <xsl:if test="$ext-target">
                 <xsl:attribute name="target">_blank</xsl:attribute>
             </xsl:if>
-            <xsl:text>Apache HTTP Server Documentation Project</xsl:text>
+            <xsl:text>Apache License, Version 2.0</xsl:text>
         </a>
+        <xsl:text>.</xsl:text>
     </p>&lf;
 
     <xsl:call-template name="super-menu"/>