tutorials

36 files changed, 112 insertions, 95 deletions

diff --git a/plugins/org.eclipse.emf.cdo.doc/html/Overview.html b/plugins/org.eclipse.emf.cdo.doc/html/Overview.html
index a3b525ee24..f4014c1b5d 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/Overview.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/Overview.html
@@ -24,26 +24,26 @@ function windowTitle()
 <p>
  <p>
 <table border="0">
-<tr><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="7"><a href="about.html" title="Article in CDO Model Repository Documentation">Legal</a></td></tr>
 <tr><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="7"><a href="" title="Article in CDO Model Repository Documentation">Overview</a></td></tr>
-<tr><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="7"><a href="online" title="Category in CDO Model Repository Documentation">Online Docs</a></td></tr>
-<tr><td/><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="6"><a href="http://www.eclipse.org/cdo" title="Article in CDO Model Repository Documentation">Homepage</a></td></tr>
-<tr><td/><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="6"><a href="http://wiki.eclipse.org/CDO" title="Article in CDO Model Repository Documentation">Wiki</a></td></tr>
-<tr><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="7"><a href="programmers" title="Category in CDO Model Repository Documentation">Programmer's Guide</a></td></tr>
-<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="6"><a href="programmers/connectors" title="Category in CDO Model Repository Documentation">Connectors</a></td></tr>
+<tr><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="7"><a href="programmers/index.html" title="Category in CDO Model Repository Documentation">Programmer's Guide</a></td></tr>
+<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="6"><a href="programmers/connectors/index.html" title="Category in CDO Model Repository Documentation">Connectors</a></td></tr>
 <tr><td/><td/><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="5"><a href="programmers/connectors/CreatingTransportConnections.html" title="Article in CDO Model Repository Documentation">Creating Transport Connections</a></td></tr>
 <tr><td/><td/><td/><td>1&nbsp;&nbsp;</td><td colspan="4"><a href="programmers/connectors/CreatingTransportConnections.html#SelectTransportType" title="Chapter in CDO Model Repository Documentation">Select a Transport Type</a></td></tr>
 <tr><td/><td/><td/><td>2&nbsp;&nbsp;</td><td colspan="4"><a href="programmers/connectors/CreatingTransportConnections.html#SetupWiringContainer" title="Chapter in CDO Model Repository Documentation">Setup a Wiring Container</a></td></tr>
 <tr><td/><td/><td/><td>3&nbsp;&nbsp;</td><td colspan="4"><a href="programmers/connectors/CreatingTransportConnections.html#AddConfigurationParameters" title="Chapter in CDO Model Repository Documentation">Add Configuration Parameters</a></td></tr>
 <tr><td/><td/><td/><td/><td>3.1&nbsp;&nbsp;</td><td colspan="3"><a href="programmers/connectors/CreatingTransportConnections.html#SetBufferCapacity" title="Chapter in CDO Model Repository Documentation">Set the Buffer Capacity</a></td></tr>
 <tr><td/><td/><td/><td/><td>3.2&nbsp;&nbsp;</td><td colspan="3"><a href="programmers/connectors/CreatingTransportConnections.html#SetConnectionTimeout" title="Chapter in CDO Model Repository Documentation">Set the Connection Timeout</a></td></tr>
-<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="6"><a href="programmers/sessions" title="Category in CDO Model Repository Documentation">Sessions</a></td></tr>
+<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="6"><a href="programmers/sessions/index.html" title="Category in CDO Model Repository Documentation">Sessions</a></td></tr>
 <tr><td/><td/><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="5"><a href="programmers/sessions/ConnectingToRepositories.html" title="Article in CDO Model Repository Documentation">Connecting To Repositories</a></td></tr>
 <tr><td/><td/><td/><td>1&nbsp;&nbsp;</td><td colspan="4"><a href="programmers/sessions/ConnectingToRepositories.html#SetBufferCapacity" title="Chapter in CDO Model Repository Documentation">Set Buffer Capacity</a></td></tr>
 <tr><td/><td/><td/><td>2&nbsp;&nbsp;</td><td colspan="4"><a href="programmers/sessions/ConnectingToRepositories.html#SetConnectionTimeout" title="Chapter in CDO Model Repository Documentation">Set Connection Timeout</a></td></tr>
-<tr><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="7"><a href="reference" title="Category in CDO Model Repository Documentation">Reference</a></td></tr>
-<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="6"><a href="reference/api" title="Category in CDO Model Repository Documentation">API Reference</a></td></tr>
-<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="6"><a href="reference/schema" title="Category in CDO Model Repository Documentation">Extension Point Reference</a></td></tr>
+<tr><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="7"><a href="reference/index.html" title="Category in CDO Model Repository Documentation">Reference</a></td></tr>
+<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="6"><a href="reference/api/index.html" title="Category in CDO Model Repository Documentation">API Reference</a></td></tr>
+<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="6"><a href="reference/schema/index.html" title="Category in CDO Model Repository Documentation">Extension Point Reference</a></td></tr>
+<tr><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="7"><a href="online/index.html" title="Category in CDO Model Repository Documentation">Online Docs</a></td></tr>
+<tr><td/><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="6"><a href="http://www.eclipse.org/cdo" title="Article in CDO Model Repository Documentation">Homepage</a></td></tr>
+<tr><td/><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="6"><a href="http://wiki.eclipse.org/CDO" title="Article in CDO Model Repository Documentation">Wiki</a></td></tr>
+<tr><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="7"><a href="about.html" title="Article in CDO Model Repository Documentation">Legal</a></td></tr>
 </table>
 </p>
 
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/online/summary.html b/plugins/org.eclipse.emf.cdo.doc/html/online/index.html
index 9353c7ef60..9353c7ef60 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/online/summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/online/index.html
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/programmers/connectors/summary.html b/plugins/org.eclipse.emf.cdo.doc/html/programmers/connectors/index.html
index 0c7fa20042..0c7fa20042 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/programmers/connectors/summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/programmers/connectors/index.html
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/programmers/summary.html b/plugins/org.eclipse.emf.cdo.doc/html/programmers/index.html
index 74a974ccbb..c40a56591e 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/programmers/summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/programmers/index.html
@@ -23,14 +23,14 @@ function windowTitle()
 <h1>Programmer's Guide</h1>
 <p>
 <table border="0">
