toc icons

59 files changed, 562 insertions, 521 deletions

diff --git a/plugins/org.eclipse.emf.cdo.doc/images/external.gif b/plugins/org.eclipse.emf.cdo.doc/images/external.gif
new file mode 100644
index 0000000000..67f815ea90
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/images/external.gif
diff --git a/plugins/org.eclipse.emf.cdo.doc/images/extpoint.gif b/plugins/org.eclipse.emf.cdo.doc/images/extpoint.gif
new file mode 100644
index 0000000000..898669c71f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/images/extpoint.gif
diff --git a/plugins/org.eclipse.emf.cdo.doc/images/package.gif b/plugins/org.eclipse.emf.cdo.doc/images/package.gif
new file mode 100644
index 0000000000..2c1a6190ba
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/images/package.gif
diff --git a/plugins/org.eclipse.emf.cdo.doc/images/plugin.gif b/plugins/org.eclipse.emf.cdo.doc/images/plugin.gif
new file mode 100644
index 0000000000..b4cc50fc45
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/images/plugin.gif
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/stylesheet.css b/plugins/org.eclipse.emf.cdo.doc/javadoc/stylesheet.css
index caaa9329cf..cbd34286b1 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/stylesheet.css
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/stylesheet.css
@@ -9,8 +9,8 @@ body { background-color: #FFFFFF; color:#000000 }
 h1 { font-size: 145% }

 

 /* Table colors */

-.TableHeadingColor     { background: #A8C7FF; color:#000000 } /* Mid Blue */

-.TableSubHeadingColor  { background: #E0EBFF; color:#000000 } /* Light Blue */

+.TableHeadingColor     { background: #CCCCFF; color:#000000 } /* Dark mauve */

+.TableSubHeadingColor  { background: #EEEEFF; color:#000000 } /* Light mauve */

 .TableRowColor         { background: #FFFFFF; color:#000000 } /* White */

 

 /* Font used in left-hand frame lists */

@@ -19,7 +19,7 @@ h1 { font-size: 145% }
 .FrameItemFont    { font-size:  90%; font-family: Helvetica, Arial, sans-serif; color:#000000 }

 

 /* Navigation bar fonts and colors */

-.NavBarCell1    { background-color:#E0EBFF; color:#000000} /* Light Blue */

+.NavBarCell1    { background-color:#EEEEFF; color:#000000} /* Light mauve */

 .NavBarCell1Rev { background-color:#00008B; color:#FFFFFF} /* Dark Blue */

 .NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;color:#000000;}

 .NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;color:#FFFFFF;}

diff --git a/plugins/org.eclipse.emf.cdo.doc/plugin.xml b/plugins/org.eclipse.emf.cdo.doc/plugin.xml
index bb53800136..8ddf6eefad 100644
--- a/plugins/org.eclipse.emf.cdo.doc/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.doc/plugin.xml
@@ -16,6 +16,10 @@
    <extension point="org.eclipse.help.toc">
       <toc file="toc.xml" primary="true"/>
       <index path="index"/>
+      <tocIcon id="plugin" altText="Plugin" openIcon="images/plugin.gif"/>
+      <tocIcon id="package" altText="Package" openIcon="images/package.gif"/>
+      <tocIcon id="extpoint" altText="Extension Point" openIcon="images/extpoint.gif"/>
+      <tocIcon id="external" altText="External Article" openIcon="images/external.gif"/>
    </extension>
 
   <extension
diff --git a/plugins/org.eclipse.emf.cdo.doc/toc.html b/plugins/org.eclipse.emf.cdo.doc/toc.html
index 8589a812ad..b5dba1fad3 100644
--- a/plugins/org.eclipse.emf.cdo.doc/toc.html
+++ b/plugins/org.eclipse.emf.cdo.doc/toc.html
@@ -5,122 +5,122 @@
   <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/javadoc/overview-summary.html" target="content">API&nbsp;Reference</a></span></div>
     <div id="org_eclipse_emf_cdo_doc_3" style="display:none; margin-left:20px;">
-      <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/javadoc/org/eclipse/emf/cdo/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client</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="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client</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/javadoc/org/eclipse/emf/cdo/package-summary.html" target="content">org.eclipse.emf.cdo</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/package-summary.html" target="content">org.eclipse.emf.cdo.eresource</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/package-summary.html" target="content">org.eclipse.emf.cdo.eresource.impl</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/util/package-summary.html" target="content">org.eclipse.emf.cdo.eresource.util</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/package-summary.html" target="content">org.eclipse.emf.cdo.etypes</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/impl/package-summary.html" target="content">org.eclipse.emf.cdo.etypes.impl</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/util/package-summary.html" target="content">org.eclipse.emf.cdo.etypes.util</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/package-summary.html" target="content">org.eclipse.emf.cdo.session</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/package-summary.html" target="content">org.eclipse.emf.cdo.session.remote</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-summary.html" target="content">org.eclipse.emf.cdo.transaction</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/util/package-summary.html" target="content">org.eclipse.emf.cdo.util</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-summary.html" target="content">org.eclipse.emf.cdo.view</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/package-summary.html" target="content">org.eclipse.emf.internal.cdo</a></span></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/javadoc/org/eclipse/emf/cdo/edit/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;Edit&nbsp;Support</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/package-summary.html" target="content">org.eclipse.emf.cdo</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/package-summary.html" target="content">org.eclipse.emf.cdo.eresource</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/package-summary.html" target="content">org.eclipse.emf.cdo.eresource.impl</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/util/package-summary.html" target="content">org.eclipse.emf.cdo.eresource.util</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/package-summary.html" target="content">org.eclipse.emf.cdo.etypes</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/impl/package-summary.html" target="content">org.eclipse.emf.cdo.etypes.impl</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/util/package-summary.html" target="content">org.eclipse.emf.cdo.etypes.util</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/package-summary.html" target="content">org.eclipse.emf.cdo.session</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/package-summary.html" target="content">org.eclipse.emf.cdo.session.remote</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-summary.html" target="content">org.eclipse.emf.cdo.transaction</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/util/package-summary.html" target="content">org.eclipse.emf.cdo.util</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-summary.html" target="content">org.eclipse.emf.cdo.view</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/package-summary.html" target="content">org.eclipse.emf.internal.cdo</a></span></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="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/edit/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;Edit&nbsp;Support</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_5" 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/javadoc/org/eclipse/emf/cdo/edit/package-summary.html" target="content">org.eclipse.emf.cdo.edit</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/provider/package-summary.html" target="content">org.eclipse.emf.cdo.eresource.provider</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/provider/package-summary.html" target="content">org.eclipse.emf.cdo.etypes.provider</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/edit/package-summary.html" target="content">org.eclipse.emf.cdo.edit</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/provider/package-summary.html" target="content">org.eclipse.emf.cdo.eresource.provider</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/provider/package-summary.html" target="content">org.eclipse.emf.cdo.etypes.provider</a></span></div>
       </div>
-      <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/org/eclipse/emf/cdo/location/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;Location</a></span></div>
+      <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="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/location/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;Location</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_6" 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/javadoc/org/eclipse/emf/cdo/location/package-summary.html" target="content">org.eclipse.emf.cdo.location</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/location/package-summary.html" target="content">org.eclipse.emf.cdo.location</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_7')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_7"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/net4j/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;Net4j&nbsp;Support</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_7')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_7"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/net4j/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;Net4j&nbsp;Support</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_7" 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/javadoc/org/eclipse/emf/cdo/net4j/package-summary.html" target="content">org.eclipse.emf.cdo.net4j</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/net4j/package-summary.html" target="content">org.eclipse.emf.cdo.net4j</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_8')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_8"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;UI</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_8')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_8"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;UI</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_8" 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/javadoc/org/eclipse/emf/cdo/ui/package-summary.html" target="content">org.eclipse.emf.cdo.ui</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/widgets/package-summary.html" target="content">org.eclipse.emf.cdo.ui.widgets</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/package-summary.html" target="content">org.eclipse.emf.cdo.ui</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/widgets/package-summary.html" target="content">org.eclipse.emf.cdo.ui.widgets</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_9')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_9"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/ide/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;UI&nbsp;IDE</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_9')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_9"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/ide/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;UI&nbsp;IDE</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_9" 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/javadoc/org/eclipse/emf/cdo/ui/ide/package-summary.html" target="content">org.eclipse.emf.cdo.ui.ide</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/ide/package-summary.html" target="content">org.eclipse.emf.cdo.ui.ide</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_10')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_10"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Common</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_10')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_10"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Common</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_10" 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/javadoc/org/eclipse/emf/cdo/common/package-summary.html" target="content">org.eclipse.emf.cdo.common</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-summary.html" target="content">org.eclipse.emf.cdo.common.branch</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/package-summary.html" target="content">org.eclipse.emf.cdo.common.commit</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/handler/package-summary.html" target="content">org.eclipse.emf.cdo.common.commit.handler</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/id/package-summary.html" target="content">org.eclipse.emf.cdo.common.id</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lob/package-summary.html" target="content">org.eclipse.emf.cdo.common.lob</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/package-summary.html" target="content">org.eclipse.emf.cdo.common.lock</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-summary.html" target="content">org.eclipse.emf.cdo.common.model</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/protocol/package-summary.html" target="content">org.eclipse.emf.cdo.common.protocol</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/package-summary.html" target="content">org.eclipse.emf.cdo.common.revision</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/package-summary.html" target="content">org.eclipse.emf.cdo.common.revision.delta</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/package-summary.html" target="content">org.eclipse.emf.cdo.common.util</a></span></div>
-      </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_11')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_11"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-summary.html" target="content">org.eclipse.emf.cdo.common</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-summary.html" target="content">org.eclipse.emf.cdo.common.branch</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/package-summary.html" target="content">org.eclipse.emf.cdo.common.commit</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/handler/package-summary.html" target="content">org.eclipse.emf.cdo.common.commit.handler</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/id/package-summary.html" target="content">org.eclipse.emf.cdo.common.id</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lob/package-summary.html" target="content">org.eclipse.emf.cdo.common.lob</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/package-summary.html" target="content">org.eclipse.emf.cdo.common.lock</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-summary.html" target="content">org.eclipse.emf.cdo.common.model</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/protocol/package-summary.html" target="content">org.eclipse.emf.cdo.common.protocol</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/package-summary.html" target="content">org.eclipse.emf.cdo.common.revision</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/package-summary.html" target="content">org.eclipse.emf.cdo.common.revision.delta</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/package-summary.html" target="content">org.eclipse.emf.cdo.common.util</a></span></div>
+      </div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_11')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_11"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_11" 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/javadoc/org/eclipse/emf/cdo/server/package-summary.html" target="content">org.eclipse.emf.cdo.server</a></span></div>
-        <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/embedded/package-summary.html" target="content">org.eclipse.emf.cdo.server.embedded</a></span></div>
-        <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/mem/package-summary.html" target="content">org.eclipse.emf.cdo.server.mem</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-summary.html" target="content">org.eclipse.emf.cdo.server</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/embedded/package-summary.html" target="content">org.eclipse.emf.cdo.server.embedded</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/mem/package-summary.html" target="content">org.eclipse.emf.cdo.server.mem</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_12')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_12"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;DB</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_12')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_12"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;DB</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_12" 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/javadoc/org/eclipse/emf/cdo/server/db/package-summary.html" target="content">org.eclipse.emf.cdo.server.db</a></span></div>
-        <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/db/mapping/package-summary.html" target="content">org.eclipse.emf.cdo.server.db.mapping</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/package-summary.html" target="content">org.eclipse.emf.cdo.server.db</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/mapping/package-summary.html" target="content">org.eclipse.emf.cdo.server.db.mapping</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_13')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_13"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db4o/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;DB4O</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_13')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_13"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db4o/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;DB4O</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_13" 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/javadoc/org/eclipse/emf/cdo/server/db4o/package-summary.html" target="content">org.eclipse.emf.cdo.server.db4o</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db4o/package-summary.html" target="content">org.eclipse.emf.cdo.server.db4o</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_14')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_14"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/hibernate/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;Hibernate</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_14')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_14"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/hibernate/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;Hibernate</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_14" 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/javadoc/org/eclipse/emf/cdo/server/hibernate/package-summary.html" target="content">org.eclipse.emf.cdo.server.hibernate</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/hibernate/package-summary.html" target="content">org.eclipse.emf.cdo.server.hibernate</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_15')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_15"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/mongodb/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;MongoDB</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_15')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_15"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/mongodb/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;MongoDB</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_15" 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/javadoc/org/eclipse/emf/cdo/server/mongodb/package-summary.html" target="content">org.eclipse.emf.cdo.server.mongodb</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/mongodb/package-summary.html" target="content">org.eclipse.emf.cdo.server.mongodb</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_16')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_16"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/net4j/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;Net4j&nbsp;Support</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_16')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_16"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/net4j/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;Net4j&nbsp;Support</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_16" 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/javadoc/org/eclipse/emf/cdo/server/net4j/package-summary.html" target="content">org.eclipse.emf.cdo.server.net4j</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/net4j/package-summary.html" target="content">org.eclipse.emf.cdo.server.net4j</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_17')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_17"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/ocl/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;OCL&nbsp;Support</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_17')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_17"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/ocl/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;OCL&nbsp;Support</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_17" 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/javadoc/org/eclipse/emf/cdo/server/ocl/package-summary.html" target="content">org.eclipse.emf.cdo.server.ocl</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/ocl/package-summary.html" target="content">org.eclipse.emf.cdo.server.ocl</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_18')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_18"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/objectivity/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;Objectivity</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_18')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_18"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/objectivity/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;Objectivity</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_18" 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/javadoc/org/eclipse/emf/cdo/server/objectivity/package-summary.html" target="content">org.eclipse.emf.cdo.server.objectivity</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.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_19')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_19"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/reference/schema/index.html" target="content">Extension&nbsp;Point&nbsp;Reference</a></span></div>
     <div id="org_eclipse_emf_cdo_doc_19" style="display:none; margin-left:20px;">
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_20')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_20"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_viewProviders.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_20')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_20"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_viewProviders.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_20" 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/schemadoc/org_eclipse_emf_cdo_viewProviders.html" target="content">viewProviders</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="extpoint.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_viewProviders.html" target="content">viewProviders</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_21')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_21"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_appExtensions.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_21')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_21"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_appExtensions.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_21" 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/schemadoc/org_eclipse_emf_cdo_server_appExtensions.html" target="content">appExtensions</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_repositoryFactories.html" target="content">repositoryFactories</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_storeFactories.html" target="content">storeFactories</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="extpoint.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_appExtensions.html" target="content">appExtensions</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="extpoint.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_repositoryFactories.html" target="content">repositoryFactories</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="extpoint.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_storeFactories.html" target="content">storeFactories</a></span></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/schemadoc/org_eclipse_emf_cdo_server_db_mappingStrategies.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;DB</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="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_db_mappingStrategies.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;DB</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_22" 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/schemadoc/org_eclipse_emf_cdo_server_db_mappingStrategies.html" target="content">mappingStrategies</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="extpoint.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_db_mappingStrategies.html" target="content">mappingStrategies</a></span></div>
       </div>
-      <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_server_hibernate_mappingProviderFactories.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;Hibernate</a></span></div>
+      <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="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_hibernate_mappingProviderFactories.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;Hibernate</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_23" 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/schemadoc/org_eclipse_emf_cdo_server_hibernate_mappingProviderFactories.html" target="content">mappingProviderFactories</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="extpoint.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_hibernate_mappingProviderFactories.html" target="content">mappingProviderFactories</a></span></div>
       </div>
     </div>
   </div>
   <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_24')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_24"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/online/index.html" target="content">Online&nbsp;Docs</a></span></div>
   <div id="org_eclipse_emf_cdo_doc_24" 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>
+    <div class="te"><span><img src="empty.gif"/><img src="external.gif"/><a href="http://www.eclipse.org/cdo" target="content">Homepage</a></span></div>
+    <div class="te"><span><img src="empty.gif"/><img src="external.gif"/><a href="http://wiki.eclipse.org/CDO" target="content">Wiki</a></span></div>
   </div>
   <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/about.html" target="content">Legal</a></span></div>
 </div>
diff --git a/plugins/org.eclipse.emf.cdo.doc/toc.xml b/plugins/org.eclipse.emf.cdo.doc/toc.xml
index e0d5dfba37..e2b4d5f298 100644
--- a/plugins/org.eclipse.emf.cdo.doc/toc.xml
+++ b/plugins/org.eclipse.emf.cdo.doc/toc.xml
@@ -5,101 +5,101 @@
   <topic label="Overview" href="html/Overview.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" />
-        <topic label="org.eclipse.emf.cdo.eresource" href="javadoc/org/eclipse/emf/cdo/eresource/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.eresource.impl" href="javadoc/org/eclipse/emf/cdo/eresource/impl/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.eresource.util" href="javadoc/org/eclipse/emf/cdo/eresource/util/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.etypes" href="javadoc/org/eclipse/emf/cdo/etypes/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.etypes.impl" href="javadoc/org/eclipse/emf/cdo/etypes/impl/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.etypes.util" href="javadoc/org/eclipse/emf/cdo/etypes/util/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.session" href="javadoc/org/eclipse/emf/cdo/session/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.session.remote" href="javadoc/org/eclipse/emf/cdo/session/remote/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.transaction" href="javadoc/org/eclipse/emf/cdo/transaction/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.util" href="javadoc/org/eclipse/emf/cdo/util/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.view" href="javadoc/org/eclipse/emf/cdo/view/package-summary.html" />
-        <topic label="org.eclipse.emf.internal.cdo" href="javadoc/org/eclipse/emf/internal/cdo/package-summary.html" />
-      </topic>
-      <topic label="CDO Model Repository Client Edit Support" href="javadoc/org/eclipse/emf/cdo/edit/package-summary.html">
-        <topic label="org.eclipse.emf.cdo.edit" href="javadoc/org/eclipse/emf/cdo/edit/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.eresource.provider" href="javadoc/org/eclipse/emf/cdo/eresource/provider/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.etypes.provider" href="javadoc/org/eclipse/emf/cdo/etypes/provider/package-summary.html" />
-      </topic>
-      <topic label="CDO Model Repository Client Location" href="javadoc/org/eclipse/emf/cdo/location/package-summary.html">
-        <topic label="org.eclipse.emf.cdo.location" href="javadoc/org/eclipse/emf/cdo/location/package-summary.html" />
-      </topic>
-      <topic label="CDO Model Repository Client Net4j Support" href="javadoc/org/eclipse/emf/cdo/net4j/package-summary.html">
-        <topic label="org.eclipse.emf.cdo.net4j" href="javadoc/org/eclipse/emf/cdo/net4j/package-summary.html" />
-      </topic>
-      <topic label="CDO Model Repository Client UI" href="javadoc/org/eclipse/emf/cdo/ui/package-summary.html">
-        <topic label="org.eclipse.emf.cdo.ui" href="javadoc/org/eclipse/emf/cdo/ui/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.ui.widgets" href="javadoc/org/eclipse/emf/cdo/ui/widgets/package-summary.html" />
-      </topic>
-      <topic label="CDO Model Repository Client UI IDE" href="javadoc/org/eclipse/emf/cdo/ui/ide/package-summary.html">
-        <topic label="org.eclipse.emf.cdo.ui.ide" href="javadoc/org/eclipse/emf/cdo/ui/ide/package-summary.html" />
-      </topic>
-      <topic label="CDO Model Repository Common" href="javadoc/org/eclipse/emf/cdo/common/package-summary.html">
-        <topic label="org.eclipse.emf.cdo.common" href="javadoc/org/eclipse/emf/cdo/common/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.common.branch" href="javadoc/org/eclipse/emf/cdo/common/branch/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.common.commit" href="javadoc/org/eclipse/emf/cdo/common/commit/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.common.commit.handler" href="javadoc/org/eclipse/emf/cdo/common/commit/handler/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.common.id" href="javadoc/org/eclipse/emf/cdo/common/id/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.common.lob" href="javadoc/org/eclipse/emf/cdo/common/lob/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.common.lock" href="javadoc/org/eclipse/emf/cdo/common/lock/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.common.model" href="javadoc/org/eclipse/emf/cdo/common/model/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.common.protocol" href="javadoc/org/eclipse/emf/cdo/common/protocol/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.common.revision" href="javadoc/org/eclipse/emf/cdo/common/revision/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.common.revision.delta" href="javadoc/org/eclipse/emf/cdo/common/revision/delta/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.common.util" href="javadoc/org/eclipse/emf/cdo/common/util/package-summary.html" />
-      </topic>
-      <topic label="CDO Model Repository Server" href="javadoc/org/eclipse/emf/cdo/server/package-summary.html">
-        <topic label="org.eclipse.emf.cdo.server" href="javadoc/org/eclipse/emf/cdo/server/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.server.embedded" href="javadoc/org/eclipse/emf/cdo/server/embedded/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.server.mem" href="javadoc/org/eclipse/emf/cdo/server/mem/package-summary.html" />
-      </topic>
-      <topic label="CDO Model Repository Server DB" href="javadoc/org/eclipse/emf/cdo/server/db/package-summary.html">
-        <topic label="org.eclipse.emf.cdo.server.db" href="javadoc/org/eclipse/emf/cdo/server/db/package-summary.html" />
-        <topic label="org.eclipse.emf.cdo.server.db.mapping" href="javadoc/org/eclipse/emf/cdo/server/db/mapping/package-summary.html" />
-      </topic>
-      <topic label="CDO Model Repository Server DB4O" href="javadoc/org/eclipse/emf/cdo/server/db4o/package-summary.html">
-        <topic label="org.eclipse.emf.cdo.server.db4o" href="javadoc/org/eclipse/emf/cdo/server/db4o/package-summary.html" />
-      </topic>
-      <topic label="CDO Model Repository Server Hibernate" href="javadoc/org/eclipse/emf/cdo/server/hibernate/package-summary.html">
-        <topic label="org.eclipse.emf.cdo.server.hibernate" href="javadoc/org/eclipse/emf/cdo/server/hibernate/package-summary.html" />
-      </topic>
-      <topic label="CDO Model Repository Server MongoDB" href="javadoc/org/eclipse/emf/cdo/server/mongodb/package-summary.html">
-        <topic label="org.eclipse.emf.cdo.server.mongodb" href="javadoc/org/eclipse/emf/cdo/server/mongodb/package-summary.html" />
-      </topic>
-      <topic label="CDO Model Repository Server Net4j Support" href="javadoc/org/eclipse/emf/cdo/server/net4j/package-summary.html">
-        <topic label="org.eclipse.emf.cdo.server.net4j" href="javadoc/org/eclipse/emf/cdo/server/net4j/package-summary.html" />
-      </topic>
-      <topic label="CDO Model Repository Server OCL Support" href="javadoc/org/eclipse/emf/cdo/server/ocl/package-summary.html">
-        <topic label="org.eclipse.emf.cdo.server.ocl" href="javadoc/org/eclipse/emf/cdo/server/ocl/package-summary.html" />
-      </topic>
-      <topic label="CDO Model Repository Server Objectivity" href="javadoc/org/eclipse/emf/cdo/server/objectivity/package-summary.html">
-        <topic label="org.eclipse.emf.cdo.server.objectivity" href="javadoc/org/eclipse/emf/cdo/server/objectivity/package-summary.html" />
+      <topic label="CDO Model Repository Client" href="javadoc/org/eclipse/emf/cdo/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.emf.cdo" href="javadoc/org/eclipse/emf/cdo/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.eresource" href="javadoc/org/eclipse/emf/cdo/eresource/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.eresource.impl" href="javadoc/org/eclipse/emf/cdo/eresource/impl/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.eresource.util" href="javadoc/org/eclipse/emf/cdo/eresource/util/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.etypes" href="javadoc/org/eclipse/emf/cdo/etypes/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.etypes.impl" href="javadoc/org/eclipse/emf/cdo/etypes/impl/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.etypes.util" href="javadoc/org/eclipse/emf/cdo/etypes/util/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.session" href="javadoc/org/eclipse/emf/cdo/session/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.session.remote" href="javadoc/org/eclipse/emf/cdo/session/remote/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.transaction" href="javadoc/org/eclipse/emf/cdo/transaction/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.util" href="javadoc/org/eclipse/emf/cdo/util/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.view" href="javadoc/org/eclipse/emf/cdo/view/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.internal.cdo" href="javadoc/org/eclipse/emf/internal/cdo/package-summary.html" icon="package" />
+      </topic>
+      <topic label="CDO Model Repository Client Edit Support" href="javadoc/org/eclipse/emf/cdo/edit/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.emf.cdo.edit" href="javadoc/org/eclipse/emf/cdo/edit/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.eresource.provider" href="javadoc/org/eclipse/emf/cdo/eresource/provider/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.etypes.provider" href="javadoc/org/eclipse/emf/cdo/etypes/provider/package-summary.html" icon="package" />
+      </topic>
+      <topic label="CDO Model Repository Client Location" href="javadoc/org/eclipse/emf/cdo/location/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.emf.cdo.location" href="javadoc/org/eclipse/emf/cdo/location/package-summary.html" icon="package" />
+      </topic>
+      <topic label="CDO Model Repository Client Net4j Support" href="javadoc/org/eclipse/emf/cdo/net4j/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.emf.cdo.net4j" href="javadoc/org/eclipse/emf/cdo/net4j/package-summary.html" icon="package" />
+      </topic>
+      <topic label="CDO Model Repository Client UI" href="javadoc/org/eclipse/emf/cdo/ui/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.emf.cdo.ui" href="javadoc/org/eclipse/emf/cdo/ui/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.ui.widgets" href="javadoc/org/eclipse/emf/cdo/ui/widgets/package-summary.html" icon="package" />
+      </topic>
+      <topic label="CDO Model Repository Client UI IDE" href="javadoc/org/eclipse/emf/cdo/ui/ide/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.emf.cdo.ui.ide" href="javadoc/org/eclipse/emf/cdo/ui/ide/package-summary.html" icon="package" />
+      </topic>
+      <topic label="CDO Model Repository Common" href="javadoc/org/eclipse/emf/cdo/common/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.emf.cdo.common" href="javadoc/org/eclipse/emf/cdo/common/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.common.branch" href="javadoc/org/eclipse/emf/cdo/common/branch/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.common.commit" href="javadoc/org/eclipse/emf/cdo/common/commit/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.common.commit.handler" href="javadoc/org/eclipse/emf/cdo/common/commit/handler/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.common.id" href="javadoc/org/eclipse/emf/cdo/common/id/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.common.lob" href="javadoc/org/eclipse/emf/cdo/common/lob/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.common.lock" href="javadoc/org/eclipse/emf/cdo/common/lock/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.common.model" href="javadoc/org/eclipse/emf/cdo/common/model/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.common.protocol" href="javadoc/org/eclipse/emf/cdo/common/protocol/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.common.revision" href="javadoc/org/eclipse/emf/cdo/common/revision/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.common.revision.delta" href="javadoc/org/eclipse/emf/cdo/common/revision/delta/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.common.util" href="javadoc/org/eclipse/emf/cdo/common/util/package-summary.html" icon="package" />
+      </topic>
+      <topic label="CDO Model Repository Server" href="javadoc/org/eclipse/emf/cdo/server/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.emf.cdo.server" href="javadoc/org/eclipse/emf/cdo/server/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.server.embedded" href="javadoc/org/eclipse/emf/cdo/server/embedded/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.server.mem" href="javadoc/org/eclipse/emf/cdo/server/mem/package-summary.html" icon="package" />
+      </topic>
+      <topic label="CDO Model Repository Server DB" href="javadoc/org/eclipse/emf/cdo/server/db/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.emf.cdo.server.db" href="javadoc/org/eclipse/emf/cdo/server/db/package-summary.html" icon="package" />
+        <topic label="org.eclipse.emf.cdo.server.db.mapping" href="javadoc/org/eclipse/emf/cdo/server/db/mapping/package-summary.html" icon="package" />
+      </topic>
+      <topic label="CDO Model Repository Server DB4O" href="javadoc/org/eclipse/emf/cdo/server/db4o/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.emf.cdo.server.db4o" href="javadoc/org/eclipse/emf/cdo/server/db4o/package-summary.html" icon="package" />
+      </topic>
+      <topic label="CDO Model Repository Server Hibernate" href="javadoc/org/eclipse/emf/cdo/server/hibernate/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.emf.cdo.server.hibernate" href="javadoc/org/eclipse/emf/cdo/server/hibernate/package-summary.html" icon="package" />
+      </topic>
+      <topic label="CDO Model Repository Server MongoDB" href="javadoc/org/eclipse/emf/cdo/server/mongodb/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.emf.cdo.server.mongodb" href="javadoc/org/eclipse/emf/cdo/server/mongodb/package-summary.html" icon="package" />
+      </topic>
+      <topic label="CDO Model Repository Server Net4j Support" href="javadoc/org/eclipse/emf/cdo/server/net4j/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.emf.cdo.server.net4j" href="javadoc/org/eclipse/emf/cdo/server/net4j/package-summary.html" icon="package" />
+      </topic>
+      <topic label="CDO Model Repository Server OCL Support" href="javadoc/org/eclipse/emf/cdo/server/ocl/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.emf.cdo.server.ocl" href="javadoc/org/eclipse/emf/cdo/server/ocl/package-summary.html" icon="package" />
+      </topic>
+      <topic label="CDO Model Repository Server Objectivity" href="javadoc/org/eclipse/emf/cdo/server/objectivity/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.emf.cdo.server.objectivity" href="javadoc/org/eclipse/emf/cdo/server/objectivity/package-summary.html" icon="package" />
       </topic>
     </topic>
     <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 label="CDO Model Repository Client" href="schemadoc/org_eclipse_emf_cdo_viewProviders.html" icon="plugin">
+        <topic label="viewProviders" href="schemadoc/org_eclipse_emf_cdo_viewProviders.html" icon="extpoint" />
       </topic>
-      <topic label="CDO Model Repository Server" href="schemadoc/org_eclipse_emf_cdo_server_appExtensions.html">
-        <topic label="appExtensions" href="schemadoc/org_eclipse_emf_cdo_server_appExtensions.html" />
-        <topic label="repositoryFactories" href="schemadoc/org_eclipse_emf_cdo_server_repositoryFactories.html" />
-        <topic label="storeFactories" href="schemadoc/org_eclipse_emf_cdo_server_storeFactories.html" />
+      <topic label="CDO Model Repository Server" href="schemadoc/org_eclipse_emf_cdo_server_appExtensions.html" icon="plugin">
+        <topic label="appExtensions" href="schemadoc/org_eclipse_emf_cdo_server_appExtensions.html" icon="extpoint" />
+        <topic label="repositoryFactories" href="schemadoc/org_eclipse_emf_cdo_server_repositoryFactories.html" icon="extpoint" />
+        <topic label="storeFactories" href="schemadoc/org_eclipse_emf_cdo_server_storeFactories.html" icon="extpoint" />
       </topic>
-      <topic label="CDO Model Repository Server DB" href="schemadoc/org_eclipse_emf_cdo_server_db_mappingStrategies.html">
-        <topic label="mappingStrategies" href="schemadoc/org_eclipse_emf_cdo_server_db_mappingStrategies.html" />
+      <topic label="CDO Model Repository Server DB" href="schemadoc/org_eclipse_emf_cdo_server_db_mappingStrategies.html" icon="plugin">
+        <topic label="mappingStrategies" href="schemadoc/org_eclipse_emf_cdo_server_db_mappingStrategies.html" icon="extpoint" />
       </topic>
-      <topic label="CDO Model Repository Server Hibernate" href="schemadoc/org_eclipse_emf_cdo_server_hibernate_mappingProviderFactories.html">
-        <topic label="mappingProviderFactories" href="schemadoc/org_eclipse_emf_cdo_server_hibernate_mappingProviderFactories.html" />
+      <topic label="CDO Model Repository Server Hibernate" href="schemadoc/org_eclipse_emf_cdo_server_hibernate_mappingProviderFactories.html" icon="plugin">
+        <topic label="mappingProviderFactories" href="schemadoc/org_eclipse_emf_cdo_server_hibernate_mappingProviderFactories.html" icon="extpoint" />
       </topic>
     </topic>
   </topic>
   <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 label="Homepage" href="http://www.eclipse.org/cdo" icon="external" />
+    <topic label="Wiki" href="http://wiki.eclipse.org/CDO" icon="external" />
   </topic>
   <topic label="Legal" href="about.html" />
 </toc>
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/images/external.gif b/plugins/org.eclipse.emf.cdo.releng.doc/images/external.gif
new file mode 100644
index 0000000000..67f815ea90
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/images/external.gif
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/images/extpoint.gif b/plugins/org.eclipse.emf.cdo.releng.doc/images/extpoint.gif
new file mode 100644
index 0000000000..898669c71f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/images/extpoint.gif
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/images/package.gif b/plugins/org.eclipse.emf.cdo.releng.doc/images/package.gif
new file mode 100644
index 0000000000..2c1a6190ba
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/images/package.gif
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/images/plugin.gif b/plugins/org.eclipse.emf.cdo.releng.doc/images/plugin.gif
new file mode 100644
index 0000000000..b4cc50fc45
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/images/plugin.gif
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 c225a188a1..e94726b375 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
@@ -93,6 +93,6 @@ public class ArticleImpl extends ChapterImpl implements Article
   @Override
   protected void generateTocEntry(TocWriter writer) throws IOException
   {
-    writer.writeSingle(getTitle(), getTocHref());
+    writer.writeSingle(getTitle(), getTocHref(), null);
   }
 } // ArticleImpl
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 49c293cf33..a437df383e 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
@@ -783,7 +783,7 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
         writer = new TocWriter.Xml(projectFolder);
       }
 
