navigation
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/Overview.html b/plugins/org.eclipse.emf.cdo.doc/html/Overview.html
index 10cf295..5153b6c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/Overview.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/Overview.html
@@ -20,7 +20,12 @@
 <BODY BGCOLOR="white" onload="windowTitle();">
 <!-- <div class="help_breadcrumbs"><a href="" title="CDO Model Repository Documentation">CDO Model Repository Documentation</a></div> -->
 
-<h1>Overview</h1>
+<table border="0">
+	<tr>
+		<td width="100%"><h1>Overview</h1></td>
+		<td align="right" valign="middle" nowrap>&nbsp;<a href="reference/index.html" title="Forward to Reference"><img src="../images/forward.png"/></a></td>
+	</tr>
+</table>
 <p>
  CDO is a pure Java <i>model repository</i> for your EMF models and meta models. CDO can also serve as a
  <i>persistence and distribution framework</i> for your EMF based application systems. For the sake of this overview a
@@ -144,6 +149,8 @@
  <p align="center">
  <img src="repository-architecture.png"/>.
 
+<p align="right">
+&nbsp;<a href="reference/index.html" title="Forward to Reference"><img src="../images/forward.png"/></a></p>
 <HR>
 <i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
 </BODY>
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/book.css b/plugins/org.eclipse.emf.cdo.doc/html/book.css
index ad66fb1..f9822b0 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/book.css
+++ b/plugins/org.eclipse.emf.cdo.doc/html/book.css
@@ -94,12 +94,12 @@
 a:hover	     { color: #000080 }

 a:visited    { text-decoration: underline }

 ul	     { margin-top: 10px; margin-bottom: 10px; }

-li	     { margin-top: 10px; margin-bottom: 10px; } 

-li p	     { margin-top: 10px; margin-bottom: 10px; }

+li	     { margin-top: 5px; margin-bottom: 5px; } 

+li p	     { margin-top: 5px; margin-bottom: 5px; }

 ol	     { margin-top: 10px; margin-bottom: 10px; }

 dl	     { margin-top: 10px; margin-bottom: 10px; }

-dt	     { margin-top: 10px; margin-bottom: 10px; font-weight: bold; }

-dd	     { margin-top: 10px; margin-bottom: 10px; }

+dt	     { margin-top: 5px; margin-bottom: 5px; font-weight: bold; }

+dd	     { margin-top: 5px; margin-bottom: 5px; }

 strong	     { font-weight: bold}

 em	     { font-style: italic}

 var	     { font-style: italic}

diff --git a/plugins/org.eclipse.emf.cdo.doc/html/online/index.html b/plugins/org.eclipse.emf.cdo.doc/html/online/index.html
index 785d0cd..c9ff795 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/online/index.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/online/index.html
@@ -20,7 +20,12 @@
 <BODY BGCOLOR="white" onload="windowTitle();">
 <!-- <div class="help_breadcrumbs"><a href="../Overview.html" title="CDO Model Repository Documentation">CDO Model Repository Documentation</a></div> -->
 
-<h1>Online Docs</h1>
+<table border="0">
+	<tr>
+		<td width="100%"><h1>Online Docs</h1></td>
+		<td align="right" valign="middle" nowrap><a href="../reference/schema/index.html" title="Backward to Extension Point Reference"><img src="../../images/backward.png"/></a>&nbsp;<a href="http://www.eclipse.org/cdo" title="Forward to Homepage"><img src="../../images/forward.png"/></a></td>
+	</tr>
+</table>
 <p>
 <table border="0">
 <tr><td><img src="../../images/article.gif"/>&nbsp;</td><td colspan="3"><a href="http://www.eclipse.org/cdo" title="Article in CDO Model Repository Documentation">Homepage</a></td></tr>
@@ -29,6 +34,8 @@
 </p>
 
 
+<p align="right">
+<a href="../reference/schema/index.html" title="Backward to Extension Point Reference"><img src="../../images/backward.png"/></a>&nbsp;<a href="http://www.eclipse.org/cdo" title="Forward to Homepage"><img src="../../images/forward.png"/></a></p>
 <HR>
 <i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
 </BODY>
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/reference/index.html b/plugins/org.eclipse.emf.cdo.doc/html/reference/index.html
index ba611ce..55c4e76 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/reference/index.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/reference/index.html
@@ -20,15 +20,22 @@
 <BODY BGCOLOR="white" onload="windowTitle();">
 <!-- <div class="help_breadcrumbs"><a href="../Overview.html" title="CDO Model Repository Documentation">CDO Model Repository Documentation</a></div> -->
 
-<h1>Reference</h1>
+<table border="0">
+	<tr>
+		<td width="100%"><h1>Reference</h1></td>
+		<td align="right" valign="middle" nowrap><a href="../Overview.html" title="Backward to Overview"><img src="../../images/backward.png"/></a>&nbsp;<a href="../../javadoc/overview-summary.html" title="Forward to API Reference"><img src="../../images/forward.png"/></a></td>
+	</tr>
+</table>
 <p>
 <table border="0">
-<tr><td><img src="../../images/category.gif"/>&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;</td><td colspan="3"><a href="../../javadoc/overview-summary.html" title="Category in CDO Model Repository Documentation">API Reference</a></td></tr>
 <tr><td><img src="../../images/category.gif"/>&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>
 
 
+<p align="right">
+<a href="../Overview.html" title="Backward to Overview"><img src="../../images/backward.png"/></a>&nbsp;<a href="../../javadoc/overview-summary.html" title="Forward to API Reference"><img src="../../images/forward.png"/></a></p>
 <HR>
 <i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
 </BODY>
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/index.html b/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/index.html
index 036982f..1da0e71 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/index.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/index.html
@@ -20,13 +20,20 @@
 <BODY BGCOLOR="white" onload="windowTitle();">
 <!-- <div class="help_breadcrumbs"><a href="../../Overview.html" title="CDO Model Repository Documentation">CDO Model Repository Documentation</a> > <a href="../index.html" title="Category in CDO Model Repository Documentation">Reference</a></div> -->
 
-<h1>Extension Point Reference</h1>
+<table border="0">
+	<tr>
+		<td width="100%"><h1>Extension Point Reference</h1></td>
+		<td align="right" valign="middle" nowrap><a href="../../../javadoc/overview-summary.html" title="Backward to API Reference"><img src="../../../images/backward.png"/></a>&nbsp;<a href="../../online/index.html" title="Forward to Online Docs"><img src="../../../images/forward.png"/></a></td>
+	</tr>
+</table>
 <p>
 <table border="0">
 </table>
 </p>
 
 
+<p align="right">
+<a href="../../../javadoc/overview-summary.html" title="Backward to API Reference"><img src="../../../images/backward.png"/></a>&nbsp;<a href="../../online/index.html" title="Forward to Online Docs"><img src="../../../images/forward.png"/></a></p>
 <HR>
 <i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
 </BODY>
diff --git a/plugins/org.eclipse.emf.cdo.doc/images/backward.png b/plugins/org.eclipse.emf.cdo.doc/images/backward.png
new file mode 100644
index 0000000..535c536
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/images/backward.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.doc/images/forward.png b/plugins/org.eclipse.emf.cdo.doc/images/forward.png
new file mode 100644
index 0000000..96ebe01
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/images/forward.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/images/backward.png b/plugins/org.eclipse.emf.cdo.releng.doc/images/backward.png
new file mode 100644
index 0000000..535c536
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/images/backward.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/images/forward.png b/plugins/org.eclipse.emf.cdo.releng.doc/images/forward.png
new file mode 100644
index 0000000..96ebe01
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/images/forward.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Documentation.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Documentation.java
index ae089d0..fc44f63 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Documentation.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Documentation.java
@@ -9,6 +9,7 @@
 import org.eclipse.emf.common.util.EList;

 

 import java.io.File;

+import java.util.List;

 

 /**

  * <!-- begin-user-doc --> A representation of the model object '<em><b>Documentation</b></em>'. <!-- end-user-doc -->

@@ -129,6 +130,11 @@
 

   File getProjectFolder();

 

+  StructuralElement getDefaultElement();

+

   void setDefaultElement(StructuralElement defaultElement);

 

+  List<StructuralElement> getNavElements();

+

+  void registerElement(StructuralElement element);

 } // Documentation

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 e440f06..6c48e76 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
@@ -149,4 +149,6 @@
 
   void generate(PrintWriter out) throws IOException;
 
+  String getImagePath();
+
 } // StructuralElement
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleImpl.java
index cb82db2..c225a18 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleImpl.java
@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -77,6 +78,13 @@
   }
 
   @Override
+  protected void collectNavElements(List<StructuralElement> navElements)
+  {
+    navElements.add(this);
+    super.collectNavElements(navElements);
+  }
+
+  @Override
   public void generate() throws IOException
   {
     generate(getOutputFile());
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyImpl.java
index c5fbc1e..fb58ad1 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyImpl.java
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Collection;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Body</b></em>'. <!-- end-user-doc -->
@@ -290,4 +291,56 @@
     BodyElementContainerImpl.generate(out, this, elements);
     super.generate(out);
   }
+
+  protected void generateHeader(PrintWriter out)
+  {
+    out.write("<table border=\"0\">\n");
+    out.write("\t<tr>\n");
+    out.write("\t\t<td width=\"100%\"><h1>");
+    out.write(getTitle());
+    out.write("</h1></td>\n");
+    out.write("\t\t<td align=\"right\" valign=\"middle\" nowrap>");
+    generateNav(out);
+    out.write("</td>\n");
+    out.write("\t</tr>\n");
+    out.write("</table>\n");
+  }
+
+  protected void generateFooter(PrintWriter out)
+  {
+    out.write("<p align=\"right\">\n");
+    generateNav(out);
+    out.write("</p>\n");
+  }
+
+  private void generateNav(PrintWriter out)
+  {
+    List<StructuralElement> elements = getDocumentation().getNavElements();
+    int index = elements.indexOf(this);
+
+    if (index > 0)
+    {
+      StructuralElement previous = elements.get(index - 1);
+      generateNav(out, previous, "Backward");
+    }
+
+    out.write("&nbsp;");
+
+    if (index < elements.size() - 1)
+    {
+      StructuralElement next = elements.get(index + 1);
+      generateNav(out, next, "Forward");
+    }
+  }
+
+  private void generateNav(PrintWriter out, StructuralElement target, String action)
+  {
+    String href = target.linkFrom(this);
+    String tooltip = action + " to " + target.getTitle();
+    String image = getImagePath() + "/" + action.toLowerCase() + ".png";
+
+    out.write("<a href=\"" + href + "\" title=\"" + tooltip + "\">");
+    out.write("<img src=\"" + image + "\"/>");
+    out.write("</a>");
+  }
 } // BodyImpl
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 b1e1c2f..d75cd59 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
@@ -19,6 +19,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Category</b></em>'. <!-- end-user-doc -->
@@ -42,7 +43,6 @@
   CategoryImpl(StructuralElement parent, PackageDoc packageDoc)
   {
     super(parent, ArticleUtil.getSimplePackageName(packageDoc) + "/index.html", packageDoc);
-    getDocumentation().getContext().register(getId(), this);
 
     for (Tag tag : packageDoc.inlineTags())
     {
@@ -73,6 +73,13 @@
   }
 
   @Override
+  protected void collectNavElements(List<StructuralElement> navElements)
+  {
+    navElements.add(this);
+    super.collectNavElements(navElements);
+  }
+
+  @Override
   public PackageDoc getDoc()
   {
     return (PackageDoc)super.getDoc();
@@ -103,10 +110,8 @@
   @Override
   public void generate(PrintWriter out) throws IOException
   {
-    out.write("<h" + 1 + ">");
-    out.write(getTitle());
-    out.write("</h" + 1 + ">\n");
-
+    generateHeader(out);
     BodyElementContainerImpl.generate(out, this, getElements());
+    generateFooter(out);
   }
 } // 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 7c84299..0e2f925 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
@@ -47,7 +47,6 @@
   ChapterImpl(StructuralElement parent, ClassDoc classDoc)
   {
     super(parent, makePath(classDoc), classDoc);
-    getDocumentation().getContext().register(getId(), this);
     ((ArticleImpl)getArticle()).registerChapter(this);
   }
 
@@ -151,9 +150,9 @@
   {
     if (this instanceof Article)
     {
-      out.write("<h" + 1 + ">");
-      out.write(getTitle());
-      out.write("</h" + 1 + ">\n");
+      generateHeader(out);
+      super.generate(out);
+      generateFooter(out);
     }
     else
     {
@@ -163,15 +162,14 @@
       out.write("<h" + level + ">");
       out.write(anchor + getTitleWithNumber());
       out.write("</h" + level + ">\n");
-    }
 
-    super.generate(out);
+      super.generate(out);
+    }
   }
 
   public String getName()
   {
     return getDoc().simpleTypeName();
-    // return getPath().replace('/', '_').replace('.', '_').replace('-', '_');
   }
 
   public String getTitleWithNumber()
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java
index aa3c098..49c293c 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java
@@ -44,7 +44,10 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Documentation</b></em>'. <!-- end-user-doc -->
@@ -126,6 +129,8 @@
 
   private StructuralElement defaultElement;
 
+  private final List<StructuralElement> navElements = new ArrayList<StructuralElement>();
+
   private boolean analyzed;
 
   private File projectFolder;
@@ -157,7 +162,6 @@
     analyzeDependencies(projectFolder);
     loadPlugins(projectFolder);
     analyzeDocumentation(projectFolder);
-
     if (defaultElement == null)
     {
       throw new AssertionError("No default element declared in " + getTitle());
@@ -165,6 +169,15 @@
 
     setPath(defaultElement.getFullPath());
     analyzed = true;
+    collectNavElements(navElements);
+  }
+
+  public void registerElement(StructuralElement element)
+  {
+    if (element != this)
+    {
+      getContext().register(element.getId(), element);
+    }
   }
 
   private void analyzeDependencies(File projectFolder)
@@ -677,6 +690,11 @@
     return "Documentation";
   }
 
+  public StructuralElement getDefaultElement()
+  {
+    return defaultElement;
+  }
+
   public void setDefaultElement(StructuralElement defaultElement)
   {
     if (this.defaultElement != null)
@@ -687,6 +705,11 @@
     this.defaultElement = defaultElement;
   }
 
+  public List<StructuralElement> getNavElements()
+  {
+    return Collections.unmodifiableList(navElements);
+  }
+
   @Override
   public RootDoc getDoc()
   {
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavadocImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavadocImpl.java
index 6d8cd16..565e0d7 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavadocImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavadocImpl.java
@@ -12,12 +12,14 @@
 import org.eclipse.emf.cdo.releng.doc.article.Plugin;
 import org.eclipse.emf.cdo.releng.doc.article.StructuralElement;
 import org.eclipse.emf.cdo.releng.doc.article.impl.DocumentationImpl.TocWriter;
+import org.eclipse.emf.cdo.releng.doc.article.util.ArticleUtil;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 
 import com.sun.javadoc.PackageDoc;
 
+import java.io.File;
 import java.io.IOException;
 
 /**
@@ -29,6 +31,8 @@
  */
 public class JavadocImpl extends CategoryImpl implements Javadoc
 {
+  private static final String OVERVIEW_SUMMARY = "javadoc/overview-summary.html";
+
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
@@ -62,9 +66,17 @@
   }
 
   @Override
+  public String linkFrom(StructuralElement source)
+  {
+    File sourceFile = source.getOutputFile();
+    File targetFile = new File(getDocumentation().getProjectFolder(), OVERVIEW_SUMMARY);
+    return ArticleUtil.createLink(sourceFile, targetFile);
+  }
+
+  @Override
   protected void generateTocEntry(TocWriter writer) throws IOException
   {
-    writer.writeGroupStart(getTitle(), "javadoc/overview-summary.html");
+    writer.writeGroupStart(getTitle(), OVERVIEW_SUMMARY);
 
     for (Plugin plugin : getDocumentation().getPlugins())
     {
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SnippetImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SnippetImpl.java
index d0d03e7..adb9199 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SnippetImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SnippetImpl.java
@@ -29,7 +29,6 @@
 import com.sun.javadoc.SourcePosition;
 import com.sun.javadoc.Tag;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.lang.reflect.Constructor;
@@ -238,9 +237,7 @@
     }
 
     StructuralElement structuralElement = getStructuralElement(embedder);
-    File source = structuralElement.getOutputFile();
-    File target = new File(getDocumentation().getProjectFolder(), "images");
-    String imagePath = ArticleUtil.createLink(source, target) + "/";
+    String imagePath = structuralElement.getImagePath() + "/";
 
     SeeTag embedderTag = (SeeTag)embedder.getTag();
     String title = embedderTag.label();
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 35872ae..66bc3b9 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
@@ -121,6 +121,7 @@
     setParent(parent);
     setPath(path);
     this.doc = doc;
+    getDocumentation().registerElement(this);
 
     if (ArticleUtil.isTagged(doc, "@default"))
     {
@@ -188,7 +189,9 @@
   public StructuralElement getParent()
   {
     if (eContainerFeatureID() != ArticlePackage.STRUCTURAL_ELEMENT__PARENT)
+    {
       return null;
+    }
     return (StructuralElement)eContainer();
   }
 
@@ -210,24 +213,34 @@
    */
   public void setParent(StructuralElement newParent)
   {
-    if (newParent != eInternalContainer()
-        || (eContainerFeatureID() != ArticlePackage.STRUCTURAL_ELEMENT__PARENT && newParent != null))
+    if (newParent != eInternalContainer() || eContainerFeatureID() != ArticlePackage.STRUCTURAL_ELEMENT__PARENT
+        && newParent != null)
     {
       if (EcoreUtil.isAncestor(this, newParent))
+      {
         throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      }
       NotificationChain msgs = null;
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       if (newParent != null)
+      {
         msgs = ((InternalEObject)newParent).eInverseAdd(this, ArticlePackage.STRUCTURAL_ELEMENT__CHILDREN,
             StructuralElement.class, msgs);
+      }
       msgs = basicSetParent(newParent, msgs);
       if (msgs != null)
+      {
         msgs.dispatch();
+      }
     }
     else if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.STRUCTURAL_ELEMENT__PARENT, newParent,
           newParent));
+    }
   }
 
   /**
@@ -289,7 +302,9 @@
       return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
     case ArticlePackage.STRUCTURAL_ELEMENT__PARENT:
       if (eInternalContainer() != null)
+      {
         msgs = eBasicRemoveFromContainer(msgs);
+      }
       return basicSetParent((StructuralElement)otherEnd, msgs);
     }
     return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -429,7 +444,9 @@
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (title: ");
@@ -490,6 +507,14 @@
     return new File(getDocumentation().getContext().getBaseFolder(), getBasePathForChildren());
   }
 
+  protected void collectNavElements(List<StructuralElement> navElements)
+  {
+    for (StructuralElement child : getSortedChildren())
+    {
+      ((StructuralElementImpl)child).collectNavElements(navElements);
+    }
+  }
+
   public boolean isOverview()
   {
     return overview;
@@ -511,6 +536,13 @@
     return 1 + depth;
   }
 
+  public String getImagePath()
+  {
+    File source = getOutputFile();
+    File target = new File(getDocumentation().getProjectFolder(), "images");
+    return ArticleUtil.createLink(source, target);
+  }
+
   @Override
   public String getDefaultLabel()
   {
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 146b42b..85a88b3 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
@@ -12,13 +12,11 @@
 import org.eclipse.emf.cdo.releng.doc.article.Documentation;
 import org.eclipse.emf.cdo.releng.doc.article.StructuralElement;
 import org.eclipse.emf.cdo.releng.doc.article.Toc;
-import org.eclipse.emf.cdo.releng.doc.article.util.ArticleUtil;
 
 import org.eclipse.emf.ecore.EClass;
 
 import com.sun.javadoc.Tag;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
 
@@ -138,7 +136,9 @@
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (levels: ");
@@ -155,13 +155,10 @@
       element = element.getDocumentation();
     }
 
-    File source = linkSource.getOutputFile();
-    File target = new File(linkSource.getDocumentation().getProjectFolder(), "images");
-    String imagePath = ArticleUtil.createLink(source, target) + "/";
-
     out.write("<p>\n");
     out.write("<table border=\"0\">\n");
 
+    String imagePath = linkSource.getImagePath() + "/";
     generate(out, linkSource, imagePath, element.getDepth(), element, 0);
 
     out.write("</table>\n");
diff --git a/plugins/org.eclipse.net4j.db.doc/html/Overview.html b/plugins/org.eclipse.net4j.db.doc/html/Overview.html
index d8b2545..a958fa8 100644
--- a/plugins/org.eclipse.net4j.db.doc/html/Overview.html
+++ b/plugins/org.eclipse.net4j.db.doc/html/Overview.html
@@ -20,13 +20,18 @@
 <BODY BGCOLOR="white" onload="windowTitle();">
 <!-- <div class="help_breadcrumbs"><a href="" title="Net4j DB Framework Documentation">Net4j DB Framework Documentation</a></div> -->
 
-<h1>Overview</h1>
+<table border="0">
+	<tr>
+		<td width="100%"><h1>Overview</h1></td>
+		<td align="right" valign="middle" nowrap>&nbsp;<a href="reference/index.html" title="Forward to Reference"><img src="../images/forward.png"/></a></td>
+	</tr>
+</table>
 <p>
  <p>
 <table border="0">
 <tr><td><img src="../images/article.gif"/>&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;</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;</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;</td><td colspan="3"><a href="../javadoc/overview-summary.html" title="Category in Net4j DB Framework Documentation">API Reference</a></td></tr>
 <tr><td/><td><img src="../images/category.gif"/>&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;</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;</td><td colspan="3"><a href="http://www.eclipse.org/cdo" title="Article in Net4j DB Framework Documentation">Homepage</a></td></tr>
@@ -36,6 +41,8 @@
 </p>
 
 
+<p align="right">
+&nbsp;<a href="reference/index.html" title="Forward to Reference"><img src="../images/forward.png"/></a></p>
 <HR>
 <i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
 </BODY>
diff --git a/plugins/org.eclipse.net4j.db.doc/html/online/index.html b/plugins/org.eclipse.net4j.db.doc/html/online/index.html
index f4c58cf..f0b7bfb 100644
--- a/plugins/org.eclipse.net4j.db.doc/html/online/index.html
+++ b/plugins/org.eclipse.net4j.db.doc/html/online/index.html
@@ -20,7 +20,12 @@
 <BODY BGCOLOR="white" onload="windowTitle();">
 <!-- <div class="help_breadcrumbs"><a href="../Overview.html" title="Net4j DB Framework Documentation">Net4j DB Framework Documentation</a></div> -->
 
-<h1>Online Docs</h1>
+<table border="0">
+	<tr>
+		<td width="100%"><h1>Online Docs</h1></td>
+		<td align="right" valign="middle" nowrap><a href="../reference/schema/index.html" title="Backward to Extension Point Reference"><img src="../../images/backward.png"/></a>&nbsp;<a href="http://www.eclipse.org/cdo" title="Forward to Homepage"><img src="../../images/forward.png"/></a></td>
+	</tr>
+</table>
 <p>
 <table border="0">
 <tr><td><img src="../../images/article.gif"/>&nbsp;</td><td colspan="3"><a href="http://www.eclipse.org/cdo" title="Article in Net4j DB Framework Documentation">Homepage</a></td></tr>
@@ -29,6 +34,8 @@
 </p>
 
 
+<p align="right">
+<a href="../reference/schema/index.html" title="Backward to Extension Point Reference"><img src="../../images/backward.png"/></a>&nbsp;<a href="http://www.eclipse.org/cdo" title="Forward to Homepage"><img src="../../images/forward.png"/></a></p>
 <HR>
 <i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
 </BODY>
diff --git a/plugins/org.eclipse.net4j.db.doc/html/reference/index.html b/plugins/org.eclipse.net4j.db.doc/html/reference/index.html
index 100bb6a..4f637b9 100644
--- a/plugins/org.eclipse.net4j.db.doc/html/reference/index.html
+++ b/plugins/org.eclipse.net4j.db.doc/html/reference/index.html
@@ -20,15 +20,22 @@
 <BODY BGCOLOR="white" onload="windowTitle();">
 <!-- <div class="help_breadcrumbs"><a href="../Overview.html" title="Net4j DB Framework Documentation">Net4j DB Framework Documentation</a></div> -->
 
-<h1>Reference</h1>
+<table border="0">
+	<tr>
+		<td width="100%"><h1>Reference</h1></td>
+		<td align="right" valign="middle" nowrap><a href="../Overview.html" title="Backward to Overview"><img src="../../images/backward.png"/></a>&nbsp;<a href="../../javadoc/overview-summary.html" title="Forward to API Reference"><img src="../../images/forward.png"/></a></td>
+	</tr>
+</table>
 <p>
 <table border="0">
-<tr><td><img src="../../images/category.gif"/>&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;</td><td colspan="3"><a href="../../javadoc/overview-summary.html" title="Category in Net4j DB Framework Documentation">API Reference</a></td></tr>
 <tr><td><img src="../../images/category.gif"/>&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>
 
 
+<p align="right">
+<a href="../Overview.html" title="Backward to Overview"><img src="../../images/backward.png"/></a>&nbsp;<a href="../../javadoc/overview-summary.html" title="Forward to API Reference"><img src="../../images/forward.png"/></a></p>
 <HR>
 <i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
 </BODY>
diff --git a/plugins/org.eclipse.net4j.db.doc/html/reference/schema/index.html b/plugins/org.eclipse.net4j.db.doc/html/reference/schema/index.html
index fa48886..d4a8b06 100644
--- a/plugins/org.eclipse.net4j.db.doc/html/reference/schema/index.html
+++ b/plugins/org.eclipse.net4j.db.doc/html/reference/schema/index.html
@@ -20,13 +20,20 @@
 <BODY BGCOLOR="white" onload="windowTitle();">
 <!-- <div class="help_breadcrumbs"><a href="../../Overview.html" title="Net4j DB Framework Documentation">Net4j DB Framework Documentation</a> > <a href="../index.html" title="Category in Net4j DB Framework Documentation">Reference</a></div> -->
 
-<h1>Extension Point Reference</h1>
+<table border="0">
+	<tr>
+		<td width="100%"><h1>Extension Point Reference</h1></td>
+		<td align="right" valign="middle" nowrap><a href="../../../javadoc/overview-summary.html" title="Backward to API Reference"><img src="../../../images/backward.png"/></a>&nbsp;<a href="../../online/index.html" title="Forward to Online Docs"><img src="../../../images/forward.png"/></a></td>
+	</tr>
+</table>
 <p>
 <table border="0">
 </table>
 </p>
 
 
+<p align="right">
+<a href="../../../javadoc/overview-summary.html" title="Backward to API Reference"><img src="../../../images/backward.png"/></a>&nbsp;<a href="../../online/index.html" title="Forward to Online Docs"><img src="../../../images/forward.png"/></a></p>
 <HR>
 <i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
 </BODY>
diff --git a/plugins/org.eclipse.net4j.db.doc/images/backward.png b/plugins/org.eclipse.net4j.db.doc/images/backward.png
new file mode 100644
index 0000000..535c536
--- /dev/null
+++ b/plugins/org.eclipse.net4j.db.doc/images/backward.png
Binary files differ
diff --git a/plugins/org.eclipse.net4j.db.doc/images/forward.png b/plugins/org.eclipse.net4j.db.doc/images/forward.png
new file mode 100644
index 0000000..96ebe01
--- /dev/null
+++ b/plugins/org.eclipse.net4j.db.doc/images/forward.png
Binary files differ
diff --git a/plugins/org.eclipse.net4j.doc/html/Overview.html b/plugins/org.eclipse.net4j.doc/html/Overview.html
index c98fbd1..51ad779 100644
--- a/plugins/org.eclipse.net4j.doc/html/Overview.html
+++ b/plugins/org.eclipse.net4j.doc/html/Overview.html
@@ -20,13 +20,18 @@
 <BODY BGCOLOR="white" onload="windowTitle();">
 <!-- <div class="help_breadcrumbs"><a href="" title="Net4j Signalling Platform Documentation">Net4j Signalling Platform Documentation</a></div> -->
 
-<h1>Overview</h1>
+<table border="0">
+	<tr>
+		<td width="100%"><h1>Overview</h1></td>
+		<td align="right" valign="middle" nowrap>&nbsp;<a href="reference/index.html" title="Forward to Reference"><img src="../images/forward.png"/></a></td>
+	</tr>
+</table>
 <p>
  <p>
 <table border="0">
 <tr><td><img src="../images/article.gif"/>&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;</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;</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;</td><td colspan="3"><a href="../javadoc/overview-summary.html" title="Category in Net4j Signalling Platform Documentation">API Reference</a></td></tr>
 <tr><td/><td><img src="../images/category.gif"/>&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;</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;</td><td colspan="3"><a href="http://www.eclipse.org/cdo" title="Article in Net4j Signalling Platform Documentation">Homepage</a></td></tr>
@@ -36,6 +41,8 @@
 </p>
 
 
+<p align="right">
+&nbsp;<a href="reference/index.html" title="Forward to Reference"><img src="../images/forward.png"/></a></p>
 <HR>
 <i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
 </BODY>
diff --git a/plugins/org.eclipse.net4j.doc/html/online/index.html b/plugins/org.eclipse.net4j.doc/html/online/index.html
index 2e23b16..cdf48c7 100644
--- a/plugins/org.eclipse.net4j.doc/html/online/index.html
+++ b/plugins/org.eclipse.net4j.doc/html/online/index.html
@@ -20,7 +20,12 @@
 <BODY BGCOLOR="white" onload="windowTitle();">
 <!-- <div class="help_breadcrumbs"><a href="../Overview.html" title="Net4j Signalling Platform Documentation">Net4j Signalling Platform Documentation</a></div> -->
 
-<h1>Online Docs</h1>
+<table border="0">
+	<tr>
+		<td width="100%"><h1>Online Docs</h1></td>
+		<td align="right" valign="middle" nowrap><a href="../reference/schema/index.html" title="Backward to Extension Point Reference"><img src="../../images/backward.png"/></a>&nbsp;<a href="http://www.eclipse.org/cdo" title="Forward to Homepage"><img src="../../images/forward.png"/></a></td>
+	</tr>
+</table>
 <p>
 <table border="0">
 <tr><td><img src="../../images/article.gif"/>&nbsp;</td><td colspan="3"><a href="http://www.eclipse.org/cdo" title="Article in Net4j Signalling Platform Documentation">Homepage</a></td></tr>
@@ -29,6 +34,8 @@
 </p>
 
 
+<p align="right">
+<a href="../reference/schema/index.html" title="Backward to Extension Point Reference"><img src="../../images/backward.png"/></a>&nbsp;<a href="http://www.eclipse.org/cdo" title="Forward to Homepage"><img src="../../images/forward.png"/></a></p>
 <HR>
 <i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
 </BODY>
diff --git a/plugins/org.eclipse.net4j.doc/html/reference/index.html b/plugins/org.eclipse.net4j.doc/html/reference/index.html
index 5a967f3..a81117e 100644
--- a/plugins/org.eclipse.net4j.doc/html/reference/index.html
+++ b/plugins/org.eclipse.net4j.doc/html/reference/index.html
@@ -20,15 +20,22 @@
 <BODY BGCOLOR="white" onload="windowTitle();">
 <!-- <div class="help_breadcrumbs"><a href="../Overview.html" title="Net4j Signalling Platform Documentation">Net4j Signalling Platform Documentation</a></div> -->
 
-<h1>Reference</h1>
+<table border="0">
+	<tr>
+		<td width="100%"><h1>Reference</h1></td>
+		<td align="right" valign="middle" nowrap><a href="../Overview.html" title="Backward to Overview"><img src="../../images/backward.png"/></a>&nbsp;<a href="../../javadoc/overview-summary.html" title="Forward to API Reference"><img src="../../images/forward.png"/></a></td>
+	</tr>
+</table>
 <p>
 <table border="0">
-<tr><td><img src="../../images/category.gif"/>&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;</td><td colspan="3"><a href="../../javadoc/overview-summary.html" title="Category in Net4j Signalling Platform Documentation">API Reference</a></td></tr>
 <tr><td><img src="../../images/category.gif"/>&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>
 
 
+<p align="right">
+<a href="../Overview.html" title="Backward to Overview"><img src="../../images/backward.png"/></a>&nbsp;<a href="../../javadoc/overview-summary.html" title="Forward to API Reference"><img src="../../images/forward.png"/></a></p>
 <HR>
 <i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
 </BODY>
diff --git a/plugins/org.eclipse.net4j.doc/html/reference/schema/index.html b/plugins/org.eclipse.net4j.doc/html/reference/schema/index.html
index bbb7825..4bc02ec 100644
--- a/plugins/org.eclipse.net4j.doc/html/reference/schema/index.html
+++ b/plugins/org.eclipse.net4j.doc/html/reference/schema/index.html
@@ -20,13 +20,20 @@
 <BODY BGCOLOR="white" onload="windowTitle();">
 <!-- <div class="help_breadcrumbs"><a href="../../Overview.html" title="Net4j Signalling Platform Documentation">Net4j Signalling Platform Documentation</a> > <a href="../index.html" title="Category in Net4j Signalling Platform Documentation">Reference</a></div> -->
 
-<h1>Extension Point Reference</h1>
+<table border="0">
+	<tr>
+		<td width="100%"><h1>Extension Point Reference</h1></td>
+		<td align="right" valign="middle" nowrap><a href="../../../javadoc/overview-summary.html" title="Backward to API Reference"><img src="../../../images/backward.png"/></a>&nbsp;<a href="../../online/index.html" title="Forward to Online Docs"><img src="../../../images/forward.png"/></a></td>
+	</tr>
+</table>
 <p>
 <table border="0">
 </table>
 </p>
 
 
+<p align="right">
+<a href="../../../javadoc/overview-summary.html" title="Backward to API Reference"><img src="../../../images/backward.png"/></a>&nbsp;<a href="../../online/index.html" title="Forward to Online Docs"><img src="../../../images/forward.png"/></a></p>
 <HR>
 <i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
 </BODY>
diff --git a/plugins/org.eclipse.net4j.doc/images/backward.png b/plugins/org.eclipse.net4j.doc/images/backward.png
new file mode 100644
index 0000000..535c536
--- /dev/null
+++ b/plugins/org.eclipse.net4j.doc/images/backward.png
Binary files differ
diff --git a/plugins/org.eclipse.net4j.doc/images/forward.png b/plugins/org.eclipse.net4j.doc/images/forward.png
new file mode 100644
index 0000000..96ebe01
--- /dev/null
+++ b/plugins/org.eclipse.net4j.doc/images/forward.png
Binary files differ
diff --git a/plugins/org.eclipse.net4j.util.doc/html/Overview.html b/plugins/org.eclipse.net4j.util.doc/html/Overview.html
index 2d4e1d5..1b19453 100644
--- a/plugins/org.eclipse.net4j.util.doc/html/Overview.html
+++ b/plugins/org.eclipse.net4j.util.doc/html/Overview.html
@@ -20,13 +20,18 @@
 <BODY BGCOLOR="white" onload="windowTitle();">
 <!-- <div class="help_breadcrumbs"><a href="" title="Net4j Utilities Documentation">Net4j Utilities Documentation</a></div> -->
 
-<h1>Overview</h1>
+<table border="0">
+	<tr>
+		<td width="100%"><h1>Overview</h1></td>
+		<td align="right" valign="middle" nowrap>&nbsp;<a href="reference/index.html" title="Forward to Reference"><img src="../images/forward.png"/></a></td>
+	</tr>
+</table>
 <p>
  <p>
 <table border="0">
 <tr><td><img src="../images/article.gif"/>&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;</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;</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;</td><td colspan="3"><a href="../javadoc/overview-summary.html" title="Category in Net4j Utilities Documentation">API Reference</a></td></tr>
 <tr><td/><td><img src="../images/category.gif"/>&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;</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;</td><td colspan="3"><a href="http://www.eclipse.org/cdo" title="Article in Net4j Utilities Documentation">Homepage</a></td></tr>
@@ -36,6 +41,8 @@
 </p>
 
 
+<p align="right">
+&nbsp;<a href="reference/index.html" title="Forward to Reference"><img src="../images/forward.png"/></a></p>
 <HR>
 <i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
 </BODY>
diff --git a/plugins/org.eclipse.net4j.util.doc/html/online/index.html b/plugins/org.eclipse.net4j.util.doc/html/online/index.html
index 28e09a5..1cd5ec5 100644
--- a/plugins/org.eclipse.net4j.util.doc/html/online/index.html
+++ b/plugins/org.eclipse.net4j.util.doc/html/online/index.html
@@ -20,7 +20,12 @@
 <BODY BGCOLOR="white" onload="windowTitle();">
 <!-- <div class="help_breadcrumbs"><a href="../Overview.html" title="Net4j Utilities Documentation">Net4j Utilities Documentation</a></div> -->
 
-<h1>Online Docs</h1>
+<table border="0">
+	<tr>
+		<td width="100%"><h1>Online Docs</h1></td>
+		<td align="right" valign="middle" nowrap><a href="../reference/schema/index.html" title="Backward to Extension Point Reference"><img src="../../images/backward.png"/></a>&nbsp;<a href="http://www.eclipse.org/cdo" title="Forward to Homepage"><img src="../../images/forward.png"/></a></td>
+	</tr>
+</table>
 <p>
 <table border="0">
 <tr><td><img src="../../images/article.gif"/>&nbsp;</td><td colspan="3"><a href="http://www.eclipse.org/cdo" title="Article in Net4j Utilities Documentation">Homepage</a></td></tr>
@@ -29,6 +34,8 @@
 </p>
 
 
+<p align="right">
+<a href="../reference/schema/index.html" title="Backward to Extension Point Reference"><img src="../../images/backward.png"/></a>&nbsp;<a href="http://www.eclipse.org/cdo" title="Forward to Homepage"><img src="../../images/forward.png"/></a></p>
 <HR>
 <i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
 </BODY>
diff --git a/plugins/org.eclipse.net4j.util.doc/html/reference/index.html b/plugins/org.eclipse.net4j.util.doc/html/reference/index.html
index 788b581..ef2779d 100644
--- a/plugins/org.eclipse.net4j.util.doc/html/reference/index.html
+++ b/plugins/org.eclipse.net4j.util.doc/html/reference/index.html
@@ -20,15 +20,22 @@
 <BODY BGCOLOR="white" onload="windowTitle();">
 <!-- <div class="help_breadcrumbs"><a href="../Overview.html" title="Net4j Utilities Documentation">Net4j Utilities Documentation</a></div> -->
 
-<h1>Reference</h1>
+<table border="0">
+	<tr>
+		<td width="100%"><h1>Reference</h1></td>
+		<td align="right" valign="middle" nowrap><a href="../Overview.html" title="Backward to Overview"><img src="../../images/backward.png"/></a>&nbsp;<a href="../../javadoc/overview-summary.html" title="Forward to API Reference"><img src="../../images/forward.png"/></a></td>
+	</tr>
+</table>
 <p>
 <table border="0">
-<tr><td><img src="../../images/category.gif"/>&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;</td><td colspan="3"><a href="../../javadoc/overview-summary.html" title="Category in Net4j Utilities Documentation">API Reference</a></td></tr>
 <tr><td><img src="../../images/category.gif"/>&nbsp;</td><td colspan="3"><a href="schema/index.html" title="Category in Net4j Utilities Documentation">Extension Point Reference</a></td></tr>
 </table>
 </p>
 
 
+<p align="right">
+<a href="../Overview.html" title="Backward to Overview"><img src="../../images/backward.png"/></a>&nbsp;<a href="../../javadoc/overview-summary.html" title="Forward to API Reference"><img src="../../images/forward.png"/></a></p>
 <HR>
 <i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
 </BODY>
diff --git a/plugins/org.eclipse.net4j.util.doc/html/reference/schema/index.html b/plugins/org.eclipse.net4j.util.doc/html/reference/schema/index.html
index 5b7112a..7d8709b 100644
--- a/plugins/org.eclipse.net4j.util.doc/html/reference/schema/index.html
+++ b/plugins/org.eclipse.net4j.util.doc/html/reference/schema/index.html
@@ -20,13 +20,20 @@
 <BODY BGCOLOR="white" onload="windowTitle();">
 <!-- <div class="help_breadcrumbs"><a href="../../Overview.html" title="Net4j Utilities Documentation">Net4j Utilities Documentation</a> > <a href="../index.html" title="Category in Net4j Utilities Documentation">Reference</a></div> -->
 
-<h1>Extension Point Reference</h1>
+<table border="0">
+	<tr>
+		<td width="100%"><h1>Extension Point Reference</h1></td>
+		<td align="right" valign="middle" nowrap><a href="../../../javadoc/overview-summary.html" title="Backward to API Reference"><img src="../../../images/backward.png"/></a>&nbsp;<a href="../../online/index.html" title="Forward to Online Docs"><img src="../../../images/forward.png"/></a></td>
+	</tr>
+</table>
 <p>
 <table border="0">
 </table>
 </p>
 
 
+<p align="right">
+<a href="../../../javadoc/overview-summary.html" title="Backward to API Reference"><img src="../../../images/backward.png"/></a>&nbsp;<a href="../../online/index.html" title="Forward to Online Docs"><img src="../../../images/forward.png"/></a></p>
 <HR>
 <i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>
 </BODY>
diff --git a/plugins/org.eclipse.net4j.util.doc/images/backward.png b/plugins/org.eclipse.net4j.util.doc/images/backward.png
new file mode 100644
index 0000000..535c536
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/images/backward.png
Binary files differ
diff --git a/plugins/org.eclipse.net4j.util.doc/images/forward.png b/plugins/org.eclipse.net4j.util.doc/images/forward.png
new file mode 100644
index 0000000..96ebe01
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/images/forward.png
Binary files differ