You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-dev@db.apache.org by mb...@apache.org on 2020/04/26 16:07:22 UTC

[db-jdo-site] 01/01: JDO-779: navigation menu

This is an automated email from the ASF dual-hosted git repository.

mbo pushed a commit to branch reorg-menu
in repository https://gitbox.apache.org/repos/asf/db-jdo-site.git

commit a201f2ea53cbc58899e592bca8fef24c72d8f9d6
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sun Apr 26 18:06:39 2020 +0200

    JDO-779: navigation menu
    
    - Reorganize navigation menu
    - Changed background color of selected menu
    - ToC on pages with subchapters
    - removed extra spacing at the top of the page
---
 src/main/asciidoc/annotations.adoc        |  11 +-
 src/main/asciidoc/attach_detach.adoc      |   9 +-
 src/main/asciidoc/class_types.adoc        |   9 +-
 src/main/asciidoc/dependencies.adoc       |   8 +-
 src/main/asciidoc/downloads.adoc          |  17 ++-
 src/main/asciidoc/enhancement.adoc        |  11 +-
 src/main/asciidoc/exceptions.adoc         |   9 +-
 src/main/asciidoc/extents.adoc            |   9 +-
 src/main/asciidoc/faq.adoc                |  24 ++--
 src/main/asciidoc/fetchgroups.adoc        |   9 +-
 src/main/asciidoc/field_types.adoc        |   9 +-
 src/main/asciidoc/get-involved.adoc       |  15 ++-
 src/main/asciidoc/getting-started.adoc    |  10 ++
 src/main/asciidoc/glossary.adoc           |   9 +-
 src/main/asciidoc/guides-maven-jdo.adoc   |   7 +-
 src/main/asciidoc/guides-replication.adoc |   8 +-
 src/main/asciidoc/impls.adoc              |   9 +-
 src/main/asciidoc/index.adoc              |  14 +--
 src/main/asciidoc/issuetracking.adoc      |  14 +--
 src/main/asciidoc/javadoc.adoc            |  21 ++--
 src/main/asciidoc/jdo_3_0_overview.adoc   |   9 +-
 src/main/asciidoc/jdo_dtd.adoc            |   9 +-
 src/main/asciidoc/jdo_v_jpa.adoc          |   9 +-
 src/main/asciidoc/jdo_v_jpa_api.adoc      |   9 +-
 src/main/asciidoc/jdo_v_jpa_orm.adoc      |   8 +-
 src/main/asciidoc/jdocentral.adoc         |   8 +-
 src/main/asciidoc/jdoconfig_dtd.adoc      |   9 +-
 src/main/asciidoc/jdohelper.adoc          |   9 +-
 src/main/asciidoc/jdoql.adoc              |   9 +-
 src/main/asciidoc/jdoql_methods.adoc      |   9 +-
 src/main/asciidoc/jdoql_result.adoc       |   9 +-
 src/main/asciidoc/jdoquery_dtd.adoc       |   9 +-
 src/main/asciidoc/mail-lists.adoc         |   9 +-
 src/main/asciidoc/metadata.adoc           |   9 +-
 src/main/asciidoc/newshistory.adoc        |   8 +-
 src/main/asciidoc/object_retrieval.adoc   |   9 +-
 src/main/asciidoc/orm_dtd.adoc            |   9 +-
 src/main/asciidoc/pm.adoc                 |   9 +-
 src/main/asciidoc/pmf.adoc                |   9 +-
 src/main/asciidoc/references.adoc         |   9 +-
 src/main/asciidoc/release-3.0.1.adoc      |  44 ++++---
 src/main/asciidoc/release-3.1-rc1.adoc    |  27 +++--
 src/main/asciidoc/release-3.1.adoc        |   8 +-
 src/main/asciidoc/roadmap.adoc            |   9 +-
 src/main/asciidoc/specifications.adoc     |  15 ++-
 src/main/asciidoc/state_transition.adoc   |   9 +-
 src/main/asciidoc/svn.adoc                |  43 ++++---
 src/main/asciidoc/tck.adoc                |  13 +--
 src/main/asciidoc/team-list.adoc          |   9 +-
 src/main/asciidoc/transactions.adoc       |   9 +-
 src/main/asciidoc/why_jdo.adoc            |   9 +-
 src/main/template/document.html.erb       | 188 +++++++++++++++++-------------
 52 files changed, 363 insertions(+), 429 deletions(-)

diff --git a/src/main/asciidoc/annotations.adoc b/src/main/asciidoc/annotations.adoc
index 83c88e8..f7d60ac 100644
--- a/src/main/asciidoc/annotations.adoc
+++ b/src/main/asciidoc/annotations.adoc
@@ -1,12 +1,11 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:notoc:
+:notitle:
+:metadata:
+
+[[index]]
 
 == JDO : Annotationsanchor:JDO_:_Annotations[]
 
diff --git a/src/main/asciidoc/attach_detach.adoc b/src/main/asciidoc/attach_detach.adoc
index a614457..ae911e2 100644
--- a/src/main/asciidoc/attach_detach.adoc
+++ b/src/main/asciidoc/attach_detach.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:usage:
+
+[[index]]
 
 == JDO Attach/Detachanchor:JDO_AttachDetach[]
 
diff --git a/src/main/asciidoc/class_types.adoc b/src/main/asciidoc/class_types.adoc
index 506acab..1efd44f 100644
--- a/src/main/asciidoc/class_types.adoc
+++ b/src/main/asciidoc/class_types.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:metadata:
+
+[[index]]
 
 == JDO Class Typesanchor:JDO_Class_Types[]
 
diff --git a/src/main/asciidoc/dependencies.adoc b/src/main/asciidoc/dependencies.adoc
index 8c2fab2..d6bcb2f 100644
--- a/src/main/asciidoc/dependencies.adoc
+++ b/src/main/asciidoc/dependencies.adoc
@@ -1,13 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
 
+[[index]]
+
 == The Apache JDO Projectanchor:The_Apache_JDO_Project[]
 
 Apache JDO is a sub-project of the Apache DB TLP. It includes two major
diff --git a/src/main/asciidoc/downloads.adoc b/src/main/asciidoc/downloads.adoc
index c1aed42..4c1a226 100644
--- a/src/main/asciidoc/downloads.adoc
+++ b/src/main/asciidoc/downloads.adoc
@@ -1,25 +1,24 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:development:
+
+[[index]]
+
+== Downloadsanchor:Downloads[]
 
-== Latest Official Releaseanchor:Latest_Official_Release[]
+=== Latest Official Releaseanchor:Latest_Official_Release[]
 
 <<release-3.1.adoc#,JDO 3.1>> image:images/dot_clear.png[image]
 March 20, 2015
 
-== Previous Official Releasesanchor:Previous_Official_Releases[]
+=== Previous Official Releasesanchor:Previous_Official_Releases[]
 
 <<release-3.1-rc1.adoc#,JDO 3.1-rc1>> image:images/dot_clear.png[image] September 22, 2013
 
 <<release-3.0.1.adoc#,JDO 3.0.1>> image:images/dot_clear.png[image] November 13, 2011
 
-== About JDO Releasesanchor:About_JDO_Releases[]
+=== About JDO Releasesanchor:About_JDO_Releases[]
 
 A release of JDO includes the JDO API and the Technology Compatibility
 Kit (TCK). The TCK is available only in source form. The API project is
diff --git a/src/main/asciidoc/enhancement.adoc b/src/main/asciidoc/enhancement.adoc
index c6480cb..7b9e0d7 100644
--- a/src/main/asciidoc/enhancement.adoc
+++ b/src/main/asciidoc/enhancement.adoc
@@ -1,14 +1,13 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
 :notoc:
-:nofooter:
-:titlepage:
+:notitle:
 :grid: cols
+:metadata:
+
+[[index]]
 
-== JDO Enhancementanchor:JDO_Enhancement[]
+== JDO Bytecode Enhancementanchor:JDO_Bytecode_Enhancement[]
 
 JDO defines a byte-code enhancement process that provides for dirty
 detection of fields. Before a class is used at runtime it is compiled