-      writer.writeGroupStart(getDocumentation().getTitle(), getTocHref());
+      writer.writeGroupStart(getDocumentation().getTitle(), getTocHref(), null);
       generateTocEntries(writer);
       writer.writeGroupEnd();
     }
@@ -816,9 +816,9 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
       }
     }
 
-    public abstract void writeSingle(String label, String href) throws IOException;
+    public abstract void writeSingle(String label, String href, String icon) throws IOException;
 
-    public abstract void writeGroupStart(String label, String href) throws IOException;
+    public abstract void writeGroupStart(String label, String href, String icon) throws IOException;
 
     public abstract void writeGroupEnd() throws IOException;
 
@@ -897,18 +897,18 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
       }
 
       @Override
-      public void writeSingle(String label, String href) throws IOException
+      public void writeSingle(String label, String href, String icon) throws IOException
       {
         writePrefix();
         write("<div class=\"te\"><span>");
         writeImage("empty.gif");
-        writeImage("article.gif");
+        writeImage(icon != null ? icon + ".gif" : "article.gif");
         writeHref(label, href);
         write("</span></div>\n");
       }
 
       @Override
-      public void writeGroupStart(String label, String href) throws IOException
+      public void writeGroupStart(String label, String href, String icon) throws IOException
       {
         String id = nextID();
 
@@ -924,7 +924,7 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
         }
         else
         {
-          writeImage("category.gif");
+          writeImage(icon != null ? icon + ".gif" : "category.gif");
         }
 
         writeHref(label, href);
