From bfdbe2ef2ca42e562f10f8936ddbbe898a773a1f Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Fri, 27 May 2011 10:04:19 +0000
Subject: [PATCH] More minor site cleanup.

---
 opendj3/opendj-ldap-toolkit/src/site/site.xml      |   21 ++++------
 opendj3/opendj-ldap-sdk/src/site/site.xml          |   21 ++++------
 opendj3/src/site/xdoc/index.xml                    |    2 
 opendj3/opendj-ldap-sdk-examples/src/site/site.xml |   21 ++++------
 opendj3/src/site/site.xml                          |   37 ++++--------------
 5 files changed, 33 insertions(+), 69 deletions(-)

diff --git a/opendj3/opendj-ldap-sdk-examples/src/site/site.xml b/opendj3/opendj-ldap-sdk-examples/src/site/site.xml
index 564977e..f103270 100644
--- a/opendj3/opendj-ldap-sdk-examples/src/site/site.xml
+++ b/opendj3/opendj-ldap-sdk-examples/src/site/site.xml
@@ -28,16 +28,14 @@
   xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.1 http://maven.apache.org/xsd/decoration-1.0.1.xsd">
   <body>
     <menu name="OpenDJ LDAP SDK Examples">
-      <item name="Welcome" href="index.html" />
+      <item name="Welcome" href="../index.html" />
       <item name="News" href="../news.html" />
-      <item name="Join"
-        href="https://idp.forgerock.org/openam/UI/Login?service=register" />
       <item name="Downloads" href="http://www.forgerock.com/downloads-opendj.html" />
       <item name="FAQ" href="../faq.html" />
+      <item name="Wiki" href="http://wikis.forgerock.org/opendj/" />
       <item name="Mailing Lists" href="../mail-lists.html" />
       <item name="Support" href="http://forgerock.com/subscriptions.html" />
       <item name="Partners" href="http://forgerock.com/partners.html" />
-      <item name="Wiki" href="http://wikis.forgerock.org/opendj/" />
     </menu>
 
     <menu name="OpenDJ LDAP SDK">
@@ -46,22 +44,19 @@
       <item name="Toolkit" href="../opendj-ldap-toolkit" />
     </menu>
 
-    <menu name="Documentation">
-      <item name="Developer Guide" href="../doc/dev-guide/OpenDJ-Dev-Guide.html" collapse="true">
-        <item name="EPUB Format" href="../doc/OpenDJ-Dev-Guide.epub" />
-        <item name="HTML Format" href="../doc/dev-guide/OpenDJ-Dev-Guide.html" />
-        <item name="PDF Format" href="../doc/OpenDJ-Dev-Guide.pdf" />
-        <item name="RTF Format" href="../doc/OpenDJ-Dev-Guide.rtf" />
-      </item>
+    <menu name="OpenDJ Documentation">
+      <item name="All Documentation" href="../docs.html"/>
+      <item name="Developer Guide" href="../doc/dev-guide/OpenDJ-Dev-Guide.html"/>
       <item name="Javadoc" href="apidocs/index.html" />
       <item name="Source code XREF" href="xref/index.html" />
     </menu>
 
-    <menu name="Project Information">
+    <menu name="OpenDJ Development">
+      <item name="Join"
+        href="https://idp.forgerock.org/openam/UI/Login?service=register" />
       <item name="Continuous Integration" href="integration.html" />
       <item name="Maven Repository" href="distribution-management.html" />
       <item name="Issue Tracking" href="issue-tracking.html" />
-      <item name="Mailing Lists" href="mail-lists.html" />
       <item name="License" href="license.html" />
       <item name="Source Repository" href="source-repository.html" />
     </menu>
diff --git a/opendj3/opendj-ldap-sdk/src/site/site.xml b/opendj3/opendj-ldap-sdk/src/site/site.xml
index 48d3041..94cfb76 100644
--- a/opendj3/opendj-ldap-sdk/src/site/site.xml
+++ b/opendj3/opendj-ldap-sdk/src/site/site.xml
@@ -28,16 +28,14 @@
   xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.1 http://maven.apache.org/xsd/decoration-1.0.1.xsd">
   <body>
     <menu name="OpenDJ LDAP SDK">
-      <item name="Welcome" href="index.html" />
+      <item name="Welcome" href="../index.html" />
       <item name="News" href="../news.html" />
-      <item name="Join"
-        href="https://idp.forgerock.org/openam/UI/Login?service=register" />
       <item name="Downloads" href="http://www.forgerock.com/downloads-opendj.html" />
       <item name="FAQ" href="../faq.html" />
+      <item name="Wiki" href="http://wikis.forgerock.org/opendj/" />
       <item name="Mailing Lists" href="../mail-lists.html" />
       <item name="Support" href="http://forgerock.com/subscriptions.html" />
       <item name="Partners" href="http://forgerock.com/partners.html" />