-<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="6"><a href="connectors" title="Category in CDO Model Repository Documentation">Connectors</a></td></tr>
+<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="6"><a href="connectors/index.html" title="Category in CDO Model Repository Documentation">Connectors</a></td></tr>
 <tr><td/><td><img src="../../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="5"><a href="connectors/CreatingTransportConnections.html" title="Article in CDO Model Repository Documentation">Creating Transport Connections</a></td></tr>
 <tr><td/><td/><td>1&nbsp;&nbsp;</td><td colspan="4"><a href="connectors/CreatingTransportConnections.html#SelectTransportType" title="Chapter in CDO Model Repository Documentation">Select a Transport Type</a></td></tr>
 <tr><td/><td/><td>2&nbsp;&nbsp;</td><td colspan="4"><a href="connectors/CreatingTransportConnections.html#SetupWiringContainer" title="Chapter in CDO Model Repository Documentation">Setup a Wiring Container</a></td></tr>
 <tr><td/><td/><td>3&nbsp;&nbsp;</td><td colspan="4"><a href="connectors/CreatingTransportConnections.html#AddConfigurationParameters" title="Chapter in CDO Model Repository Documentation">Add Configuration Parameters</a></td></tr>
 <tr><td/><td/><td/><td>3.1&nbsp;&nbsp;</td><td colspan="3"><a href="connectors/CreatingTransportConnections.html#SetBufferCapacity" title="Chapter in CDO Model Repository Documentation">Set the Buffer Capacity</a></td></tr>
 <tr><td/><td/><td/><td>3.2&nbsp;&nbsp;</td><td colspan="3"><a href="connectors/CreatingTransportConnections.html#SetConnectionTimeout" title="Chapter in CDO Model Repository Documentation">Set the Connection Timeout</a></td></tr>
-<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="6"><a href="sessions" title="Category in CDO Model Repository Documentation">Sessions</a></td></tr>
+<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="6"><a href="sessions/index.html" title="Category in CDO Model Repository Documentation">Sessions</a></td></tr>
 <tr><td/><td><img src="../../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="5"><a href="sessions/ConnectingToRepositories.html" title="Article in CDO Model Repository Documentation">Connecting To Repositories</a></td></tr>
 <tr><td/><td/><td>1&nbsp;&nbsp;</td><td colspan="4"><a href="sessions/ConnectingToRepositories.html#SetBufferCapacity" title="Chapter in CDO Model Repository Documentation">Set Buffer Capacity</a></td></tr>
 <tr><td/><td/><td>2&nbsp;&nbsp;</td><td colspan="4"><a href="sessions/ConnectingToRepositories.html#SetConnectionTimeout" title="Chapter in CDO Model Repository Documentation">Set Connection Timeout</a></td></tr>
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/programmers/sessions/summary.html b/plugins/org.eclipse.emf.cdo.doc/html/programmers/sessions/index.html
index 6292845925..6292845925 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/programmers/sessions/summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/programmers/sessions/index.html
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/reference/summary.html b/plugins/org.eclipse.emf.cdo.doc/html/reference/index.html
index 0b8cccd08c..c0cc1d0ac8 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/reference/summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/reference/index.html
@@ -23,8 +23,8 @@ function windowTitle()
 <h1>Reference</h1>
 <p>
 <table border="0">
-<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="api" title="Category in CDO Model Repository Documentation">API Reference</a></td></tr>
-<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="schema" title="Category in CDO Model Repository Documentation">Extension Point Reference</a></td></tr>
+<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="api/index.html" title="Category in CDO Model Repository Documentation">API Reference</a></td></tr>
+<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="schema/index.html" title="Category in CDO Model Repository Documentation">Extension Point Reference</a></td></tr>
 </table>
 </p>
 
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/summary.html b/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/index.html
index 838dc91aa2..838dc91aa2 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/index.html
diff --git a/plugins/org.eclipse.emf.cdo.doc/toc.html b/plugins/org.eclipse.emf.cdo.doc/toc.html
index 54bd9e5542..57a00efb93 100644
--- a/plugins/org.eclipse.emf.cdo.doc/toc.html
+++ b/plugins/org.eclipse.emf.cdo.doc/toc.html
@@ -1,18 +1,18 @@
 <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_1')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_1"/></a><img src="documentation.gif"/><a href="org.eclipse.emf.cdo.doc/html/Overview.html" target="content"><b>CDO&nbspModel&nbspRepository&nbspDocumentation</b></a></span></div>
 <div id="org_eclipse_emf_cdo_doc_1" style="display:none; margin-left:20px;">
   <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/html/Overview.html" target="content">Overview</a></span></div>
-  <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_2')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_2"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/programmers/summary.html" target="content">Programmer's&nbspGuide</a></span></div>
+  <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_2')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_2"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/programmers/index.html" target="content">Programmer's&nbspGuide</a></span></div>
   <div id="org_eclipse_emf_cdo_doc_2" style="display:none; margin-left:20px;">
-    <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_3')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_3"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/programmers/connectors/summary.html" target="content">Connectors</a></span></div>
+    <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_3')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_3"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/programmers/connectors/index.html" target="content">Connectors</a></span></div>
     <div id="org_eclipse_emf_cdo_doc_3" style="display:none; margin-left:20px;">
       <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/html/programmers/connectors/CreatingTransportConnections.html" target="content">Creating&nbspTransport&nbspConnections</a></span></div>
     </div>
-    <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_4')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_4"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/programmers/sessions/summary.html" target="content">Sessions</a></span></div>
+    <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_4')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_4"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/programmers/sessions/index.html" target="content">Sessions</a></span></div>
     <div id="org_eclipse_emf_cdo_doc_4" style="display:none; margin-left:20px;">
       <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/html/programmers/sessions/ConnectingToRepositories.html" target="content">Connecting&nbspTo&nbspRepositories</a></span></div>
     </div>
   </div>
-  <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_5')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_5"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/reference/summary.html" target="content">Reference</a></span></div>
+  <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_5')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_5"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/reference/index.html" target="content">Reference</a></span></div>
   <div id="org_eclipse_emf_cdo_doc_5" style="display:none; margin-left:20px;">
     <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_6')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_6"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/overview-summary.html" target="content">API&nbspReference</a></span></div>
     <div id="org_eclipse_emf_cdo_doc_6" style="display:none; margin-left:20px;">
@@ -115,7 +115,7 @@
         <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/objectivity/package-summary.html" target="content">org.eclipse.emf.cdo.server.objectivity</a></span></div>
       </div>
     </div>
-    <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_22')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_22"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/reference/schema/summary.html" target="content">Extension&nbspPoint&nbspReference</a></span></div>
+    <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_22')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_22"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/reference/schema/index.html" target="content">Extension&nbspPoint&nbspReference</a></span></div>
     <div id="org_eclipse_emf_cdo_doc_22" style="display:none; margin-left:20px;">
       <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_23')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_23"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_viewProviders.html" target="content">CDO&nbspModel&nbspRepository&nbspClient</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_23" style="display:none; margin-left:20px;">
@@ -137,7 +137,7 @@
       </div>
     </div>
   </div>
-  <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_27')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_27"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/online/summary.html" target="content">Online&nbspDocs</a></span></div>
+  <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_27')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_27"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/online/index.html" target="content">Online&nbspDocs</a></span></div>
   <div id="org_eclipse_emf_cdo_doc_27" style="display:none; margin-left:20px;">
     <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="http://www.eclipse.org/cdo" target="content">Homepage</a></span></div>
     <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="http://wiki.eclipse.org/CDO" target="content">Wiki</a></span></div>
