Merge 2.4 from trunk

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

diff --git a/docs/manual/developer/index.xml b/docs/manual/developer/index.xml
index 7121f2952d18f9365fa92f08644942a844c154cd..e7cba4310593c62dd238e85393a9de5a65107b35 100644 (file)
--- a/docs/manual/developer/index.xml
+++ b/docs/manual/developer/index.xml
@@ -23,7 +23,7 @@
 <manualpage metafile="index.xml.meta">
 <parentdocument href="../" />
 
-<title>Developer Documentation for Apache 2.x</title>
+<title>Developer Documentation for the Apache HTTP Server 2.4</title>
 
 <summary>
     <note type="warning"><title>Warning</title>
@@ -36,16 +36,22 @@
     </note>
 </summary>
 
-<section id="topics"><title>Topics</title>
+<section id="developing"><title>2.4 development documents</title>
     <ul>
-      <li><a href="new_api_2_4.html">API changes in Apache 2.3/2.4</a></li>
-      <li><a href="hooks.html">Apache 2.x Hook Functions</a></li>
-      <li><a href="request.html">Request Processing in Apache 2.x</a></li>
-      <li><a href="filters.html">How filters work in Apache 2.x</a></li>
-      <li><a href="output-filters.html">Guidelines for output filters in Apache 2.x</a></li>
-      <li><a href="modules.html">Converting Modules from Apache 1.3 to Apache 2.x</a></li>
-      <li><a href="documenting.html">Documenting Apache 2.x</a></li>
-      <li><a href="thread_safety.html">Apache 2.x Thread Safety Issues</a></li>
+      <li><a href="modguide.html">Developing modules for the Apache HTTP Server 2.4</a></li>
+      <li><a href="hooks.html">Hook Functions in 2.4</a></li>
+      <li><a href="request.html">Request Processing in 2.4</a></li>
+      <li><a href="filters.html">How filters work in 2.4</a></li>
+      <li><a href="output-filters.html">Guidelines for output filters in 2.4</a></li>
+      <li><a href="documenting.html">Documenting code in 2.4</a></li>
+      <li><a href="thread_safety.html">Thread Safety Issues in 2.4</a></li>
+    </ul>
+</section>
+
+<section id="upgrading"><title>Upgrading to 2.4</title>
+    <ul>
+      <li><a href="new_api_2_4.html">API changes in 2.3/2.4</a></li>
+      <li><a href="modules.html">Converting Modules from 1.3 to 2.x</a></li>
     </ul>
 </section>
 
@@ -57,10 +63,10 @@
 
       <li>Developer articles at <a href="http://www.apachetutor.org/">apachetutor</a> include:
       <ul>
-        <li><a href="http://www.apachetutor.org/dev/request">Request Processing in Apache</a></li>
+        <li><a href="http://www.apachetutor.org/dev/request">Request Processing</a></li>
         <li><a href="http://www.apachetutor.org/dev/config">Configuration for Modules</a></li>
-        <li><a href="http://www.apachetutor.org/dev/pools">Resource Management in Apache</a></li>
-        <li><a href="http://www.apachetutor.org/dev/reslist">Connection Pooling in Apache</a></li>
+        <li><a href="http://www.apachetutor.org/dev/pools">Resource Management</a></li>
+        <li><a href="http://www.apachetutor.org/dev/reslist">Connection Pooling</a></li>
         <li><a href="http://www.apachetutor.org/dev/brigades">Introduction to Buckets and Brigades</a></li>
       </ul></li>
     </ul>