diff --git a/devel-docs/ChangeLog b/devel-docs/ChangeLog
index 79f2877af9..6088b43de7 100644
--- a/devel-docs/ChangeLog
+++ b/devel-docs/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-08  Michael Natterer  <mitch@gimp.org>
+
+	* app/app-docs.sgml
+	* app/app-sections.txt: even more cleanup. Put most stuff in
+	<chapter>s so the main TOC has a reasonable size now.
+
 2003-09-08  Sven Neumann  <sven@gimp.org>
 
 	* README
diff --git a/devel-docs/app/app-docs.sgml b/devel-docs/app/app-docs.sgml
index aff4eedfcc..ab0fd8f6c1 100644
--- a/devel-docs/app/app-docs.sgml
+++ b/devel-docs/app/app-docs.sgml
@@ -362,19 +362,35 @@
   <part id="app-text-part">
     <title>Text</title>
     <xi:include href="xml/text-enums.xml"/>
-    <xi:include href="xml/gimpfonts.xml"/>
-    <xi:include href="xml/gimpfont.xml"/>
-    <xi:include href="xml/gimpfontlist.xml"/>
-    <xi:include href="xml/gimptext.xml"/>
-    <xi:include href="xml/gimptext-bitmap.xml"/>
-    <xi:include href="xml/gimptext-compat.xml"/>
-    <xi:include href="xml/gimptext-parasite.xml"/>
-    <xi:include href="xml/gimptext-vectors.xml"/>
-    <xi:include href="xml/gimptext-xlfd.xml"/>
-    <xi:include href="xml/gimptextlayer.xml"/>
-    <xi:include href="xml/gimptextlayer-transform.xml"/>
-    <xi:include href="xml/gimptextlayout.xml"/>
-    <xi:include href="xml/gimptextlayout-render.xml"/>
+
+    <chapter>
+      <title>Initialization &amp; Font Management</title>
+      <xi:include href="xml/gimpfonts.xml"/>
+      <xi:include href="xml/gimpfont.xml"/>
+      <xi:include href="xml/gimpfontlist.xml"/>
+    </chapter>
+
+    <chapter>
+      <title>The GimpText Object</title>
+      <xi:include href="xml/gimptext.xml"/>
+      <xi:include href="xml/gimptext-bitmap.xml"/>
+      <xi:include href="xml/gimptext-compat.xml"/>
+      <xi:include href="xml/gimptext-parasite.xml"/>
+      <xi:include href="xml/gimptext-vectors.xml"/>
+      <xi:include href="xml/gimptext-xlfd.xml"/>
+    </chapter>
+
+    <chapter>
+      <title>The GimpTextLayout Object</title>
+      <xi:include href="xml/gimptextlayout.xml"/>
+      <xi:include href="xml/gimptextlayout-render.xml"/>
+    </chapter>
+
+    <chapter>
+      <title>The GimpTextLayer Object</title>
+      <xi:include href="xml/gimptextlayer.xml"/>
+      <xi:include href="xml/gimptextlayer-transform.xml"/>
+    </chapter>
   </part>
 
   <part id="app-display-part">
@@ -519,7 +535,7 @@
     </chapter>
 
     <chapter>
-      <title>Text and Path Tools</title>
+      <title>Text and Vector Tools</title>
       <xi:include href="xml/gimptexttool.xml"/>
       <xi:include href="xml/gimptextoptions.xml"/>
       <xi:include href="xml/gimpvectortool.xml"/>
@@ -546,7 +562,6 @@
       <title>Input Device Management</title>
       <xi:include href="xml/gimpdevices.xml"/>
       <xi:include href="xml/gimpdeviceinfo.xml"/>
-      <xi:include href="xml/gimpdevicestatus.xml"/>
     </chapter>
 
     <chapter>
@@ -562,7 +577,16 @@
     </chapter>
 
     <chapter>