@@ -957,14 +957,14 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
       }
 
       @Override
-      public void writeSingle(String label, String href) throws IOException
+      public void writeSingle(String label, String href, String icon) throws IOException
       {
         writePrefix();
-        write("<topic label=\"" + label + "\" href=\"" + href + "\" />\n");
+        write("<topic label=\"" + label + "\" href=\"" + href + "\"" + icon(icon) + " />\n");
       }
 
       @Override
-      public void writeGroupStart(String label, String href) throws IOException
+      public void writeGroupStart(String label, String href, String icon) throws IOException
       {
         writePrefix();
         if (level == 0)
@@ -973,7 +973,7 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
         }
         else
         {
-          write("<topic label=\"" + label + "\" href=\"" + href + "\">\n");
+          write("<topic label=\"" + label + "\" href=\"" + href + "\"" + icon(icon) + ">\n");
         }
 
         ++level;
@@ -994,6 +994,16 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
           write("</topic>\n");
         }
       }
+
+      private String icon(String icon)
+      {
+        if (icon == null)
+        {
+          return "";
+        }
+
+        return " icon=\"" + icon + "\"";
+      }
     }
   }
 } // DocumentationImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalArticleImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalArticleImpl.java
index 3bd53b5d2f..b9446ec8f7 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalArticleImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalArticleImpl.java
@@ -127,7 +127,9 @@ public class ExternalArticleImpl extends ArticleImpl implements ExternalArticle
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (url: ");
@@ -151,6 +153,6 @@ public class ExternalArticleImpl extends ArticleImpl implements ExternalArticle
   @Override
   protected void generateTocEntry(TocWriter writer) throws IOException
   {
-    writer.writeSingle(getTitle(), url);
+    writer.writeSingle(getTitle(), url, "external");
   }
 } // ExternalArticleImpl
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 565e0d719f..6d8ff36ae5 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
@@ -76,7 +76,7 @@ public class JavadocImpl extends CategoryImpl implements Javadoc
   @Override
   protected void generateTocEntry(TocWriter writer) throws IOException
   {
-    writer.writeGroupStart(getTitle(), OVERVIEW_SUMMARY);
+    writer.writeGroupStart(getTitle(), OVERVIEW_SUMMARY, null);
 
     for (Plugin plugin : getDocumentation().getPlugins())
     {
@@ -84,12 +84,12 @@ public class JavadocImpl extends CategoryImpl implements Javadoc
       if (!packages.isEmpty())
       {
         String href = getHref(packages.get(0));
-        writer.writeGroupStart(plugin.getLabel(), href);
+        writer.writeGroupStart(plugin.getLabel(), href, "plugin");
 
         for (JavaPackage javaPackage : packages)
         {
           href = getHref(javaPackage);
-          writer.writeSingle(javaPackage.getName(), href);
+          writer.writeSingle(javaPackage.getName(), href, "package");
         }
 
         writer.writeGroupEnd();
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/PluginResourceImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/PluginResourceImpl.java
index 5830bb94e6..f592f4dbd8 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/PluginResourceImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/PluginResourceImpl.java
@@ -9,6 +9,7 @@ package org.eclipse.emf.cdo.releng.doc.article.impl;
 import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage;
 import org.eclipse.emf.cdo.releng.doc.article.PluginResource;
 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.ecore.EClass;
@@ -16,6 +17,7 @@ import org.eclipse.emf.ecore.EClass;
 import com.sun.javadoc.ClassDoc;
 
 import java.io.File;
+import java.io.IOException;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Plugin Resource</b></em>'. <!-- end-user-doc
@@ -60,4 +62,11 @@ public class PluginResourceImpl extends ExternalArticleImpl implements PluginRes
     File targetFile = new File(getDocumentation().getProjectFolder(), getUrl());
     return ArticleUtil.createLink(sourceFile, targetFile);
   }
+
+  @Override
+  protected void generateTocEntry(TocWriter writer) throws IOException
+  {
+    writer.writeSingle(getTitle(), url, null);
+  }
+
 } // PluginResourceImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SchemadocImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SchemadocImpl.java
index b9a5f9917e..3e358e3518 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SchemadocImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SchemadocImpl.java
@@ -67,17 +67,17 @@ public class SchemadocImpl extends CategoryImpl implements Schemadoc
       {
         if (!exists)
         {
-          writer.writeGroupStart(getTitle(), getTocHref());
+          writer.writeGroupStart(getTitle(), getTocHref(), null);
           exists = true;
         }
 
         String href = getHref(extensionPoints.get(0));
-        writer.writeGroupStart(plugin.getLabel(), href);
+        writer.writeGroupStart(plugin.getLabel(), href, "plugin");
 
         for (ExtensionPoint extensionPoint : extensionPoints)
         {
           href = getHref(extensionPoint);
-          writer.writeSingle(extensionPoint.getName(), href);
+          writer.writeSingle(extensionPoint.getName(), href, "extpoint");
         }
 
         writer.writeGroupEnd();
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 66bc3b97a7..88085dbaea 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
@@ -674,7 +674,7 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St
   protected void generateTocEntry(TocWriter writer) throws IOException
   {
     checkAnalyzed();
-    writer.writeGroupStart(getTitle(), getTocHref());
+    writer.writeGroupStart(getTitle(), getTocHref(), null);
     generateTocEntries(writer);
     writer.writeGroupEnd();
   }
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/images/external.gif b/plugins/org.eclipse.emf.cdo.releng.help/images/external.gif
new file mode 100644
index 0000000000..67f815ea90
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.help/images/external.gif
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/images/extpoint.gif b/plugins/org.eclipse.emf.cdo.releng.help/images/extpoint.gif
new file mode 100644
index 0000000000..898669c71f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.help/images/extpoint.gif
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/images/package.gif b/plugins/org.eclipse.emf.cdo.releng.help/images/package.gif
new file mode 100644
index 0000000000..2c1a6190ba
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.help/images/package.gif
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/images/plugin.gif b/plugins/org.eclipse.emf.cdo.releng.help/images/plugin.gif
new file mode 100644
index 0000000000..b4cc50fc45
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.help/images/plugin.gif
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/javadoc/stylesheet.css b/plugins/org.eclipse.emf.cdo.releng.help/javadoc/stylesheet.css
index caaa9329cf..cbd34286b1 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/javadoc/stylesheet.css
+++ b/plugins/org.eclipse.emf.cdo.releng.help/javadoc/stylesheet.css
@@ -9,8 +9,8 @@ body { background-color: #FFFFFF; color:#000000 }
 h1 { font-size: 145% }

 

 /* Table colors */

-.TableHeadingColor     { background: #A8C7FF; color:#000000 } /* Mid Blue */

-.TableSubHeadingColor  { background: #E0EBFF; color:#000000 } /* Light Blue */

+.TableHeadingColor     { background: #CCCCFF; color:#000000 } /* Dark mauve */

+.TableSubHeadingColor  { background: #EEEEFF; color:#000000 } /* Light mauve */

 .TableRowColor         { background: #FFFFFF; color:#000000 } /* White */

 

 /* Font used in left-hand frame lists */

@@ -19,7 +19,7 @@ h1 { font-size: 145% }
 .FrameItemFont    { font-size:  90%; font-family: Helvetica, Arial, sans-serif; color:#000000 }

 

 /* Navigation bar fonts and colors */

-.NavBarCell1    { background-color:#E0EBFF; color:#000000} /* Light Blue */

+.NavBarCell1    { background-color:#EEEEFF; color:#000000} /* Light mauve */

 .NavBarCell1Rev { background-color:#00008B; color:#FFFFFF} /* Dark Blue */

 .NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;color:#000000;}

 .NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;color:#FFFFFF;}

diff --git a/plugins/org.eclipse.emf.cdo.releng.help/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.help/plugin.xml
index 71a2e8174d..b9df1fce4b 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.releng.help/plugin.xml
@@ -16,6 +16,10 @@
    <extension point="org.eclipse.help.toc">
       <toc file="toc.xml" primary="true"/>
       <index path="index"/>
+      <tocIcon id="plugin" altText="Plugin" openIcon="images/plugin.gif"/>
+      <tocIcon id="package" altText="Package" openIcon="images/package.gif"/>
+      <tocIcon id="extpoint" altText="Extension Point" openIcon="images/extpoint.gif"/>
+      <tocIcon id="external" altText="External Article" openIcon="images/external.gif"/>
    </extension>
 
 </plugin>
diff --git a/plugins/org.eclipse.emf.cdo.releng/help/article.gif b/plugins/org.eclipse.emf.cdo.releng/help/article.gif
index 1d7f7c73b4..bee7d89086 100644
--- a/plugins/org.eclipse.emf.cdo.releng/help/article.gif
+++ b/plugins/org.eclipse.emf.cdo.releng/help/article.gif
diff --git a/plugins/org.eclipse.emf.cdo.releng/help/category.gif b/plugins/org.eclipse.emf.cdo.releng/help/category.gif
index 49ea1e1757..33467c3be6 100644
--- a/plugins/org.eclipse.emf.cdo.releng/help/category.gif
+++ b/plugins/org.eclipse.emf.cdo.releng/help/category.gif
diff --git a/plugins/org.eclipse.emf.cdo.releng/help/documentation.gif b/plugins/org.eclipse.emf.cdo.releng/help/documentation.gif
index 4c0edfade7..82b0f01be2 100644
--- a/plugins/org.eclipse.emf.cdo.releng/help/documentation.gif
+++ b/plugins/org.eclipse.emf.cdo.releng/help/documentation.gif
diff --git a/plugins/org.eclipse.emf.cdo.releng/help/external.gif b/plugins/org.eclipse.emf.cdo.releng/help/external.gif
new file mode 100644
index 0000000000..e7ebe9c332
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng/help/external.gif
diff --git a/plugins/org.eclipse.emf.cdo.releng/help/extpoint.gif b/plugins/org.eclipse.emf.cdo.releng/help/extpoint.gif
new file mode 100644
index 0000000000..94167cb0f9
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng/help/extpoint.gif
diff --git a/plugins/org.eclipse.emf.cdo.releng/help/package.gif b/plugins/org.eclipse.emf.cdo.releng/help/package.gif
new file mode 100644
index 0000000000..4c1253c77f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng/help/package.gif
diff --git a/plugins/org.eclipse.emf.cdo.releng/help/plugin.gif b/plugins/org.eclipse.emf.cdo.releng/help/plugin.gif
new file mode 100644
index 0000000000..59f4d0ed26
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng/help/plugin.gif
diff --git a/plugins/org.eclipse.emf.cdo.releng/help/toc.html b/plugins/org.eclipse.emf.cdo.releng/help/toc.html
index 7b5b6aba53..c55448cfc0 100644
--- a/plugins/org.eclipse.emf.cdo.releng/help/toc.html
+++ b/plugins/org.eclipse.emf.cdo.releng/help/toc.html
@@ -74,25 +74,25 @@
   <div id="org_eclipse_emf_cdo_releng_help_12" style="display:none; margin-left:20px;">
     <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_releng_help_13')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_releng_help_13"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.releng.help/javadoc/overview-summary.html" target="content">API&nbsp;Reference</a></span></div>
     <div id="org_eclipse_emf_cdo_releng_help_13" style="display:none; margin-left:20px;">
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_releng_help_14')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_releng_help_14"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.releng.help/javadoc/org/eclipse/emf/cdo/releng/version/package-summary.html" target="content">CDO&nbsp;Release&nbsp;Engineering&nbsp;Version&nbsp;Tool</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_releng_help_14')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_releng_help_14"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.releng.help/javadoc/org/eclipse/emf/cdo/releng/version/package-summary.html" target="content">CDO&nbsp;Release&nbsp;Engineering&nbsp;Version&nbsp;Tool</a></span></div>
       <div id="org_eclipse_emf_cdo_releng_help_14" style="display:none; margin-left:20px;">
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.releng.help/javadoc/org/eclipse/emf/cdo/releng/version/package-summary.html" target="content">org.eclipse.emf.cdo.releng.version</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.releng.help/javadoc/org/eclipse/emf/cdo/releng/version/test/package-summary.html" target="content">org.eclipse.emf.cdo.releng.version.test</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.releng.help/javadoc/org/eclipse/emf/cdo/releng/version/package-summary.html" target="content">org.eclipse.emf.cdo.releng.version</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.releng.help/javadoc/org/eclipse/emf/cdo/releng/version/test/package-summary.html" target="content">org.eclipse.emf.cdo.releng.version.test</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_releng_help_15')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_releng_help_15"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.releng.help/javadoc/org/eclipse/emf/cdo/releng/version/digest/ui/package-summary.html" target="content">CDO&nbsp;Release&nbsp;Engineering&nbsp;Version&nbsp;Tool&nbsp;(Digest&nbsp;Validator&nbsp;UI)</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_releng_help_15')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_releng_help_15"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.releng.help/javadoc/org/eclipse/emf/cdo/releng/version/digest/ui/package-summary.html" target="content">CDO&nbsp;Release&nbsp;Engineering&nbsp;Version&nbsp;Tool&nbsp;(Digest&nbsp;Validator&nbsp;UI)</a></span></div>
       <div id="org_eclipse_emf_cdo_releng_help_15" style="display:none; margin-left:20px;">
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.releng.help/javadoc/org/eclipse/emf/cdo/releng/version/digest/ui/package-summary.html" target="content">org.eclipse.emf.cdo.releng.version.digest.ui</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.releng.help/javadoc/org/eclipse/emf/cdo/releng/version/digest/ui/package-summary.html" target="content">org.eclipse.emf.cdo.releng.version.digest.ui</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_releng_help_16')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_releng_help_16"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.releng.help/javadoc/org/eclipse/emf/cdo/releng/version/digest/package-summary.html" target="content">CDO&nbsp;Release&nbsp;Engineering&nbsp;Version&nbsp;Tool&nbsp;(Digest&nbsp;Validator)</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_releng_help_16')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_releng_help_16"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.releng.help/javadoc/org/eclipse/emf/cdo/releng/version/digest/package-summary.html" target="content">CDO&nbsp;Release&nbsp;Engineering&nbsp;Version&nbsp;Tool&nbsp;(Digest&nbsp;Validator)</a></span></div>
       <div id="org_eclipse_emf_cdo_releng_help_16" style="display:none; margin-left:20px;">
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.releng.help/javadoc/org/eclipse/emf/cdo/releng/version/digest/package-summary.html" target="content">org.eclipse.emf.cdo.releng.version.digest</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.releng.help/javadoc/org/eclipse/emf/cdo/releng/version/digest/package-summary.html" target="content">org.eclipse.emf.cdo.releng.version.digest</a></span></div>
       </div>
     </div>
   </div>
   <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_releng_help_17')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_releng_help_17"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.releng.help/html/online/index.html" target="content">Online&nbsp;Docs</a></span></div>
   <div id="org_eclipse_emf_cdo_releng_help_17" 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>
+    <div class="te"><span><img src="empty.gif"/><img src="external.gif"/><a href="http://www.eclipse.org/cdo" target="content">Homepage</a></span></div>
+    <div class="te"><span><img src="empty.gif"/><img src="external.gif"/><a href="http://wiki.eclipse.org/CDO" target="content">Wiki</a></span></div>
   </div>
   <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.releng.help/about.html" target="content">Legal</a></span></div>
 </div>
@@ -103,122 +103,122 @@
   <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/javadoc/overview-summary.html" target="content">API&nbsp;Reference</a></span></div>
     <div id="org_eclipse_emf_cdo_doc_3" style="display:none; margin-left:20px;">
-      <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/javadoc/org/eclipse/emf/cdo/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client</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="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client</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/javadoc/org/eclipse/emf/cdo/package-summary.html" target="content">org.eclipse.emf.cdo</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/package-summary.html" target="content">org.eclipse.emf.cdo.eresource</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/package-summary.html" target="content">org.eclipse.emf.cdo.eresource.impl</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/util/package-summary.html" target="content">org.eclipse.emf.cdo.eresource.util</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/package-summary.html" target="content">org.eclipse.emf.cdo.etypes</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/impl/package-summary.html" target="content">org.eclipse.emf.cdo.etypes.impl</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/util/package-summary.html" target="content">org.eclipse.emf.cdo.etypes.util</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/package-summary.html" target="content">org.eclipse.emf.cdo.session</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/package-summary.html" target="content">org.eclipse.emf.cdo.session.remote</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-summary.html" target="content">org.eclipse.emf.cdo.transaction</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/util/package-summary.html" target="content">org.eclipse.emf.cdo.util</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-summary.html" target="content">org.eclipse.emf.cdo.view</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/package-summary.html" target="content">org.eclipse.emf.internal.cdo</a></span></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/javadoc/org/eclipse/emf/cdo/edit/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;Edit&nbsp;Support</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/package-summary.html" target="content">org.eclipse.emf.cdo</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/package-summary.html" target="content">org.eclipse.emf.cdo.eresource</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/package-summary.html" target="content">org.eclipse.emf.cdo.eresource.impl</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/util/package-summary.html" target="content">org.eclipse.emf.cdo.eresource.util</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/package-summary.html" target="content">org.eclipse.emf.cdo.etypes</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/impl/package-summary.html" target="content">org.eclipse.emf.cdo.etypes.impl</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/util/package-summary.html" target="content">org.eclipse.emf.cdo.etypes.util</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/package-summary.html" target="content">org.eclipse.emf.cdo.session</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/package-summary.html" target="content">org.eclipse.emf.cdo.session.remote</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-summary.html" target="content">org.eclipse.emf.cdo.transaction</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/util/package-summary.html" target="content">org.eclipse.emf.cdo.util</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-summary.html" target="content">org.eclipse.emf.cdo.view</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/package-summary.html" target="content">org.eclipse.emf.internal.cdo</a></span></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="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/edit/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;Edit&nbsp;Support</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_5" 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/javadoc/org/eclipse/emf/cdo/edit/package-summary.html" target="content">org.eclipse.emf.cdo.edit</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/provider/package-summary.html" target="content">org.eclipse.emf.cdo.eresource.provider</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/provider/package-summary.html" target="content">org.eclipse.emf.cdo.etypes.provider</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/edit/package-summary.html" target="content">org.eclipse.emf.cdo.edit</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/provider/package-summary.html" target="content">org.eclipse.emf.cdo.eresource.provider</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/provider/package-summary.html" target="content">org.eclipse.emf.cdo.etypes.provider</a></span></div>
       </div>
-      <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/org/eclipse/emf/cdo/location/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;Location</a></span></div>
+      <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="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/location/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;Location</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_6" 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/javadoc/org/eclipse/emf/cdo/location/package-summary.html" target="content">org.eclipse.emf.cdo.location</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/location/package-summary.html" target="content">org.eclipse.emf.cdo.location</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_7')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_7"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/net4j/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;Net4j&nbsp;Support</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_7')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_7"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/net4j/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;Net4j&nbsp;Support</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_7" 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/javadoc/org/eclipse/emf/cdo/net4j/package-summary.html" target="content">org.eclipse.emf.cdo.net4j</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/net4j/package-summary.html" target="content">org.eclipse.emf.cdo.net4j</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_8')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_8"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;UI</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_8')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_8"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;UI</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_8" 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/javadoc/org/eclipse/emf/cdo/ui/package-summary.html" target="content">org.eclipse.emf.cdo.ui</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/widgets/package-summary.html" target="content">org.eclipse.emf.cdo.ui.widgets</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/package-summary.html" target="content">org.eclipse.emf.cdo.ui</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/widgets/package-summary.html" target="content">org.eclipse.emf.cdo.ui.widgets</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_9')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_9"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/ide/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;UI&nbsp;IDE</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_9')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_9"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/ide/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client&nbsp;UI&nbsp;IDE</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_9" 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/javadoc/org/eclipse/emf/cdo/ui/ide/package-summary.html" target="content">org.eclipse.emf.cdo.ui.ide</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/ui/ide/package-summary.html" target="content">org.eclipse.emf.cdo.ui.ide</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_10')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_10"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Common</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_10')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_10"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Common</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_10" 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/javadoc/org/eclipse/emf/cdo/common/package-summary.html" target="content">org.eclipse.emf.cdo.common</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-summary.html" target="content">org.eclipse.emf.cdo.common.branch</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/package-summary.html" target="content">org.eclipse.emf.cdo.common.commit</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/handler/package-summary.html" target="content">org.eclipse.emf.cdo.common.commit.handler</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/id/package-summary.html" target="content">org.eclipse.emf.cdo.common.id</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lob/package-summary.html" target="content">org.eclipse.emf.cdo.common.lob</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/package-summary.html" target="content">org.eclipse.emf.cdo.common.lock</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-summary.html" target="content">org.eclipse.emf.cdo.common.model</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/protocol/package-summary.html" target="content">org.eclipse.emf.cdo.common.protocol</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/package-summary.html" target="content">org.eclipse.emf.cdo.common.revision</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/package-summary.html" target="content">org.eclipse.emf.cdo.common.revision.delta</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/package-summary.html" target="content">org.eclipse.emf.cdo.common.util</a></span></div>
-      </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_11')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_11"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-summary.html" target="content">org.eclipse.emf.cdo.common</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-summary.html" target="content">org.eclipse.emf.cdo.common.branch</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/package-summary.html" target="content">org.eclipse.emf.cdo.common.commit</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/handler/package-summary.html" target="content">org.eclipse.emf.cdo.common.commit.handler</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/id/package-summary.html" target="content">org.eclipse.emf.cdo.common.id</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lob/package-summary.html" target="content">org.eclipse.emf.cdo.common.lob</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/lock/package-summary.html" target="content">org.eclipse.emf.cdo.common.lock</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-summary.html" target="content">org.eclipse.emf.cdo.common.model</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/protocol/package-summary.html" target="content">org.eclipse.emf.cdo.common.protocol</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/package-summary.html" target="content">org.eclipse.emf.cdo.common.revision</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/package-summary.html" target="content">org.eclipse.emf.cdo.common.revision.delta</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/package-summary.html" target="content">org.eclipse.emf.cdo.common.util</a></span></div>
+      </div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_11')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_11"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_11" 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/javadoc/org/eclipse/emf/cdo/server/package-summary.html" target="content">org.eclipse.emf.cdo.server</a></span></div>
-        <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/embedded/package-summary.html" target="content">org.eclipse.emf.cdo.server.embedded</a></span></div>
-        <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/mem/package-summary.html" target="content">org.eclipse.emf.cdo.server.mem</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-summary.html" target="content">org.eclipse.emf.cdo.server</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/embedded/package-summary.html" target="content">org.eclipse.emf.cdo.server.embedded</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/mem/package-summary.html" target="content">org.eclipse.emf.cdo.server.mem</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_12')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_12"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;DB</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_12')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_12"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;DB</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_12" 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/javadoc/org/eclipse/emf/cdo/server/db/package-summary.html" target="content">org.eclipse.emf.cdo.server.db</a></span></div>
-        <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/db/mapping/package-summary.html" target="content">org.eclipse.emf.cdo.server.db.mapping</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/package-summary.html" target="content">org.eclipse.emf.cdo.server.db</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db/mapping/package-summary.html" target="content">org.eclipse.emf.cdo.server.db.mapping</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_13')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_13"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db4o/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;DB4O</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_13')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_13"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db4o/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;DB4O</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_13" 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/javadoc/org/eclipse/emf/cdo/server/db4o/package-summary.html" target="content">org.eclipse.emf.cdo.server.db4o</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/db4o/package-summary.html" target="content">org.eclipse.emf.cdo.server.db4o</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_14')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_14"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/hibernate/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;Hibernate</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_14')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_14"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/hibernate/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;Hibernate</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_14" 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/javadoc/org/eclipse/emf/cdo/server/hibernate/package-summary.html" target="content">org.eclipse.emf.cdo.server.hibernate</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/hibernate/package-summary.html" target="content">org.eclipse.emf.cdo.server.hibernate</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_15')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_15"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/mongodb/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;MongoDB</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_15')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_15"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/mongodb/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;MongoDB</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_15" 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/javadoc/org/eclipse/emf/cdo/server/mongodb/package-summary.html" target="content">org.eclipse.emf.cdo.server.mongodb</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/mongodb/package-summary.html" target="content">org.eclipse.emf.cdo.server.mongodb</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_16')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_16"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/net4j/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;Net4j&nbsp;Support</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_16')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_16"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/net4j/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;Net4j&nbsp;Support</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_16" 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/javadoc/org/eclipse/emf/cdo/server/net4j/package-summary.html" target="content">org.eclipse.emf.cdo.server.net4j</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/net4j/package-summary.html" target="content">org.eclipse.emf.cdo.server.net4j</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_17')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_17"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/ocl/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;OCL&nbsp;Support</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_17')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_17"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/ocl/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;OCL&nbsp;Support</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_17" 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/javadoc/org/eclipse/emf/cdo/server/ocl/package-summary.html" target="content">org.eclipse.emf.cdo.server.ocl</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/ocl/package-summary.html" target="content">org.eclipse.emf.cdo.server.ocl</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_18')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_18"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/objectivity/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;Objectivity</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_18')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_18"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/objectivity/package-summary.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;Objectivity</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_18" 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/javadoc/org/eclipse/emf/cdo/server/objectivity/package-summary.html" target="content">org.eclipse.emf.cdo.server.objectivity</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.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_19')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_19"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/reference/schema/index.html" target="content">Extension&nbsp;Point&nbsp;Reference</a></span></div>
     <div id="org_eclipse_emf_cdo_doc_19" style="display:none; margin-left:20px;">
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_20')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_20"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_viewProviders.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_20')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_20"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_viewProviders.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Client</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_20" 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/schemadoc/org_eclipse_emf_cdo_viewProviders.html" target="content">viewProviders</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="extpoint.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_viewProviders.html" target="content">viewProviders</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_21')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_21"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_appExtensions.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_21')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_21"/></a><img src="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_appExtensions.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_21" 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/schemadoc/org_eclipse_emf_cdo_server_appExtensions.html" target="content">appExtensions</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_repositoryFactories.html" target="content">repositoryFactories</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_storeFactories.html" target="content">storeFactories</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="extpoint.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_appExtensions.html" target="content">appExtensions</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="extpoint.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_repositoryFactories.html" target="content">repositoryFactories</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="extpoint.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_storeFactories.html" target="content">storeFactories</a></span></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/schemadoc/org_eclipse_emf_cdo_server_db_mappingStrategies.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;DB</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="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_db_mappingStrategies.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;DB</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_22" 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/schemadoc/org_eclipse_emf_cdo_server_db_mappingStrategies.html" target="content">mappingStrategies</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="extpoint.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_db_mappingStrategies.html" target="content">mappingStrategies</a></span></div>
       </div>