diff --git a/plugins/org.eclipse.emf.cdo.doc/toc.xml b/plugins/org.eclipse.emf.cdo.doc/toc.xml
index c59f79b6bb..2575aa139e 100644
--- a/plugins/org.eclipse.emf.cdo.doc/toc.xml
+++ b/plugins/org.eclipse.emf.cdo.doc/toc.xml
@@ -3,15 +3,15 @@
 
 <toc label="CDO Model Repository Documentation" topic="html/Overview.html">
   <topic label="Overview" href="html/Overview.html" />
-  <topic label="Programmer's Guide" href="html/programmers/summary.html">
-    <topic label="Connectors" href="html/programmers/connectors/summary.html">
+  <topic label="Programmer's Guide" href="html/programmers/index.html">
+    <topic label="Connectors" href="html/programmers/connectors/index.html">
       <topic label="Creating Transport Connections" href="html/programmers/connectors/CreatingTransportConnections.html" />
     </topic>
-    <topic label="Sessions" href="html/programmers/sessions/summary.html">
+    <topic label="Sessions" href="html/programmers/sessions/index.html">
       <topic label="Connecting To Repositories" href="html/programmers/sessions/ConnectingToRepositories.html" />
     </topic>
   </topic>
-  <topic label="Reference" href="html/reference/summary.html">
+  <topic label="Reference" href="html/reference/index.html">
     <topic label="API Reference" href="javadoc/overview-summary.html">
       <topic label="CDO Model Repository Client" href="javadoc/org/eclipse/emf/cdo/package-summary.html">
         <topic label="org.eclipse.emf.cdo" href="javadoc/org/eclipse/emf/cdo/package-summary.html" />
@@ -97,7 +97,7 @@
         <topic label="org.eclipse.emf.cdo.server.objectivity" href="javadoc/org/eclipse/emf/cdo/server/objectivity/package-summary.html" />
       </topic>
     </topic>
-    <topic label="Extension Point Reference" href="html/reference/schema/summary.html">
+    <topic label="Extension Point Reference" href="html/reference/schema/index.html">
       <topic label="CDO Model Repository Client" href="schemadoc/org_eclipse_emf_cdo_viewProviders.html">
         <topic label="viewProviders" href="schemadoc/org_eclipse_emf_cdo_viewProviders.html" />
       </topic>
@@ -114,7 +114,7 @@
       </topic>
     </topic>
   </topic>
-  <topic label="Online Docs" href="html/online/summary.html">
+  <topic label="Online Docs" href="html/online/index.html">
     <topic label="Homepage" href="http://www.eclipse.org/cdo" />
     <topic label="Wiki" href="http://wiki.eclipse.org/CDO" />
   </topic>
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/buildLib.ant b/plugins/org.eclipse.emf.cdo.releng.doc/buildLib.ant
index fd3d202de2..90a6889141 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/buildLib.ant
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/buildLib.ant
@@ -14,12 +14,12 @@
 
 	<target name="toc">
 		<concat destfile="plugins/org.eclipse.emf.cdo.releng/help/toc.html">
-			<path path="plugins/org.eclipse.emf.cdo.releng/help/tocHeader.html" />
+			<path path="plugins/org.eclipse.emf.cdo.releng.doc/help/tocHeader.html" />
 			<path path="plugins/org.eclipse.emf.cdo.doc/toc.html" />
 			<path path="plugins/org.eclipse.net4j.doc/toc.html" />
 			<path path="plugins/org.eclipse.net4j.db.doc/toc.html" />
 			<path path="plugins/org.eclipse.net4j.util.doc/toc.html" />
-			<path path="plugins/org.eclipse.emf.cdo.releng/help/tocFooter.html" />
+			<path path="plugins/org.eclipse.emf.cdo.releng.doc/help/tocFooter.html" />
 		</concat>
 	</target>
 
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/StructuralElement.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/StructuralElement.java
index 21108f1f3a..e8a963d2ea 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/StructuralElement.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/StructuralElement.java
@@ -13,6 +13,7 @@ import com.sun.javadoc.Doc;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Structural Element</b></em>'. <!-- end-user-doc
@@ -176,6 +177,8 @@ public interface StructuralElement extends LinkTarget
 
   int getDepth();
 
+  List<StructuralElement> getSortedChildren();
+
   void generate() throws IOException;
 
   void generate(PrintWriter out) throws IOException;
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/CategoryImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/CategoryImpl.java
index f13c2275cf..ed2738df45 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/CategoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/CategoryImpl.java
@@ -111,8 +111,14 @@ public class CategoryImpl extends BodyImpl implements Category
   }
 
   @Override
+  public String linkFrom(StructuralElement source)
+  {
+    return super.linkFrom(source) + "/index.html";
+  }
+
+  @Override
   protected File getTocTarget()
   {
-    return new File(super.getTocTarget(), "summary.html");
+    return new File(super.getTocTarget(), "index.html");
   }
 } // CategoryImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ChapterImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ChapterImpl.java
index 04d4638603..5d2a21440a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ChapterImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ChapterImpl.java
@@ -213,7 +213,7 @@ public class ChapterImpl extends BodyImpl implements Chapter
       getLevelNumbers((ChapterImpl)parent, levelNumbers);
     }
 
-    int number = parent.getChildren().indexOf(chapter) + 1;
+    int number = parent.getSortedChildren().indexOf(chapter) + 1;
     levelNumbers.add(number);
   }
 } // ChapterImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ContextImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ContextImpl.java