-      <title>Data Editor Widgets</title>
+      <title>GimpEditor Widgets</title>
+      <xi:include href="xml/gimpeditor.xml"/>
+      <xi:include href="xml/gimpcoloreditor.xml"/>
+      <xi:include href="xml/gimpdevicestatus.xml"/>
+      <xi:include href="xml/gimperrorconsole.xml"/>
+      <xi:include href="xml/gimptemplateeditor.xml"/>
+    </chapter>
+
+    <chapter>
+      <title>GimpDataEditor Widgets</title>
       <xi:include href="xml/gimpdataeditor.xml"/>
       <xi:include href="xml/gimpbrusheditor.xml"/>
       <xi:include href="xml/gimpgradienteditor.xml"/>
@@ -570,43 +594,14 @@
     </chapter>
 
     <chapter>
-      <title>Data Factory Views</title>
-      <xi:include href="xml/gimpdatafactoryview.xml"/>
-      <xi:include href="xml/gimpbrushfactoryview.xml"/>
+      <title>GimpImageEditor Widgets</title>
+      <xi:include href="xml/gimpimageeditor.xml"/>
+      <xi:include href="xml/gimpcomponenteditor.xml"/>
+      <xi:include href="xml/gimpcolormapeditor.xml"/>
+      <xi:include href="xml/gimpselectioneditor.xml"/>
+      <xi:include href="xml/gimpundoeditor.xml"/>
     </chapter>
 
-    <xi:include href="xml/gimpeditor.xml"/>
-
-    <xi:include href="xml/gimpcoloreditor.xml"/>
-
-    <xi:include href="xml/gimpcolorpanel.xml"/>
-    <xi:include href="xml/gimpcomponenteditor.xml"/>
-    <xi:include href="xml/gimpcontainerpopup.xml"/>
-    <xi:include href="xml/gimpdialogfactory.xml"/>
-
-
-
-    <xi:include href="xml/gimpcontainereditor.xml"/>
-
-    <xi:include href="xml/gimpbufferview.xml"/>
-    <xi:include href="xml/gimpdocumentview.xml"/>
-    <xi:include href="xml/gimpimageview.xml"/>
-    <xi:include href="xml/gimptemplateview.xml"/>
-
-    <xi:include href="xml/gimpimageeditor.xml"/>
-
-    <xi:include href="xml/gimpcolormapeditor.xml"/>
-    <xi:include href="xml/gimpundoeditor.xml"/>
-
-
-    <xi:include href="xml/gimpselectioneditor.xml"/>
-    <xi:include href="xml/gimptemplateeditor.xml"/>
-    <xi:include href="xml/gimptexteditor.xml"/>
-
-    <xi:include href="xml/gimpviewablebutton.xml"/>
-    <xi:include href="xml/gimpviewabledialog.xml"/>
-
-
     <chapter>
       <title>GimpContainerView Widgets</title>
       <xi:include href="xml/gimpcontainerview.xml"/>
@@ -627,6 +622,21 @@
       <xi:include href="xml/gimpcontainermenuimpl.xml"/>
     </chapter>
 
+    <chapter>
+      <title>GimpContainerEditor Widgets</title>
+      <xi:include href="xml/gimpcontainereditor.xml"/>
+      <xi:include href="xml/gimpbufferview.xml"/>
+      <xi:include href="xml/gimpdocumentview.xml"/>
+      <xi:include href="xml/gimpimageview.xml"/>
+      <xi:include href="xml/gimptemplateview.xml"/>
+    </chapter>
+
+    <chapter>
+      <title>GimpDataFactoryView Widgets</title>
+      <xi:include href="xml/gimpdatafactoryview.xml"/>
+      <xi:include href="xml/gimpbrushfactoryview.xml"/>
+    </chapter>
+
     <chapter>
       <title>Menus</title>
       <xi:include href="xml/gimpitemfactory.xml"/>
@@ -636,11 +646,15 @@
 
     <chapter>
       <title>Misc. Widgets</title>
-      <xi:include href="xml/gimperrorconsole.xml"/>
+      <xi:include href="xml/gimpcolorpanel.xml"/>
+      <xi:include href="xml/gimpcontainerpopup.xml"/>
       <xi:include href="xml/gimpfontselection-dialog.xml"/>
       <xi:include href="xml/gimpfontselection.xml"/>
       <xi:include href="xml/gimphistogrambox.xml"/>
       <xi:include href="xml/gimphistogramview.xml"/>
