diff --git a/doc/index.html b/doc/index.html
index d341eeb..e13480d 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -8,6 +8,7 @@
 H1 {font-size: 16pt; font-family: Verdana,Arial,Helvetica}
 H2 {font-size: 14pt; font-family: Verdana,Arial,Helvetica}
 H3 {font-size: 12pt; font-family: Verdana,Arial,Helvetica}
+A:link, A:visited, A:active { text-decoration: underline }
 --></style>
 <title>The XML C library for Gnome</title>
 </head>
@@ -27,8 +28,8 @@
 <tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr>
 <tr><td bgcolor="#fffacd"><ul style="margin-left: -2pt">
 <li><a href="index.html">Home</a></li>
-<li><a href="FAQ.html">FAQ</a></li>
 <li><a href="intro.html">Introduction</a></li>
+<li><a href="FAQ.html">FAQ</a></li>
 <li><a href="docs.html">Documentation</a></li>
 <li><a href="bugs.html">Reporting bugs and getting help</a></li>
 <li><a href="help.html">How to help</a></li>
@@ -36,21 +37,21 @@
 <li><a href="news.html">News</a></li>
 <li><a href="XML.html">XML</a></li>
 <li><a href="XSLT.html">XSLT</a></li>
-<li><a href="architecture.html">An overview of libxml architecture</a></li>
+<li><a href="architecture.html">libxml architecture</a></li>
 <li><a href="tree.html">The tree output</a></li>
 <li><a href="interface.html">The SAX interface</a></li>
-<li><a href="library.html">The XML library interfaces</a></li>
+<li><a href="xmldtd.html">Validation &amp; DTDs</a></li>
+<li><a href="xmlmem.html">Memory Management</a></li>
+<li><a href="encoding.html">Encodings support</a></li>
+<li><a href="xmlio.html">I/O Interfaces</a></li>
+<li><a href="catalog.html">Catalog support</a></li>
+<li><a href="library.html">The parser interfaces</a></li>
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
-<li><a href="valid.html">Validation, or are you afraid of DTDs ?</a></li>
+<li><a href="upgrade.html">Upgrading 1.x code</a></li>
 <li><a href="DOM.html">DOM Principles</a></li>
 <li><a href="example.html">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
-<li><a href="encoding.html">Encodings support</a></li>
-<li><a href="catalog.html">Catalogs support</a></li>
-<li><a href="xmlio.html">I/O interfaces</a></li>
-<li><a href="xmlmem.html">Memory interfaces</a></li>
-<li><a href="xmldtd.html">DTD support</a></li>
 <li>
 <a href="xml.html">flat page</a>, <a href="site.xsl">stylesheet</a>
 </li>
@@ -84,21 +85,13 @@
 <li><a href="library.html">The XML library interfaces</a></li>
 <li><a href="entities.html">Entities or no entities</a></li>
 <li><a href="namespaces.html">Namespaces</a></li>
-<li><a href="valid.html">Validation</a></li>
+<li><a href="xmldtd.html">Validation</a></li>
 <li><a href="#Principles">DOM principles</a></li>
 <li><a href="#real">A real example</a></li>
 <li><a href="contribs.html">Contributions</a></li>
 </ul>
 <p>Separate documents:</p>
 <ul>
-<li><a href="upgrade.html">upgrade instructions for migrating to
-  libxml2</a></li>
-<li><a href="encoding.html">libxml Internationalization support</a></li>
-<li><a href="xmlio.html">libxml Input/Output interfaces</a></li>
-<li><a href="xmlmem.html">libxml Memory interfaces</a></li>
-<li><a href="catalog.html">libxml Catalog support</a></li>
-<li><a href="xmldtd.html">a short introduction about DTDs and
-  libxml</a></li>
 <li><a href="http://xmlsoft.org/XSLT/">the libxslt page</a></li>
 <li><a href="http://www.cs.unibo.it/~casarini/gdome2/">the gdome2 page: a
     standard DOM interface for libxml2</a></li>