index 53fdbe58b6..931803a380 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ContextImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ContextImpl.java
@@ -165,7 +165,7 @@ public class ContextImpl extends EObjectImpl implements Context
   {
     System.out.println(prefix + element.getTitle() + "   --> " + ArticleUtil.makeConsoleLink(element.getDoc()));
 
-    for (StructuralElement child : element.getChildren())
+    for (StructuralElement child : element.getSortedChildren())
     {
       dump(child, prefix + "  ");
     }
@@ -349,7 +349,9 @@ public class ContextImpl extends EObjectImpl implements Context
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (baseFolder: ");
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java
index 4501b563e3..fb87269b98 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java
@@ -563,9 +563,23 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St
 
   protected abstract String getKind();
 
+  public List<StructuralElement> getSortedChildren()
+  {
+    List<StructuralElement> children = new ArrayList<StructuralElement>(getChildren());
+    Collections.sort(children, new Comparator<StructuralElement>()
+    {
+      public int compare(StructuralElement body1, StructuralElement body2)
+      {
+        return new Integer(((Body)body1).getNumber()).compareTo(((Body)body2).getNumber());
+      }
+    });
+
+    return children;
+  }
+
   public void generate() throws IOException
   {
-    for (StructuralElement child : getChildren())
+    for (StructuralElement child : getSortedChildren())
     {
       child.generate();
     }
@@ -573,7 +587,7 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St
 
   public void generate(PrintWriter out) throws IOException
   {
-    for (StructuralElement child : getChildren())
+    for (StructuralElement child : getSortedChildren())
     {
       child.generate(out);
     }
@@ -627,16 +641,7 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St
 
   protected void generateTocEntries(TocWriter writer) throws IOException
   {
-    List<StructuralElement> children = new ArrayList<StructuralElement>(getChildren());
-    Collections.sort(children, new Comparator<StructuralElement>()
-    {
-      public int compare(StructuralElement body1, StructuralElement body2)
-      {
-        return new Integer(((Body)body1).getNumber()).compareTo(((Body)body2).getNumber());
-      }
-    });
-
-    for (StructuralElement child : children)
+    for (StructuralElement child : getSortedChildren())
     {
       BodyImpl body = (BodyImpl)child;
       body.generateTocEntry(writer);
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TocImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TocImpl.java
index 7333ff53a2..cf2c652e06 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TocImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TocImpl.java
@@ -226,7 +226,7 @@ public class TocImpl extends BodyElementImpl implements Toc
       out.write("</td></tr>\n");
     }
 
-    for (StructuralElement child : element.getChildren())
+    for (StructuralElement child : element.getSortedChildren())
     {
       generate(out, linkSource, imagePath, depth, child, level + 1);
     }
diff --git a/plugins/org.eclipse.emf.cdo.releng/help/toc.css b/plugins/org.eclipse.emf.cdo.releng/help/toc.css
index 120d2cca3f..19c645d203 100644
--- a/plugins/org.eclipse.emf.cdo.releng/help/toc.css
+++ b/plugins/org.eclipse.emf.cdo.releng/help/toc.css
@@ -1,5 +1,6 @@
 a:link {
   text-decoration: none;
+  border: none;
   color: #000000;
 }
 
diff --git a/plugins/org.eclipse.emf.cdo.releng/help/toc.html b/plugins/org.eclipse.emf.cdo.releng/help/toc.html
index a4c870c602..2efb7d0ecc 100644
--- a/plugins/org.eclipse.emf.cdo.releng/help/toc.html
+++ b/plugins/org.eclipse.emf.cdo.releng/help/toc.html
@@ -21,18 +21,18 @@
 <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_1')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_1"/></a><img src="documentation.gif"/><a href="org.eclipse.emf.cdo.doc/html/Overview.html" target="content"><b>CDO&nbspModel&nbspRepository&nbspDocumentation</b></a></span></div>
 <div id="org_eclipse_emf_cdo_doc_1" style="display:none; margin-left:20px;">
   <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/html/Overview.html" target="content">Overview</a></span></div>
-  <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_2')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_2"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/programmers/summary.html" target="content">Programmer's&nbspGuide</a></span></div>
+  <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_2')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_2"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/programmers/index.html" target="content">Programmer's&nbspGuide</a></span></div>
   <div id="org_eclipse_emf_cdo_doc_2" style="display:none; margin-left:20px;">
-    <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_3')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_3"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/programmers/connectors/summary.html" target="content">Connectors</a></span></div>
+    <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_3')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_3"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/programmers/connectors/index.html" target="content">Connectors</a></span></div>
     <div id="org_eclipse_emf_cdo_doc_3" style="display:none; margin-left:20px;">
       <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/html/programmers/connectors/CreatingTransportConnections.html" target="content">Creating&nbspTransport&nbspConnections</a></span></div>
     </div>
-    <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_4')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_4"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/programmers/sessions/summary.html" target="content">Sessions</a></span></div>
+    <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_4')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_4"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/programmers/sessions/index.html" target="content">Sessions</a></span></div>
     <div id="org_eclipse_emf_cdo_doc_4" style="display:none; margin-left:20px;">
       <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/html/programmers/sessions/ConnectingToRepositories.html" target="content">Connecting&nbspTo&nbspRepositories</a></span></div>
     </div>
   </div>
-  <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_5')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_5"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/reference/summary.html" target="content">Reference</a></span></div>
+  <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_5')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_5"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/reference/index.html" target="content">Reference</a></span></div>
   <div id="org_eclipse_emf_cdo_doc_5" style="display:none; margin-left:20px;">
     <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_6')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_6"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/overview-summary.html" target="content">API&nbspReference</a></span></div>
     <div id="org_eclipse_emf_cdo_doc_6" style="display:none; margin-left:20px;">
@@ -135,7 +135,7 @@
         <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/objectivity/package-summary.html" target="content">org.eclipse.emf.cdo.server.objectivity</a></span></div>
       </div>
     </div>
-    <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_22')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_22"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/reference/schema/summary.html" target="content">Extension&nbspPoint&nbspReference</a></span></div>
+    <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_22')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_22"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/reference/schema/index.html" target="content">Extension&nbspPoint&nbspReference</a></span></div>
     <div id="org_eclipse_emf_cdo_doc_22" style="display:none; margin-left:20px;">
       <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_23')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_23"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_viewProviders.html" target="content">CDO&nbspModel&nbspRepository&nbspClient</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_23" style="display:none; margin-left:20px;">
@@ -157,7 +157,7 @@
       </div>
     </div>
   </div>
-  <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_27')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_27"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/online/summary.html" target="content">Online&nbspDocs</a></span></div>
+  <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_27')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_27"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/online/index.html" target="content">Online&nbspDocs</a></span></div>
   <div id="org_eclipse_emf_cdo_doc_27" style="display:none; margin-left:20px;">
     <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="http://www.eclipse.org/cdo" target="content">Homepage</a></span></div>
     <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="http://wiki.eclipse.org/CDO" target="content">Wiki</a></span></div>
@@ -167,7 +167,7 @@
 <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_1')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_1"/></a><img src="documentation.gif"/><a href="org.eclipse.net4j.doc/html/Overview.html" target="content"><b>Net4j&nbspSignalling&nbspPlatform&nbspDocumentation</b></a></span></div>
 <div id="org_eclipse_net4j_doc_1" style="display:none; margin-left:20px;">
   <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/html/Overview.html" target="content">Overview</a></span></div>
-  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_2')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_2"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/html/reference/summary.html" target="content">Reference</a></span></div>
+  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_2')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_2"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/html/reference/index.html" target="content">Reference</a></span></div>
   <div id="org_eclipse_net4j_doc_2" style="display:none; margin-left:20px;">
     <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_3')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_3"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/javadoc/overview-summary.html" target="content">API&nbspReference</a></span></div>
     <div id="org_eclipse_net4j_doc_3" style="display:none; margin-left:20px;">
@@ -211,7 +211,7 @@
       </div>
     </div>
   </div>
-  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_11')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_11"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/html/online/summary.html" target="content">Online&nbspDocs</a></span></div>
+  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_11')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_11"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/html/online/index.html" target="content">Online&nbspDocs</a></span></div>
   <div id="org_eclipse_net4j_doc_11" style="display:none; margin-left:20px;">
     <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="http://www.eclipse.org/cdo" target="content">Homepage</a></span></div>
     <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="http://wiki.eclipse.org/CDO" target="content">Wiki</a></span></div>
@@ -221,7 +221,7 @@
 <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_1')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_1"/></a><img src="documentation.gif"/><a href="org.eclipse.net4j.db.doc/html/Overview.html" target="content"><b>Net4j&nbspDB&nbspFramework&nbspDocumentation</b></a></span></div>
 <div id="org_eclipse_net4j_db_doc_1" style="display:none; margin-left:20px;">
   <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.db.doc/html/Overview.html" target="content">Overview</a></span></div>
-  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_2')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_2"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/html/reference/summary.html" target="content">Reference</a></span></div>
+  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_2')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_2"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/html/reference/index.html" target="content">Reference</a></span></div>
   <div id="org_eclipse_net4j_db_doc_2" style="display:none; margin-left:20px;">
     <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_3')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_3"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/overview-summary.html" target="content">API&nbspReference</a></span></div>
     <div id="org_eclipse_net4j_db_doc_3" style="display:none; margin-left:20px;">
@@ -253,7 +253,7 @@
         <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/postgresql/package-summary.html" target="content">org.eclipse.net4j.db.postgresql</a></span></div>
       </div>
     </div>
-    <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_10')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_10"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/html/reference/schema/summary.html" target="content">Extension&nbspPoint&nbspReference</a></span></div>
+    <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_10')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_10"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/html/reference/schema/index.html" target="content">Extension&nbspPoint&nbspReference</a></span></div>
     <div id="org_eclipse_net4j_db_doc_10" style="display:none; margin-left:20px;">
       <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_11')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_11"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/schemadoc/org_eclipse_net4j_db_dbAdapters.html" target="content">Net4j&nbspDB&nbspFramework</a></span></div>
       <div id="org_eclipse_net4j_db_doc_11" style="display:none; margin-left:20px;">
@@ -261,7 +261,7 @@
       </div>
     </div>
   </div>
-  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_12')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_12"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/html/online/summary.html" target="content">Online&nbspDocs</a></span></div>
+  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_12')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_12"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/html/online/index.html" target="content">Online&nbspDocs</a></span></div>
   <div id="org_eclipse_net4j_db_doc_12" style="display:none; margin-left:20px;">
     <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="http://www.eclipse.org/cdo" target="content">Homepage</a></span></div>
     <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="http://wiki.eclipse.org/CDO" target="content">Wiki</a></span></div>
@@ -271,7 +271,7 @@
 <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_1')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_1"/></a><img src="documentation.gif"/><a href="org.eclipse.net4j.util.doc/html/Overview.html" target="content"><b>Net4j&nbspUtilities&nbspDocumentation</b></a></span></div>
 <div id="org_eclipse_net4j_util_doc_1" style="display:none; margin-left:20px;">
   <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/html/Overview.html" target="content">Overview</a></span></div>
-  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_2')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_2"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/html/reference/summary.html" target="content">Reference</a></span></div>
+  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_2')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_2"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/html/reference/index.html" target="content">Reference</a></span></div>
   <div id="org_eclipse_net4j_util_doc_2" style="display:none; margin-left:20px;">
     <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_3')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_3"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/overview-summary.html" target="content">API&nbspReference</a></span></div>
     <div id="org_eclipse_net4j_util_doc_3" style="display:none; margin-left:20px;">
@@ -313,7 +313,7 @@
         <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/widgets/package-summary.html" target="content">org.eclipse.net4j.util.ui.widgets</a></span></div>
       </div>
     </div>
-    <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_6')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_6"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/html/reference/schema/summary.html" target="content">Extension&nbspPoint&nbspReference</a></span></div>
+    <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_6')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_6"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/html/reference/schema/index.html" target="content">Extension&nbspPoint&nbspReference</a></span></div>
     <div id="org_eclipse_net4j_util_doc_6" style="display:none; margin-left:20px;">
       <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_7')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_7"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/schemadoc/org_eclipse_net4j_util_elementProcessors.html" target="content">Net4j&nbspUtilities</a></span></div>
       <div id="org_eclipse_net4j_util_doc_7" style="display:none; margin-left:20px;">
@@ -322,7 +322,7 @@
       </div>
     </div>
   </div>
-  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_8')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_8"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/html/online/summary.html" target="content">Online&nbspDocs</a></span></div>
+  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_8')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_8"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/html/online/index.html" target="content">Online&nbspDocs</a></span></div>
   <div id="org_eclipse_net4j_util_doc_8" style="display:none; margin-left:20px;">
     <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="http://www.eclipse.org/cdo" target="content">Homepage</a></span></div>
     <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="http://wiki.eclipse.org/CDO" target="content">Wiki</a></span></div>
diff --git a/plugins/org.eclipse.net4j.db.doc/html/Overview.html b/plugins/org.eclipse.net4j.db.doc/html/Overview.html
index 72fb714c36..024941605d 100644
--- a/plugins/org.eclipse.net4j.db.doc/html/Overview.html
+++ b/plugins/org.eclipse.net4j.db.doc/html/Overview.html
@@ -24,14 +24,14 @@ function windowTitle()
 <p>
  <p>
 <table border="0">
-<tr><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="about.html" title="Article in Net4j DB Framework Documentation">Legal</a></td></tr>
 <tr><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="" title="Article in Net4j DB Framework Documentation">Overview</a></td></tr>
-<tr><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="online" title="Category in Net4j DB Framework Documentation">Online Docs</a></td></tr>
+<tr><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="reference/index.html" title="Category in Net4j DB Framework Documentation">Reference</a></td></tr>
+<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="reference/api/index.html" title="Category in Net4j DB Framework Documentation">API Reference</a></td></tr>
+<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="reference/schema/index.html" title="Category in Net4j DB Framework Documentation">Extension Point Reference</a></td></tr>
+<tr><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="online/index.html" title="Category in Net4j DB Framework Documentation">Online Docs</a></td></tr>
 <tr><td/><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="http://www.eclipse.org/cdo" title="Article in Net4j DB Framework Documentation">Homepage</a></td></tr>
 <tr><td/><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="http://wiki.eclipse.org/CDO" title="Article in Net4j DB Framework Documentation">Wiki</a></td></tr>
-<tr><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="reference" title="Category in Net4j DB Framework Documentation">Reference</a></td></tr>
-<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="reference/api" title="Category in Net4j DB Framework Documentation">API Reference</a></td></tr>
-<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="reference/schema" title="Category in Net4j DB Framework Documentation">Extension Point Reference</a></td></tr>
+<tr><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="about.html" title="Article in Net4j DB Framework Documentation">Legal</a></td></tr>
 </table>
 </p>
 
diff --git a/plugins/org.eclipse.net4j.db.doc/html/online/summary.html b/plugins/org.eclipse.net4j.db.doc/html/online/index.html
index 3c96870164..3c96870164 100644
--- a/plugins/org.eclipse.net4j.db.doc/html/online/summary.html
+++ b/plugins/org.eclipse.net4j.db.doc/html/online/index.html
diff --git a/plugins/org.eclipse.net4j.db.doc/html/reference/summary.html b/plugins/org.eclipse.net4j.db.doc/html/reference/index.html
index cdc20221c9..2714ee9992 100644
--- a/plugins/org.eclipse.net4j.db.doc/html/reference/summary.html
+++ b/plugins/org.eclipse.net4j.db.doc/html/reference/index.html
@@ -23,8 +23,8 @@ function windowTitle()
 <h1>Reference</h1>
 <p>
 <table border="0">
-<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="api" title="Category in Net4j DB Framework Documentation">API Reference</a></td></tr>
-<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="schema" title="Category in Net4j DB Framework Documentation">Extension Point Reference</a></td></tr>
+<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="api/index.html" title="Category in Net4j DB Framework Documentation">API Reference</a></td></tr>
+<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="schema/index.html" title="Category in Net4j DB Framework Documentation">Extension Point Reference</a></td></tr>
 </table>
 </p>
 
diff --git a/plugins/org.eclipse.net4j.db.doc/html/reference/schema/summary.html b/plugins/org.eclipse.net4j.db.doc/html/reference/schema/index.html
index 1284f7a362..1284f7a362 100644
--- a/plugins/org.eclipse.net4j.db.doc/html/reference/schema/summary.html
+++ b/plugins/org.eclipse.net4j.db.doc/html/reference/schema/index.html
diff --git a/plugins/org.eclipse.net4j.db.doc/toc.html b/plugins/org.eclipse.net4j.db.doc/toc.html
index 7ae9c8644e..e3e9372a0f 100644
--- a/plugins/org.eclipse.net4j.db.doc/toc.html
+++ b/plugins/org.eclipse.net4j.db.doc/toc.html
@@ -1,7 +1,7 @@
 <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_1')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_1"/></a><img src="documentation.gif"/><a href="org.eclipse.net4j.db.doc/html/Overview.html" target="content"><b>Net4j&nbspDB&nbspFramework&nbspDocumentation</b></a></span></div>
 <div id="org_eclipse_net4j_db_doc_1" style="display:none; margin-left:20px;">
   <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.db.doc/html/Overview.html" target="content">Overview</a></span></div>
-  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_2')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_2"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/html/reference/summary.html" target="content">Reference</a></span></div>
+  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_2')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_2"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/html/reference/index.html" target="content">Reference</a></span></div>
   <div id="org_eclipse_net4j_db_doc_2" style="display:none; margin-left:20px;">
     <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_3')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_3"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/overview-summary.html" target="content">API&nbspReference</a></span></div>
     <div id="org_eclipse_net4j_db_doc_3" style="display:none; margin-left:20px;">
@@ -33,7 +33,7 @@
         <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/postgresql/package-summary.html" target="content">org.eclipse.net4j.db.postgresql</a></span></div>
       </div>
     </div>
-    <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_10')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_10"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/html/reference/schema/summary.html" target="content">Extension&nbspPoint&nbspReference</a></span></div>
+    <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_10')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_10"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/html/reference/schema/index.html" target="content">Extension&nbspPoint&nbspReference</a></span></div>
     <div id="org_eclipse_net4j_db_doc_10" style="display:none; margin-left:20px;">
       <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_11')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_11"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/schemadoc/org_eclipse_net4j_db_dbAdapters.html" target="content">Net4j&nbspDB&nbspFramework</a></span></div>
       <div id="org_eclipse_net4j_db_doc_11" style="display:none; margin-left:20px;">
@@ -41,7 +41,7 @@
       </div>
     </div>
   </div>
-  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_12')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_12"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/html/online/summary.html" target="content">Online&nbspDocs</a></span></div>
+  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_12')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_12"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/html/online/index.html" target="content">Online&nbspDocs</a></span></div>
   <div id="org_eclipse_net4j_db_doc_12" style="display:none; margin-left:20px;">
     <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="http://www.eclipse.org/cdo" target="content">Homepage</a></span></div>
     <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="http://wiki.eclipse.org/CDO" target="content">Wiki</a></span></div>
diff --git a/plugins/org.eclipse.net4j.db.doc/toc.xml b/plugins/org.eclipse.net4j.db.doc/toc.xml
index 5447f5aa29..cbb6154eff 100644
--- a/plugins/org.eclipse.net4j.db.doc/toc.xml
+++ b/plugins/org.eclipse.net4j.db.doc/toc.xml
@@ -3,7 +3,7 @@
 
 <toc label="Net4j DB Framework Documentation" topic="html/Overview.html">
   <topic label="Overview" href="html/Overview.html" />
-  <topic label="Reference" href="html/reference/summary.html">
+  <topic label="Reference" href="html/reference/index.html">
     <topic label="API Reference" href="javadoc/overview-summary.html">
       <topic label="Net4j DB Framework" href="javadoc/org/eclipse/net4j/db/package-summary.html">
         <topic label="org.eclipse.net4j.db" href="javadoc/org/eclipse/net4j/db/package-summary.html" />
@@ -27,13 +27,13 @@
         <topic label="org.eclipse.net4j.db.postgresql" href="javadoc/org/eclipse/net4j/db/postgresql/package-summary.html" />
       </topic>
     </topic>
-    <topic label="Extension Point Reference" href="html/reference/schema/summary.html">
+    <topic label="Extension Point Reference" href="html/reference/schema/index.html">
       <topic label="Net4j DB Framework" href="schemadoc/org_eclipse_net4j_db_dbAdapters.html">
         <topic label="dbAdapters" href="schemadoc/org_eclipse_net4j_db_dbAdapters.html" />
       </topic>
     </topic>
   </topic>
-  <topic label="Online Docs" href="html/online/summary.html">
+  <topic label="Online Docs" href="html/online/index.html">
     <topic label="Homepage" href="http://www.eclipse.org/cdo" />
     <topic label="Wiki" href="http://wiki.eclipse.org/CDO" />
   </topic>
diff --git a/plugins/org.eclipse.net4j.doc/html/Overview.html b/plugins/org.eclipse.net4j.doc/html/Overview.html
index 9cf6f3e1e1..4a2c1f32b4 100644
--- a/plugins/org.eclipse.net4j.doc/html/Overview.html
+++ b/plugins/org.eclipse.net4j.doc/html/Overview.html
@@ -24,14 +24,14 @@ function windowTitle()
 <p>
  <p>
 <table border="0">
-<tr><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="about.html" title="Article in Net4j Signalling Platform Documentation">Legal</a></td></tr>
 <tr><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="" title="Article in Net4j Signalling Platform Documentation">Overview</a></td></tr>
-<tr><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="online" title="Category in Net4j Signalling Platform Documentation">Online Docs</a></td></tr>
+<tr><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="reference/index.html" title="Category in Net4j Signalling Platform Documentation">Reference</a></td></tr>
+<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="reference/api/index.html" title="Category in Net4j Signalling Platform Documentation">API Reference</a></td></tr>
+<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="reference/schema/index.html" title="Category in Net4j Signalling Platform Documentation">Extension Point Reference</a></td></tr>
+<tr><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="online/index.html" title="Category in Net4j Signalling Platform Documentation">Online Docs</a></td></tr>
 <tr><td/><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="http://www.eclipse.org/cdo" title="Article in Net4j Signalling Platform Documentation">Homepage</a></td></tr>
 <tr><td/><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="http://wiki.eclipse.org/CDO" title="Article in Net4j Signalling Platform Documentation">Wiki</a></td></tr>
-<tr><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="reference" title="Category in Net4j Signalling Platform Documentation">Reference</a></td></tr>
-<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="reference/api" title="Category in Net4j Signalling Platform Documentation">API Reference</a></td></tr>
-<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="reference/schema" title="Category in Net4j Signalling Platform Documentation">Extension Point Reference</a></td></tr>
+<tr><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="about.html" title="Article in Net4j Signalling Platform Documentation">Legal</a></td></tr>
 </table>
 </p>
 
diff --git a/plugins/org.eclipse.net4j.doc/html/online/summary.html b/plugins/org.eclipse.net4j.doc/html/online/index.html
index 2019df68e4..2019df68e4 100644
--- a/plugins/org.eclipse.net4j.doc/html/online/summary.html
+++ b/plugins/org.eclipse.net4j.doc/html/online/index.html
diff --git a/plugins/org.eclipse.net4j.doc/html/reference/summary.html b/plugins/org.eclipse.net4j.doc/html/reference/index.html
index bb7d915ed0..f9ec1ded78 100644
--- a/plugins/org.eclipse.net4j.doc/html/reference/summary.html
+++ b/plugins/org.eclipse.net4j.doc/html/reference/index.html
@@ -23,8 +23,8 @@ function windowTitle()
 <h1>Reference</h1>
 <p>
 <table border="0">
-<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="api" title="Category in Net4j Signalling Platform Documentation">API Reference</a></td></tr>
-<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="schema" title="Category in Net4j Signalling Platform Documentation">Extension Point Reference</a></td></tr>
+<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="api/index.html" title="Category in Net4j Signalling Platform Documentation">API Reference</a></td></tr>
+<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="schema/index.html" title="Category in Net4j Signalling Platform Documentation">Extension Point Reference</a></td></tr>
 </table>
 </p>
 
diff --git a/plugins/org.eclipse.net4j.doc/html/reference/schema/summary.html b/plugins/org.eclipse.net4j.doc/html/reference/schema/index.html
index f5fdacda1c..f5fdacda1c 100644
--- a/plugins/org.eclipse.net4j.doc/html/reference/schema/summary.html
+++ b/plugins/org.eclipse.net4j.doc/html/reference/schema/index.html
diff --git a/plugins/org.eclipse.net4j.doc/toc.html b/plugins/org.eclipse.net4j.doc/toc.html
index 33a03a99ee..947ca2eaac 100644
--- a/plugins/org.eclipse.net4j.doc/toc.html
+++ b/plugins/org.eclipse.net4j.doc/toc.html
@@ -1,7 +1,7 @@
 <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_1')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_1"/></a><img src="documentation.gif"/><a href="org.eclipse.net4j.doc/html/Overview.html" target="content"><b>Net4j&nbspSignalling&nbspPlatform&nbspDocumentation</b></a></span></div>
 <div id="org_eclipse_net4j_doc_1" style="display:none; margin-left:20px;">
   <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/html/Overview.html" target="content">Overview</a></span></div>
-  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_2')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_2"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/html/reference/summary.html" target="content">Reference</a></span></div>
+  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_2')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_2"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/html/reference/index.html" target="content">Reference</a></span></div>
   <div id="org_eclipse_net4j_doc_2" style="display:none; margin-left:20px;">
     <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_3')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_3"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/javadoc/overview-summary.html" target="content">API&nbspReference</a></span></div>
     <div id="org_eclipse_net4j_doc_3" style="display:none; margin-left:20px;">
@@ -45,7 +45,7 @@
       </div>
     </div>
   </div>
-  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_11')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_11"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/html/online/summary.html" target="content">Online&nbspDocs</a></span></div>
+  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_11')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_11"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/html/online/index.html" target="content">Online&nbspDocs</a></span></div>
   <div id="org_eclipse_net4j_doc_11" style="display:none; margin-left:20px;">
     <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="http://www.eclipse.org/cdo" target="content">Homepage</a></span></div>
     <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="http://wiki.eclipse.org/CDO" target="content">Wiki</a></span></div>
diff --git a/plugins/org.eclipse.net4j.doc/toc.xml b/plugins/org.eclipse.net4j.doc/toc.xml
index 6ee2b8dc5a..08135c91ba 100644
--- a/plugins/org.eclipse.net4j.doc/toc.xml
+++ b/plugins/org.eclipse.net4j.doc/toc.xml
@@ -3,7 +3,7 @@
 
 <toc label="Net4j Signalling Platform Documentation" topic="html/Overview.html">
   <topic label="Overview" href="html/Overview.html" />
-  <topic label="Reference" href="html/reference/summary.html">
+  <topic label="Reference" href="html/reference/index.html">
     <topic label="API Reference" href="javadoc/overview-summary.html">
       <topic label="Net4j Signalling Platform Transport" href="javadoc/org/eclipse/net4j/package-summary.html">
         <topic label="org.eclipse.net4j" href="javadoc/org/eclipse/net4j/package-summary.html" />
@@ -38,7 +38,7 @@
       </topic>
     </topic>
   </topic>
-  <topic label="Online Docs" href="html/online/summary.html">
+  <topic label="Online Docs" href="html/online/index.html">
     <topic label="Homepage" href="http://www.eclipse.org/cdo" />
     <topic label="Wiki" href="http://wiki.eclipse.org/CDO" />
   </topic>
diff --git a/plugins/org.eclipse.net4j.util.doc/html/Overview.html b/plugins/org.eclipse.net4j.util.doc/html/Overview.html
index 603ee2f161..b3a132c838 100644
--- a/plugins/org.eclipse.net4j.util.doc/html/Overview.html
+++ b/plugins/org.eclipse.net4j.util.doc/html/Overview.html
@@ -24,14 +24,14 @@ function windowTitle()
 <p>
  <p>
 <table border="0">
-<tr><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="about.html" title="Article in Net4j Utilities Documentation">Legal</a></td></tr>
 <tr><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="" title="Article in Net4j Utilities Documentation">Overview</a></td></tr>
-<tr><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="online" title="Category in Net4j Utilities Documentation">Online Docs</a></td></tr>
+<tr><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="reference/index.html" title="Category in Net4j Utilities Documentation">Reference</a></td></tr>
+<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="reference/api/index.html" title="Category in Net4j Utilities Documentation">API Reference</a></td></tr>
+<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="reference/schema/index.html" title="Category in Net4j Utilities Documentation">Extension Point Reference</a></td></tr>
+<tr><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="online/index.html" title="Category in Net4j Utilities Documentation">Online Docs</a></td></tr>
 <tr><td/><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="http://www.eclipse.org/cdo" title="Article in Net4j Utilities Documentation">Homepage</a></td></tr>
 <tr><td/><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="http://wiki.eclipse.org/CDO" title="Article in Net4j Utilities Documentation">Wiki</a></td></tr>
-<tr><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="reference" title="Category in Net4j Utilities Documentation">Reference</a></td></tr>
-<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="reference/api" title="Category in Net4j Utilities Documentation">API Reference</a></td></tr>
-<tr><td/><td><img src="../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="reference/schema" title="Category in Net4j Utilities Documentation">Extension Point Reference</a></td></tr>
+<tr><td><img src="../images/article.gif"/>&nbsp;&nbsp;</td><td colspan="4"><a href="about.html" title="Article in Net4j Utilities Documentation">Legal</a></td></tr>
 </table>
 </p>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/html/online/summary.html b/plugins/org.eclipse.net4j.util.doc/html/online/index.html
index 5d1751c320..5d1751c320 100644
--- a/plugins/org.eclipse.net4j.util.doc/html/online/summary.html
+++ b/plugins/org.eclipse.net4j.util.doc/html/online/index.html
diff --git a/plugins/org.eclipse.net4j.util.doc/html/reference/summary.html b/plugins/org.eclipse.net4j.util.doc/html/reference/index.html
index ac58a72839..fd70fe63c4 100644
--- a/plugins/org.eclipse.net4j.util.doc/html/reference/summary.html
+++ b/plugins/org.eclipse.net4j.util.doc/html/reference/index.html
@@ -23,8 +23,8 @@ function windowTitle()
 <h1>Reference</h1>
 <p>
 <table border="0">
-<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="api" title="Category in Net4j Utilities Documentation">API Reference</a></td></tr>
-<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="schema" title="Category in Net4j Utilities Documentation">Extension Point Reference</a></td></tr>
+<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="api/index.html" title="Category in Net4j Utilities Documentation">API Reference</a></td></tr>
+<tr><td><img src="../../images/category.gif"/>&nbsp;&nbsp;</td><td colspan="3"><a href="schema/index.html" title="Category in Net4j Utilities Documentation">Extension Point Reference</a></td></tr>
 </table>
 </p>
 
diff --git a/plugins/org.eclipse.net4j.util.doc/html/reference/schema/summary.html b/plugins/org.eclipse.net4j.util.doc/html/reference/schema/index.html
index 96839b7f2b..96839b7f2b 100644
--- a/plugins/org.eclipse.net4j.util.doc/html/reference/schema/summary.html
+++ b/plugins/org.eclipse.net4j.util.doc/html/reference/schema/index.html
diff --git a/plugins/org.eclipse.net4j.util.doc/toc.html b/plugins/org.eclipse.net4j.util.doc/toc.html
index dff5b2d336..f4507e2f9a 100644
--- a/plugins/org.eclipse.net4j.util.doc/toc.html
+++ b/plugins/org.eclipse.net4j.util.doc/toc.html
@@ -1,7 +1,7 @@
 <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_1')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_1"/></a><img src="documentation.gif"/><a href="org.eclipse.net4j.util.doc/html/Overview.html" target="content"><b>Net4j&nbspUtilities&nbspDocumentation</b></a></span></div>
 <div id="org_eclipse_net4j_util_doc_1" style="display:none; margin-left:20px;">
   <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/html/Overview.html" target="content">Overview</a></span></div>
-  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_2')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_2"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/html/reference/summary.html" target="content">Reference</a></span></div>
+  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_2')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_2"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/html/reference/index.html" target="content">Reference</a></span></div>
   <div id="org_eclipse_net4j_util_doc_2" style="display:none; margin-left:20px;">
     <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_3')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_3"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/overview-summary.html" target="content">API&nbspReference</a></span></div>
     <div id="org_eclipse_net4j_util_doc_3" style="display:none; margin-left:20px;">
@@ -43,7 +43,7 @@
         <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/widgets/package-summary.html" target="content">org.eclipse.net4j.util.ui.widgets</a></span></div>
       </div>
     </div>
-    <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_6')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_6"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/html/reference/schema/summary.html" target="content">Extension&nbspPoint&nbspReference</a></span></div>
+    <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_6')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_6"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/html/reference/schema/index.html" target="content">Extension&nbspPoint&nbspReference</a></span></div>
     <div id="org_eclipse_net4j_util_doc_6" style="display:none; margin-left:20px;">
       <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_7')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_7"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/schemadoc/org_eclipse_net4j_util_elementProcessors.html" target="content">Net4j&nbspUtilities</a></span></div>
       <div id="org_eclipse_net4j_util_doc_7" style="display:none; margin-left:20px;">
@@ -52,7 +52,7 @@
       </div>
     </div>
   </div>
-  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_8')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_8"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/html/online/summary.html" target="content">Online&nbspDocs</a></span></div>
+  <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_8')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_8"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/html/online/index.html" target="content">Online&nbspDocs</a></span></div>
   <div id="org_eclipse_net4j_util_doc_8" style="display:none; margin-left:20px;">
     <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="http://www.eclipse.org/cdo" target="content">Homepage</a></span></div>
     <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="http://wiki.eclipse.org/CDO" target="content">Wiki</a></span></div>
diff --git a/plugins/org.eclipse.net4j.util.doc/toc.xml b/plugins/org.eclipse.net4j.util.doc/toc.xml
index 39710c0592..342d6ee82f 100644
--- a/plugins/org.eclipse.net4j.util.doc/toc.xml
+++ b/plugins/org.eclipse.net4j.util.doc/toc.xml
@@ -3,7 +3,7 @@
 
 <toc label="Net4j Utilities Documentation" topic="html/Overview.html">
   <topic label="Overview" href="html/Overview.html" />
-  <topic label="Reference" href="html/reference/summary.html">
+  <topic label="Reference" href="html/reference/index.html">
     <topic label="API Reference" href="javadoc/overview-summary.html">
       <topic label="Net4j Utilities" href="javadoc/org/eclipse/net4j/util/package-summary.html">
         <topic label="org.eclipse.net4j.util" href="javadoc/org/eclipse/net4j/util/package-summary.html" />
@@ -41,14 +41,14 @@
         <topic label="org.eclipse.net4j.util.ui.widgets" href="javadoc/org/eclipse/net4j/util/ui/widgets/package-summary.html" />
       </topic>
     </topic>
-    <topic label="Extension Point Reference" href="html/reference/schema/summary.html">
+    <topic label="Extension Point Reference" href="html/reference/schema/index.html">
       <topic label="Net4j Utilities" href="schemadoc/org_eclipse_net4j_util_elementProcessors.html">
         <topic label="elementProcessors" href="schemadoc/org_eclipse_net4j_util_elementProcessors.html" />
         <topic label="factories" href="schemadoc/org_eclipse_net4j_util_factories.html" />
       </topic>
     </topic>
   </topic>
-  <topic label="Online Docs" href="html/online/summary.html">
+  <topic label="Online Docs" href="html/online/index.html">
     <topic label="Homepage" href="http://www.eclipse.org/cdo" />
     <topic label="Wiki" href="http://wiki.eclipse.org/CDO" />
   </topic>