+      <xi:include href="xml/gimptexteditor.xml"/>
+      <xi:include href="xml/gimpviewablebutton.xml"/>
+      <xi:include href="xml/gimpviewabledialog.xml"/>
     </chapter>
 
     <chapter>
@@ -677,6 +691,7 @@
     <chapter>
       <title>Misc. Utilities</title>
       <xi:include href="xml/gimpcursor.xml"/>
+      <xi:include href="xml/gimpdialogfactory.xml"/>
       <xi:include href="xml/gimpdnd.xml"/>
       <xi:include href="xml/gimphelp.xml"/>
       <xi:include href="xml/gimpwidgets-utils.xml"/>
@@ -697,8 +712,8 @@
       <title>Initialization &amp; Glue Code</title>
       <xi:include href="xml/gui.xml"/>
       <xi:include href="xml/session.xml"/>
-      <xi:include href="xml/dialogs-constructors.xml"/>
       <xi:include href="xml/dialogs.xml"/>
+      <xi:include href="xml/dialogs-constructors.xml"/>
     </chapter>
 
     <chapter>
@@ -738,56 +753,87 @@
 
     <chapter>
       <title>Menus &amp; Callbacks</title>
-      <xi:include href="xml/brushes-menu.xml"/>
-      <xi:include href="xml/buffers-commands.xml"/>
-      <xi:include href="xml/buffers-menu.xml"/>
-      <xi:include href="xml/channels-commands.xml"/>
-      <xi:include href="xml/channels-menu.xml"/>
-      <xi:include href="xml/colormap-editor-commands.xml"/>
-      <xi:include href="xml/colormap-editor-menu.xml"/>
-      <xi:include href="xml/data-commands.xml"/>
-      <xi:include href="xml/debug-commands.xml"/>
-      <xi:include href="xml/dialogs-commands.xml"/>
-      <xi:include href="xml/dialogs-menu.xml"/>
-      <xi:include href="xml/documents-commands.xml"/>
-      <xi:include href="xml/documents-menu.xml"/>
-      <xi:include href="xml/drawable-commands.xml"/>
-      <xi:include href="xml/edit-commands.xml"/>
-      <xi:include href="xml/error-console-commands.xml"/>
-      <xi:include href="xml/error-console-menu.xml"/>
-      <xi:include href="xml/file-commands.xml"/>
+      <xi:include href="xml/menus.xml"/>
+    </chapter>
+
+    <chapter>
+      <title>
+        The &lt;Toolbox&gt;, &lt;Image&gt;, &lt;Open&gt; &amp; &lt;Save&gt;
+        Menus &amp; Callbacks
+      </title>
+      <subtitle>
+        Note that the &lt;Image&gt; menu shares callbacks with the
+        &lt;Layers&gt;, &lt;Channels&gt; &amp; &lt;Vectors&gt; menus.
+      </subtitle>
+      <xi:include href="xml/toolbox-menu.xml"/>
+      <xi:include href="xml/image-menu.xml"/>
       <xi:include href="xml/file-open-menu.xml"/>
       <xi:include href="xml/file-save-menu.xml"/>
-      <xi:include href="xml/gradient-editor-commands.xml"/>
-      <xi:include href="xml/gradient-editor-menu.xml"/>
-      <xi:include href="xml/gradients-commands.xml"/>
-      <xi:include href="xml/gradients-menu.xml"/>
-      <xi:include href="xml/help-commands.xml"/>
-      <xi:include href="xml/image-commands.xml"/>
-      <xi:include href="xml/image-menu.xml"/>
-      <xi:include href="xml/images-commands.xml"/>
-      <xi:include href="xml/images-menu.xml"/>
-      <xi:include href="xml/layers-commands.xml"/>
-      <xi:include href="xml/layers-menu.xml"/>
-      <xi:include href="xml/menus.xml"/>
-      <xi:include href="xml/palette-editor-commands.xml"/>
-      <xi:include href="xml/palette-editor-menu.xml"/>
-      <xi:include href="xml/palettes-commands.xml"/>
-      <xi:include href="xml/palettes-menu.xml"/>
-      <xi:include href="xml/patterns-menu.xml"/>
-      <xi:include href="xml/plug-in-commands.xml"/>
       <xi:include href="xml/plug-in-menus.xml"/>
