diff --git a/docs/manual/developer/index.xml b/docs/manual/developer/index.xml
index bbc91483a3..e246ce9d8f 100644
--- 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 Apache 2.4</title>
 
 <summary>
     <note type="warning"><title>Warning</title>
@@ -36,20 +36,25 @@
     </note>
 </summary>
 
-<section id="topics"><title>Topics</title>
+<section id="developing"><title>Apache 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="modguide.html">Developing modules for Apache 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="documenting.html">Documenting code in Apache 2.4</a></li>
       <li><a href="thread_safety.html">Apache 2.x Thread Safety Issues</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 Apache 2.3/2.4</a></li>
+      <li><a href="modules.html">Converting Modules from Apache 1.3 to Apache 2.x</a></li>
+    </ul>
+</section>
+
 <section id="external"><title>External Resources</title>
     <ul>
       <li><a