-      <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_server_hibernate_mappingProviderFactories.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;Hibernate</a></span></div>
+      <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="plugin.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_hibernate_mappingProviderFactories.html" target="content">CDO&nbsp;Model&nbsp;Repository&nbsp;Server&nbsp;Hibernate</a></span></div>
       <div id="org_eclipse_emf_cdo_doc_23" 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/schemadoc/org_eclipse_emf_cdo_server_hibernate_mappingProviderFactories.html" target="content">mappingProviderFactories</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="extpoint.gif"/><a href="org.eclipse.emf.cdo.doc/schemadoc/org_eclipse_emf_cdo_server_hibernate_mappingProviderFactories.html" target="content">mappingProviderFactories</a></span></div>
       </div>
     </div>
   </div>
   <div class="te"><span><a href="javascript:toggle('org_eclipse_emf_cdo_doc_24')"><img src="plus.gif" id="img_org_eclipse_emf_cdo_doc_24"/></a><img src="category.gif"/><a href="org.eclipse.emf.cdo.doc/html/online/index.html" target="content">Online&nbsp;Docs</a></span></div>
   <div id="org_eclipse_emf_cdo_doc_24" 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>
+    <div class="te"><span><img src="empty.gif"/><img src="external.gif"/><a href="http://www.eclipse.org/cdo" target="content">Homepage</a></span></div>
+    <div class="te"><span><img src="empty.gif"/><img src="external.gif"/><a href="http://wiki.eclipse.org/CDO" target="content">Wiki</a></span></div>
   </div>
   <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.emf.cdo.doc/about.html" target="content">Legal</a></span></div>
 </div>