-      <xi:include href="xml/qmask-commands.xml"/>
-      <xi:include href="xml/qmask-menu.xml"/>
+      <xi:include href="xml/file-commands.xml"/>
+      <xi:include href="xml/edit-commands.xml"/>
       <xi:include href="xml/select-commands.xml"/>
-      <xi:include href="xml/templates-commands.xml"/>
-      <xi:include href="xml/templates-menu.xml"/>
-      <xi:include href="xml/toolbox-menu.xml"/>
+      <xi:include href="xml/image-commands.xml"/>
+      <xi:include href="xml/drawable-commands.xml"/>
       <xi:include href="xml/tools-commands.xml"/>
-      <xi:include href="xml/vectors-commands.xml"/>
-      <xi:include href="xml/vectors-menu.xml"/>
       <xi:include href="xml/view-commands.xml"/>
+      <xi:include href="xml/help-commands.xml"/>
+      <xi:include href="xml/debug-commands.xml"/>
+      <xi:include href="xml/plug-in-commands.xml"/>
+    </chapter>
+
+    <chapter>
+      <title>
+        The &lt;Layers&gt;, &lt;Channels&gt; &amp; &lt;Vectors&gt;
+        Menus &amp; Callbacks
+      </title>
+      <subtitle>
+        Note that these menus share callbacks with the &lt;Image&gt; menu.
+      </subtitle>
+      <xi:include href="xml/channels-menu.xml"/>
+      <xi:include href="xml/channels-commands.xml"/>
+      <xi:include href="xml/layers-menu.xml"/>
+      <xi:include href="xml/layers-commands.xml"/>
+      <xi:include href="xml/vectors-menu.xml"/>
+      <xi:include href="xml/vectors-commands.xml"/>
+    </chapter>
+
+    <chapter>
+      <title>Data Factory Menus &amp; Callbacks</title>
+      <xi:include href="xml/brushes-menu.xml"/>
+      <xi:include href="xml/patterns-menu.xml"/>
+      <xi:include href="xml/gradients-menu.xml"/>
+      <xi:include href="xml/gradients-commands.xml"/>
+      <xi:include href="xml/palettes-menu.xml"/>
+      <xi:include href="xml/palettes-commands.xml"/>
+      <xi:include href="xml/data-commands.xml"/>
+    </chapter>
+
+    <chapter>
+      <title>Other Menus &amp; Callbacks</title>
+      <xi:include href="xml/buffers-menu.xml"/>
+      <xi:include href="xml/buffers-commands.xml"/>
+      <xi:include href="xml/colormap-editor-menu.xml"/>
+      <xi:include href="xml/colormap-editor-commands.xml"/>
+      <xi:include href="xml/dialogs-menu.xml"/>
+      <xi:include href="xml/dialogs-commands.xml"/>
+      <xi:include href="xml/documents-menu.xml"/>
+      <xi:include href="xml/documents-commands.xml"/>
+      <xi:include href="xml/error-console-menu.xml"/>
+      <xi:include href="xml/error-console-commands.xml"/>
+      <xi:include href="xml/gradient-editor-menu.xml"/>
+      <xi:include href="xml/gradient-editor-commands.xml"/>
+      <xi:include href="xml/images-menu.xml"/>
+      <xi:include href="xml/images-commands.xml"/>
+      <xi:include href="xml/palette-editor-menu.xml"/>
+      <xi:include href="xml/palette-editor-commands.xml"/>
+      <xi:include href="xml/qmask-menu.xml"/>
+      <xi:include href="xml/qmask-commands.xml"/>
+      <xi:include href="xml/templates-menu.xml"/>
+      <xi:include href="xml/templates-commands.xml"/>
     </chapter>
   </part>
 
+  <index/>
+
 </book>
diff --git a/devel-docs/app/app-sections.txt b/devel-docs/app/app-sections.txt
index 4cb2cb1d85..819420d191 100644
--- a/devel-docs/app/app-sections.txt
+++ b/devel-docs/app/app-sections.txt
@@ -1810,6 +1810,7 @@ gimp_fonts_reset
 
 <SECTION>
 <FILE>gimpfont</FILE>