-      <item name="Wiki" href="http://wikis.forgerock.org/opendj/" />
     </menu>
 
     <menu name="OpenDJ LDAP SDK">
@@ -46,21 +44,18 @@
       <item name="Toolkit" href="../opendj-ldap-toolkit" />
     </menu>
 
-    <menu name="Documentation">
-      <item name="Developer Guide" href="../doc/dev-guide/OpenDJ-Dev-Guide.html" collapse="true">
-        <item name="EPUB Format" href="../doc/OpenDJ-Dev-Guide.epub" />
-        <item name="HTML Format" href="../doc/dev-guide/OpenDJ-Dev-Guide.html" />
-        <item name="PDF Format" href="../doc/OpenDJ-Dev-Guide.pdf" />
-        <item name="RTF Format" href="../doc/OpenDJ-Dev-Guide.rtf" />
-      </item>
+    <menu name="OpenDJ Documentation">
+      <item name="All Documentation" href="../docs.html"/>
+      <item name="Developer Guide" href="../doc/dev-guide/OpenDJ-Dev-Guide.html"/>
       <item name="Javadoc" href="apidocs/index.html" />
     </menu>
 
-    <menu name="Project Information">
+    <menu name="OpenDJ Development">
+      <item name="Join"
+        href="https://idp.forgerock.org/openam/UI/Login?service=register" />
       <item name="Continuous Integration" href="integration.html" />
       <item name="Maven Repository" href="distribution-management.html" />
       <item name="Issue Tracking" href="issue-tracking.html" />
-      <item name="Mailing Lists" href="mail-lists.html" />
       <item name="License" href="license.html" />
       <item name="Source Repository" href="source-repository.html" />
     </menu>
diff --git a/opendj3/opendj-ldap-toolkit/src/site/site.xml b/opendj3/opendj-ldap-toolkit/src/site/site.xml
index 0a4d696..00cb226 100644
--- a/opendj3/opendj-ldap-toolkit/src/site/site.xml
+++ b/opendj3/opendj-ldap-toolkit/src/site/site.xml
@@ -28,16 +28,14 @@
   xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.1 http://maven.apache.org/xsd/decoration-1.0.1.xsd">
   <body>
     <menu name="OpenDJ LDAP Toolkit">
-      <item name="Welcome" href="index.html" />
+      <item name="Welcome" href="../index.html" />
       <item name="News" href="../news.html" />
-      <item name="Join"
-        href="https://idp.forgerock.org/openam/UI/Login?service=register" />
       <item name="Downloads" href="http://www.forgerock.com/downloads-opendj.html" />
       <item name="FAQ" href="../faq.html" />
+      <item name="Wiki" href="http://wikis.forgerock.org/opendj/" />
       <item name="Mailing Lists" href="../mail-lists.html" />
       <item name="Support" href="http://forgerock.com/subscriptions.html" />
       <item name="Partners" href="http://forgerock.com/partners.html" />
-      <item name="Wiki" href="http://wikis.forgerock.org/opendj/" />
     </menu>
 
     <menu name="OpenDJ LDAP SDK">
@@ -46,20 +44,17 @@
       <item name="Toolkit" href="index.html" />
     </menu>
 
-    <menu name="Documentation">
-      <item name="Developer Guide" href="../doc/dev-guide/OpenDJ-Dev-Guide.html" collapse="true">
-        <item name="EPUB Format" href="../doc/OpenDJ-Dev-Guide.epub" />
-        <item name="HTML Format" href="../doc/dev-guide/OpenDJ-Dev-Guide.html" />
-        <item name="PDF Format" href="../doc/OpenDJ-Dev-Guide.pdf" />
-        <item name="RTF Format" href="../doc/OpenDJ-Dev-Guide.rtf" />
-      </item>
+    <menu name="OpenDJ Documentation">
+      <item name="All Documentation" href="../docs.html"/>
+      <item name="Developer Guide" href="../doc/dev-guide/OpenDJ-Dev-Guide.html"/>
     </menu>
 
-    <menu name="Project Information">
+    <menu name="OpenDJ Development">
+      <item name="Join"
+        href="https://idp.forgerock.org/openam/UI/Login?service=register" />
       <item name="Continuous Integration" href="integration.html" />
       <item name="Maven Repository" href="distribution-management.html" />
       <item name="Issue Tracking" href="issue-tracking.html" />
-      <item name="Mailing Lists" href="mail-lists.html" />
       <item name="License" href="license.html" />
       <item name="Source Repository" href="source-repository.html" />
     </menu>
diff --git a/opendj3/src/site/site.xml b/opendj3/src/site/site.xml
index 9e98016..86aff5f 100644
--- a/opendj3/src/site/site.xml
+++ b/opendj3/src/site/site.xml
@@ -46,13 +46,12 @@
   <menu name="OpenDJ">
    <item name="Welcome" href="index.html" />
    <item name="News" href="news.html" />