@@ -229,49 +229,49 @@
   <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&nbsp;Reference</a></span></div>
     <div id="org_eclipse_net4j_doc_3" style="display:none; margin-left:20px;">
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_4')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_4"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_4')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_4"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport</a></span></div>
       <div id="org_eclipse_net4j_doc_4" style="display:none; margin-left:20px;">
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/package-summary.html" target="content">org.eclipse.net4j</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/acceptor/package-summary.html" target="content">org.eclipse.net4j.acceptor</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/buffer/package-summary.html" target="content">org.eclipse.net4j.buffer</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/channel/package-summary.html" target="content">org.eclipse.net4j.channel</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/connector/package-summary.html" target="content">org.eclipse.net4j.connector</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/protocol/package-summary.html" target="content">org.eclipse.net4j.protocol</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/signal/package-summary.html" target="content">org.eclipse.net4j.signal</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/signal/heartbeat/package-summary.html" target="content">org.eclipse.net4j.signal.heartbeat</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/signal/wrapping/package-summary.html" target="content">org.eclipse.net4j.signal.wrapping</a></span></div>
-      </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_5')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_5"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;HTTP</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/package-summary.html" target="content">org.eclipse.net4j</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/acceptor/package-summary.html" target="content">org.eclipse.net4j.acceptor</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/buffer/package-summary.html" target="content">org.eclipse.net4j.buffer</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/channel/package-summary.html" target="content">org.eclipse.net4j.channel</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/connector/package-summary.html" target="content">org.eclipse.net4j.connector</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/protocol/package-summary.html" target="content">org.eclipse.net4j.protocol</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/signal/package-summary.html" target="content">org.eclipse.net4j.signal</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/signal/heartbeat/package-summary.html" target="content">org.eclipse.net4j.signal.heartbeat</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/signal/wrapping/package-summary.html" target="content">org.eclipse.net4j.signal.wrapping</a></span></div>
+      </div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_5')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_5"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;HTTP</a></span></div>
       <div id="org_eclipse_net4j_doc_5" style="display:none; margin-left:20px;">
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/package-summary.html" target="content">org.eclipse.net4j.http</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/package-summary.html" target="content">org.eclipse.net4j.http</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_6')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_6"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/common/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;HTTP&nbsp;Common</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_6')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_6"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/common/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;HTTP&nbsp;Common</a></span></div>
       <div id="org_eclipse_net4j_doc_6" style="display:none; margin-left:20px;">
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/common/package-summary.html" target="content">org.eclipse.net4j.http.common</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/common/package-summary.html" target="content">org.eclipse.net4j.http.common</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_7')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_7"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/server/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;HTTP&nbsp;Server</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_7')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_7"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/server/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;HTTP&nbsp;Server</a></span></div>
       <div id="org_eclipse_net4j_doc_7" style="display:none; margin-left:20px;">
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/server/package-summary.html" target="content">org.eclipse.net4j.http.server</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/server/package-summary.html" target="content">org.eclipse.net4j.http.server</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_8')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_8"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/jvm/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;JVM</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_8')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_8"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/jvm/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;JVM</a></span></div>
       <div id="org_eclipse_net4j_doc_8" style="display:none; margin-left:20px;">
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/jvm/package-summary.html" target="content">org.eclipse.net4j.jvm</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/jvm/package-summary.html" target="content">org.eclipse.net4j.jvm</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_9')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_9"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/tcp/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;TCP</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_9')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_9"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/tcp/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;TCP</a></span></div>
       <div id="org_eclipse_net4j_doc_9" style="display:none; margin-left:20px;">
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/tcp/package-summary.html" target="content">org.eclipse.net4j.tcp</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/tcp/ssl/package-summary.html" target="content">org.eclipse.net4j.tcp.ssl</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/tcp/package-summary.html" target="content">org.eclipse.net4j.tcp</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/tcp/ssl/package-summary.html" target="content">org.eclipse.net4j.tcp.ssl</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_10')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_10"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/ui/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;UI</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_10')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_10"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/ui/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;UI</a></span></div>
       <div id="org_eclipse_net4j_doc_10" style="display:none; margin-left:20px;">
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/ui/package-summary.html" target="content">org.eclipse.net4j.ui</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/ui/package-summary.html" target="content">org.eclipse.net4j.ui</a></span></div>
       </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/index.html" target="content">Online&nbsp;Docs</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>
+    <div class="te"><span><img src="empty.gif"/><img src="external.gif"/><a href="http://www.eclipse.org/cdo" target="content">Homepage</a></span></div>
+    <div class="te"><span><img src="empty.gif"/><img src="external.gif"/><a href="http://wiki.eclipse.org/CDO" target="content">Wiki</a></span></div>
   </div>
   <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/about.html" target="content">Legal</a></span></div>
 </div>
@@ -282,45 +282,45 @@
   <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&nbsp;Reference</a></span></div>
     <div id="org_eclipse_net4j_db_doc_3" style="display:none; margin-left:20px;">
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_4')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_4"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_4')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_4"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework</a></span></div>
       <div id="org_eclipse_net4j_db_doc_4" 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/javadoc/org/eclipse/net4j/db/package-summary.html" target="content">org.eclipse.net4j.db</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/ddl/package-summary.html" target="content">org.eclipse.net4j.db.ddl</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/dml/package-summary.html" target="content">org.eclipse.net4j.db.dml</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/package-summary.html" target="content">org.eclipse.net4j.db</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/ddl/package-summary.html" target="content">org.eclipse.net4j.db.ddl</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/dml/package-summary.html" target="content">org.eclipse.net4j.db.dml</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_5')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_5"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/derby/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;Derby&nbsp;Adapter</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_5')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_5"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/derby/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;Derby&nbsp;Adapter</a></span></div>
       <div id="org_eclipse_net4j_db_doc_5" 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/javadoc/org/eclipse/net4j/db/derby/package-summary.html" target="content">org.eclipse.net4j.db.derby</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/derby/package-summary.html" target="content">org.eclipse.net4j.db.derby</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_6')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_6"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/h2/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;H2&nbsp;Adapter</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_6')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_6"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/h2/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;H2&nbsp;Adapter</a></span></div>
       <div id="org_eclipse_net4j_db_doc_6" 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/javadoc/org/eclipse/net4j/db/h2/package-summary.html" target="content">org.eclipse.net4j.db.h2</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/h2/package-summary.html" target="content">org.eclipse.net4j.db.h2</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_7')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_7"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/hsqldb/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;HSQLDB&nbsp;Adapter</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_7')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_7"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/hsqldb/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;HSQLDB&nbsp;Adapter</a></span></div>
       <div id="org_eclipse_net4j_db_doc_7" 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/javadoc/org/eclipse/net4j/db/hsqldb/package-summary.html" target="content">org.eclipse.net4j.db.hsqldb</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/hsqldb/package-summary.html" target="content">org.eclipse.net4j.db.hsqldb</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_8')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_8"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/mysql/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;MYSQL&nbsp;Adapter</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_8')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_8"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/mysql/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;MYSQL&nbsp;Adapter</a></span></div>
       <div id="org_eclipse_net4j_db_doc_8" 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/javadoc/org/eclipse/net4j/db/mysql/package-summary.html" target="content">org.eclipse.net4j.db.mysql</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/mysql/package-summary.html" target="content">org.eclipse.net4j.db.mysql</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_9')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_9"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/postgresql/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;PostgreSQL&nbsp;Adapter</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_9')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_9"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/postgresql/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;PostgreSQL&nbsp;Adapter</a></span></div>
       <div id="org_eclipse_net4j_db_doc_9" 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/javadoc/org/eclipse/net4j/db/postgresql/package-summary.html" target="content">org.eclipse.net4j.db.postgresql</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.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/index.html" target="content">Extension&nbsp;Point&nbsp;Reference</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&nbsp;DB&nbsp;Framework</a></span></div>
+      <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="plugin.gif"/><a href="org.eclipse.net4j.db.doc/schemadoc/org_eclipse_net4j_db_dbAdapters.html" target="content">Net4j&nbsp;DB&nbsp;Framework</a></span></div>
       <div id="org_eclipse_net4j_db_doc_11" 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/schemadoc/org_eclipse_net4j_db_dbAdapters.html" target="content">dbAdapters</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="extpoint.gif"/><a href="org.eclipse.net4j.db.doc/schemadoc/org_eclipse_net4j_db_dbAdapters.html" target="content">dbAdapters</a></span></div>
       </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/index.html" target="content">Online&nbsp;Docs</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>
+    <div class="te"><span><img src="empty.gif"/><img src="external.gif"/><a href="http://www.eclipse.org/cdo" target="content">Homepage</a></span></div>
+    <div class="te"><span><img src="empty.gif"/><img src="external.gif"/><a href="http://wiki.eclipse.org/CDO" target="content">Wiki</a></span></div>
   </div>
   <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.db.doc/about.html" target="content">Legal</a></span></div>
 </div>
@@ -331,57 +331,57 @@
   <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&nbsp;Reference</a></span></div>
     <div id="org_eclipse_net4j_util_doc_3" style="display:none; margin-left:20px;">
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_4')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_4"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/package-summary.html" target="content">Net4j&nbsp;Utilities</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_4')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_4"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/package-summary.html" target="content">Net4j&nbsp;Utilities</a></span></div>
       <div id="org_eclipse_net4j_util_doc_4" 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/javadoc/org/eclipse/net4j/util/package-summary.html" target="content">org.eclipse.net4j.util</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/package-summary.html" target="content">org.eclipse.net4j.util.cache</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/package-summary.html" target="content">org.eclipse.net4j.util.collection</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/package-summary.html" target="content">org.eclipse.net4j.util.concurrent</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/package-summary.html" target="content">org.eclipse.net4j.util.container</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/package-summary.html" target="content">org.eclipse.net4j.util.container.delegate</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/package-summary.html" target="content">org.eclipse.net4j.util.event</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/package-summary.html" target="content">org.eclipse.net4j.util.factory</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/fsm/package-summary.html" target="content">org.eclipse.net4j.util.fsm</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/io/package-summary.html" target="content">org.eclipse.net4j.util.io</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/lifecycle/package-summary.html" target="content">org.eclipse.net4j.util.lifecycle</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/package-summary.html" target="content">org.eclipse.net4j.util.om</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/log/package-summary.html" target="content">org.eclipse.net4j.util.om.log</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/monitor/package-summary.html" target="content">org.eclipse.net4j.util.om.monitor</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/pref/package-summary.html" target="content">org.eclipse.net4j.util.om.pref</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/trace/package-summary.html" target="content">org.eclipse.net4j.util.om.trace</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/package-summary.html" target="content">org.eclipse.net4j.util.options</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/properties/package-summary.html" target="content">org.eclipse.net4j.util.properties</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ref/package-summary.html" target="content">org.eclipse.net4j.util.ref</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/registry/package-summary.html" target="content">org.eclipse.net4j.util.registry</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/security/package-summary.html" target="content">org.eclipse.net4j.util.security</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/transaction/package-summary.html" target="content">org.eclipse.net4j.util.transaction</a></span></div>
-      </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_5')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_5"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/package-summary.html" target="content">Net4j&nbsp;Utilities&nbsp;UI</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/package-summary.html" target="content">org.eclipse.net4j.util</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/package-summary.html" target="content">org.eclipse.net4j.util.cache</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/package-summary.html" target="content">org.eclipse.net4j.util.collection</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/package-summary.html" target="content">org.eclipse.net4j.util.concurrent</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/package-summary.html" target="content">org.eclipse.net4j.util.container</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/package-summary.html" target="content">org.eclipse.net4j.util.container.delegate</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/package-summary.html" target="content">org.eclipse.net4j.util.event</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/package-summary.html" target="content">org.eclipse.net4j.util.factory</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/fsm/package-summary.html" target="content">org.eclipse.net4j.util.fsm</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/io/package-summary.html" target="content">org.eclipse.net4j.util.io</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/lifecycle/package-summary.html" target="content">org.eclipse.net4j.util.lifecycle</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/package-summary.html" target="content">org.eclipse.net4j.util.om</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/log/package-summary.html" target="content">org.eclipse.net4j.util.om.log</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/monitor/package-summary.html" target="content">org.eclipse.net4j.util.om.monitor</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/pref/package-summary.html" target="content">org.eclipse.net4j.util.om.pref</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/trace/package-summary.html" target="content">org.eclipse.net4j.util.om.trace</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/package-summary.html" target="content">org.eclipse.net4j.util.options</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/properties/package-summary.html" target="content">org.eclipse.net4j.util.properties</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ref/package-summary.html" target="content">org.eclipse.net4j.util.ref</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/registry/package-summary.html" target="content">org.eclipse.net4j.util.registry</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/security/package-summary.html" target="content">org.eclipse.net4j.util.security</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/transaction/package-summary.html" target="content">org.eclipse.net4j.util.transaction</a></span></div>
+      </div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_5')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_5"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/package-summary.html" target="content">Net4j&nbsp;Utilities&nbsp;UI</a></span></div>
       <div id="org_eclipse_net4j_util_doc_5" 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/javadoc/org/eclipse/net4j/util/ui/package-summary.html" target="content">org.eclipse.net4j.util.ui</a></span></div>
-        <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/actions/package-summary.html" target="content">org.eclipse.net4j.util.ui.actions</a></span></div>
-        <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/container/package-summary.html" target="content">org.eclipse.net4j.util.ui.container</a></span></div>
-        <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/dnd/package-summary.html" target="content">org.eclipse.net4j.util.ui.dnd</a></span></div>
-        <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/prefs/package-summary.html" target="content">org.eclipse.net4j.util.ui.prefs</a></span></div>
-        <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/proposals/package-summary.html" target="content">org.eclipse.net4j.util.ui.proposals</a></span></div>
-        <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/security/package-summary.html" target="content">org.eclipse.net4j.util.ui.security</a></span></div>
-        <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/views/package-summary.html" target="content">org.eclipse.net4j.util.ui.views</a></span></div>
-        <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 class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/package-summary.html" target="content">org.eclipse.net4j.util.ui</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/actions/package-summary.html" target="content">org.eclipse.net4j.util.ui.actions</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/container/package-summary.html" target="content">org.eclipse.net4j.util.ui.container</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/dnd/package-summary.html" target="content">org.eclipse.net4j.util.ui.dnd</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/prefs/package-summary.html" target="content">org.eclipse.net4j.util.ui.prefs</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/proposals/package-summary.html" target="content">org.eclipse.net4j.util.ui.proposals</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/security/package-summary.html" target="content">org.eclipse.net4j.util.ui.security</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/views/package-summary.html" target="content">org.eclipse.net4j.util.ui.views</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.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/index.html" target="content">Extension&nbsp;Point&nbsp;Reference</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&nbsp;Utilities</a></span></div>
+      <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="plugin.gif"/><a href="org.eclipse.net4j.util.doc/schemadoc/org_eclipse_net4j_util_elementProcessors.html" target="content">Net4j&nbsp;Utilities</a></span></div>
       <div id="org_eclipse_net4j_util_doc_7" 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/schemadoc/org_eclipse_net4j_util_elementProcessors.html" target="content">elementProcessors</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/schemadoc/org_eclipse_net4j_util_factories.html" target="content">factories</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="extpoint.gif"/><a href="org.eclipse.net4j.util.doc/schemadoc/org_eclipse_net4j_util_elementProcessors.html" target="content">elementProcessors</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="extpoint.gif"/><a href="org.eclipse.net4j.util.doc/schemadoc/org_eclipse_net4j_util_factories.html" target="content">factories</a></span></div>
       </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/index.html" target="content">Online&nbsp;Docs</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>
