--- doc_orig.shtml	2008-04-01 21:15:43.000000000 +0200
+++ doc_new.shtml	2008-04-01 21:17:17.000000000 +0200
@@ -11,19 +11,67 @@
 </div>
 <h3>Getting Started with gtkmm</h3>
 <p>You might start by reading the <em>Programming with gtkmm</em> online book, also available as a <a href="<!--#echo var="doc_base"-->/tutorial/pdf/programming-with-gtkmm.pdf">PDF</a>.</p>
-<p><a href="<!--#echo var="doc_base"-->/tutorial/html/index.html">Contents</a> of the whole online book.</p>
-<p>Selected chapters:
-<ul>
-    <li><a href="<!--#echo var="doc_base"-->/tutorial/html/chapter-installation.html">Installation</a></li>
-    <li><a href="<!--#echo var="doc_base"-->/tutorial/html/chapter-basics.html">Basics</a></li>
-    <li><a href="<!--#echo var="doc_base"-->/tutorial/html/chapter-signals.html">Signals</a></li>
-    <li><a href="<!--#echo var="doc_base"-->/tutorial/html/chapter-container-widgets.html">Container Widgets</a></li>
-    <li><a href="<!--#echo var="doc_base"-->/tutorial/html/chapter-treeview.html">TreeView</a></li>
-    <li><a href="<!--#echo var="doc_base"-->/tutorial/html/chapter-memory.html">Memory Management</a></li>
-    <li><a href="<!--#echo var="doc_base"-->/tutorial/html/chapter-libglademm.html">Glade and libglademm</a></li>
+<p>The contents of the book is as follows, but you can also see the detailed
+<a href="http://gtkmm.org/docs/gtkmm-2.4/docs/tutorial/html/index.html">Table of Contents</a>.</p>
+<table>
+    <tbody>
+        <tr>
+          <td>
+            <ol>
+              <li><a href="chapter-introduction.html">Introduction</a></li>
+              <li><a href="chapter-installation.html">Installation</a></li>
+              <li><a href="chapter-basics.html">Basics</a></li>
+              <li><a href="chapter-button-widget.html">Buttons</a></li>
+              <li><a href="chapter-range-widgets.html">Range Widgets</a></li>
+              <li><a href="chapter-misc-widgets.html">Miscellaneous Widgets</a></li>
+              <li><a href="chapter-container-widgets.html">Container Widgets</a></li>
+              <li><a href="chapter-treeview.html">The TreeView widget</a></li>
+              <li><a href="chapter-combobox.html">Combo Boxes</a></li>
+              <li><a href="chapter-textview.html">TextView</a></li>
+              <li><a href="chapter-menus-and-toolbars.html">Menus and Toolbars</a></li>
+              <li><a href="chapter-adjustment.html">Adjustments </a></li>
+              <li><a href="chapter-widgets-without-xwindows.html">Widgets Without X-Windows</a></li>
+            </ol>
+          </td>
+          <td>
+            <ol start="14">
+              <li><a href="chapter-dialogs.html">Dialogs</a></li>
+              <li><a href="chapter-drawingarea.html">The Drawing Area Widget</a></li>
+              <li><a href="chapter-draganddrop.html">Drag and Drop</a></li>
+              <li><a href="chapter-clipboard.html">The Clipboard</a></li>
+              <li><a href="chapter-printing.html">Printing</a></li>
+              <li><a href="chapter-recent-documents.html">Recently Used Documents</a></li>
+              <li><a href="chapter-plugs-sockets.html">Plugs and Sockets</a></li>
+              <li><a href="chapter-chapter-timeouts.html">Timeouts, I/O and Idle Functions </a></li>
+              <li><a href="chapter-memory.html">Memory management</a></li>
+              <li><a href="chapter-libglademm.html">Glade and libglademm</a></li>
+              <li><a href="chapter-internationalization.html">Internationalization and Localization</a></li>
+              <li><a href="chapter-customwidgets.html">Custom Widgets</a></li>
+            </ol>
+          </td>
+          <td>
+            <ol start="26">
+              <li><a href="chapter-recommended-techniques.html">Recommended Techniques</a></li>
+              <li><a href="chapter-contributing.html">Contributing </a></li>
+            </ol>
+            <ol type="A">
+              <li><a href="chapter-refptr.html">The RefPtr smartpointer</a></li>
+              <li><a href="chapter-signals.html">Signals</a></li>
+              <li><a href="chapter-custom-signals.html">Creating your own signals</a></li>
+              <li><a href="sec-signals-comparison.html">Comparison with other signalling systems</a></li>
+              <li><a href="sec-windows-installation.html"><span class="application">gtkmm</span> and Win32</a></li>
+              <li><a href="chapter-gdk-drawing.html">Drawing With GDK</a></li>
+              <li><a href="chapter-working-with-svn.html">Working with Subversion</a></li>
+              <li><a href="chapter-wrapping-c-libraries.html">Wrapping C Libraries with gmmproc</a></li>
+              <li><a href="chapter-optional-api.html">Optional API</a></li>
+              <li><a href="chapter-msvc.html">Using <span class="application">gtkmm</span> with Visual Studio 2005</a></li>
+            </ol>
+          </td>
+        </tr>
+    </tbody>
+</table>
+
 
-</ul>
-</p>
 <h3>API Reference</h3>
 
 <table>