-   <item name="Join" href="https://idp.forgerock.org/openam/UI/Login?service=register" />
    <item name="Downloads" href="http://www.forgerock.com/downloads-opendj.html" />
    <item name="FAQ" href="faq.html" />
+   <item name="Wiki" href="http://wikis.forgerock.org/opendj/" />
    <item name="Mailing Lists" href="mail-lists.html" />
    <item name="Support" href="http://forgerock.com/subscriptions.html" />
    <item name="Partners" href="http://forgerock.com/partners.html" />
-   <item name="Wiki" href="http://wikis.forgerock.org/opendj/" />
   </menu>
 
   <menu name="OpenDJ LDAP SDK">
@@ -63,40 +62,20 @@
   
   <menu name="OpenDJ Documentation">
    <item name="All Formats" href="docs.html" />
-   <item name="Release Notes" href="./doc/release-notes/OpenDJ-Release-Notes.html" collapse="true">
-    <item name="EPUB Format" href="./doc/OpenDJ-Release-Notes.epub"/>
-    <item name="HTML Format" href="./doc/release-notes/OpenDJ-Release-Notes.html"/>
-    <item name="PDF Format" href="./doc/OpenDJ-Release-Notes.pdf" />
-    <item name="RTF Format" href="./doc/OpenDJ-Release-Notes.rtf" />
-   </item>
-   <item name="Installation Guide" href="./doc/install-guide/OpenDJ-Install-Guide.html" collapse="true">
-    <item name="EPUB Format" href="./doc/OpenDJ-Install-Guide.epub"/>
-    <item name="HTML Format" href="./doc/install-guide/OpenDJ-Install-Guide.html" />
-    <item name="PDF Format" href="./doc/OpenDJ-Install-Guide.pdf" />
-    <item name="RTF Format" href="./doc/OpenDJ-Install-Guide.rtf" />
-   </item>
-   <item name="Administration Guide" href="./doc/admin-guide/OpenDJ-Admin-Guide.html" collapse="true">
-    <item name="EPUB Format" href="./doc/OpenDJ-Admin-Guide.epub" />
-    <item name="HTML Format" href="./doc/admin-guide/OpenDJ-Admin-Guide.html" />
-    <item name="PDF Format" href="./doc/OpenDJ-Admin-Guide.pdf" />
-    <item name="RTF Format" href="./doc/OpenDJ-Admin-Guide.rtf" />
-   </item>
-   <item name="Developer Guide" href="./doc/dev-guide/OpenDJ-Dev-Guide.html" collapse="true">
-    <item name="EPUB Format" href="./doc/OpenDJ-Dev-Guide.epub" />
-    <item name="HTML Format" href="./doc/dev-guide/OpenDJ-Dev-Guide.html" />
-    <item name="PDF Format" href="./doc/OpenDJ-Dev-Guide.pdf" />
-    <item name="RTF Format" href="./doc/OpenDJ-Dev-Guide.rtf" />
-   </item>
+   <item name="Release Notes" href="./doc/release-notes/OpenDJ-Release-Notes.html" />
+   <item name="Installation Guide" href="./doc/install-guide/OpenDJ-Install-Guide.html" />
+   <item name="Administration Guide" href="./doc/admin-guide/OpenDJ-Admin-Guide.html" />
+   <item name="Developer Guide" href="./doc/dev-guide/OpenDJ-Dev-Guide.html" />
    <item name="Config Reference" href="404.html" alt="TODO" />
    <item name="Plugin Javadoc" href="404.html" alt="TODO" />
    <item name="SDK Javadoc" href="./opendj-ldap-sdk/apidocs/index.html" />
   </menu>
 
-  <menu name="Project Information">
+  <menu name="OpenDJ Development">
+   <item name="Join" href="https://idp.forgerock.org/openam/UI/Login?service=register" />
    <item name="Issue Tracking" href="issue-tracking.html" />
-   <item name="Mailing Lists" href="mail-lists.html" />
    <item name="License" href="license.html" />
-   <item name="Source Repository" href="source-repository.html" />
+   <item name="Source Repository" href="source-repository.html" />  
   </menu>
   
  </body>
diff --git a/opendj3/src/site/xdoc/index.xml b/opendj3/src/site/xdoc/index.xml
index 4c1d26a..3dc30be 100644
--- a/opendj3/src/site/xdoc/index.xml
+++ b/opendj3/src/site/xdoc/index.xml
@@ -32,7 +32,7 @@
   <author email="opendj-dev@forgerock.org">ForgeRock AS</author>
  </properties>
  <body>
-  <section name="About OpenDJ">
+  <section name="About the OpenDJ Project">
    <p>The OpenDJ community actively develops open source directory services,
    including a high performance, highly available, secure directory server,
    built-in data replication, client tools, and an LDAP SDK. OpenDJ offers

--
Gitblit v1.10.0