+    <div class="te"><span><img src="empty.gif"/><img src="external.gif"/><a href="http://www.eclipse.org/cdo" target="content">Homepage</a></span></div>
+    <div class="te"><span><img src="empty.gif"/><img src="external.gif"/><a href="http://wiki.eclipse.org/CDO" target="content">Wiki</a></span></div>
   </div>
   <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/about.html" target="content">Legal</a></span></div>
 </div>
diff --git a/plugins/org.eclipse.emf.cdo.releng/help/usage.html b/plugins/org.eclipse.emf.cdo.releng/help/usage.html
index 4394704747..dd0895aec4 100644
--- a/plugins/org.eclipse.emf.cdo.releng/help/usage.html
+++ b/plugins/org.eclipse.emf.cdo.releng/help/usage.html
@@ -14,7 +14,7 @@
 </div>

 

 <div id="content">

-	<h1>Using the CDO help center</h1>

+	<h1>Using the CDO Help Center</h1>

 	

 	<p>

 	Browse topics in the left frame <span class="icon">(<img

diff --git a/plugins/org.eclipse.net4j.db.doc/images/external.gif b/plugins/org.eclipse.net4j.db.doc/images/external.gif
new file mode 100644
index 0000000000..67f815ea90
--- /dev/null
+++ b/plugins/org.eclipse.net4j.db.doc/images/external.gif
diff --git a/plugins/org.eclipse.net4j.db.doc/images/extpoint.gif b/plugins/org.eclipse.net4j.db.doc/images/extpoint.gif
new file mode 100644
index 0000000000..898669c71f
--- /dev/null
+++ b/plugins/org.eclipse.net4j.db.doc/images/extpoint.gif
diff --git a/plugins/org.eclipse.net4j.db.doc/images/package.gif b/plugins/org.eclipse.net4j.db.doc/images/package.gif
new file mode 100644
index 0000000000..2c1a6190ba
--- /dev/null
+++ b/plugins/org.eclipse.net4j.db.doc/images/package.gif
diff --git a/plugins/org.eclipse.net4j.db.doc/images/plugin.gif b/plugins/org.eclipse.net4j.db.doc/images/plugin.gif
new file mode 100644
index 0000000000..b4cc50fc45
--- /dev/null
+++ b/plugins/org.eclipse.net4j.db.doc/images/plugin.gif
diff --git a/plugins/org.eclipse.net4j.db.doc/javadoc/stylesheet.css b/plugins/org.eclipse.net4j.db.doc/javadoc/stylesheet.css
index caaa9329cf..cbd34286b1 100644
--- a/plugins/org.eclipse.net4j.db.doc/javadoc/stylesheet.css
+++ b/plugins/org.eclipse.net4j.db.doc/javadoc/stylesheet.css
@@ -9,8 +9,8 @@ body { background-color: #FFFFFF; color:#000000 }
 h1 { font-size: 145% }

 

 /* Table colors */

-.TableHeadingColor     { background: #A8C7FF; color:#000000 } /* Mid Blue */

-.TableSubHeadingColor  { background: #E0EBFF; color:#000000 } /* Light Blue */

+.TableHeadingColor     { background: #CCCCFF; color:#000000 } /* Dark mauve */

+.TableSubHeadingColor  { background: #EEEEFF; color:#000000 } /* Light mauve */

 .TableRowColor         { background: #FFFFFF; color:#000000 } /* White */

 

 /* Font used in left-hand frame lists */

@@ -19,7 +19,7 @@ h1 { font-size: 145% }
 .FrameItemFont    { font-size:  90%; font-family: Helvetica, Arial, sans-serif; color:#000000 }

 

 /* Navigation bar fonts and colors */

-.NavBarCell1    { background-color:#E0EBFF; color:#000000} /* Light Blue */

+.NavBarCell1    { background-color:#EEEEFF; color:#000000} /* Light mauve */

 .NavBarCell1Rev { background-color:#00008B; color:#FFFFFF} /* Dark Blue */

 .NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;color:#000000;}

 .NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;color:#FFFFFF;}

diff --git a/plugins/org.eclipse.net4j.db.doc/plugin.xml b/plugins/org.eclipse.net4j.db.doc/plugin.xml
index 71a2e8174d..b9df1fce4b 100644
--- a/plugins/org.eclipse.net4j.db.doc/plugin.xml
+++ b/plugins/org.eclipse.net4j.db.doc/plugin.xml
@@ -16,6 +16,10 @@
    <extension point="org.eclipse.help.toc">
       <toc file="toc.xml" primary="true"/>
       <index path="index"/>
+      <tocIcon id="plugin" altText="Plugin" openIcon="images/plugin.gif"/>
+      <tocIcon id="package" altText="Package" openIcon="images/package.gif"/>
+      <tocIcon id="extpoint" altText="Extension Point" openIcon="images/extpoint.gif"/>
+      <tocIcon id="external" altText="External Article" openIcon="images/external.gif"/>
    </extension>
 
 </plugin>
diff --git a/plugins/org.eclipse.net4j.db.doc/toc.html b/plugins/org.eclipse.net4j.db.doc/toc.html
index 6551ff92b1..393eea2304 100644
--- a/plugins/org.eclipse.net4j.db.doc/toc.html
+++ b/plugins/org.eclipse.net4j.db.doc/toc.html
@@ -5,45 +5,45 @@
   <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&nbsp;Reference</a></span></div>
     <div id="org_eclipse_net4j_db_doc_3" style="display:none; margin-left:20px;">
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_4')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_4"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_4')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_4"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework</a></span></div>
       <div id="org_eclipse_net4j_db_doc_4" 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/javadoc/org/eclipse/net4j/db/package-summary.html" target="content">org.eclipse.net4j.db</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/ddl/package-summary.html" target="content">org.eclipse.net4j.db.ddl</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/dml/package-summary.html" target="content">org.eclipse.net4j.db.dml</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/package-summary.html" target="content">org.eclipse.net4j.db</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/ddl/package-summary.html" target="content">org.eclipse.net4j.db.ddl</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/dml/package-summary.html" target="content">org.eclipse.net4j.db.dml</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_5')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_5"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/derby/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;Derby&nbsp;Adapter</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_5')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_5"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/derby/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;Derby&nbsp;Adapter</a></span></div>
       <div id="org_eclipse_net4j_db_doc_5" 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/javadoc/org/eclipse/net4j/db/derby/package-summary.html" target="content">org.eclipse.net4j.db.derby</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/derby/package-summary.html" target="content">org.eclipse.net4j.db.derby</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_6')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_6"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/h2/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;H2&nbsp;Adapter</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_6')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_6"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/h2/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;H2&nbsp;Adapter</a></span></div>
       <div id="org_eclipse_net4j_db_doc_6" 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/javadoc/org/eclipse/net4j/db/h2/package-summary.html" target="content">org.eclipse.net4j.db.h2</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/h2/package-summary.html" target="content">org.eclipse.net4j.db.h2</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_7')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_7"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/hsqldb/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;HSQLDB&nbsp;Adapter</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_7')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_7"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/hsqldb/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;HSQLDB&nbsp;Adapter</a></span></div>
       <div id="org_eclipse_net4j_db_doc_7" 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/javadoc/org/eclipse/net4j/db/hsqldb/package-summary.html" target="content">org.eclipse.net4j.db.hsqldb</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/hsqldb/package-summary.html" target="content">org.eclipse.net4j.db.hsqldb</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_8')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_8"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/mysql/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;MYSQL&nbsp;Adapter</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_8')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_8"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/mysql/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;MYSQL&nbsp;Adapter</a></span></div>
       <div id="org_eclipse_net4j_db_doc_8" 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/javadoc/org/eclipse/net4j/db/mysql/package-summary.html" target="content">org.eclipse.net4j.db.mysql</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/mysql/package-summary.html" target="content">org.eclipse.net4j.db.mysql</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_9')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_9"/></a><img src="category.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/postgresql/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;PostgreSQL&nbsp;Adapter</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_db_doc_9')"><img src="plus.gif" id="img_org_eclipse_net4j_db_doc_9"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.db.doc/javadoc/org/eclipse/net4j/db/postgresql/package-summary.html" target="content">Net4j&nbsp;DB&nbsp;Framework&nbsp;PostgreSQL&nbsp;Adapter</a></span></div>
       <div id="org_eclipse_net4j_db_doc_9" 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/javadoc/org/eclipse/net4j/db/postgresql/package-summary.html" target="content">org.eclipse.net4j.db.postgresql</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.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/index.html" target="content">Extension&nbsp;Point&nbsp;Reference</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&nbsp;DB&nbsp;Framework</a></span></div>
+      <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="plugin.gif"/><a href="org.eclipse.net4j.db.doc/schemadoc/org_eclipse_net4j_db_dbAdapters.html" target="content">Net4j&nbsp;DB&nbsp;Framework</a></span></div>
       <div id="org_eclipse_net4j_db_doc_11" 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/schemadoc/org_eclipse_net4j_db_dbAdapters.html" target="content">dbAdapters</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="extpoint.gif"/><a href="org.eclipse.net4j.db.doc/schemadoc/org_eclipse_net4j_db_dbAdapters.html" target="content">dbAdapters</a></span></div>
       </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/index.html" target="content">Online&nbsp;Docs</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>
+    <div class="te"><span><img src="empty.gif"/><img src="external.gif"/><a href="http://www.eclipse.org/cdo" target="content">Homepage</a></span></div>
+    <div class="te"><span><img src="empty.gif"/><img src="external.gif"/><a href="http://wiki.eclipse.org/CDO" target="content">Wiki</a></span></div>
   </div>
   <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.db.doc/about.html" target="content">Legal</a></span></div>
 </div>
diff --git a/plugins/org.eclipse.net4j.db.doc/toc.xml b/plugins/org.eclipse.net4j.db.doc/toc.xml
index cb5033e361..345b258456 100644
--- a/plugins/org.eclipse.net4j.db.doc/toc.xml
+++ b/plugins/org.eclipse.net4j.db.doc/toc.xml
@@ -5,36 +5,36 @@
   <topic label="Overview" href="html/Overview.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" />
-        <topic label="org.eclipse.net4j.db.ddl" href="javadoc/org/eclipse/net4j/db/ddl/package-summary.html" />
-        <topic label="org.eclipse.net4j.db.dml" href="javadoc/org/eclipse/net4j/db/dml/package-summary.html" />
+      <topic label="Net4j DB Framework" href="javadoc/org/eclipse/net4j/db/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.net4j.db" href="javadoc/org/eclipse/net4j/db/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.db.ddl" href="javadoc/org/eclipse/net4j/db/ddl/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.db.dml" href="javadoc/org/eclipse/net4j/db/dml/package-summary.html" icon="package" />
       </topic>
-      <topic label="Net4j DB Framework Derby Adapter" href="javadoc/org/eclipse/net4j/db/derby/package-summary.html">
-        <topic label="org.eclipse.net4j.db.derby" href="javadoc/org/eclipse/net4j/db/derby/package-summary.html" />
+      <topic label="Net4j DB Framework Derby Adapter" href="javadoc/org/eclipse/net4j/db/derby/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.net4j.db.derby" href="javadoc/org/eclipse/net4j/db/derby/package-summary.html" icon="package" />
       </topic>
-      <topic label="Net4j DB Framework H2 Adapter" href="javadoc/org/eclipse/net4j/db/h2/package-summary.html">
-        <topic label="org.eclipse.net4j.db.h2" href="javadoc/org/eclipse/net4j/db/h2/package-summary.html" />
+      <topic label="Net4j DB Framework H2 Adapter" href="javadoc/org/eclipse/net4j/db/h2/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.net4j.db.h2" href="javadoc/org/eclipse/net4j/db/h2/package-summary.html" icon="package" />
       </topic>
-      <topic label="Net4j DB Framework HSQLDB Adapter" href="javadoc/org/eclipse/net4j/db/hsqldb/package-summary.html">
-        <topic label="org.eclipse.net4j.db.hsqldb" href="javadoc/org/eclipse/net4j/db/hsqldb/package-summary.html" />
+      <topic label="Net4j DB Framework HSQLDB Adapter" href="javadoc/org/eclipse/net4j/db/hsqldb/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.net4j.db.hsqldb" href="javadoc/org/eclipse/net4j/db/hsqldb/package-summary.html" icon="package" />
       </topic>
-      <topic label="Net4j DB Framework MYSQL Adapter" href="javadoc/org/eclipse/net4j/db/mysql/package-summary.html">
-        <topic label="org.eclipse.net4j.db.mysql" href="javadoc/org/eclipse/net4j/db/mysql/package-summary.html" />
+      <topic label="Net4j DB Framework MYSQL Adapter" href="javadoc/org/eclipse/net4j/db/mysql/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.net4j.db.mysql" href="javadoc/org/eclipse/net4j/db/mysql/package-summary.html" icon="package" />
       </topic>
-      <topic label="Net4j DB Framework PostgreSQL Adapter" href="javadoc/org/eclipse/net4j/db/postgresql/package-summary.html">
-        <topic label="org.eclipse.net4j.db.postgresql" href="javadoc/org/eclipse/net4j/db/postgresql/package-summary.html" />
+      <topic label="Net4j DB Framework PostgreSQL Adapter" href="javadoc/org/eclipse/net4j/db/postgresql/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.net4j.db.postgresql" href="javadoc/org/eclipse/net4j/db/postgresql/package-summary.html" icon="package" />
       </topic>
     </topic>
     <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 label="Net4j DB Framework" href="schemadoc/org_eclipse_net4j_db_dbAdapters.html" icon="plugin">
+        <topic label="dbAdapters" href="schemadoc/org_eclipse_net4j_db_dbAdapters.html" icon="extpoint" />
       </topic>
     </topic>
   </topic>
   <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 label="Homepage" href="http://www.eclipse.org/cdo" icon="external" />
+    <topic label="Wiki" href="http://wiki.eclipse.org/CDO" icon="external" />
   </topic>
   <topic label="Legal" href="about.html" />
 </toc>
diff --git a/plugins/org.eclipse.net4j.doc/images/external.gif b/plugins/org.eclipse.net4j.doc/images/external.gif
new file mode 100644
index 0000000000..67f815ea90
--- /dev/null
+++ b/plugins/org.eclipse.net4j.doc/images/external.gif
diff --git a/plugins/org.eclipse.net4j.doc/images/extpoint.gif b/plugins/org.eclipse.net4j.doc/images/extpoint.gif
new file mode 100644
index 0000000000..898669c71f
--- /dev/null
+++ b/plugins/org.eclipse.net4j.doc/images/extpoint.gif
diff --git a/plugins/org.eclipse.net4j.doc/images/package.gif b/plugins/org.eclipse.net4j.doc/images/package.gif
new file mode 100644
index 0000000000..2c1a6190ba
--- /dev/null
+++ b/plugins/org.eclipse.net4j.doc/images/package.gif
diff --git a/plugins/org.eclipse.net4j.doc/images/plugin.gif b/plugins/org.eclipse.net4j.doc/images/plugin.gif
new file mode 100644
index 0000000000..b4cc50fc45
--- /dev/null
+++ b/plugins/org.eclipse.net4j.doc/images/plugin.gif
diff --git a/plugins/org.eclipse.net4j.doc/images/plugin_obj.gif b/plugins/org.eclipse.net4j.doc/images/plugin_obj.gif
new file mode 100644
index 0000000000..8493df40df
--- /dev/null
+++ b/plugins/org.eclipse.net4j.doc/images/plugin_obj.gif
diff --git a/plugins/org.eclipse.net4j.doc/javadoc/stylesheet.css b/plugins/org.eclipse.net4j.doc/javadoc/stylesheet.css
index caaa9329cf..cbd34286b1 100644
--- a/plugins/org.eclipse.net4j.doc/javadoc/stylesheet.css
+++ b/plugins/org.eclipse.net4j.doc/javadoc/stylesheet.css
@@ -9,8 +9,8 @@ body { background-color: #FFFFFF; color:#000000 }
 h1 { font-size: 145% }

 

 /* Table colors */

-.TableHeadingColor     { background: #A8C7FF; color:#000000 } /* Mid Blue */

-.TableSubHeadingColor  { background: #E0EBFF; color:#000000 } /* Light Blue */

+.TableHeadingColor     { background: #CCCCFF; color:#000000 } /* Dark mauve */

+.TableSubHeadingColor  { background: #EEEEFF; color:#000000 } /* Light mauve */

 .TableRowColor         { background: #FFFFFF; color:#000000 } /* White */

 

 /* Font used in left-hand frame lists */

@@ -19,7 +19,7 @@ h1 { font-size: 145% }
 .FrameItemFont    { font-size:  90%; font-family: Helvetica, Arial, sans-serif; color:#000000 }

 

 /* Navigation bar fonts and colors */

-.NavBarCell1    { background-color:#E0EBFF; color:#000000} /* Light Blue */

+.NavBarCell1    { background-color:#EEEEFF; color:#000000} /* Light mauve */

 .NavBarCell1Rev { background-color:#00008B; color:#FFFFFF} /* Dark Blue */

 .NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;color:#000000;}

 .NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;color:#FFFFFF;}

diff --git a/plugins/org.eclipse.net4j.doc/plugin.xml b/plugins/org.eclipse.net4j.doc/plugin.xml
index bb53800136..8ddf6eefad 100644
--- a/plugins/org.eclipse.net4j.doc/plugin.xml
+++ b/plugins/org.eclipse.net4j.doc/plugin.xml
@@ -16,6 +16,10 @@
    <extension point="org.eclipse.help.toc">
       <toc file="toc.xml" primary="true"/>
       <index path="index"/>
+      <tocIcon id="plugin" altText="Plugin" openIcon="images/plugin.gif"/>
+      <tocIcon id="package" altText="Package" openIcon="images/package.gif"/>
+      <tocIcon id="extpoint" altText="Extension Point" openIcon="images/extpoint.gif"/>
+      <tocIcon id="external" altText="External Article" openIcon="images/external.gif"/>
    </extension>
 
   <extension
diff --git a/plugins/org.eclipse.net4j.doc/toc.html b/plugins/org.eclipse.net4j.doc/toc.html
index 9b57c55d04..df056bd95e 100644
--- a/plugins/org.eclipse.net4j.doc/toc.html
+++ b/plugins/org.eclipse.net4j.doc/toc.html
@@ -5,49 +5,49 @@
   <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&nbsp;Reference</a></span></div>
     <div id="org_eclipse_net4j_doc_3" style="display:none; margin-left:20px;">
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_4')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_4"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_4')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_4"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport</a></span></div>
       <div id="org_eclipse_net4j_doc_4" style="display:none; margin-left:20px;">
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/package-summary.html" target="content">org.eclipse.net4j</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/acceptor/package-summary.html" target="content">org.eclipse.net4j.acceptor</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/buffer/package-summary.html" target="content">org.eclipse.net4j.buffer</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/channel/package-summary.html" target="content">org.eclipse.net4j.channel</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/connector/package-summary.html" target="content">org.eclipse.net4j.connector</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/protocol/package-summary.html" target="content">org.eclipse.net4j.protocol</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/signal/package-summary.html" target="content">org.eclipse.net4j.signal</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/signal/heartbeat/package-summary.html" target="content">org.eclipse.net4j.signal.heartbeat</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/signal/wrapping/package-summary.html" target="content">org.eclipse.net4j.signal.wrapping</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/package-summary.html" target="content">org.eclipse.net4j</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/acceptor/package-summary.html" target="content">org.eclipse.net4j.acceptor</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/buffer/package-summary.html" target="content">org.eclipse.net4j.buffer</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/channel/package-summary.html" target="content">org.eclipse.net4j.channel</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/connector/package-summary.html" target="content">org.eclipse.net4j.connector</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/protocol/package-summary.html" target="content">org.eclipse.net4j.protocol</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/signal/package-summary.html" target="content">org.eclipse.net4j.signal</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/signal/heartbeat/package-summary.html" target="content">org.eclipse.net4j.signal.heartbeat</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/signal/wrapping/package-summary.html" target="content">org.eclipse.net4j.signal.wrapping</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_5')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_5"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;HTTP</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_5')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_5"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;HTTP</a></span></div>
       <div id="org_eclipse_net4j_doc_5" style="display:none; margin-left:20px;">
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/package-summary.html" target="content">org.eclipse.net4j.http</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/package-summary.html" target="content">org.eclipse.net4j.http</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_6')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_6"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/common/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;HTTP&nbsp;Common</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_6')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_6"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/common/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;HTTP&nbsp;Common</a></span></div>
       <div id="org_eclipse_net4j_doc_6" style="display:none; margin-left:20px;">
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/common/package-summary.html" target="content">org.eclipse.net4j.http.common</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/common/package-summary.html" target="content">org.eclipse.net4j.http.common</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_7')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_7"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/server/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;HTTP&nbsp;Server</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_7')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_7"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/server/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;HTTP&nbsp;Server</a></span></div>
       <div id="org_eclipse_net4j_doc_7" style="display:none; margin-left:20px;">
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/server/package-summary.html" target="content">org.eclipse.net4j.http.server</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/server/package-summary.html" target="content">org.eclipse.net4j.http.server</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_8')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_8"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/jvm/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;JVM</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_8')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_8"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/jvm/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;JVM</a></span></div>
       <div id="org_eclipse_net4j_doc_8" style="display:none; margin-left:20px;">
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/jvm/package-summary.html" target="content">org.eclipse.net4j.jvm</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/jvm/package-summary.html" target="content">org.eclipse.net4j.jvm</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_9')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_9"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/tcp/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;TCP</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_9')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_9"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/tcp/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;Transport&nbsp;TCP</a></span></div>
       <div id="org_eclipse_net4j_doc_9" style="display:none; margin-left:20px;">
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/tcp/package-summary.html" target="content">org.eclipse.net4j.tcp</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/tcp/ssl/package-summary.html" target="content">org.eclipse.net4j.tcp.ssl</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/tcp/package-summary.html" target="content">org.eclipse.net4j.tcp</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/tcp/ssl/package-summary.html" target="content">org.eclipse.net4j.tcp.ssl</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_10')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_10"/></a><img src="category.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/ui/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;UI</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_doc_10')"><img src="plus.gif" id="img_org_eclipse_net4j_doc_10"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/ui/package-summary.html" target="content">Net4j&nbsp;Signalling&nbsp;Platform&nbsp;UI</a></span></div>
       <div id="org_eclipse_net4j_doc_10" style="display:none; margin-left:20px;">
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/ui/package-summary.html" target="content">org.eclipse.net4j.ui</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/ui/package-summary.html" target="content">org.eclipse.net4j.ui</a></span></div>
       </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/index.html" target="content">Online&nbsp;Docs</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>
+    <div class="te"><span><img src="empty.gif"/><img src="external.gif"/><a href="http://www.eclipse.org/cdo" target="content">Homepage</a></span></div>
+    <div class="te"><span><img src="empty.gif"/><img src="external.gif"/><a href="http://wiki.eclipse.org/CDO" target="content">Wiki</a></span></div>
   </div>
   <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.doc/about.html" target="content">Legal</a></span></div>
 </div>
diff --git a/plugins/org.eclipse.net4j.doc/toc.xml b/plugins/org.eclipse.net4j.doc/toc.xml
index 0d12b7a810..aad63d3142 100644
--- a/plugins/org.eclipse.net4j.doc/toc.xml
+++ b/plugins/org.eclipse.net4j.doc/toc.xml
@@ -5,41 +5,41 @@
   <topic label="Overview" href="html/Overview.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" />
-        <topic label="org.eclipse.net4j.acceptor" href="javadoc/org/eclipse/net4j/acceptor/package-summary.html" />
-        <topic label="org.eclipse.net4j.buffer" href="javadoc/org/eclipse/net4j/buffer/package-summary.html" />
-        <topic label="org.eclipse.net4j.channel" href="javadoc/org/eclipse/net4j/channel/package-summary.html" />
-        <topic label="org.eclipse.net4j.connector" href="javadoc/org/eclipse/net4j/connector/package-summary.html" />
-        <topic label="org.eclipse.net4j.protocol" href="javadoc/org/eclipse/net4j/protocol/package-summary.html" />
-        <topic label="org.eclipse.net4j.signal" href="javadoc/org/eclipse/net4j/signal/package-summary.html" />
-        <topic label="org.eclipse.net4j.signal.heartbeat" href="javadoc/org/eclipse/net4j/signal/heartbeat/package-summary.html" />
-        <topic label="org.eclipse.net4j.signal.wrapping" href="javadoc/org/eclipse/net4j/signal/wrapping/package-summary.html" />
+      <topic label="Net4j Signalling Platform Transport" href="javadoc/org/eclipse/net4j/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.net4j" href="javadoc/org/eclipse/net4j/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.acceptor" href="javadoc/org/eclipse/net4j/acceptor/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.buffer" href="javadoc/org/eclipse/net4j/buffer/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.channel" href="javadoc/org/eclipse/net4j/channel/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.connector" href="javadoc/org/eclipse/net4j/connector/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.protocol" href="javadoc/org/eclipse/net4j/protocol/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.signal" href="javadoc/org/eclipse/net4j/signal/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.signal.heartbeat" href="javadoc/org/eclipse/net4j/signal/heartbeat/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.signal.wrapping" href="javadoc/org/eclipse/net4j/signal/wrapping/package-summary.html" icon="package" />
       </topic>
-      <topic label="Net4j Signalling Platform Transport HTTP" href="javadoc/org/eclipse/net4j/http/package-summary.html">
-        <topic label="org.eclipse.net4j.http" href="javadoc/org/eclipse/net4j/http/package-summary.html" />
+      <topic label="Net4j Signalling Platform Transport HTTP" href="javadoc/org/eclipse/net4j/http/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.net4j.http" href="javadoc/org/eclipse/net4j/http/package-summary.html" icon="package" />
       </topic>
-      <topic label="Net4j Signalling Platform Transport HTTP Common" href="javadoc/org/eclipse/net4j/http/common/package-summary.html">
-        <topic label="org.eclipse.net4j.http.common" href="javadoc/org/eclipse/net4j/http/common/package-summary.html" />
+      <topic label="Net4j Signalling Platform Transport HTTP Common" href="javadoc/org/eclipse/net4j/http/common/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.net4j.http.common" href="javadoc/org/eclipse/net4j/http/common/package-summary.html" icon="package" />
       </topic>
-      <topic label="Net4j Signalling Platform Transport HTTP Server" href="javadoc/org/eclipse/net4j/http/server/package-summary.html">
-        <topic label="org.eclipse.net4j.http.server" href="javadoc/org/eclipse/net4j/http/server/package-summary.html" />
+      <topic label="Net4j Signalling Platform Transport HTTP Server" href="javadoc/org/eclipse/net4j/http/server/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.net4j.http.server" href="javadoc/org/eclipse/net4j/http/server/package-summary.html" icon="package" />
       </topic>
-      <topic label="Net4j Signalling Platform Transport JVM" href="javadoc/org/eclipse/net4j/jvm/package-summary.html">
-        <topic label="org.eclipse.net4j.jvm" href="javadoc/org/eclipse/net4j/jvm/package-summary.html" />
+      <topic label="Net4j Signalling Platform Transport JVM" href="javadoc/org/eclipse/net4j/jvm/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.net4j.jvm" href="javadoc/org/eclipse/net4j/jvm/package-summary.html" icon="package" />
       </topic>
-      <topic label="Net4j Signalling Platform Transport TCP" href="javadoc/org/eclipse/net4j/tcp/package-summary.html">
-        <topic label="org.eclipse.net4j.tcp" href="javadoc/org/eclipse/net4j/tcp/package-summary.html" />
-        <topic label="org.eclipse.net4j.tcp.ssl" href="javadoc/org/eclipse/net4j/tcp/ssl/package-summary.html" />
+      <topic label="Net4j Signalling Platform Transport TCP" href="javadoc/org/eclipse/net4j/tcp/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.net4j.tcp" href="javadoc/org/eclipse/net4j/tcp/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.tcp.ssl" href="javadoc/org/eclipse/net4j/tcp/ssl/package-summary.html" icon="package" />
       </topic>
-      <topic label="Net4j Signalling Platform UI" href="javadoc/org/eclipse/net4j/ui/package-summary.html">
-        <topic label="org.eclipse.net4j.ui" href="javadoc/org/eclipse/net4j/ui/package-summary.html" />
+      <topic label="Net4j Signalling Platform UI" href="javadoc/org/eclipse/net4j/ui/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.net4j.ui" href="javadoc/org/eclipse/net4j/ui/package-summary.html" icon="package" />
       </topic>
     </topic>
   </topic>
   <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 label="Homepage" href="http://www.eclipse.org/cdo" icon="external" />
+    <topic label="Wiki" href="http://wiki.eclipse.org/CDO" icon="external" />
   </topic>
   <topic label="Legal" href="about.html" />
 </toc>
diff --git a/plugins/org.eclipse.net4j.util.doc/images/external.gif b/plugins/org.eclipse.net4j.util.doc/images/external.gif
new file mode 100644
index 0000000000..67f815ea90
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/images/external.gif
diff --git a/plugins/org.eclipse.net4j.util.doc/images/extpoint.gif b/plugins/org.eclipse.net4j.util.doc/images/extpoint.gif
new file mode 100644
index 0000000000..898669c71f
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/images/extpoint.gif
diff --git a/plugins/org.eclipse.net4j.util.doc/images/package.gif b/plugins/org.eclipse.net4j.util.doc/images/package.gif
new file mode 100644
index 0000000000..2c1a6190ba
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/images/package.gif
diff --git a/plugins/org.eclipse.net4j.util.doc/images/plugin.gif b/plugins/org.eclipse.net4j.util.doc/images/plugin.gif
new file mode 100644
index 0000000000..b4cc50fc45
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util.doc/images/plugin.gif
diff --git a/plugins/org.eclipse.net4j.util.doc/javadoc/stylesheet.css b/plugins/org.eclipse.net4j.util.doc/javadoc/stylesheet.css
index caaa9329cf..cbd34286b1 100644
--- a/plugins/org.eclipse.net4j.util.doc/javadoc/stylesheet.css
+++ b/plugins/org.eclipse.net4j.util.doc/javadoc/stylesheet.css
@@ -9,8 +9,8 @@ body { background-color: #FFFFFF; color:#000000 }
 h1 { font-size: 145% }

 

 /* Table colors */

-.TableHeadingColor     { background: #A8C7FF; color:#000000 } /* Mid Blue */

-.TableSubHeadingColor  { background: #E0EBFF; color:#000000 } /* Light Blue */

+.TableHeadingColor     { background: #CCCCFF; color:#000000 } /* Dark mauve */

+.TableSubHeadingColor  { background: #EEEEFF; color:#000000 } /* Light mauve */

 .TableRowColor         { background: #FFFFFF; color:#000000 } /* White */

 

 /* Font used in left-hand frame lists */

@@ -19,7 +19,7 @@ h1 { font-size: 145% }
 .FrameItemFont    { font-size:  90%; font-family: Helvetica, Arial, sans-serif; color:#000000 }

 

 /* Navigation bar fonts and colors */

-.NavBarCell1    { background-color:#E0EBFF; color:#000000} /* Light Blue */

+.NavBarCell1    { background-color:#EEEEFF; color:#000000} /* Light mauve */

 .NavBarCell1Rev { background-color:#00008B; color:#FFFFFF} /* Dark Blue */

 .NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;color:#000000;}

 .NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;color:#FFFFFF;}

diff --git a/plugins/org.eclipse.net4j.util.doc/plugin.xml b/plugins/org.eclipse.net4j.util.doc/plugin.xml
index 71a2e8174d..b9df1fce4b 100644
--- a/plugins/org.eclipse.net4j.util.doc/plugin.xml
+++ b/plugins/org.eclipse.net4j.util.doc/plugin.xml
@@ -16,6 +16,10 @@
    <extension point="org.eclipse.help.toc">
       <toc file="toc.xml" primary="true"/>
       <index path="index"/>
+      <tocIcon id="plugin" altText="Plugin" openIcon="images/plugin.gif"/>
+      <tocIcon id="package" altText="Package" openIcon="images/package.gif"/>
+      <tocIcon id="extpoint" altText="Extension Point" openIcon="images/extpoint.gif"/>
+      <tocIcon id="external" altText="External Article" openIcon="images/external.gif"/>
    </extension>
 
 </plugin>
diff --git a/plugins/org.eclipse.net4j.util.doc/toc.html b/plugins/org.eclipse.net4j.util.doc/toc.html
index 6449e15a3b..377268677c 100644
--- a/plugins/org.eclipse.net4j.util.doc/toc.html
+++ b/plugins/org.eclipse.net4j.util.doc/toc.html
@@ -5,57 +5,57 @@
   <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&nbsp;Reference</a></span></div>
     <div id="org_eclipse_net4j_util_doc_3" style="display:none; margin-left:20px;">
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_4')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_4"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/package-summary.html" target="content">Net4j&nbsp;Utilities</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_4')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_4"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/package-summary.html" target="content">Net4j&nbsp;Utilities</a></span></div>
       <div id="org_eclipse_net4j_util_doc_4" 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/javadoc/org/eclipse/net4j/util/package-summary.html" target="content">org.eclipse.net4j.util</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/package-summary.html" target="content">org.eclipse.net4j.util.cache</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/package-summary.html" target="content">org.eclipse.net4j.util.collection</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/package-summary.html" target="content">org.eclipse.net4j.util.concurrent</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/package-summary.html" target="content">org.eclipse.net4j.util.container</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/package-summary.html" target="content">org.eclipse.net4j.util.container.delegate</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/package-summary.html" target="content">org.eclipse.net4j.util.event</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/package-summary.html" target="content">org.eclipse.net4j.util.factory</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/fsm/package-summary.html" target="content">org.eclipse.net4j.util.fsm</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/io/package-summary.html" target="content">org.eclipse.net4j.util.io</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/lifecycle/package-summary.html" target="content">org.eclipse.net4j.util.lifecycle</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/package-summary.html" target="content">org.eclipse.net4j.util.om</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/log/package-summary.html" target="content">org.eclipse.net4j.util.om.log</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/monitor/package-summary.html" target="content">org.eclipse.net4j.util.om.monitor</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/pref/package-summary.html" target="content">org.eclipse.net4j.util.om.pref</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/trace/package-summary.html" target="content">org.eclipse.net4j.util.om.trace</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/package-summary.html" target="content">org.eclipse.net4j.util.options</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/properties/package-summary.html" target="content">org.eclipse.net4j.util.properties</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ref/package-summary.html" target="content">org.eclipse.net4j.util.ref</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/registry/package-summary.html" target="content">org.eclipse.net4j.util.registry</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/security/package-summary.html" target="content">org.eclipse.net4j.util.security</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/transaction/package-summary.html" target="content">org.eclipse.net4j.util.transaction</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/package-summary.html" target="content">org.eclipse.net4j.util</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/cache/package-summary.html" target="content">org.eclipse.net4j.util.cache</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/collection/package-summary.html" target="content">org.eclipse.net4j.util.collection</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/package-summary.html" target="content">org.eclipse.net4j.util.concurrent</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/package-summary.html" target="content">org.eclipse.net4j.util.container</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/delegate/package-summary.html" target="content">org.eclipse.net4j.util.container.delegate</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/package-summary.html" target="content">org.eclipse.net4j.util.event</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/factory/package-summary.html" target="content">org.eclipse.net4j.util.factory</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/fsm/package-summary.html" target="content">org.eclipse.net4j.util.fsm</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/io/package-summary.html" target="content">org.eclipse.net4j.util.io</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/lifecycle/package-summary.html" target="content">org.eclipse.net4j.util.lifecycle</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/package-summary.html" target="content">org.eclipse.net4j.util.om</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/log/package-summary.html" target="content">org.eclipse.net4j.util.om.log</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/monitor/package-summary.html" target="content">org.eclipse.net4j.util.om.monitor</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/pref/package-summary.html" target="content">org.eclipse.net4j.util.om.pref</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/trace/package-summary.html" target="content">org.eclipse.net4j.util.om.trace</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/package-summary.html" target="content">org.eclipse.net4j.util.options</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/properties/package-summary.html" target="content">org.eclipse.net4j.util.properties</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ref/package-summary.html" target="content">org.eclipse.net4j.util.ref</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/registry/package-summary.html" target="content">org.eclipse.net4j.util.registry</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/security/package-summary.html" target="content">org.eclipse.net4j.util.security</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/transaction/package-summary.html" target="content">org.eclipse.net4j.util.transaction</a></span></div>
       </div>
-      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_5')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_5"/></a><img src="category.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/package-summary.html" target="content">Net4j&nbsp;Utilities&nbsp;UI</a></span></div>
+      <div class="te"><span><a href="javascript:toggle('org_eclipse_net4j_util_doc_5')"><img src="plus.gif" id="img_org_eclipse_net4j_util_doc_5"/></a><img src="plugin.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/package-summary.html" target="content">Net4j&nbsp;Utilities&nbsp;UI</a></span></div>
       <div id="org_eclipse_net4j_util_doc_5" 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/javadoc/org/eclipse/net4j/util/ui/package-summary.html" target="content">org.eclipse.net4j.util.ui</a></span></div>
-        <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/actions/package-summary.html" target="content">org.eclipse.net4j.util.ui.actions</a></span></div>
-        <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/container/package-summary.html" target="content">org.eclipse.net4j.util.ui.container</a></span></div>
-        <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/dnd/package-summary.html" target="content">org.eclipse.net4j.util.ui.dnd</a></span></div>
-        <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/prefs/package-summary.html" target="content">org.eclipse.net4j.util.ui.prefs</a></span></div>
-        <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/proposals/package-summary.html" target="content">org.eclipse.net4j.util.ui.proposals</a></span></div>
-        <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/security/package-summary.html" target="content">org.eclipse.net4j.util.ui.security</a></span></div>
-        <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/views/package-summary.html" target="content">org.eclipse.net4j.util.ui.views</a></span></div>
-        <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 class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/package-summary.html" target="content">org.eclipse.net4j.util.ui</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/actions/package-summary.html" target="content">org.eclipse.net4j.util.ui.actions</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/container/package-summary.html" target="content">org.eclipse.net4j.util.ui.container</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/dnd/package-summary.html" target="content">org.eclipse.net4j.util.ui.dnd</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/prefs/package-summary.html" target="content">org.eclipse.net4j.util.ui.prefs</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/proposals/package-summary.html" target="content">org.eclipse.net4j.util.ui.proposals</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/security/package-summary.html" target="content">org.eclipse.net4j.util.ui.security</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.gif"/><a href="org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/ui/views/package-summary.html" target="content">org.eclipse.net4j.util.ui.views</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="package.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/index.html" target="content">Extension&nbsp;Point&nbsp;Reference</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&nbsp;Utilities</a></span></div>
+      <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="plugin.gif"/><a href="org.eclipse.net4j.util.doc/schemadoc/org_eclipse_net4j_util_elementProcessors.html" target="content">Net4j&nbsp;Utilities</a></span></div>
       <div id="org_eclipse_net4j_util_doc_7" 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/schemadoc/org_eclipse_net4j_util_elementProcessors.html" target="content">elementProcessors</a></span></div>
-        <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/schemadoc/org_eclipse_net4j_util_factories.html" target="content">factories</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="extpoint.gif"/><a href="org.eclipse.net4j.util.doc/schemadoc/org_eclipse_net4j_util_elementProcessors.html" target="content">elementProcessors</a></span></div>
+        <div class="te"><span><img src="empty.gif"/><img src="extpoint.gif"/><a href="org.eclipse.net4j.util.doc/schemadoc/org_eclipse_net4j_util_factories.html" target="content">factories</a></span></div>
       </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/index.html" target="content">Online&nbsp;Docs</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>
+    <div class="te"><span><img src="empty.gif"/><img src="external.gif"/><a href="http://www.eclipse.org/cdo" target="content">Homepage</a></span></div>
+    <div class="te"><span><img src="empty.gif"/><img src="external.gif"/><a href="http://wiki.eclipse.org/CDO" target="content">Wiki</a></span></div>
   </div>
   <div class="te"><span><img src="empty.gif"/><img src="article.gif"/><a href="org.eclipse.net4j.util.doc/about.html" target="content">Legal</a></span></div>
 </div>
diff --git a/plugins/org.eclipse.net4j.util.doc/toc.xml b/plugins/org.eclipse.net4j.util.doc/toc.xml
index 342d6ee82f..0d7dedc9e8 100644
--- a/plugins/org.eclipse.net4j.util.doc/toc.xml
+++ b/plugins/org.eclipse.net4j.util.doc/toc.xml
@@ -5,52 +5,52 @@
   <topic label="Overview" href="html/Overview.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" />
-        <topic label="org.eclipse.net4j.util.cache" href="javadoc/org/eclipse/net4j/util/cache/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.collection" href="javadoc/org/eclipse/net4j/util/collection/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.concurrent" href="javadoc/org/eclipse/net4j/util/concurrent/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.container" href="javadoc/org/eclipse/net4j/util/container/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.container.delegate" href="javadoc/org/eclipse/net4j/util/container/delegate/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.event" href="javadoc/org/eclipse/net4j/util/event/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.factory" href="javadoc/org/eclipse/net4j/util/factory/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.fsm" href="javadoc/org/eclipse/net4j/util/fsm/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.io" href="javadoc/org/eclipse/net4j/util/io/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.lifecycle" href="javadoc/org/eclipse/net4j/util/lifecycle/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.om" href="javadoc/org/eclipse/net4j/util/om/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.om.log" href="javadoc/org/eclipse/net4j/util/om/log/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.om.monitor" href="javadoc/org/eclipse/net4j/util/om/monitor/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.om.pref" href="javadoc/org/eclipse/net4j/util/om/pref/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.om.trace" href="javadoc/org/eclipse/net4j/util/om/trace/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.options" href="javadoc/org/eclipse/net4j/util/options/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.properties" href="javadoc/org/eclipse/net4j/util/properties/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.ref" href="javadoc/org/eclipse/net4j/util/ref/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.registry" href="javadoc/org/eclipse/net4j/util/registry/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.security" href="javadoc/org/eclipse/net4j/util/security/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.transaction" href="javadoc/org/eclipse/net4j/util/transaction/package-summary.html" />
+      <topic label="Net4j Utilities" href="javadoc/org/eclipse/net4j/util/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.net4j.util" href="javadoc/org/eclipse/net4j/util/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.cache" href="javadoc/org/eclipse/net4j/util/cache/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.collection" href="javadoc/org/eclipse/net4j/util/collection/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.concurrent" href="javadoc/org/eclipse/net4j/util/concurrent/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.container" href="javadoc/org/eclipse/net4j/util/container/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.container.delegate" href="javadoc/org/eclipse/net4j/util/container/delegate/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.event" href="javadoc/org/eclipse/net4j/util/event/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.factory" href="javadoc/org/eclipse/net4j/util/factory/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.fsm" href="javadoc/org/eclipse/net4j/util/fsm/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.io" href="javadoc/org/eclipse/net4j/util/io/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.lifecycle" href="javadoc/org/eclipse/net4j/util/lifecycle/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.om" href="javadoc/org/eclipse/net4j/util/om/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.om.log" href="javadoc/org/eclipse/net4j/util/om/log/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.om.monitor" href="javadoc/org/eclipse/net4j/util/om/monitor/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.om.pref" href="javadoc/org/eclipse/net4j/util/om/pref/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.om.trace" href="javadoc/org/eclipse/net4j/util/om/trace/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.options" href="javadoc/org/eclipse/net4j/util/options/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.properties" href="javadoc/org/eclipse/net4j/util/properties/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.ref" href="javadoc/org/eclipse/net4j/util/ref/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.registry" href="javadoc/org/eclipse/net4j/util/registry/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.security" href="javadoc/org/eclipse/net4j/util/security/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.transaction" href="javadoc/org/eclipse/net4j/util/transaction/package-summary.html" icon="package" />
       </topic>
-      <topic label="Net4j Utilities UI" href="javadoc/org/eclipse/net4j/util/ui/package-summary.html">
-        <topic label="org.eclipse.net4j.util.ui" href="javadoc/org/eclipse/net4j/util/ui/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.ui.actions" href="javadoc/org/eclipse/net4j/util/ui/actions/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.ui.container" href="javadoc/org/eclipse/net4j/util/ui/container/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.ui.dnd" href="javadoc/org/eclipse/net4j/util/ui/dnd/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.ui.prefs" href="javadoc/org/eclipse/net4j/util/ui/prefs/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.ui.proposals" href="javadoc/org/eclipse/net4j/util/ui/proposals/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.ui.security" href="javadoc/org/eclipse/net4j/util/ui/security/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.ui.views" href="javadoc/org/eclipse/net4j/util/ui/views/package-summary.html" />
-        <topic label="org.eclipse.net4j.util.ui.widgets" href="javadoc/org/eclipse/net4j/util/ui/widgets/package-summary.html" />
+      <topic label="Net4j Utilities UI" href="javadoc/org/eclipse/net4j/util/ui/package-summary.html" icon="plugin">
+        <topic label="org.eclipse.net4j.util.ui" href="javadoc/org/eclipse/net4j/util/ui/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.ui.actions" href="javadoc/org/eclipse/net4j/util/ui/actions/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.ui.container" href="javadoc/org/eclipse/net4j/util/ui/container/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.ui.dnd" href="javadoc/org/eclipse/net4j/util/ui/dnd/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.ui.prefs" href="javadoc/org/eclipse/net4j/util/ui/prefs/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.ui.proposals" href="javadoc/org/eclipse/net4j/util/ui/proposals/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.ui.security" href="javadoc/org/eclipse/net4j/util/ui/security/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.ui.views" href="javadoc/org/eclipse/net4j/util/ui/views/package-summary.html" icon="package" />
+        <topic label="org.eclipse.net4j.util.ui.widgets" href="javadoc/org/eclipse/net4j/util/ui/widgets/package-summary.html" icon="package" />
       </topic>
     </topic>
     <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 label="Net4j Utilities" href="schemadoc/org_eclipse_net4j_util_elementProcessors.html" icon="plugin">
+        <topic label="elementProcessors" href="schemadoc/org_eclipse_net4j_util_elementProcessors.html" icon="extpoint" />
+        <topic label="factories" href="schemadoc/org_eclipse_net4j_util_factories.html" icon="extpoint" />
       </topic>
     </topic>
   </topic>
   <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 label="Homepage" href="http://www.eclipse.org/cdo" icon="external" />
+    <topic label="Wiki" href="http://wiki.eclipse.org/CDO" icon="external" />
   </topic>
   <topic label="Legal" href="about.html" />
 </toc>