diff --git a/src/main/asciidoc/exceptions.adoc b/src/main/asciidoc/exceptions.adoc
index 11cca84..16b5d05 100644
--- a/src/main/asciidoc/exceptions.adoc
+++ b/src/main/asciidoc/exceptions.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:usage:
+
+[[index]]
 
 == JDO Exceptionsanchor:JDO_Exceptions[]
 
diff --git a/src/main/asciidoc/extents.adoc b/src/main/asciidoc/extents.adoc
index 237731c..a8422ed 100644
--- a/src/main/asciidoc/extents.adoc
+++ b/src/main/asciidoc/extents.adoc
@@ -1,12 +1,11 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
 :notoc:
-:nofooter:
-:titlepage:
+:notitle:
 :grid: cols
+:query:
+
+[[index]]
 
 == JDO Extentsanchor:JDO_Extents[]
 
diff --git a/src/main/asciidoc/faq.adoc b/src/main/asciidoc/faq.adoc
index a0a02c7..8c477a1 100644
--- a/src/main/asciidoc/faq.adoc
+++ b/src/main/asciidoc/faq.adoc
@@ -1,20 +1,18 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:community:
+
+[[index]]
 
-== Generalanchor:General[]
+== FAQanchor:FAQ[]
 
-*What is JDO?* JDO is Java Data Objects, a datastore-agnostic interface
+=== What is JDO?
+JDO is Java Data Objects, a datastore-agnostic interface
 for storing Java objects in transactional datastores.
 
-*I'd like to find out more about the project and possibly contribute.
-What do I do next?* Participation on the project is via the mailing list
+=== I'd like to find out more about the project and possibly contribute. What do I do next?
+Participation on the project is via the mailing list
 and the source code repository. You join by subscribing to the mailing
 list and participating in discussions. You can help by contributing your
 ideas, enthusiasm, code, documentation, and tests. The fundamental tenet
@@ -23,12 +21,14 @@ code. The emphasis is on community; the code comes from that. If you
 want to help, just join the mailing list, see what needs to be done, and
 do it. Welcome!
 
-*Where is the mailing list, and how can I subscribe?* The developers
+=== Where is the mailing list, and how can I subscribe?
+The developers
 mailing list is jdo-dev@db.apache.org, a high-volume list currently
 receiving from 100 to 300 messages a month. +
 The users mailing list is jdo-user@db.apache.org.
 
-*Does this project use a wiki?* It does - the
+=== Does this project use a wiki?
+It does - the
 http://wiki.apache.org/jdo[JDO wiki] complements the work taking place
 on the mailing list and provides additional information on the project.
 
diff --git a/src/main/asciidoc/fetchgroups.adoc b/src/main/asciidoc/fetchgroups.adoc
index b06e768..29147f6 100644
--- a/src/main/asciidoc/fetchgroups.adoc
+++ b/src/main/asciidoc/fetchgroups.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:usage:
+
+[[index]]
 
 == Fetch Groupsanchor:Fetch_Groups[]
 
diff --git a/src/main/asciidoc/field_types.adoc b/src/main/asciidoc/field_types.adoc
index d102a03..dc26b4f 100644
--- a/src/main/asciidoc/field_types.adoc
+++ b/src/main/asciidoc/field_types.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:metadata:
+
+[[index]]
 
 == Supported Java Typesanchor:Supported_Java_Types[]
 
diff --git a/src/main/asciidoc/get-involved.adoc b/src/main/asciidoc/get-involved.adoc
index fe88054..64832e7 100644
--- a/src/main/asciidoc/get-involved.adoc
+++ b/src/main/asciidoc/get-involved.adoc
@@ -1,14 +1,13 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:community:
+
+[[index]]
+
+== Get Involvedanchor:Get_Involved[]
 
-== How do I contribute, give feedback, fix bugs and so on?anchor:How_do_I_contribute_give_feedback_fix_bugs_and_so_on[]
+=== How do I contribute, give feedback, fix bugs?
 
 The Apache JDO project really needs and appreciates any contributions,
 including documentation help, source code and feedback. Suggested