+<TITLE>GimpFont</TITLE>
 GimpFont
 gimp_font_get_standard
 <SUBSECTION Standard>
@@ -1913,6 +1914,7 @@ GIMP_TEXT_LAYER_GET_CLASS
 
 <SECTION>
 <FILE>gimptextlayer-transform</FILE>
+<TITLE>GimpTextLayer-transform</TITLE>
 gimp_text_layer_scale
 gimp_text_layer_flip
 gimp_text_layer_rotate
@@ -1934,6 +1936,13 @@ GIMP_TYPE_TEXT_LAYOUT
 gimp_text_layout_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gimptextlayout-render</FILE>
+<TITLE>GimpTextLayout-render</TITLE>
+GimpTextRenderFunc
+gimp_text_layout_render
+</SECTION>
+
 <SECTION>
 <FILE>gimpairbrushtool</FILE>
 <TITLE>GimpAirbrushTool</TITLE>
@@ -3954,6 +3963,12 @@ GIMP_IS_PREVIEW_CLASS
 GIMP_PREVIEW_GET_CLASS
 </SECTION>
 
+<SECTION>
+<FILE>gimppreview-popup</FILE>
+<TITLE>GimpPreview-popup</TITLE>
+gimp_preview_popup_show
+</SECTION>
+
 <SECTION>
 <FILE>gimppreviewrenderer</FILE>
 GIMP_PREVIEW_MAX_BORDER_WIDTH
@@ -4151,6 +4166,28 @@ GIMP_IS_TOOLBOX_CLASS
 GIMP_TOOLBOX_GET_CLASS
 </SECTION>
 
+<SECTION>
+<FILE>gimptoolbox-dnd</FILE>
+<TITLE>GimpToolbox-dnd</TITLE>
+gimp_toolbox_dnd_init
+</SECTION>
+
+<SECTION>
+<FILE>gimptoolbox-color-area</FILE>
+<TITLE>GimpToolbox-color-area</TITLE>
+FOREGROUND
+BACKGROUND
+active_color
+color_area_gdisp
+gimp_toolbox_color_area_create
+</SECTION>
+
+<SECTION>
+<FILE>gimptoolbox-indicator-area</FILE>
+<TITLE>GimpToolbox-indicator-area</TITLE>
+gimp_toolbox_indicator_area_create
+</SECTION>
+
 <SECTION>
 <FILE>gimpundoeditor</FILE>
 <TITLE>GimpUndoEditor</TITLE>
@@ -6471,12 +6508,6 @@ plug_ins_extensions_parse
 plug_ins_image_types_parse
 </SECTION>
 
-<SECTION>
-<FILE>gimptextlayout-render</FILE>
-GimpTextRenderFunc
-gimp_text_layout_render
-</SECTION>
-
 <SECTION>
 <FILE>text-enums</FILE>
 GIMP_TYPE_TEXT_BOX_MODE
@@ -6687,11 +6718,6 @@ gimp_font_selection_dialog_set_font_desc
 gimp_help
 </SECTION>
 
-<SECTION>
-<FILE>gimppreview-popup</FILE>
-gimp_preview_popup_show
-</SECTION>
-
 <SECTION>
 <FILE>gimppropwidgets</FILE>
 gimp_prop_check_button_new
@@ -6720,25 +6746,6 @@ gimp_prop_preview_new
 gimp_prop_stock_image_new
 </SECTION>
 
-<SECTION>
-<FILE>gimptoolbox-color-area</FILE>
-FOREGROUND
-BACKGROUND
-active_color
-color_area_gdisp
-gimp_toolbox_color_area_create
-</SECTION>
-
-<SECTION>
-<FILE>gimptoolbox-dnd</FILE>
-gimp_toolbox_dnd_init
-</SECTION>
-
-<SECTION>
-<FILE>gimptoolbox-indicator-area</FILE>
-gimp_toolbox_indicator_area_create
-</SECTION>
-
 <SECTION>
 <FILE>gimpwidgets-constructors</FILE>
 gimp_paint_mode_menu_new