propagate the html-formatted license and the all-on-one-page faq.

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

diff --git a/docs/manual/index.html.en b/docs/manual/index.html.en
index 86d081fa570cf566d48a177a83e1b3af7826c515..f09f0088caa93fbc72657541e9f9627bb0c10e89 100644 (file)
--- a/docs/manual/index.html.en
+++ b/docs/manual/index.html.en
@@ -23,7 +23,7 @@
 <table id="indextable"><tr><td class="col1"><div class="category"><h2><a name="release" id="release">Release Notes</a></h2>
 <ul><li><a href="new_features_2_0.html">New features with Apache 2.0</a></li>
 <li><a href="upgrading.html">Upgrading to 2.0 from 1.3</a></li>
-<li><a href="LICENSE">Apache License</a></li>
+<li><a href="license.html">Apache License</a></li>
 </ul>
 </div><div class="category"><h2><a name="manual" id="manual">Reference Manual</a></h2>
 <ul><li><a href="install.html">Compiling and Installing</a></li>

diff --git a/docs/manual/index.xml b/docs/manual/index.xml
index 54123480bf8f6cbe1b5ae33d211e0a30191763d0..e8644219b1969439d3e183a63577012902d298cd 100644 (file)
--- a/docs/manual/index.xml
+++ b/docs/manual/index.xml
@@ -10,7 +10,7 @@
 <category id="release"><title>Release Notes</title>
     <page href="new_features_2_0.html">New features with Apache 2.0</page>
     <page href="upgrading.html">Upgrading to 2.0 from 1.3</page>
-    <page href="LICENSE">Apache License</page>
+    <page href="license.html">Apache License</page>
 </category>
 
 <category id="manual"><title>Reference Manual</title>

diff --git a/docs/manual/sitemap.html.en b/docs/manual/sitemap.html.en
index 2264a4e2e40b6d283235c4a047b463409cd97359..2e2e1a9e9839711ce7f92bd0085e38001b535adf 100644 (file)
--- a/docs/manual/sitemap.html.en
+++ b/docs/manual/sitemap.html.en
@@ -42,6 +42,7 @@
 <div class="section"><h2><a name="release" id="release">Release Notes</a></h2>
 <ul><li><a href="upgrading.html">Upgrading to 2.0 from 1.3</a></li>
 <li><a href="new_features_2_0.html">New features with Apache 2.0</a></li>
+<li><a href="license.html">Apache License</a></li>
 </ul>
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section"><h2><a name="using" id="using">Using the Apache HTTP Server</a></h2>
@@ -79,7 +80,8 @@
 </ul>
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section"><h2><a name="faq" id="faq">Apache Server Frequently Asked Questions</a></h2>
-<ul><li class="separate"><a href="faq/">Overview</a></li>
+<ul><li><a href="faq/">Overview</a></li>
+<li class="separate"><a href="faq/all_in_one.html">All on One Page</a></li>
 <li><a href="faq/support.html">Support</a></li>
 </ul>
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>

diff --git a/docs/manual/sitemap.xml b/docs/manual/sitemap.xml
index c93827dac3f19cc2204bd7072b5e947ef585b2ad..c7cd853e4c3597aa10b9c4d60f063c1db52b8e9e 100644 (file)
--- a/docs/manual/sitemap.xml
+++ b/docs/manual/sitemap.xml
@@ -17,6 +17,7 @@
 <title>Release Notes</title>
 <page href="upgrading.html">Upgrading to 2.0 from 1.3</page>
 <page href="new_features_2_0.html">New features with Apache 2.0</page>
+<page href="license.html">Apache License</page>
 </category>
 
 <category id="using">
@@ -57,7 +58,8 @@
 
 <category id="faq">
 <title>Apache Server Frequently Asked Questions</title>
-<page separate="yes" href="faq/">Overview</page>
+<page href="faq/">Overview</page>
+<page separate="yes" href="faq/all_in_one.html">All on One Page</page>
 <page href="faq/support.html">Support</page>
 </category>