@@ -28,7 +27,7 @@ Pacific time. The conference call number is 866 230-6968 (international
 status, issues, concerns, and strategy. Everyone interested in Apache
 JDO is welcome and encouraged to participate.
 
-== How do I become a committer?anchor:How_do_I_become_a_committer[]
+=== How do I become a committer
 
 If you're interested in committing to the project:
 
diff --git a/src/main/asciidoc/getting-started.adoc b/src/main/asciidoc/getting-started.adoc
new file mode 100644
index 0000000..ea49a71
--- /dev/null
+++ b/src/main/asciidoc/getting-started.adoc
@@ -0,0 +1,10 @@
+:_basedir: 
+:_imagesdir: images/
+:notoc:
+:notitle:
+:grid: cols
+:general:
+
+[[index]]
+
+== Getting Startedanchor:Getting_Started[]
diff --git a/src/main/asciidoc/glossary.adoc b/src/main/asciidoc/glossary.adoc
index 8196507..8e7e828 100644
--- a/src/main/asciidoc/glossary.adoc
+++ b/src/main/asciidoc/glossary.adoc
@@ -1,12 +1,11 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
 :notoc:
-:nofooter:
-:titlepage:
+:notitle:
 :grid: cols
+:general:
+
+[[index]]
 
 == JDO Glossaryanchor:JDO_Glossary[]
 
diff --git a/src/main/asciidoc/guides-maven-jdo.adoc b/src/main/asciidoc/guides-maven-jdo.adoc
index 80331ed..f26ab37 100644
--- a/src/main/asciidoc/guides-maven-jdo.adoc
+++ b/src/main/asciidoc/guides-maven-jdo.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:titlepage:
 :grid: cols
 
+[[index]]
+
 == JDO Meets Mavenanchor:JDO_Meets_Maven[]
 
 By mailto:andy@jpox.org[Andy Jefferson]
diff --git a/src/main/asciidoc/guides-replication.adoc b/src/main/asciidoc/guides-replication.adoc
index 6c5d120..3587310 100644
--- a/src/main/asciidoc/guides-replication.adoc
+++ b/src/main/asciidoc/guides-replication.adoc
@@ -1,11 +1,11 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
 :notoc:
-:titlepage:
+:notitle:
 :grid: cols
+:usage:
+
+[[index]]
 
 == Data Replicationanchor:Data_Replication[]
 
diff --git a/src/main/asciidoc/impls.adoc b/src/main/asciidoc/impls.adoc
index b60259f..ba9e048 100644
--- a/src/main/asciidoc/impls.adoc
+++ b/src/main/asciidoc/impls.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:general:
+
+[[index]]
 
 == JDO Implementationsanchor:JDO_Implementations[]
 
diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc
index 2938f36..31eff86 100644
--- a/src/main/asciidoc/index.adoc
+++ b/src/main/asciidoc/index.adoc
@@ -1,16 +1,16 @@
-[[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
-
 :_basedir: 
 :_imagesdir: images/
 :notoc:
 :nofooter:
-:titlepage:
+:notitle:
 :grid: cols
 
+[[index]]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
+
+'''''
+
 == About Apache JDOanchor:About_Apache_JDO[]
 
 Welcome to Apache JDO, a project of the http://db.apache.org/[Apache DB
diff --git a/src/main/asciidoc/issuetracking.adoc b/src/main/asciidoc/issuetracking.adoc
index c413d35..9e356bc 100644
--- a/src/main/asciidoc/issuetracking.adoc
+++ b/src/main/asciidoc/issuetracking.adoc
@@ -1,15 +1,13 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:development:
+
+[[index]]
 
-== Processanchor:Process[]
+== Issue Trackingsanchor:Issue_Tracking[]
 
+=== JIRA
 The JDO project uses
 http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10630[JIRA]
 to track issues.
@@ -33,7 +31,7 @@ backported (if ever necessary) to dot releases after the original
 release ships.
 ____
 
-== View Issuesanchor:View_Issues[]
+=== View Issuesanchor:View_Issues[]
 
 * http://issues.apache.org/jira/browse/JDO?report=com.atlassian.jira.plugin.system.project:openissues-panel[Open
 Issues]
diff --git a/src/main/asciidoc/javadoc.adoc b/src/main/asciidoc/javadoc.adoc
index bf5e5b2..1282f67 100644
--- a/src/main/asciidoc/javadoc.adoc
+++ b/src/main/asciidoc/javadoc.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:general:
+
+[[index]]
 
 == Javadoc Formatsanchor:Javadoc_Formats[]
 
@@ -14,7 +11,7 @@ JDO Javadoc is available in two formats. You can browse the javadoc
 online, or you can download it as a .zip file and unzip it to a local
 directory.
 
-== JDO 3.1 javadocanchor:JDO_3.1_javadoc[]
+=== JDO 3.1 javadocanchor:JDO_3.1_javadoc[]
 
 JDO 3.1 is the current release of the Apache JDO implementation of
 JSR-243.
@@ -23,7 +20,7 @@ link:api31/apidocs/index.html[Browse JDO 3.1 javadoc online]
 
 link:api31/apidocs.zip[Download JDO 3.1 javadoc]
 
-== JDO 3.0 javadocanchor:JDO_3.0_javadoc[]
+=== JDO 3.0 javadocanchor:JDO_3.0_javadoc[]
 
 JDO 3.0 is the Apache JDO implementation of JSR-243.
 
@@ -31,7 +28,7 @@ link:api30/apidocs/index.html[Browse JDO 3.0 javadoc online]
 
 link:api30/apidocs.zip[Download JDO 3.0 javadoc]
 
-== JDO 2.2 javadocanchor:JDO_2.2_javadoc[]
+=== JDO 2.2 javadocanchor:JDO_2.2_javadoc[]
 
 JDO 2.2 is the Maintenance Release 2 of the Apache JDO implementation of
 JSR-243.
@@ -40,7 +37,7 @@ link:api22/apidocs/index.html[Browse JDO 2.2 javadoc online]
 
 link:api22/apidocs.zip[Download JDO 2.2 javadoc]
 
-== JDO 2.1 javadocanchor:JDO_2.1_javadoc[]
+=== JDO 2.1 javadocanchor:JDO_2.1_javadoc[]
 
 JDO 2.1 is the Maintenance Release 1 of the Apache JDO implementation of
 JSR-243.
@@ -54,7 +51,7 @@ online]
 
 link:api21-legacy/apidocs.zip[Download JDO 2.1-legacy javadoc]
 
-== JDO 2.0 javadocanchor:JDO_2.0_javadoc[]
+=== JDO 2.0 javadocanchor:JDO_2.0_javadoc[]
 
 JDO 2.0 is the Apache JDO implementation of JSR-243.
 
@@ -62,7 +59,7 @@ link:api20/apidocs/index.html[Browse JDO 2.0 javadoc online]
 
 link:api20/apidocs.zip[Download JDO 2.0 javadoc]
 
-== JDO 1.1 javadocanchor:JDO_1.1_javadoc[]
+=== JDO 1.1 javadocanchor:JDO_1.1_javadoc[]
 
 JDO 1.1 is the Apache JDO implementation of JSR-12.
 
diff --git a/src/main/asciidoc/jdo_3_0_overview.adoc b/src/main/asciidoc/jdo_3_0_overview.adoc
index 4c99f04..787435b 100644
--- a/src/main/asciidoc/jdo_3_0_overview.adoc
+++ b/src/main/asciidoc/jdo_3_0_overview.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:general:
+
+[[index]]
 
 == JDO 3.0 Overviewanchor:JDO_3.0_Overview[]
 
diff --git a/src/main/asciidoc/jdo_dtd.adoc b/src/main/asciidoc/jdo_dtd.adoc
index 9aaf074..5c4f27c 100644
--- a/src/main/asciidoc/jdo_dtd.adoc
+++ b/src/main/asciidoc/jdo_dtd.adoc
@@ -1,12 +1,11 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
 :notoc:
-:nofooter:
-:titlepage:
+:notitle:
 :grid: cols
+:metadata:
+
+[[index]]
 
 == Meta-Data - JDOanchor:Meta-Data_-_JDO[]
 
diff --git a/src/main/asciidoc/jdo_v_jpa.adoc b/src/main/asciidoc/jdo_v_jpa.adoc
index 7c9db49..8591275 100644
--- a/src/main/asciidoc/jdo_v_jpa.adoc
+++ b/src/main/asciidoc/jdo_v_jpa.adoc
@@ -1,12 +1,11 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
 :notoc:
-:nofooter:
-:titlepage:
+:notitle:
 :grid: cols
+:general:
+
+[[index]]
 
 == Which Persistence Specification ?anchor:Which_Persistence_Specification_[]
 
diff --git a/src/main/asciidoc/jdo_v_jpa_api.adoc b/src/main/asciidoc/jdo_v_jpa_api.adoc
index 90ed9d9..989e576 100644
--- a/src/main/asciidoc/jdo_v_jpa_api.adoc
+++ b/src/main/asciidoc/jdo_v_jpa_api.adoc
@@ -1,12 +1,11 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
 :notoc:
-:nofooter:
-:titlepage:
+:notitle:
 :grid: cols
+:general:
+
+[[index]]
 
 == JDO .v. JPA : APIanchor:JDO_.v._JPA_:_API[]
 
diff --git a/src/main/asciidoc/jdo_v_jpa_orm.adoc b/src/main/asciidoc/jdo_v_jpa_orm.adoc
index efb3c22..be7f888 100644
--- a/src/main/asciidoc/jdo_v_jpa_orm.adoc
+++ b/src/main/asciidoc/jdo_v_jpa_orm.adoc
@@ -1,12 +1,10 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
 :notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:metadata:
+
+[[index]]
 
 == Which ORM specification ?anchor:Which_ORM_specification_[]
 
diff --git a/src/main/asciidoc/jdocentral.adoc b/src/main/asciidoc/jdocentral.adoc
index f21688a..77bb389 100644
--- a/src/main/asciidoc/jdocentral.adoc
+++ b/src/main/asciidoc/jdocentral.adoc
@@ -1,13 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
 
+[[index]]
+
 == JDOCentral at Apache JDOanchor:JDOCentral_at_Apache_JDO[]
 
 Welcome to the new home of JDOCentral!
diff --git a/src/main/asciidoc/jdoconfig_dtd.adoc b/src/main/asciidoc/jdoconfig_dtd.adoc
index 0475458..9115e3b 100644
--- a/src/main/asciidoc/jdoconfig_dtd.adoc
+++ b/src/main/asciidoc/jdoconfig_dtd.adoc
@@ -1,12 +1,11 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
 :notoc:
-:nofooter:
-:titlepage:
+:notitle:
 :grid: cols
+:metadata:
+
+[[index]]
 
 == Meta-Data - JDOConfiganchor:Meta-Data_-_JDOConfig[]
 
diff --git a/src/main/asciidoc/jdohelper.adoc b/src/main/asciidoc/jdohelper.adoc
index a52f083..a060586 100644
--- a/src/main/asciidoc/jdohelper.adoc
+++ b/src/main/asciidoc/jdohelper.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:usage:
+
+[[index]]
 
 == JDOHelperanchor:JDOHelper[]
 
diff --git a/src/main/asciidoc/jdoql.adoc b/src/main/asciidoc/jdoql.adoc
index 255ee12..d8cd6e9 100644
--- a/src/main/asciidoc/jdoql.adoc
+++ b/src/main/asciidoc/jdoql.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:query:
+
+[[index]]
 
 == JDOQLanchor:JDOQL[]
 
diff --git a/src/main/asciidoc/jdoql_methods.adoc b/src/main/asciidoc/jdoql_methods.adoc
index fd7cfdd..098494b 100644
--- a/src/main/asciidoc/jdoql_methods.adoc
+++ b/src/main/asciidoc/jdoql_methods.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:query:
+
+[[index]]
 
 == JDOQL : Methodsanchor:JDOQL_:_Methods[]
 
diff --git a/src/main/asciidoc/jdoql_result.adoc b/src/main/asciidoc/jdoql_result.adoc
index 8b0d19a..fe2dc48 100644
--- a/src/main/asciidoc/jdoql_result.adoc
+++ b/src/main/asciidoc/jdoql_result.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:query:
+
+[[index]]
 
 == JDOQL : Resultanchor:JDOQL_:_Result[]
 
diff --git a/src/main/asciidoc/jdoquery_dtd.adoc b/src/main/asciidoc/jdoquery_dtd.adoc
index f48737f..6f45a20 100644
--- a/src/main/asciidoc/jdoquery_dtd.adoc
+++ b/src/main/asciidoc/jdoquery_dtd.adoc
@@ -1,12 +1,11 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
 :notoc:
-:nofooter:
-:titlepage:
+:notitle:
 :grid: cols
+:metadata:
+
+[[index]]
 
 == Meta-Data - JDOQueryanchor:Meta-Data_-_JDOQuery[]
 
diff --git a/src/main/asciidoc/mail-lists.adoc b/src/main/asciidoc/mail-lists.adoc
index 0705025..a500de5 100644
--- a/src/main/asciidoc/mail-lists.adoc
+++ b/src/main/asciidoc/mail-lists.adoc
@@ -1,12 +1,11 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
 :notoc:
-:nofooter:
-:titlepage:
+:notitle:
 :grid: cols
+:community:
+
+[[index]]
 
 == Apache JDO Mailing Listsanchor:Apache_JDO_Mailing_Lists[]
 
diff --git a/src/main/asciidoc/metadata.adoc b/src/main/asciidoc/metadata.adoc
index 8aa5fcb..b5c240e 100644
--- a/src/main/asciidoc/metadata.adoc
+++ b/src/main/asciidoc/metadata.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:metadata:
+
+[[index]]
 
 == Persistence MetaDataanchor:Persistence_MetaData[]
 
diff --git a/src/main/asciidoc/newshistory.adoc b/src/main/asciidoc/newshistory.adoc
index 111d7d7..9001392 100644
--- a/src/main/asciidoc/newshistory.adoc
+++ b/src/main/asciidoc/newshistory.adoc
@@ -1,13 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
 
+[[index]]
+
 == Older JDO Newsanchor:Older_JDO_News[]
 
 *JDO code donated to Apache by Sun Microsystems, Inc.*
diff --git a/src/main/asciidoc/object_retrieval.adoc b/src/main/asciidoc/object_retrieval.adoc
index e316843..675f2c0 100644
--- a/src/main/asciidoc/object_retrieval.adoc
+++ b/src/main/asciidoc/object_retrieval.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:usage:
+
+[[index]]
 
 == Object Retrievalanchor:Object_Retrieval[]
 
diff --git a/src/main/asciidoc/orm_dtd.adoc b/src/main/asciidoc/orm_dtd.adoc
index 089c2a5..6d2d6f3 100644
--- a/src/main/asciidoc/orm_dtd.adoc
+++ b/src/main/asciidoc/orm_dtd.adoc
@@ -1,12 +1,11 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
 :notoc:
-:nofooter:
-:titlepage:
+:notitle:
 :grid: cols
+:metadata:
+
+[[index]]
 
 == Meta-Data - ORManchor:Meta-Data_-_ORM[]
 
diff --git a/src/main/asciidoc/pm.adoc b/src/main/asciidoc/pm.adoc
index c99f0d3..f350f42 100644
--- a/src/main/asciidoc/pm.adoc
+++ b/src/main/asciidoc/pm.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:usage:
+
+[[index]]
 
 == Persistence Manageranchor:Persistence_Manager[]
 
diff --git a/src/main/asciidoc/pmf.adoc b/src/main/asciidoc/pmf.adoc
index 1643640..9bb20bf 100644
--- a/src/main/asciidoc/pmf.adoc
+++ b/src/main/asciidoc/pmf.adoc
@@ -1,12 +1,11 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
 :notoc:
-:nofooter:
-:titlepage:
+:notitle:
 :grid: cols
+:usage:
+
+[[index]]
 
 == Persistence Manager Factoryanchor:Persistence_Manager_Factory[]
 
diff --git a/src/main/asciidoc/references.adoc b/src/main/asciidoc/references.adoc
index 3d95678..b838b6c 100644
--- a/src/main/asciidoc/references.adoc
+++ b/src/main/asciidoc/references.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:general:
+
+[[index]]
 
 == JDO Referencesanchor:JDO_References[]
 
diff --git a/src/main/asciidoc/release-3.0.1.adoc b/src/main/asciidoc/release-3.0.1.adoc
index baa54f5..b57c39a 100644
--- a/src/main/asciidoc/release-3.0.1.adoc
+++ b/src/main/asciidoc/release-3.0.1.adoc
@@ -1,11 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:titlepage:
 :grid: cols
+:development:
+
+[[index]]
 
 == JDO 3.0.1 Distributionsanchor:JDO_3.0.1_Distributions[]
 
@@ -53,21 +51,21 @@ groupId javax.jdo, artifactId jdo-api, version 3.0 and define your
 remote repository as http://www.ibiblio.org/maven. Alternatively, it can
 be downloaded manually and put into a location of your choice.
 
-http://people.apache.org/repo/m1-ibiblio-rsync-repository/javax.jdo/jars/jdo-api-3.0.1.jar[jdo-api-3.0.1.jar]
-[http://people.apache.org/repo/m1-ibiblio-rsync-repository/javax.jdo/jars/jdo-api-3.0.1.jar.asc[PGP]]
-[http://people.apache.org/repo/m1-ibiblio-rsync-repository/javax.jdo/jars/jdo-api-3.0.1.jar.md5[MD5]]
+* http://people.apache.org/repo/m1-ibiblio-rsync-repository/javax.jdo/jars/jdo-api-3.0.1.jar[jdo-api-3.0.1.jar]
+http://people.apache.org/repo/m1-ibiblio-rsync-repository/javax.jdo/jars/jdo-api-3.0.1.jar.asc[PGP]
+http://people.apache.org/repo/m1-ibiblio-rsync-repository/javax.jdo/jars/jdo-api-3.0.1.jar.md5[MD5]
 
-http://people.apache.org/repo/m1-ibiblio-rsync-repository/javax.jdo/poms/jdo-api-3.0.1.pom[jdo-api-3.0.1.pom]
-[http://people.apache.org/repo/m1-ibiblio-rsync-repository/javax.jdo/poms/jdo-api-3.0.1.pom.asc[PGP]]
-[http://people.apache.org/repo/m1-ibiblio-rsync-repository/javax.jdo/poms/jdo-api-3.0.1.pom.md5[MD5]]
+* http://people.apache.org/repo/m1-ibiblio-rsync-repository/javax.jdo/poms/jdo-api-3.0.1.pom[jdo-api-3.0.1.pom]
+http://people.apache.org/repo/m1-ibiblio-rsync-repository/javax.jdo/poms/jdo-api-3.0.1.pom.asc[PGP]
+http://people.apache.org/repo/m1-ibiblio-rsync-repository/javax.jdo/poms/jdo-api-3.0.1.pom.md5[MD5]
 
-http://apache.mirrors.nublue.co.uk//db/jdo/3.0.1/jdo-api-3.0.1-src.zip[jdo-api-3.0.1-src.zip]
-[http://www.apache.org/dist/db/jdo/3.0.1/jdo-api-3.0.1-src.zip.asc[PGP]]
-[http://www.apache.org/dist/db/jdo/3.0.1/jdo-api-3.0.1-src.zip.md5[MD5]]
+* http://apache.mirrors.nublue.co.uk//db/jdo/3.0.1/jdo-api-3.0.1-src.zip[jdo-api-3.0.1-src.zip]
+http://www.apache.org/dist/db/jdo/3.0.1/jdo-api-3.0.1-src.zip.asc[PGP]
+http://www.apache.org/dist/db/jdo/3.0.1/jdo-api-3.0.1-src.zip.md5[MD5]
 
-http://apache.mirrors.nublue.co.uk//db/jdo/3.0.1/jdo-api-3.0.1-src.tar.gz[jdo-api-3.0.1-src.tar.gz]
-[http://www.apache.org/dist/db/jdo/3.0.1/jdo-api-3.0.1-src.tar.gz.asc[PGP]]
-[http://www.apache.org/dist/db/jdo/3.0.1/jdo-api-3.0.1-src.tar.gz.md5[MD5]]
+* http://apache.mirrors.nublue.co.uk//db/jdo/3.0.1/jdo-api-3.0.1-src.tar.gz[jdo-api-3.0.1-src.tar.gz]
+http://www.apache.org/dist/db/jdo/3.0.1/jdo-api-3.0.1-src.tar.gz.asc[PGP]
+http://www.apache.org/dist/db/jdo/3.0.1/jdo-api-3.0.1-src.tar.gz.md5[MD5]
 
 === TCKanchor:TCK[]
 
@@ -79,13 +77,13 @@ to be downloaded by the user. The dependencies (including the model20
 jar, util20 jar, enhancer20 jar, api2 jar, and JPOX) are automatically
 downloaded by maven as needed to run the TCK.
 
-http://apache.mirrors.nublue.co.uk//db/jdo/3.0.1/jdo-tck-3.0.1-src.zip[jdo-tck-3.0.1-src.zip]
-[http://www.apache.org/dist/db/jdo/3.0.1/jdo-tck-3.0.1-src.zip.asc[PGP]]
-[http://www.apache.org/dist/db/jdo/3.0.1/jdo-tck-3.0.1-src.zip.md5[MD5]]
+* http://apache.mirrors.nublue.co.uk//db/jdo/3.0.1/jdo-tck-3.0.1-src.zip[jdo-tck-3.0.1-src.zip]
+http://www.apache.org/dist/db/jdo/3.0.1/jdo-tck-3.0.1-src.zip.asc[PGP]
+http://www.apache.org/dist/db/jdo/3.0.1/jdo-tck-3.0.1-src.zip.md5[MD5]
 
-http://apache.mirrors.nublue.co.uk//db/jdo/3.0.1/jdo-tck-3.0.1-src.tar.gz[jdo-tck-3.0.1-src.tar.gz]
-[http://www.apache.org/dist/db/jdo/3.0.1/jdo-tck-3.0.1-src.tar.gz.asc[PGP]]
-[http://www.apache.org/dist/db/jdo/3.0.1/jdo-tck-3.0.1-src.tar.gz.md5[MD5]]
+* http://apache.mirrors.nublue.co.uk//db/jdo/3.0.1/jdo-tck-3.0.1-src.tar.gz[jdo-tck-3.0.1-src.tar.gz]
+http://www.apache.org/dist/db/jdo/3.0.1/jdo-tck-3.0.1-src.tar.gz.asc[PGP]
+http://www.apache.org/dist/db/jdo/3.0.1/jdo-tck-3.0.1-src.tar.gz.md5[MD5]
 
 == Verifying Releasesanchor:Verifying_Releases[]
 
diff --git a/src/main/asciidoc/release-3.1-rc1.adoc b/src/main/asciidoc/release-3.1-rc1.adoc
index bb3e93b..46583f8 100644
--- a/src/main/asciidoc/release-3.1-rc1.adoc
+++ b/src/main/asciidoc/release-3.1-rc1.adoc
@@ -1,10 +1,9 @@
-[[index]]
-{empty} +
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:titlepage:
 :grid: cols
+:development:
+
+[[index]]
 
 == JDO 3.1-rc1 Distributionsanchor:JDO_3.1-rc1_Distributions[]
 
@@ -53,14 +52,14 @@ groupId javax.jdo, artifactId jdo-api, version 3.1-rc1 and define your
 remote repository as http://www.ibiblio.org/maven. Alternatively, it can
 be downloaded manually and put into a location of your choice.
 
-http://mirror.ox.ac.uk/sites/rsync.apache.org//db/jdo/3.1-rc1/jdo-api-3.1-rc1.jar[jdo-api-3.1-rc1.jar]
-[http://www.apache.org/dist/db/jdo/3.1-rc1/jdo-api-3.1-rc1.jar.asc[PGP]]
+* http://mirror.ox.ac.uk/sites/rsync.apache.org//db/jdo/3.1-rc1/jdo-api-3.1-rc1.jar[jdo-api-3.1-rc1.jar]
+http://www.apache.org/dist/db/jdo/3.1-rc1/jdo-api-3.1-rc1.jar.asc[PGP]
 
-http://mirror.ox.ac.uk/sites/rsync.apache.org//db/jdo/3.1-rc1/jdo-api-3.1-rc1.pom[jdo-api-3.1-rc1.pom]
-[http://www.apache.org/dist/db/jdo/3.1-rc1/jdo-api-3.1-rc1.pom.asc[PGP]]
+* http://mirror.ox.ac.uk/sites/rsync.apache.org//db/jdo/3.1-rc1/jdo-api-3.1-rc1.pom[jdo-api-3.1-rc1.pom]
+http://www.apache.org/dist/db/jdo/3.1-rc1/jdo-api-3.1-rc1.pom.asc[PGP]
 
-http://mirror.ox.ac.uk/sites/rsync.apache.org//db/jdo/3.1-rc1/jdo-api-3.1-rc1-sources.jar[jdo-api-3.1-rc1-sources.jar]
-[http://www.apache.org/dist/db/jdo/3.1-rc1/jdo-api-3.1-rc1-sources.jar.asc[PGP]]
+* http://mirror.ox.ac.uk/sites/rsync.apache.org//db/jdo/3.1-rc1/jdo-api-3.1-rc1-sources.jar[jdo-api-3.1-rc1-sources.jar]
+http://www.apache.org/dist/db/jdo/3.1-rc1/jdo-api-3.1-rc1-sources.jar.asc[PGP]
 
 === TCKanchor:TCK[]
 
@@ -72,11 +71,11 @@ downloaded by the user. The dependencies are automatically downloaded by
 maven as needed to run the TCK. Please refer to the README.html for
 further details.
 
-http://mirror.ox.ac.uk/sites/rsync.apache.org//db/jdo/3.1-rc1/jdo-3.1-rc1-src.zip[jdo-3.1-rc1-src.zip]
-[http://www.apache.org/dist/db/jdo/3.1-rc1/jdo-3.1-rc1-src.zip.asc[PGP]]
+* http://mirror.ox.ac.uk/sites/rsync.apache.org//db/jdo/3.1-rc1/jdo-3.1-rc1-src.zip[jdo-3.1-rc1-src.zip]
+http://www.apache.org/dist/db/jdo/3.1-rc1/jdo-3.1-rc1-src.zip.asc[PGP]
 
-http://mirror.ox.ac.uk/sites/rsync.apache.org//db/jdo/3.1-rc1/jdo-3.1-rc1-src.tar.gz[jdo-3.1-rc1-src.tar.gz]
-[http://www.apache.org/dist/db/jdo/3.1-rc1/jdo-3.1-rc1-src.tar.gz.asc[PGP]]
+* http://mirror.ox.ac.uk/sites/rsync.apache.org//db/jdo/3.1-rc1/jdo-3.1-rc1-src.tar.gz[jdo-3.1-rc1-src.tar.gz]
+http://www.apache.org/dist/db/jdo/3.1-rc1/jdo-3.1-rc1-src.tar.gz.asc[PGP]
 
 == Verifying Releasesanchor:Verifying_Releases[]
 
diff --git a/src/main/asciidoc/release-3.1.adoc b/src/main/asciidoc/release-3.1.adoc
index f4ebc87..4057418 100644
--- a/src/main/asciidoc/release-3.1.adoc
+++ b/src/main/asciidoc/release-3.1.adoc
@@ -1,11 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:titlepage:
 :grid: cols
+:development:
+
+[[index]]
 
 == JDO 3.1 Distributionsanchor:JDO_3.1_Distributions[]
 
diff --git a/src/main/asciidoc/roadmap.adoc b/src/main/asciidoc/roadmap.adoc
index bac6bad..7ea569d 100644
--- a/src/main/asciidoc/roadmap.adoc
+++ b/src/main/asciidoc/roadmap.adoc
@@ -1,12 +1,11 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
 :notoc:
-:nofooter:
-:titlepage:
+:notitle:
 :grid: cols
+:development:
+
+[[index]]
 
 == Roadmap and TODOanchor:Roadmap_and_TODO[]
 
diff --git a/src/main/asciidoc/specifications.adoc b/src/main/asciidoc/specifications.adoc
index 42cab08..5712fe4 100644
--- a/src/main/asciidoc/specifications.adoc
+++ b/src/main/asciidoc/specifications.adoc
@@ -1,14 +1,13 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:general:
+
+[[index]]
+
+== JDO Specificationsanchor:JDO_Specifications[]
 
-== JDO Final Specificationsanchor:JDO_Final_Specifications[]
+=== JDO Final Specificationsanchor:JDO_Final_Specifications[]
 
 The following specifications for JDO are available
 
@@ -31,7 +30,7 @@ http://jcp.org/aboutJava/communityprocess/mrel/jsr243/index2.html[JDO
 * The http://www.jcp.org/en/jsr/detail?id=12[JDO 1.0 Specification
 (Final)]
 
-== JDO Draft Specificationsanchor:JDO_Draft_Specifications[]
+=== JDO Draft Specificationsanchor:JDO_Draft_Specifications[]
 
 The following specifications for JDO are snapshots of the current
 Maintenance Release specification under development. The specification
diff --git a/src/main/asciidoc/state_transition.adoc b/src/main/asciidoc/state_transition.adoc
index dd85c98..99b0dac 100644
--- a/src/main/asciidoc/state_transition.adoc
+++ b/src/main/asciidoc/state_transition.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:usage:
+
+[[index]]
 
 == JDO State Transitionanchor:JDO_State_Transition[]
 
diff --git a/src/main/asciidoc/svn.adoc b/src/main/asciidoc/svn.adoc
index 559e5ef..d11c8fc 100644
--- a/src/main/asciidoc/svn.adoc
+++ b/src/main/asciidoc/svn.adoc
@@ -1,14 +1,13 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:development:
+
+[[index]]
+
+== JDO Souce Codeanchor:JDO_Source_Code[]
 
-== Source Code Version Controlanchor:Source_Code_Version_Control[]
+=== Source Code Version Controlanchor:Source_Code_Version_Control[]
 
 Apache JDO uses http://subversion.tigris.org[Subversion] to manage its
 source code. If you're new to Subversion, you can check out the
@@ -20,13 +19,13 @@ To receive notice of commits to the repository subscribe to
 jdo-commits@db.apache.org by sending email to
 jdo-commits-subscribe@db.apache.org.
 
-== Web Access to Subversionanchor:Web_Access_to_Subversion[]
+=== Web Access to Subversionanchor:Web_Access_to_Subversion[]
 
 If you just want to browse the source code, you can use the
 https://svn.apache.org/viewvc/db/jdo[ViewVC web interface] to
 Subversion. This is current at all times.
 
-== Checking Out Code Using Subversionanchor:Checking_Out_Code_Using_Subversion[]
+==== Checking Out Code Using Subversionanchor:Checking_Out_Code_Using_Subversion[]
 
 Anyone can check code out of Subversion. You only need to specify a
 username and password to update the Subversion repository, and only JDO
@@ -34,7 +33,7 @@ committers can do that. If you are a committer, are working from behind
 a firewall, or are connected to the internet through a proxy server,
 please see the sections below for more information.
 
-=== Anonymous check out from Subversionanchor:Anonymous_check_out_from_Subversion[]
+==== Anonymous check out from Subversionanchor:Anonymous_check_out_from_Subversion[]
 
 Use a command like:
 
@@ -49,7 +48,7 @@ executing the following command from within the jdo.
 % svn update
 ....
 
-=== Access from behind a firewallanchor:Access_from_behind_a_firewall[]
+==== Access from behind a firewallanchor:Access_from_behind_a_firewall[]
 
 For those users who are stuck behind a corporate firewall which is
 blocking http access to the Subversion repository, you can try to access
@@ -59,7 +58,7 @@ it via HTTPS:
 % svn checkout https://svn.apache.org/repos/asf/db/jdo
 ....
 
-=== Access through a proxyanchor:Access_through_a_proxy[]
+==== Access through a proxyanchor:Access_through_a_proxy[]
 
 The Subversion client can go through a proxy, if you configure it to do
 so. First, edit your "servers" configuration file to indicate which
@@ -83,7 +82,7 @@ http-proxy-port = 3128
 Please use the regular http proxy settings in case you want to access
 the the repository from the Sun network (SWAN).
 
-=== Committer accessanchor:Committer_access[]
+==== Committer accessanchor:Committer_access[]
 
 Everyone can access the Apache JDO Subversion repository via HTTPS, but
 Apache JDO Committers must checkout the Subversion repository via HTTPS.
@@ -92,7 +91,7 @@ Apache JDO Committers must checkout the Subversion repository via HTTPS.
 % svn checkout https://svn.apache.org/repos/asf/db/jdo
 ....
 
-=== NetBeans CVS repository accessanchor:NetBeans_CVS_repository_access[]
+==== NetBeans CVS repository accessanchor:NetBeans_CVS_repository_access[]
 
 The btree subproject checks out the NetBeans mdr btree implementation.
 This requires cvs being installed on your system. The official NetBeans
@@ -107,9 +106,9 @@ link:/jdo-data/attachments/SubversionRepository/attachments/netbeans-mdr-btree.z
 Unzip the file in the btree directory and comment out (or remove) the
 definition of the preGoal java:prepare-filesystem.
 
-== Submitting Code Changesanchor:Submitting_Code_Changes[]
+=== Submitting Code Changesanchor:Submitting_Code_Changes[]
 
-=== Submitting a patchanchor:Submitting_a_patch[]
+==== Submitting a patchanchor:Submitting_a_patch[]
 
 If you make changes to Apache JDO, and would like to contribute the to
 the project, you should create a patch and send it to the jdo-dev alias
@@ -120,7 +119,7 @@ command:
 % svn diff > your-changes.patch
 ....
 
-=== Committing changes to subversionanchor:Committing_changes_to_subversion[]
+==== Committing changes to subversionanchor:Committing_changes_to_subversion[]
 
 To commit changes to the Subversion repository, you must be an Apache
 JDO committer. See link:get-involved.html[Get Involved] for information
@@ -147,13 +146,13 @@ $> svn commit --username your-username --password your-password
 Remember to replace 'your-username' and 'your-password' with your actual
 username and password on svn.apache.org.
 
-== Building JDO from Sourceanchor:Building_JDO_from_Source[]
+=== Building JDO from Sourceanchor:Building_JDO_from_Source[]
 
 Refer to the http://wiki.apache.org/jdo/FrontPage[Wiki page] for
 details. Note that the JDO project is subdivided into several smaller
 projects, and each project is built separately.
 
-== Using Subversion on Windows with cygwinanchor:Using_Subversion_on_Windows_with_cygwin[]
+=== Using Subversion on Windows with cygwinanchor:Using_Subversion_on_Windows_with_cygwin[]
 
 If you use Subversion on Windows under cygwin, you may find that the
 Subversion client automatically assigns the executable property to
@@ -170,7 +169,7 @@ Name: svn:executable
 This section explains the source of the problem and suggests some
 actions to avoid it.
 
-=== Backgroundanchor:Background[]
+==== Backgroundanchor:Background[]
 
 Subversion carries executable information in the built-in property
 called svn:executable. This property, unlike others, may be present or
@@ -190,7 +189,7 @@ Unix-style permissions this way as well. If the file is executable by
 all, cygwin svn sets the svn:executable property on the file when you
 invoke _svn add_.
 
-=== Removing existing executable properties from the repositoryanchor:Removing_existing_executable_properties_from_the_repository[]
+==== Removing existing executable properties from the repositoryanchor:Removing_existing_executable_properties_from_the_repository[]
 
 You can use svn propdel to remove the svn:executable property from your
 working copy.
@@ -203,7 +202,7 @@ will recursively remove the svn:executable property from all of the
 files below the current directory. You can use this and commit the files
 to clean the repository if necessary.
 
-=== Preventing Subversion from adding unwanted executable propertiesanchor:Preventing_Subversion_from_adding_unwanted_executable_properties[]
+==== Preventing Subversion from adding unwanted executable propertiesanchor:Preventing_Subversion_from_adding_unwanted_executable_properties[]
 
 Windows/cygwin users who don't want to have to think about using _svn
 propdel_ or _chmod_ on each added file can use a non-cygwin version of
diff --git a/src/main/asciidoc/tck.adoc b/src/main/asciidoc/tck.adoc
index 35ab47c..aba4a4a 100644
--- a/src/main/asciidoc/tck.adoc
+++ b/src/main/asciidoc/tck.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:general:
+
+[[index]]
 
 == About the Technology Compatibility Kitanchor:About_the_Technology_Compatibility_Kit[]
 
@@ -16,7 +13,7 @@ Technology Compatibility Kit (TCK). The TCK is released as a packaged
 Java source tree. Maven is the driver of a test run. You must download
 and install http://maven.apache.org/[Maven 2+]before running the TCK.
 
-== Running the TCKanchor:Running_the_TCK[]
+=== Running the TCKanchor:Running_the_TCK[]
 
 To run the Technology Compatibility Kit:
 
@@ -30,7 +27,7 @@ http://svn.apache.org/viewcvs.cgi/*checkout*/db/jdo/branches/3.1/README.html[REA
 http://svn.apache.org/viewcvs.cgi/*checkout*/db/jdo/branches/3.1/tck/RunRules.html[RunRules.html]
 in the tck directory.
 
-== Demonstrating Complianceanchor:Demonstrating_Compliance[]
+=== Demonstrating Complianceanchor:Demonstrating_Compliance[]
 
 Vendors must post test results on a publicly accessible web site for
 examination by the public. The posting includes the output of the test
diff --git a/src/main/asciidoc/team-list.adoc b/src/main/asciidoc/team-list.adoc
index 0ee48da..9634c75 100644
--- a/src/main/asciidoc/team-list.adoc
+++ b/src/main/asciidoc/team-list.adoc
@@ -1,12 +1,9 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
 :grid: cols
+:community:
+
+[[index]]
 
 == The Apache JDO Teamanchor:The_Apache_JDO_Team[]
 
diff --git a/src/main/asciidoc/transactions.adoc b/src/main/asciidoc/transactions.adoc
index 06bc605..71b8b3c 100644
--- a/src/main/asciidoc/transactions.adoc
+++ b/src/main/asciidoc/transactions.adoc
@@ -1,12 +1,11 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
 :notoc:
-:nofooter:
-:titlepage:
+:notitle:
 :grid: cols
+:usage:
+
+[[index]]
 
 == Transactionsanchor:Transactions[]
 
diff --git a/src/main/asciidoc/why_jdo.adoc b/src/main/asciidoc/why_jdo.adoc
index 614c453..845e5d1 100644
--- a/src/main/asciidoc/why_jdo.adoc
+++ b/src/main/asciidoc/why_jdo.adoc
@@ -1,12 +1,11 @@
-[[index]]
-{empty} +
-
 :_basedir: 
 :_imagesdir: images/
 :notoc:
-:nofooter:
-:titlepage:
+:notitle:
 :grid: cols
+:general:
+
+[[index]]
 
 == Why JDO ?anchor:Why_JDO_[]
 
diff --git a/src/main/template/document.html.erb b/src/main/template/document.html.erb
index 9b4b839..3406351 100644
--- a/src/main/template/document.html.erb
+++ b/src/main/template/document.html.erb
@@ -39,32 +39,39 @@
        def is_toc?
          not (attributes.has_key?('notoc'))
        end
-    %>
-
-    <%
-       def is_titlepage?
-         attributes.has_key?('titlepage')
+     %>
+    
+     <%
+       def is_footer?
+        not (attributes.has_key?('nofooter'))
        end
-    %>
+     %>
 
     <%
-       def is_jdo?
-         attributes.has_key?('jdo')
+       def is_no_title?
+         attributes.has_key?('notitle')
        end
     %>
+
     <%
-       def is_jpa?
-         attributes.has_key?('jpa')
+       def is_general?
+         attributes.has_key?('general')
        end
     %>
     <%
        def is_usage?
          attributes.has_key?('usage')
        end
+      %>
+    <%
+       def is_metadata?
+         attributes.has_key?('metadata')
+       end
     %>
+
     <%
-       def is_articles?
-         attributes.has_key?('articles')
+       def is_query?
+         attributes.has_key?('query')
        end
     %>
     <%
@@ -76,7 +83,7 @@
        def is_development?
          attributes.has_key?('development')
        end
-    %>
+      %>
 
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
     <script src="<%= (attr :_basedir) %>js/bootstrap/3.3.7/bootstrap.min.js"></script>
@@ -110,44 +117,69 @@
         <div id="navbar" class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
                 <li class="dropdown">
-                  <% if is_jdo? then %>
+
+                  <!-- menu item General -->
+
+                  <% if is_general? then %>
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" style="background-color:#2385c6">General <span class="caret"></span></a>
                   <% else %>
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">General <span class="caret"></span></a>
                   <% end %>
-                    <ul class="dropdown-menu">
+                  <ul class="dropdown-menu">
                         <li><a href="<%= (attr :_basedir) %>why_jdo.html">Why JDO?</a></li>
+                        <li><a href="<%= (attr :_basedir) %>getting-started.html">Gettig Started</a></li>
+                        <li><a href="<%= (attr :_basedir) %>specifications.html">Specifications</a></li>
+                        <li><a href="<%= (attr :_basedir) %>tck.html">TCK</a></li>
+                        <li><a href="<%= (attr :_basedir) %>javadoc.html">API Javadoc</a></li>
+                        <li role="separator" class="divider"></li>
                         <li><a href="<%= (attr :_basedir) %>jdo_v_jpa.html">JDO v JPA</a></li>
                         <li><a href="<%= (attr :_basedir) %>jdo_v_jpa_api.html">JDO v JPA : API</a></li>
                         <li><a href="<%= (attr :_basedir) %>jdo_v_jpa_orm.html">JDO v JPA : ORM</a></li>
-                        <li><a href="<%= (attr :_basedir) %>downloads.html">Downloads</a></li>
+                        <li role="separator" class="divider"></li>
                         <li><a href="<%= (attr :_basedir) %>http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
+                        <li><a href="<%= (attr :_basedir) %>impls.html">Implementations</a></li>
+                        <li><a href="<%= (attr :_basedir) %>jdo_3_0_overview.html">JDO 3.0 Overview</a></li>
+                        <li><a href="<%= (attr :_basedir) %>references.html">References</a></li>
+                        <li><a href="<%= (attr :_basedir) %>glossary.html">Glossary</a></li>
                     </ul>
                 </li>
+
+                <!-- menu item API Usage -->
+
                 <li class="dropdown">
-                  <% if is_jpa? then %>
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" style="background-color:#2385c6">JDO Implementation <span class="caret"></span></a>
+                  <% if is_usage? then %>
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" style="background-color:#2385c6">JDO Usage <span class="caret"></span></a>
                   <% else %>
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">JDO Implementation <span class="caret"></span></a>
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">API Usage <span class="caret"></span></a>
                   <% end %>
                     <ul class="dropdown-menu">
-                        <li><a href="<%= (attr :_basedir) %>specifications.html">Specifications</a></li>
-                        <li><a href="<%= (attr :_basedir) %>tck.html">TCK</a></li>
+                        <li><a href="<%= (attr :_basedir) %>jdohelper.html">JDO Helper</a></li>
+                        <li><a href="<%= (attr :_basedir) %>pmf.html">PersistenceManagerFactory</a></li>
+                        <li><a href="<%= (attr :_basedir) %>pm.html">PersistenceManager</a></li>
+                        <li><a href="<%= (attr :_basedir) %>transactions.html">Transactions</a></li>
+                        <li><a href="<%= (attr :_basedir) %>attach_detach.html">Attach-Detach</a></li>
+                        <li><a href="<%= (attr :_basedir) %>fetchgroups.html">Fetch Groups</a></li>
+                        <li><a href="<%= (attr :_basedir) %>state_transition.html">Object States</a></li>
+                        <li><a href="<%= (attr :_basedir) %>object_retrieval.html">Object Retrieval</a></li>
+                        <li><a href="<%= (attr :_basedir) %>exceptions.html">Exceptions</a></li>
+                        <li role="separator" class="divider"></li>
+                        <li><a href="<%= (attr :_basedir) %>guides-replication.html">Data Replication</a></li>
                     </ul>
                 </li>
+
+                <!-- menu item Types & Metadata -->
+
                 <li class="dropdown">
-                  <% if is_usage? then %>
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" style="background-color:#2385c6">JDO Usage <span class="caret"></span></a>
+                  <% if is_metadata? then %>
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" style="background-color:#2385c6">Types &amp; Metadata<span class="caret"></span></a>
                   <% else %>
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">JDO Usage <span class="caret"></span></a>
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Types &amp; Metadata <span class="caret"></span></a>
                   <% end %>
                     <ul class="dropdown-menu">
-                        <li><a href="<%= (attr :_basedir) %>impls.html">Implementations</a></li>
-                        <li><a href="<%= (attr :_basedir) %>javadoc.html">API Javadoc</a></li>
                         <li><a href="<%= (attr :_basedir) %>class_types.html">Types of Classes</a></li>
                         <li><a href="<%= (attr :_basedir) %>field_types.html">Types of Fields</a></li>
                         <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">Metadata</li>
+                        <!-- <li class="dropdown-header">Metadata</li> -->
                         <li><a href="<%= (attr :_basedir) %>metadata.html">MetaData</a></li>
                         <li><a href="<%= (attr :_basedir) %>annotations.html">Annotations</a></li>
                         <li><a href="<%= (attr :_basedir) %>jdo_dtd.html">jdo DTD/XSD</a></li>
@@ -156,42 +188,29 @@
                         <li><a href="<%= (attr :_basedir) %>jdoconfig_dtd.html">jdoconfig DTD/XSD</a></li>
                         <li role="separator" class="divider"></li>
                         <li><a href="<%= (attr :_basedir) %>enhancement.html">Bytecode Enhancement</a></li>
-                        <li><a href="<%= (attr :_basedir) %>jdohelper.html">JDO Helper</a></li>
-                        <li><a href="<%= (attr :_basedir) %>pmf.html">PersistenceManagerFactory</a></li>
-                        <li><a href="<%= (attr :_basedir) %>pm.html">PersistenceManager</a></li>
-                        <li><a href="<%= (attr :_basedir) %>transactions.html">Transactions</a></li>
-                        <li><a href="<%= (attr :_basedir) %>attach_detach.html">Attach-Detach</a></li>
-                        <li><a href="<%= (attr :_basedir) %>fetchgroups.html">Fetch Groups</a></li>
-                        <li><a href="<%= (attr :_basedir) %>state_transition.html">Object States</a></li>
-                        <li><a href="<%= (attr :_basedir) %>object_retrieval.html">Object Retrieval</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">JDOQL</li>
+                    </ul>
+                </li>
+
+                <!-- menu item Query -->
+
+                <li class="dropdown">
+                  <% if is_query? then %>
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" style="background-color:#2385c6">Query <span class="caret"></span></a>
+                  <% else %>
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Query <span class="caret"></span></a>
+                  <% end %>
+                    <ul class="dropdown-menu">
                         <li><a href="<%= (attr :_basedir) %>jdoql.html">JDOQL</a></li>
                         <li><a href="<%= (attr :_basedir) %>jdoql_result.html">Result</a></li>
                         <li><a href="<%= (attr :_basedir) %>jdoql_methods.html">Methods</a></li>
                         <li><a href="<%= (attr :_basedir) %>jdoql_quickref.pdf">Quick Ref PDF</a></li>
                         <li role="separator" class="divider"></li>
                         <li><a href="<%= (attr :_basedir) %>extents.html">Extents</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">Guides</li>
-                        <li><a href="<%= (attr :_basedir) %>guides-replication.html">Datastore Replication</a></li>
-                        <li><a href="<%= (attr :_basedir) %>guides-maven-jdo.html">JDO and Maven1</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="<%= (attr :_basedir) %>references.html">References</a></li>
-                        <li><a href="<%= (attr :_basedir) %>exceptions.html">Exceptions</a></li>
-                        <li><a href="<%= (attr :_basedir) %>glossary.html">Glossary</a></li>
                     </ul>
-                </li>
-               <li class="dropdown">
-                  <% if is_articles? then %>
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" style="background-color:#2385c6">Articles <span class="caret"></span></a>
-                  <% else %>
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Articles <span class="caret"></span></a>
-                  <% end %>
-                    <ul class="dropdown-menu">
-                        <li><a href="<%= (attr :_basedir) %>jdo_3_0_overview.html">JDO 3.0 Overview</a></li>
-                    </ul>
-                </li>
+               </li>
+
+                <!-- menu item Community -->
+
                <li class="dropdown">
                   <% if is_community? then %>
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" style="background-color:#2385c6">Community <span class="caret"></span></a>
@@ -204,7 +223,10 @@
                         <li><a href="<%= (attr :_basedir) %>mail-lists.html">Mailing Lists</a></li>
                         <li><a href="<%= (attr :_basedir) %>faq.html">FAQ</a></li>
                     </ul>
-                </li>
+               </li>
+
+                <!-- menu item Development -->
+
                <li class="dropdown">
                   <% if is_development? then %>
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" style="background-color:#2385c6">Development <span class="caret"></span></a>
@@ -213,10 +235,10 @@
                   <% end %>
                     <ul class="dropdown-menu">
                         <li><a href="<%= (attr :_basedir) %>roadmap.html">RoadMap / TODO</a></li>
+                        <li><a href="<%= (attr :_basedir) %>downloads.html">Downloads</a></li>
                         <li><a href="<%= (attr :_basedir) %>svn.html">Source Code</a></li>
                         <li><a href="<%= (attr :_basedir) %>http://cwiki.apache.org/GMOxDEV/Coding+standards">Coding Standards</a></li>
                         <li><a href="<%= (attr :_basedir) %>issuetracking.html">Issue Tracking</a></li>
-                        <li><a href="<%= (attr :_basedir) %>dependencies.html">Dependencies</a></li>
                     </ul>
                 </li>
             </ul>
@@ -250,8 +272,8 @@
         <!-- No TOC -->
         <div class="row-fluid">
             <div class="col-sm-12">
-                <% if is_titlepage? then %>
-                    <!-- Front Page, so no heading -->
+                <% if is_no_title? then %>
+                    <!-- no heading -->
                 <% else %>
                     <div class="page-title">
                         <h4><%= document.name %></h4>
@@ -264,28 +286,30 @@
         </div>
     <% end %>
 </div>
-<footer style="background-color:#97d5ca; padding: 5px;">
-<div class="container">
-    <hr/>
-    <div class="row">
-        <div class="col-sm-9">
-    <a href="https://www.facebook.com/JavaDataObjects" class="externalLink" title="Facebook">Facebook</a>
-            |
-                        <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
-            |
-                        <a href="http://wiki.apache.org/jdo" class="externalLink" title="Wiki">Wiki</a>
-            |
-                        <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10630" class="externalLink" title="Issue Tracker">Issue Tracker</a>
-            |
-                        <a href="mail-lists.html" title="Mailing Lists">Mailing Lists</a>
-            |
-                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
-        </div>
-    </div>
-    <hr/>
-    <p class="text-center">&copy; 2005-2020 Apache Software Foundation. All Rights Reserved.</p>
-</div>
-</footer>
+<% if is_footer? then %>
+  <footer style="background-color:#97d5ca; padding: 5px;">
+  <div class="container">
+      <hr/>
+      <div class="row">
+          <div class="col-sm-9">
+      <a href="https://www.facebook.com/JavaDataObjects" class="externalLink" title="Facebook">Facebook</a>
+              |
+                          <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
+              |
+                          <a href="http://wiki.apache.org/jdo" class="externalLink" title="Wiki">Wiki</a>
+              |
+                          <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10630" class="externalLink" title="Issue Tracker">Issue Tracker</a>
+              |
+                          <a href="mail-lists.html" title="Mailing Lists">Mailing Lists</a>
+              |
+                          <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+          </div>
+      </div>
+      <hr/>
+      <p class="text-center">&copy; 2005-2020 Apache Software Foundation. All Rights Reserved.</p>
+  </div>
+  </footer>
+<% end %>
 </body>
 </html>