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 ti...@apache.org on 2020/04/15 21:07:50 UTC

[db-jdo-site] branch master updated (eb1c10b -> d15bb23)

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

tilmannz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/db-jdo-site.git.


    from eb1c10b  Update .asf.yaml
     new cd7af3c  Fixed htm tab tooltip & pom cleanup
     new 739de93  Removed title images from all pages except index.html
     new 0341358  Removed weird '-' after ':'
     new 47c54c7  Removed dead files
     new d15bb23  Rebuilt website

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 docs/annotations.html                     |   9 +-
 docs/attach_detach.html                   |   9 +-
 docs/class_types.html                     |   7 +-
 docs/cvs-usage.html                       | 323 -----------------------------
 docs/dependencies.html                    |   7 +-
 docs/downloads.html                       |   7 +-
 docs/enhancement.html                     |   7 +-
 docs/exceptions.html                      |   7 +-
 docs/extents.html                         |   7 +-
 docs/faq.html                             |   7 +-
 docs/fetchgroups.html                     |   9 +-
 docs/field_types.html                     |   7 +-
 docs/get-involved.html                    |   7 +-
 docs/glossary.html                        |   7 +-
 docs/guides-maven-jdo.html                |   7 +-
 docs/guides-replication.html              |   7 +-
 docs/guides.html                          | 332 ------------------------------
 docs/impls.html                           |   7 +-
 docs/index.html                           |   3 +-
 docs/issue-tracking.html                  | 323 -----------------------------
 docs/issuetracking.html                   |   7 +-
 docs/javadoc.html                         |   7 +-
 docs/jdo_3_0_overview.html                |   7 +-
 docs/jdo_dtd.html                         |   7 +-
 docs/jdo_v_jpa.html                       |   7 +-
 docs/jdo_v_jpa_api.html                   |   7 +-
 docs/jdo_v_jpa_orm.html                   |   7 +-
 docs/jdocentral.html                      |   7 +-
 docs/jdoconfig_dtd.html                   |   7 +-
 docs/jdohelper.html                       |   7 +-
 docs/jdoql.html                           |   7 +-
 docs/jdoql_methods.html                   |   7 +-
 docs/jdoql_result.html                    |   7 +-
 docs/jdoquery_dtd.html                    |   7 +-
 docs/mail-lists.html                      |   7 +-
 docs/maven-reports.html                   | 323 -----------------------------
 docs/metadata.html                        |   9 +-
 docs/newshistory.html                     |   7 +-
 docs/object_retrieval.html                |   7 +-
 docs/orm_dtd.html                         |   7 +-
 docs/pm.html                              |   7 +-
 docs/pmf.html                             |   7 +-
 docs/project-info.html                    | 323 -----------------------------
 docs/references.html                      |   7 +-
 docs/release-3.0.1.html                   |   7 +-
 docs/release-3.1-rc1.html                 |  12 +-
 docs/release-3.1.html                     |   7 +-
 docs/roadmap.html                         |   7 +-
 docs/specifications.html                  |   7 +-
 docs/state_transition.html                |   7 +-
 docs/svn.html                             |   7 +-
 docs/tck.html                             |   7 +-
 docs/team-list.html                       |   7 +-
 docs/transactions.html                    |   7 +-
 docs/types.html                           | 323 -----------------------------
 docs/why_jdo.html                         |   7 +-
 pom.xml                                   |  60 +-----
 src/main/asciidoc/annotations.adoc        |   7 +-
 src/main/asciidoc/attach_detach.adoc      |   7 +-
 src/main/asciidoc/class_types.adoc        |   5 +-
 src/main/asciidoc/cvs-usage.adoc          |  13 --
 src/main/asciidoc/dependencies.adoc       |   5 +-
 src/main/asciidoc/downloads.adoc          |   5 +-
 src/main/asciidoc/enhancement.adoc        |   5 +-
 src/main/asciidoc/exceptions.adoc         |   5 +-
 src/main/asciidoc/extents.adoc            |   5 +-
 src/main/asciidoc/faq.adoc                |   5 +-
 src/main/asciidoc/fetchgroups.adoc        |   7 +-
 src/main/asciidoc/field_types.adoc        |   5 +-
 src/main/asciidoc/get-involved.adoc       |   5 +-
 src/main/asciidoc/glossary.adoc           |   5 +-
 src/main/asciidoc/guides-maven-jdo.adoc   |   5 +-
 src/main/asciidoc/guides-replication.adoc |   5 +-
 src/main/asciidoc/guides.adoc             |   5 +-
 src/main/asciidoc/impls.adoc              |   5 +-
 src/main/asciidoc/issue-tracking.adoc     |  13 --
 src/main/asciidoc/issuetracking.adoc      |   5 +-
 src/main/asciidoc/javadoc.adoc            |   5 +-
 src/main/asciidoc/jdo_3_0_overview.adoc   |   5 +-
 src/main/asciidoc/jdo_dtd.adoc            |   5 +-
 src/main/asciidoc/jdo_v_jpa.adoc          |   5 +-
 src/main/asciidoc/jdo_v_jpa_api.adoc      |   5 +-
 src/main/asciidoc/jdo_v_jpa_orm.adoc      |   5 +-
 src/main/asciidoc/jdocentral.adoc         |   5 +-
 src/main/asciidoc/jdoconfig_dtd.adoc      |   5 +-
 src/main/asciidoc/jdohelper.adoc          |   5 +-
 src/main/asciidoc/jdoql.adoc              |   5 +-
 src/main/asciidoc/jdoql_methods.adoc      |   5 +-
 src/main/asciidoc/jdoql_result.adoc       |   5 +-
 src/main/asciidoc/jdoquery_dtd.adoc       |   5 +-
 src/main/asciidoc/mail-lists.adoc         |   5 +-
 src/main/asciidoc/maven-reports.adoc      |  13 --
 src/main/asciidoc/metadata.adoc           |   7 +-
 src/main/asciidoc/newshistory.adoc        |   5 +-
 src/main/asciidoc/object_retrieval.adoc   |   5 +-
 src/main/asciidoc/orm_dtd.adoc            |   5 +-
 src/main/asciidoc/pm.adoc                 |   5 +-
 src/main/asciidoc/pmf.adoc                |   5 +-
 src/main/asciidoc/project-info.adoc       |  13 --
 src/main/asciidoc/references.adoc         |   5 +-
 src/main/asciidoc/release-3.0.1.adoc      |   5 +-
 src/main/asciidoc/release-3.1-rc1.adoc    |   6 +-
 src/main/asciidoc/release-3.1.adoc        |   5 +-
 src/main/asciidoc/roadmap.adoc            |   5 +-
 src/main/asciidoc/specifications.adoc     |   5 +-
 src/main/asciidoc/state_transition.adoc   |   5 +-
 src/main/asciidoc/svn.adoc                |   5 +-
 src/main/asciidoc/tck.adoc                |   5 +-
 src/main/asciidoc/team-list.adoc          |   5 +-
 src/main/asciidoc/transactions.adoc       |   5 +-
 src/main/asciidoc/types.adoc              |  13 --
 src/main/asciidoc/why_jdo.adoc            |   5 +-
 src/main/template/document.html.erb       |   3 +-
 113 files changed, 164 insertions(+), 2529 deletions(-)
 delete mode 100644 docs/cvs-usage.html
 delete mode 100644 docs/guides.html
 delete mode 100644 docs/issue-tracking.html
 delete mode 100644 docs/maven-reports.html
 delete mode 100644 docs/project-info.html
 delete mode 100644 docs/types.html
 delete mode 100644 src/main/asciidoc/cvs-usage.adoc
 delete mode 100644 src/main/asciidoc/issue-tracking.adoc
 delete mode 100644 src/main/asciidoc/maven-reports.adoc
 delete mode 100644 src/main/asciidoc/project-info.adoc
 delete mode 100644 src/main/asciidoc/types.adoc


[db-jdo-site] 04/05: Removed dead files

Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 47c54c7342e77c132f7918177de969639bab12c8
Author: Tilmann <zo...@gmx.de>
AuthorDate: Wed Apr 15 23:05:41 2020 +0200

    Removed dead files
---
 docs/cvs-usage.html                   | 323 ----------------------------------
 docs/issue-tracking.html              | 323 ----------------------------------
 docs/maven-reports.html               | 323 ----------------------------------
 docs/project-info.html                | 323 ----------------------------------
 docs/types.html                       | 323 ----------------------------------
 src/main/asciidoc/cvs-usage.adoc      |  13 --
 src/main/asciidoc/issue-tracking.adoc |  13 --
 src/main/asciidoc/maven-reports.adoc  |  13 --
 src/main/asciidoc/project-info.adoc   |  13 --
 src/main/asciidoc/types.adoc          |  13 --
 src/main/template/document.html.erb   |   1 -
 11 files changed, 1681 deletions(-)

diff --git a/docs/cvs-usage.html b/docs/cvs-usage.html
deleted file mode 100644
index f5ff78b..0000000
--- a/docs/cvs-usage.html
+++ /dev/null
@@ -1,323 +0,0 @@
-<!DOCTYPE html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache"/>
-    <meta http-equiv="pragma" content="no-cache"/>
-    <meta http-equiv="expires" content="-1"/>
-    <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
-    <meta name="description" content="Apache JDO - Java Data Objects"/>
-
-    <title></title>
-
-    <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
-
-    <!--
-        Apache JDO Documentation Template
-        ==================================
-        This template derived various aspects from Apache Deltaspike template, the Apache ISIS template and the Datanucleus template.
-        This template uses 
-        * Bootstrap v3.3.7 (https://getbootstrap.com/) for navbar.
-        * Asciidoctor "foundation" CSS
-        * Bootswatch "cosmo" theme for Bootstrap (https://bootswatch.com/cosmo).
-        * Bootstrap TOC plugin v0.4.1 (https://afeld.github.io/bootstrap-toc/) for the table of contents.
-        * jQuery (necessary for Bootstrap's JavaScript plugins)
-        * Font-Awesome for some icons used by Asciidoctor
-        NOTE: tried using Font-Awesome CSS hosted locally but then fails to work!
-    -->
-    <link href="css/bootswatch/3.3.7/bootstrap-cosmo.css" rel="stylesheet"/>
-    <link href="css/bootstrap-toc/0.4.1/bootstrap-toc.min.css" rel="stylesheet"/>
-
-    <link href="css/asciidoctor/foundation.css" rel="stylesheet"/>
-    <link href="css/datanucleus_theme.css" rel="stylesheet"/>
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-    
-
-    
-
-    
-    
-    
-    
-    
-    
-
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap/3.3.7/bootstrap.min.js"></script>
-    <script src="js/bootstrap-toc/0.4.1/bootstrap-toc.min.js"></script>
-
-    <!-- Coderay syntax formatter -->
-    <style type="text/css">
-        /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
-/*pre.CodeRay {background-color:#f7f7f8;}*/
-.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
-.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
-.CodeRay .line-numbers strong{color:rgba(0,0,0,.4)}
-table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
-table.CodeRay td{vertical-align: top;line-height:1.45}
-table.CodeRay td.line-numbers{text-align:right}
-table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
-table.CodeRay td.code{padding:0 0 0 .5em}
-table.CodeRay td.code>pre{padding:0}
-.CodeRay .debug{color:#fff !important;background:#000080 !important}
-.CodeRay .annotation{color:#007}
-.CodeRay .attribute-name{color:#000080}
-.CodeRay .attribute-value{color:#700}
-.CodeRay .binary{color:#509}
-.CodeRay .comment{color:#998;font-style:italic}
-.CodeRay .char{color:#04d}
-.CodeRay .char .content{color:#04d}
-.CodeRay .char .delimiter{color:#039}
-.CodeRay .class{color:#458;font-weight:bold}
-.CodeRay .complex{color:#a08}
-.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
-.CodeRay .color{color:#099}
-.CodeRay .class-variable{color:#369}
-.CodeRay .decorator{color:#b0b}
-.CodeRay .definition{color:#099}
-.CodeRay .delimiter{color:#000}
-.CodeRay .doc{color:#970}
-.CodeRay .doctype{color:#34b}
-.CodeRay .doc-string{color:#d42}
-.CodeRay .escape{color:#666}
-.CodeRay .entity{color:#800}
-.CodeRay .error{color:#808}
-.CodeRay .exception{color:inherit}
-.CodeRay .filename{color:#099}
-.CodeRay .function{color:#900;font-weight:bold}
-.CodeRay .global-variable{color:#008080}
-.CodeRay .hex{color:#058}
-.CodeRay .integer,.CodeRay .float{color:#099}
-.CodeRay .include{color:#555}
-.CodeRay .inline{color:#000}
-.CodeRay .inline .inline{background:#ccc}
-.CodeRay .inline .inline .inline{background:#bbb}
-.CodeRay .inline .inline-delimiter{color:#d14}
-.CodeRay .inline-delimiter{color:#d14}
-.CodeRay .important{color:#555;font-weight:bold}
-.CodeRay .interpreted{color:#b2b}
-.CodeRay .instance-variable{color:#008080}
-.CodeRay .label{color:#970}
-.CodeRay .local-variable{color:#963}
-.CodeRay .octal{color:#40e}
-.CodeRay .predefined{color:#369}
-.CodeRay .preprocessor{color:#579}
-.CodeRay .pseudo-class{color:#555}
-.CodeRay .directive{font-weight:bold}
-.CodeRay .type{font-weight:bold}
-.CodeRay .predefined-type{color:inherit}
-.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
-.CodeRay .key{color:#808}
-.CodeRay .key .delimiter{color:#606}
-.CodeRay .key .char{color:#80f}
-.CodeRay .value{color:#088}
-.CodeRay .regexp .delimiter{color:#808}
-.CodeRay .regexp .content{color:#808}
-.CodeRay .regexp .modifier{color:#808}
-.CodeRay .regexp .char{color:#d14}
-.CodeRay .regexp .function{color:#404;font-weight:bold}
-.CodeRay .string{color:#d20}
-.CodeRay .string .string .string{background:#ffd0d0}
-.CodeRay .string .content{color:#d14}
-.CodeRay .string .char{color:#d14}
-.CodeRay .string .delimiter{color:#d14}
-.CodeRay .shell{color:#d14}
-.CodeRay .shell .delimiter{color:#d14}
-.CodeRay .symbol{color:#990073}
-.CodeRay .symbol .content{color:#a60}
-.CodeRay .symbol .delimiter{color:#630}
-.CodeRay .tag{color:#008080}
-.CodeRay .tag-special{color:#d70}
-.CodeRay .variable{color:#036}
-.CodeRay .insert{background:#afa}
-.CodeRay .delete{background:#faa}
-.CodeRay .change{color:#aaf;background:#007}
-.CodeRay .head{color:#f8f;background:#505}
-.CodeRay .insert .insert{color:#080}
-.CodeRay .delete .delete{color:#800}
-.CodeRay .change .change{color:#66f}
-.CodeRay .head .head{color:#f4f}
-    </style>
-</head>
-<body data-spy="scroll" data-target="#toc">
-<!-- Navbar -->
-<nav class="navbar navbar-default navbar-static-top">
-    <div class="container">
-        <div class="navbar-header">
-            <!-- Three line menu button for use on mobile screens -->
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <!-- 'style' added to align image with navbar. FIX THIS -->
-            <a class="navbar-brand" href="https://db.apache.org/jdo/">
-                <img style="margin-top: -12px;" alt="Brand" src="images/JDO_44x44.png"/>
-            </a>
-            <!-- TODO Any way to abstract the version from Maven? -->
-            <a class="navbar-brand" href="index.html">Apache JDO</a>
-        </div>
-        <!-- Navbar that will collapse on mobile screens -->
-        <div id="navbar" class="navbar-collapse collapse">
-            <ul class="nav navbar-nav">
-                <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">General <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="why_jdo.html">Why JDO?</a></li>
-                        <li><a href="jdo_v_jpa.html">JDO v JPA</a></li>
-                        <li><a href="jdo_v_jpa_api.html">JDO v JPA : API</a></li>
-                        <li><a href="jdo_v_jpa_orm.html">JDO v JPA : ORM</a></li>
-                        <li><a href="downloads.html">Downloads</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                    </ul>
-                </li>
-                <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">JDO Implementation <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="specifications.html">Specifications</a></li>
-                        <li><a href="tck.html">TCK</a></li>
-                    </ul>
-                </li>
-                <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">JDO Usage <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="impls.html">Implementations</a></li>
-                        <li><a href="javadoc.html">API Javadoc</a></li>
-                        <li><a href="class_types.html">Types of Classes</a></li>
-                        <li><a href="field_types.html">Types of Fields</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">Metadata</li>
-                        <li><a href="metadata.html">MetaData</a></li>
-                        <li><a href="annotations.html">Annotations</a></li>
-                        <li><a href="jdo_dtd.html">jdo DTD/XSD</a></li>
-                        <li><a href="orm_dtd.html">orm DTD/XSD</a></li>
-                        <li><a href="jdoquery_dtd.html">jdoquery DTD/XSD</a></li>
-                        <li><a href="jdoconfig_dtd.html">jdoconfig DTD/XSD</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="enhancement.html">Bytecode Enhancement</a></li>
-                        <li><a href="jdohelper.html">JDO Helper</a></li>
-                        <li><a href="pmf.html">PersistenceManagerFactory</a></li>
-                        <li><a href="pm.html">PersistenceManager</a></li>
-                        <li><a href="transactions.html">Transactions</a></li>
-                        <li><a href="attach_detach.html">Attach-Detach</a></li>
-                        <li><a href="fetchgroups.html">Fetch Groups</a></li>
-                        <li><a href="state_transition.html">Object States</a></li>
-                        <li><a href="object_retrieval.html">Object Retrieval</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">JDOQL</li>
-                        <li><a href="jdoql.html">JDOQL</a></li>
-                        <li><a href="jdoql_result.html">Result</a></li>
-                        <li><a href="jdoql_methods.html">Methods</a></li>
-                        <li><a href="jdoql_quickref.pdf">Quick Ref PDF</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="extents.html">Extents</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
-                        <li><a href="guides-replication.html">Datastore Replication</a></li>
-                        <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="references.html">References</a></li>
-                        <li><a href="exceptions.html">Exceptions</a></li>
-                        <li><a href="glossary.html">Glossary</a></li>
-                    </ul>
-                </li>
-               <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Articles <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="jdo_3_0_overview.html">JDO 3.0 Overview</a></li>
-                    </ul>
-                </li>
-               <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="get-involved.html">Get Involved</a></li>
-                        <li><a href="team-list.html">Project Team</a></li>
-                        <li><a href="mail-lists.html">Mailing Lists</a></li>
-                        <li><a href="faq.html">FAQ</a></li>
-                    </ul>
-                </li>
-               <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Development <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="roadmap.html">RoadMap / TODO</a></li>
-                        <li><a href="svn.html">Source Code</a></li>
-                        <li><a href="http://cwiki.apache.org/GMOxDEV/Coding+standards">Coding Standards</a></li>
-                        <li><a href="issuetracking.html">Issue Tracking</a></li>
-                        <li><a href="dependencies.html">Dependencies</a></li>
-                    </ul>
-                </li>
-            </ul>
-           <!-- 'style' added to fix height of input box. FIX THIS -->
-            <form class="navbar-form navbar-left" role="search" id="search-form" action="https://www.google.com/search" method="get" style="padding: 1px 15px;">
-                <div class="form-group">
-                    <input name="sitesearch" value="db.apache.org" type="hidden">
-                    <input name="q" type="text" class="form-control" placeholder="Search" style="margin-top: 7px; padding: 1px; border-radius: 5px; height: 30px; vertical-align: middle;">
-                </div>
-            </form>
-        </div>
-    </div>
-</nav>
-<div class="container">
-    
-        <div class="row-fluid">
-            <div class="col-sm-9">
-<!--                <div class="page-title">
-                    <h3></h3>
-                </div>
--->
-                <div id="doc-content">
-                    <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
-</div>
-<hr>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <nav id="toc" data-spy="affix" data-toggle="toc"></nav>
-            </div>
-        </div>
-    
-</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>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/issue-tracking.html b/docs/issue-tracking.html
deleted file mode 100644
index f5ff78b..0000000
--- a/docs/issue-tracking.html
+++ /dev/null
@@ -1,323 +0,0 @@
-<!DOCTYPE html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache"/>
-    <meta http-equiv="pragma" content="no-cache"/>
-    <meta http-equiv="expires" content="-1"/>
-    <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
-    <meta name="description" content="Apache JDO - Java Data Objects"/>
-
-    <title></title>
-
-    <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
-
-    <!--
-        Apache JDO Documentation Template
-        ==================================
-        This template derived various aspects from Apache Deltaspike template, the Apache ISIS template and the Datanucleus template.
-        This template uses 
-        * Bootstrap v3.3.7 (https://getbootstrap.com/) for navbar.
-        * Asciidoctor "foundation" CSS
-        * Bootswatch "cosmo" theme for Bootstrap (https://bootswatch.com/cosmo).
-        * Bootstrap TOC plugin v0.4.1 (https://afeld.github.io/bootstrap-toc/) for the table of contents.
-        * jQuery (necessary for Bootstrap's JavaScript plugins)
-        * Font-Awesome for some icons used by Asciidoctor
-        NOTE: tried using Font-Awesome CSS hosted locally but then fails to work!
-    -->
-    <link href="css/bootswatch/3.3.7/bootstrap-cosmo.css" rel="stylesheet"/>
-    <link href="css/bootstrap-toc/0.4.1/bootstrap-toc.min.css" rel="stylesheet"/>
-
-    <link href="css/asciidoctor/foundation.css" rel="stylesheet"/>
-    <link href="css/datanucleus_theme.css" rel="stylesheet"/>
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-    
-
-    
-
-    
-    
-    
-    
-    
-    
-
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap/3.3.7/bootstrap.min.js"></script>
-    <script src="js/bootstrap-toc/0.4.1/bootstrap-toc.min.js"></script>
-
-    <!-- Coderay syntax formatter -->
-    <style type="text/css">
-        /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
-/*pre.CodeRay {background-color:#f7f7f8;}*/
-.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
-.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
-.CodeRay .line-numbers strong{color:rgba(0,0,0,.4)}
-table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
-table.CodeRay td{vertical-align: top;line-height:1.45}
-table.CodeRay td.line-numbers{text-align:right}
-table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
-table.CodeRay td.code{padding:0 0 0 .5em}
-table.CodeRay td.code>pre{padding:0}
-.CodeRay .debug{color:#fff !important;background:#000080 !important}
-.CodeRay .annotation{color:#007}
-.CodeRay .attribute-name{color:#000080}
-.CodeRay .attribute-value{color:#700}
-.CodeRay .binary{color:#509}
-.CodeRay .comment{color:#998;font-style:italic}
-.CodeRay .char{color:#04d}
-.CodeRay .char .content{color:#04d}
-.CodeRay .char .delimiter{color:#039}
-.CodeRay .class{color:#458;font-weight:bold}
-.CodeRay .complex{color:#a08}
-.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
-.CodeRay .color{color:#099}
-.CodeRay .class-variable{color:#369}
-.CodeRay .decorator{color:#b0b}
-.CodeRay .definition{color:#099}
-.CodeRay .delimiter{color:#000}
-.CodeRay .doc{color:#970}
-.CodeRay .doctype{color:#34b}
-.CodeRay .doc-string{color:#d42}
-.CodeRay .escape{color:#666}
-.CodeRay .entity{color:#800}
-.CodeRay .error{color:#808}
-.CodeRay .exception{color:inherit}
-.CodeRay .filename{color:#099}
-.CodeRay .function{color:#900;font-weight:bold}
-.CodeRay .global-variable{color:#008080}
-.CodeRay .hex{color:#058}
-.CodeRay .integer,.CodeRay .float{color:#099}
-.CodeRay .include{color:#555}
-.CodeRay .inline{color:#000}
-.CodeRay .inline .inline{background:#ccc}
-.CodeRay .inline .inline .inline{background:#bbb}
-.CodeRay .inline .inline-delimiter{color:#d14}
-.CodeRay .inline-delimiter{color:#d14}
-.CodeRay .important{color:#555;font-weight:bold}
-.CodeRay .interpreted{color:#b2b}
-.CodeRay .instance-variable{color:#008080}
-.CodeRay .label{color:#970}
-.CodeRay .local-variable{color:#963}
-.CodeRay .octal{color:#40e}
-.CodeRay .predefined{color:#369}
-.CodeRay .preprocessor{color:#579}
-.CodeRay .pseudo-class{color:#555}
-.CodeRay .directive{font-weight:bold}
-.CodeRay .type{font-weight:bold}
-.CodeRay .predefined-type{color:inherit}
-.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
-.CodeRay .key{color:#808}
-.CodeRay .key .delimiter{color:#606}
-.CodeRay .key .char{color:#80f}
-.CodeRay .value{color:#088}
-.CodeRay .regexp .delimiter{color:#808}
-.CodeRay .regexp .content{color:#808}
-.CodeRay .regexp .modifier{color:#808}
-.CodeRay .regexp .char{color:#d14}
-.CodeRay .regexp .function{color:#404;font-weight:bold}
-.CodeRay .string{color:#d20}
-.CodeRay .string .string .string{background:#ffd0d0}
-.CodeRay .string .content{color:#d14}
-.CodeRay .string .char{color:#d14}
-.CodeRay .string .delimiter{color:#d14}
-.CodeRay .shell{color:#d14}
-.CodeRay .shell .delimiter{color:#d14}
-.CodeRay .symbol{color:#990073}
-.CodeRay .symbol .content{color:#a60}
-.CodeRay .symbol .delimiter{color:#630}
-.CodeRay .tag{color:#008080}
-.CodeRay .tag-special{color:#d70}
-.CodeRay .variable{color:#036}
-.CodeRay .insert{background:#afa}
-.CodeRay .delete{background:#faa}
-.CodeRay .change{color:#aaf;background:#007}
-.CodeRay .head{color:#f8f;background:#505}
-.CodeRay .insert .insert{color:#080}
-.CodeRay .delete .delete{color:#800}
-.CodeRay .change .change{color:#66f}
-.CodeRay .head .head{color:#f4f}
-    </style>
-</head>
-<body data-spy="scroll" data-target="#toc">
-<!-- Navbar -->
-<nav class="navbar navbar-default navbar-static-top">
-    <div class="container">
-        <div class="navbar-header">
-            <!-- Three line menu button for use on mobile screens -->
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <!-- 'style' added to align image with navbar. FIX THIS -->
-            <a class="navbar-brand" href="https://db.apache.org/jdo/">
-                <img style="margin-top: -12px;" alt="Brand" src="images/JDO_44x44.png"/>
-            </a>
-            <!-- TODO Any way to abstract the version from Maven? -->
-            <a class="navbar-brand" href="index.html">Apache JDO</a>
-        </div>
-        <!-- Navbar that will collapse on mobile screens -->
-        <div id="navbar" class="navbar-collapse collapse">
-            <ul class="nav navbar-nav">
-                <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">General <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="why_jdo.html">Why JDO?</a></li>
-                        <li><a href="jdo_v_jpa.html">JDO v JPA</a></li>
-                        <li><a href="jdo_v_jpa_api.html">JDO v JPA : API</a></li>
-                        <li><a href="jdo_v_jpa_orm.html">JDO v JPA : ORM</a></li>
-                        <li><a href="downloads.html">Downloads</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                    </ul>
-                </li>
-                <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">JDO Implementation <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="specifications.html">Specifications</a></li>
-                        <li><a href="tck.html">TCK</a></li>
-                    </ul>
-                </li>
-                <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">JDO Usage <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="impls.html">Implementations</a></li>
-                        <li><a href="javadoc.html">API Javadoc</a></li>
-                        <li><a href="class_types.html">Types of Classes</a></li>
-                        <li><a href="field_types.html">Types of Fields</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">Metadata</li>
-                        <li><a href="metadata.html">MetaData</a></li>
-                        <li><a href="annotations.html">Annotations</a></li>
-                        <li><a href="jdo_dtd.html">jdo DTD/XSD</a></li>
-                        <li><a href="orm_dtd.html">orm DTD/XSD</a></li>
-                        <li><a href="jdoquery_dtd.html">jdoquery DTD/XSD</a></li>
-                        <li><a href="jdoconfig_dtd.html">jdoconfig DTD/XSD</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="enhancement.html">Bytecode Enhancement</a></li>
-                        <li><a href="jdohelper.html">JDO Helper</a></li>
-                        <li><a href="pmf.html">PersistenceManagerFactory</a></li>
-                        <li><a href="pm.html">PersistenceManager</a></li>
-                        <li><a href="transactions.html">Transactions</a></li>
-                        <li><a href="attach_detach.html">Attach-Detach</a></li>
-                        <li><a href="fetchgroups.html">Fetch Groups</a></li>
-                        <li><a href="state_transition.html">Object States</a></li>
-                        <li><a href="object_retrieval.html">Object Retrieval</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">JDOQL</li>
-                        <li><a href="jdoql.html">JDOQL</a></li>
-                        <li><a href="jdoql_result.html">Result</a></li>
-                        <li><a href="jdoql_methods.html">Methods</a></li>
-                        <li><a href="jdoql_quickref.pdf">Quick Ref PDF</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="extents.html">Extents</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
-                        <li><a href="guides-replication.html">Datastore Replication</a></li>
-                        <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="references.html">References</a></li>
-                        <li><a href="exceptions.html">Exceptions</a></li>
-                        <li><a href="glossary.html">Glossary</a></li>
-                    </ul>
-                </li>
-               <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Articles <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="jdo_3_0_overview.html">JDO 3.0 Overview</a></li>
-                    </ul>
-                </li>
-               <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="get-involved.html">Get Involved</a></li>
-                        <li><a href="team-list.html">Project Team</a></li>
-                        <li><a href="mail-lists.html">Mailing Lists</a></li>
-                        <li><a href="faq.html">FAQ</a></li>
-                    </ul>
-                </li>
-               <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Development <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="roadmap.html">RoadMap / TODO</a></li>
-                        <li><a href="svn.html">Source Code</a></li>
-                        <li><a href="http://cwiki.apache.org/GMOxDEV/Coding+standards">Coding Standards</a></li>
-                        <li><a href="issuetracking.html">Issue Tracking</a></li>
-                        <li><a href="dependencies.html">Dependencies</a></li>
-                    </ul>
-                </li>
-            </ul>
-           <!-- 'style' added to fix height of input box. FIX THIS -->
-            <form class="navbar-form navbar-left" role="search" id="search-form" action="https://www.google.com/search" method="get" style="padding: 1px 15px;">
-                <div class="form-group">
-                    <input name="sitesearch" value="db.apache.org" type="hidden">
-                    <input name="q" type="text" class="form-control" placeholder="Search" style="margin-top: 7px; padding: 1px; border-radius: 5px; height: 30px; vertical-align: middle;">
-                </div>
-            </form>
-        </div>
-    </div>
-</nav>
-<div class="container">
-    
-        <div class="row-fluid">
-            <div class="col-sm-9">
-<!--                <div class="page-title">
-                    <h3></h3>
-                </div>
--->
-                <div id="doc-content">
-                    <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
-</div>
-<hr>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <nav id="toc" data-spy="affix" data-toggle="toc"></nav>
-            </div>
-        </div>
-    
-</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>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/maven-reports.html b/docs/maven-reports.html
deleted file mode 100644
index f5ff78b..0000000
--- a/docs/maven-reports.html
+++ /dev/null
@@ -1,323 +0,0 @@
-<!DOCTYPE html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache"/>
-    <meta http-equiv="pragma" content="no-cache"/>
-    <meta http-equiv="expires" content="-1"/>
-    <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
-    <meta name="description" content="Apache JDO - Java Data Objects"/>
-
-    <title></title>
-
-    <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
-
-    <!--
-        Apache JDO Documentation Template
-        ==================================
-        This template derived various aspects from Apache Deltaspike template, the Apache ISIS template and the Datanucleus template.
-        This template uses 
-        * Bootstrap v3.3.7 (https://getbootstrap.com/) for navbar.
-        * Asciidoctor "foundation" CSS
-        * Bootswatch "cosmo" theme for Bootstrap (https://bootswatch.com/cosmo).
-        * Bootstrap TOC plugin v0.4.1 (https://afeld.github.io/bootstrap-toc/) for the table of contents.
-        * jQuery (necessary for Bootstrap's JavaScript plugins)
-        * Font-Awesome for some icons used by Asciidoctor
-        NOTE: tried using Font-Awesome CSS hosted locally but then fails to work!
-    -->
-    <link href="css/bootswatch/3.3.7/bootstrap-cosmo.css" rel="stylesheet"/>
-    <link href="css/bootstrap-toc/0.4.1/bootstrap-toc.min.css" rel="stylesheet"/>
-
-    <link href="css/asciidoctor/foundation.css" rel="stylesheet"/>
-    <link href="css/datanucleus_theme.css" rel="stylesheet"/>
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-    
-
-    
-
-    
-    
-    
-    
-    
-    
-
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap/3.3.7/bootstrap.min.js"></script>
-    <script src="js/bootstrap-toc/0.4.1/bootstrap-toc.min.js"></script>
-
-    <!-- Coderay syntax formatter -->
-    <style type="text/css">
-        /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
-/*pre.CodeRay {background-color:#f7f7f8;}*/
-.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
-.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
-.CodeRay .line-numbers strong{color:rgba(0,0,0,.4)}
-table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
-table.CodeRay td{vertical-align: top;line-height:1.45}
-table.CodeRay td.line-numbers{text-align:right}
-table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
-table.CodeRay td.code{padding:0 0 0 .5em}
-table.CodeRay td.code>pre{padding:0}
-.CodeRay .debug{color:#fff !important;background:#000080 !important}
-.CodeRay .annotation{color:#007}
-.CodeRay .attribute-name{color:#000080}
-.CodeRay .attribute-value{color:#700}
-.CodeRay .binary{color:#509}
-.CodeRay .comment{color:#998;font-style:italic}
-.CodeRay .char{color:#04d}
-.CodeRay .char .content{color:#04d}
-.CodeRay .char .delimiter{color:#039}
-.CodeRay .class{color:#458;font-weight:bold}
-.CodeRay .complex{color:#a08}
-.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
-.CodeRay .color{color:#099}
-.CodeRay .class-variable{color:#369}
-.CodeRay .decorator{color:#b0b}
-.CodeRay .definition{color:#099}
-.CodeRay .delimiter{color:#000}
-.CodeRay .doc{color:#970}
-.CodeRay .doctype{color:#34b}
-.CodeRay .doc-string{color:#d42}
-.CodeRay .escape{color:#666}
-.CodeRay .entity{color:#800}
-.CodeRay .error{color:#808}
-.CodeRay .exception{color:inherit}
-.CodeRay .filename{color:#099}
-.CodeRay .function{color:#900;font-weight:bold}
-.CodeRay .global-variable{color:#008080}
-.CodeRay .hex{color:#058}
-.CodeRay .integer,.CodeRay .float{color:#099}
-.CodeRay .include{color:#555}
-.CodeRay .inline{color:#000}
-.CodeRay .inline .inline{background:#ccc}
-.CodeRay .inline .inline .inline{background:#bbb}
-.CodeRay .inline .inline-delimiter{color:#d14}
-.CodeRay .inline-delimiter{color:#d14}
-.CodeRay .important{color:#555;font-weight:bold}
-.CodeRay .interpreted{color:#b2b}
-.CodeRay .instance-variable{color:#008080}
-.CodeRay .label{color:#970}
-.CodeRay .local-variable{color:#963}
-.CodeRay .octal{color:#40e}
-.CodeRay .predefined{color:#369}
-.CodeRay .preprocessor{color:#579}
-.CodeRay .pseudo-class{color:#555}
-.CodeRay .directive{font-weight:bold}
-.CodeRay .type{font-weight:bold}
-.CodeRay .predefined-type{color:inherit}
-.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
-.CodeRay .key{color:#808}
-.CodeRay .key .delimiter{color:#606}
-.CodeRay .key .char{color:#80f}
-.CodeRay .value{color:#088}
-.CodeRay .regexp .delimiter{color:#808}
-.CodeRay .regexp .content{color:#808}
-.CodeRay .regexp .modifier{color:#808}
-.CodeRay .regexp .char{color:#d14}
-.CodeRay .regexp .function{color:#404;font-weight:bold}
-.CodeRay .string{color:#d20}
-.CodeRay .string .string .string{background:#ffd0d0}
-.CodeRay .string .content{color:#d14}
-.CodeRay .string .char{color:#d14}
-.CodeRay .string .delimiter{color:#d14}
-.CodeRay .shell{color:#d14}
-.CodeRay .shell .delimiter{color:#d14}
-.CodeRay .symbol{color:#990073}
-.CodeRay .symbol .content{color:#a60}
-.CodeRay .symbol .delimiter{color:#630}
-.CodeRay .tag{color:#008080}
-.CodeRay .tag-special{color:#d70}
-.CodeRay .variable{color:#036}
-.CodeRay .insert{background:#afa}
-.CodeRay .delete{background:#faa}
-.CodeRay .change{color:#aaf;background:#007}
-.CodeRay .head{color:#f8f;background:#505}
-.CodeRay .insert .insert{color:#080}
-.CodeRay .delete .delete{color:#800}
-.CodeRay .change .change{color:#66f}
-.CodeRay .head .head{color:#f4f}
-    </style>
-</head>
-<body data-spy="scroll" data-target="#toc">
-<!-- Navbar -->
-<nav class="navbar navbar-default navbar-static-top">
-    <div class="container">
-        <div class="navbar-header">
-            <!-- Three line menu button for use on mobile screens -->
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <!-- 'style' added to align image with navbar. FIX THIS -->
-            <a class="navbar-brand" href="https://db.apache.org/jdo/">
-                <img style="margin-top: -12px;" alt="Brand" src="images/JDO_44x44.png"/>
-            </a>
-            <!-- TODO Any way to abstract the version from Maven? -->
-            <a class="navbar-brand" href="index.html">Apache JDO</a>
-        </div>
-        <!-- Navbar that will collapse on mobile screens -->
-        <div id="navbar" class="navbar-collapse collapse">
-            <ul class="nav navbar-nav">
-                <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">General <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="why_jdo.html">Why JDO?</a></li>
-                        <li><a href="jdo_v_jpa.html">JDO v JPA</a></li>
-                        <li><a href="jdo_v_jpa_api.html">JDO v JPA : API</a></li>
-                        <li><a href="jdo_v_jpa_orm.html">JDO v JPA : ORM</a></li>
-                        <li><a href="downloads.html">Downloads</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                    </ul>
-                </li>
-                <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">JDO Implementation <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="specifications.html">Specifications</a></li>
-                        <li><a href="tck.html">TCK</a></li>
-                    </ul>
-                </li>
-                <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">JDO Usage <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="impls.html">Implementations</a></li>
-                        <li><a href="javadoc.html">API Javadoc</a></li>
-                        <li><a href="class_types.html">Types of Classes</a></li>
-                        <li><a href="field_types.html">Types of Fields</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">Metadata</li>
-                        <li><a href="metadata.html">MetaData</a></li>
-                        <li><a href="annotations.html">Annotations</a></li>
-                        <li><a href="jdo_dtd.html">jdo DTD/XSD</a></li>
-                        <li><a href="orm_dtd.html">orm DTD/XSD</a></li>
-                        <li><a href="jdoquery_dtd.html">jdoquery DTD/XSD</a></li>
-                        <li><a href="jdoconfig_dtd.html">jdoconfig DTD/XSD</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="enhancement.html">Bytecode Enhancement</a></li>
-                        <li><a href="jdohelper.html">JDO Helper</a></li>
-                        <li><a href="pmf.html">PersistenceManagerFactory</a></li>
-                        <li><a href="pm.html">PersistenceManager</a></li>
-                        <li><a href="transactions.html">Transactions</a></li>
-                        <li><a href="attach_detach.html">Attach-Detach</a></li>
-                        <li><a href="fetchgroups.html">Fetch Groups</a></li>
-                        <li><a href="state_transition.html">Object States</a></li>
-                        <li><a href="object_retrieval.html">Object Retrieval</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">JDOQL</li>
-                        <li><a href="jdoql.html">JDOQL</a></li>
-                        <li><a href="jdoql_result.html">Result</a></li>
-                        <li><a href="jdoql_methods.html">Methods</a></li>
-                        <li><a href="jdoql_quickref.pdf">Quick Ref PDF</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="extents.html">Extents</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
-                        <li><a href="guides-replication.html">Datastore Replication</a></li>
-                        <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="references.html">References</a></li>
-                        <li><a href="exceptions.html">Exceptions</a></li>
-                        <li><a href="glossary.html">Glossary</a></li>
-                    </ul>
-                </li>
-               <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Articles <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="jdo_3_0_overview.html">JDO 3.0 Overview</a></li>
-                    </ul>
-                </li>
-               <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="get-involved.html">Get Involved</a></li>
-                        <li><a href="team-list.html">Project Team</a></li>
-                        <li><a href="mail-lists.html">Mailing Lists</a></li>
-                        <li><a href="faq.html">FAQ</a></li>
-                    </ul>
-                </li>
-               <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Development <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="roadmap.html">RoadMap / TODO</a></li>
-                        <li><a href="svn.html">Source Code</a></li>
-                        <li><a href="http://cwiki.apache.org/GMOxDEV/Coding+standards">Coding Standards</a></li>
-                        <li><a href="issuetracking.html">Issue Tracking</a></li>
-                        <li><a href="dependencies.html">Dependencies</a></li>
-                    </ul>
-                </li>
-            </ul>
-           <!-- 'style' added to fix height of input box. FIX THIS -->
-            <form class="navbar-form navbar-left" role="search" id="search-form" action="https://www.google.com/search" method="get" style="padding: 1px 15px;">
-                <div class="form-group">
-                    <input name="sitesearch" value="db.apache.org" type="hidden">
-                    <input name="q" type="text" class="form-control" placeholder="Search" style="margin-top: 7px; padding: 1px; border-radius: 5px; height: 30px; vertical-align: middle;">
-                </div>
-            </form>
-        </div>
-    </div>
-</nav>
-<div class="container">
-    
-        <div class="row-fluid">
-            <div class="col-sm-9">
-<!--                <div class="page-title">
-                    <h3></h3>
-                </div>
--->
-                <div id="doc-content">
-                    <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
-</div>
-<hr>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <nav id="toc" data-spy="affix" data-toggle="toc"></nav>
-            </div>
-        </div>
-    
-</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>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/project-info.html b/docs/project-info.html
deleted file mode 100644
index f5ff78b..0000000
--- a/docs/project-info.html
+++ /dev/null
@@ -1,323 +0,0 @@
-<!DOCTYPE html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache"/>
-    <meta http-equiv="pragma" content="no-cache"/>
-    <meta http-equiv="expires" content="-1"/>
-    <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
-    <meta name="description" content="Apache JDO - Java Data Objects"/>
-
-    <title></title>
-
-    <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
-
-    <!--
-        Apache JDO Documentation Template
-        ==================================
-        This template derived various aspects from Apache Deltaspike template, the Apache ISIS template and the Datanucleus template.
-        This template uses 
-        * Bootstrap v3.3.7 (https://getbootstrap.com/) for navbar.
-        * Asciidoctor "foundation" CSS
-        * Bootswatch "cosmo" theme for Bootstrap (https://bootswatch.com/cosmo).
-        * Bootstrap TOC plugin v0.4.1 (https://afeld.github.io/bootstrap-toc/) for the table of contents.
-        * jQuery (necessary for Bootstrap's JavaScript plugins)
-        * Font-Awesome for some icons used by Asciidoctor
-        NOTE: tried using Font-Awesome CSS hosted locally but then fails to work!
-    -->
-    <link href="css/bootswatch/3.3.7/bootstrap-cosmo.css" rel="stylesheet"/>
-    <link href="css/bootstrap-toc/0.4.1/bootstrap-toc.min.css" rel="stylesheet"/>
-
-    <link href="css/asciidoctor/foundation.css" rel="stylesheet"/>
-    <link href="css/datanucleus_theme.css" rel="stylesheet"/>
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-    
-
-    
-
-    
-    
-    
-    
-    
-    
-
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap/3.3.7/bootstrap.min.js"></script>
-    <script src="js/bootstrap-toc/0.4.1/bootstrap-toc.min.js"></script>
-
-    <!-- Coderay syntax formatter -->
-    <style type="text/css">
-        /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
-/*pre.CodeRay {background-color:#f7f7f8;}*/
-.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
-.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
-.CodeRay .line-numbers strong{color:rgba(0,0,0,.4)}
-table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
-table.CodeRay td{vertical-align: top;line-height:1.45}
-table.CodeRay td.line-numbers{text-align:right}
-table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
-table.CodeRay td.code{padding:0 0 0 .5em}
-table.CodeRay td.code>pre{padding:0}
-.CodeRay .debug{color:#fff !important;background:#000080 !important}
-.CodeRay .annotation{color:#007}
-.CodeRay .attribute-name{color:#000080}
-.CodeRay .attribute-value{color:#700}
-.CodeRay .binary{color:#509}
-.CodeRay .comment{color:#998;font-style:italic}
-.CodeRay .char{color:#04d}
-.CodeRay .char .content{color:#04d}
-.CodeRay .char .delimiter{color:#039}
-.CodeRay .class{color:#458;font-weight:bold}
-.CodeRay .complex{color:#a08}
-.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
-.CodeRay .color{color:#099}
-.CodeRay .class-variable{color:#369}
-.CodeRay .decorator{color:#b0b}
-.CodeRay .definition{color:#099}
-.CodeRay .delimiter{color:#000}
-.CodeRay .doc{color:#970}
-.CodeRay .doctype{color:#34b}
-.CodeRay .doc-string{color:#d42}
-.CodeRay .escape{color:#666}
-.CodeRay .entity{color:#800}
-.CodeRay .error{color:#808}
-.CodeRay .exception{color:inherit}
-.CodeRay .filename{color:#099}
-.CodeRay .function{color:#900;font-weight:bold}
-.CodeRay .global-variable{color:#008080}
-.CodeRay .hex{color:#058}
-.CodeRay .integer,.CodeRay .float{color:#099}
-.CodeRay .include{color:#555}
-.CodeRay .inline{color:#000}
-.CodeRay .inline .inline{background:#ccc}
-.CodeRay .inline .inline .inline{background:#bbb}
-.CodeRay .inline .inline-delimiter{color:#d14}
-.CodeRay .inline-delimiter{color:#d14}
-.CodeRay .important{color:#555;font-weight:bold}
-.CodeRay .interpreted{color:#b2b}
-.CodeRay .instance-variable{color:#008080}
-.CodeRay .label{color:#970}
-.CodeRay .local-variable{color:#963}
-.CodeRay .octal{color:#40e}
-.CodeRay .predefined{color:#369}
-.CodeRay .preprocessor{color:#579}
-.CodeRay .pseudo-class{color:#555}
-.CodeRay .directive{font-weight:bold}
-.CodeRay .type{font-weight:bold}
-.CodeRay .predefined-type{color:inherit}
-.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
-.CodeRay .key{color:#808}
-.CodeRay .key .delimiter{color:#606}
-.CodeRay .key .char{color:#80f}
-.CodeRay .value{color:#088}
-.CodeRay .regexp .delimiter{color:#808}
-.CodeRay .regexp .content{color:#808}
-.CodeRay .regexp .modifier{color:#808}
-.CodeRay .regexp .char{color:#d14}
-.CodeRay .regexp .function{color:#404;font-weight:bold}
-.CodeRay .string{color:#d20}
-.CodeRay .string .string .string{background:#ffd0d0}
-.CodeRay .string .content{color:#d14}
-.CodeRay .string .char{color:#d14}
-.CodeRay .string .delimiter{color:#d14}
-.CodeRay .shell{color:#d14}
-.CodeRay .shell .delimiter{color:#d14}
-.CodeRay .symbol{color:#990073}
-.CodeRay .symbol .content{color:#a60}
-.CodeRay .symbol .delimiter{color:#630}
-.CodeRay .tag{color:#008080}
-.CodeRay .tag-special{color:#d70}
-.CodeRay .variable{color:#036}
-.CodeRay .insert{background:#afa}
-.CodeRay .delete{background:#faa}
-.CodeRay .change{color:#aaf;background:#007}
-.CodeRay .head{color:#f8f;background:#505}
-.CodeRay .insert .insert{color:#080}
-.CodeRay .delete .delete{color:#800}
-.CodeRay .change .change{color:#66f}
-.CodeRay .head .head{color:#f4f}
-    </style>
-</head>
-<body data-spy="scroll" data-target="#toc">
-<!-- Navbar -->
-<nav class="navbar navbar-default navbar-static-top">
-    <div class="container">
-        <div class="navbar-header">
-            <!-- Three line menu button for use on mobile screens -->
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <!-- 'style' added to align image with navbar. FIX THIS -->
-            <a class="navbar-brand" href="https://db.apache.org/jdo/">
-                <img style="margin-top: -12px;" alt="Brand" src="images/JDO_44x44.png"/>
-            </a>
-            <!-- TODO Any way to abstract the version from Maven? -->
-            <a class="navbar-brand" href="index.html">Apache JDO</a>
-        </div>
-        <!-- Navbar that will collapse on mobile screens -->
-        <div id="navbar" class="navbar-collapse collapse">
-            <ul class="nav navbar-nav">
-                <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">General <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="why_jdo.html">Why JDO?</a></li>
-                        <li><a href="jdo_v_jpa.html">JDO v JPA</a></li>
-                        <li><a href="jdo_v_jpa_api.html">JDO v JPA : API</a></li>
-                        <li><a href="jdo_v_jpa_orm.html">JDO v JPA : ORM</a></li>
-                        <li><a href="downloads.html">Downloads</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                    </ul>
-                </li>
-                <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">JDO Implementation <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="specifications.html">Specifications</a></li>
-                        <li><a href="tck.html">TCK</a></li>
-                    </ul>
-                </li>
-                <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">JDO Usage <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="impls.html">Implementations</a></li>
-                        <li><a href="javadoc.html">API Javadoc</a></li>
-                        <li><a href="class_types.html">Types of Classes</a></li>
-                        <li><a href="field_types.html">Types of Fields</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">Metadata</li>
-                        <li><a href="metadata.html">MetaData</a></li>
-                        <li><a href="annotations.html">Annotations</a></li>
-                        <li><a href="jdo_dtd.html">jdo DTD/XSD</a></li>
-                        <li><a href="orm_dtd.html">orm DTD/XSD</a></li>
-                        <li><a href="jdoquery_dtd.html">jdoquery DTD/XSD</a></li>
-                        <li><a href="jdoconfig_dtd.html">jdoconfig DTD/XSD</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="enhancement.html">Bytecode Enhancement</a></li>
-                        <li><a href="jdohelper.html">JDO Helper</a></li>
-                        <li><a href="pmf.html">PersistenceManagerFactory</a></li>
-                        <li><a href="pm.html">PersistenceManager</a></li>
-                        <li><a href="transactions.html">Transactions</a></li>
-                        <li><a href="attach_detach.html">Attach-Detach</a></li>
-                        <li><a href="fetchgroups.html">Fetch Groups</a></li>
-                        <li><a href="state_transition.html">Object States</a></li>
-                        <li><a href="object_retrieval.html">Object Retrieval</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">JDOQL</li>
-                        <li><a href="jdoql.html">JDOQL</a></li>
-                        <li><a href="jdoql_result.html">Result</a></li>
-                        <li><a href="jdoql_methods.html">Methods</a></li>
-                        <li><a href="jdoql_quickref.pdf">Quick Ref PDF</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="extents.html">Extents</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
-                        <li><a href="guides-replication.html">Datastore Replication</a></li>
-                        <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="references.html">References</a></li>
-                        <li><a href="exceptions.html">Exceptions</a></li>
-                        <li><a href="glossary.html">Glossary</a></li>
-                    </ul>
-                </li>
-               <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Articles <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="jdo_3_0_overview.html">JDO 3.0 Overview</a></li>
-                    </ul>
-                </li>
-               <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="get-involved.html">Get Involved</a></li>
-                        <li><a href="team-list.html">Project Team</a></li>
-                        <li><a href="mail-lists.html">Mailing Lists</a></li>
-                        <li><a href="faq.html">FAQ</a></li>
-                    </ul>
-                </li>
-               <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Development <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="roadmap.html">RoadMap / TODO</a></li>
-                        <li><a href="svn.html">Source Code</a></li>
-                        <li><a href="http://cwiki.apache.org/GMOxDEV/Coding+standards">Coding Standards</a></li>
-                        <li><a href="issuetracking.html">Issue Tracking</a></li>
-                        <li><a href="dependencies.html">Dependencies</a></li>
-                    </ul>
-                </li>
-            </ul>
-           <!-- 'style' added to fix height of input box. FIX THIS -->
-            <form class="navbar-form navbar-left" role="search" id="search-form" action="https://www.google.com/search" method="get" style="padding: 1px 15px;">
-                <div class="form-group">
-                    <input name="sitesearch" value="db.apache.org" type="hidden">
-                    <input name="q" type="text" class="form-control" placeholder="Search" style="margin-top: 7px; padding: 1px; border-radius: 5px; height: 30px; vertical-align: middle;">
-                </div>
-            </form>
-        </div>
-    </div>
-</nav>
-<div class="container">
-    
-        <div class="row-fluid">
-            <div class="col-sm-9">
-<!--                <div class="page-title">
-                    <h3></h3>
-                </div>
--->
-                <div id="doc-content">
-                    <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
-</div>
-<hr>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <nav id="toc" data-spy="affix" data-toggle="toc"></nav>
-            </div>
-        </div>
-    
-</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>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/types.html b/docs/types.html
deleted file mode 100644
index f5ff78b..0000000
--- a/docs/types.html
+++ /dev/null
@@ -1,323 +0,0 @@
-<!DOCTYPE html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache"/>
-    <meta http-equiv="pragma" content="no-cache"/>
-    <meta http-equiv="expires" content="-1"/>
-    <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
-    <meta name="description" content="Apache JDO - Java Data Objects"/>
-
-    <title></title>
-
-    <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
-
-    <!--
-        Apache JDO Documentation Template
-        ==================================
-        This template derived various aspects from Apache Deltaspike template, the Apache ISIS template and the Datanucleus template.
-        This template uses 
-        * Bootstrap v3.3.7 (https://getbootstrap.com/) for navbar.
-        * Asciidoctor "foundation" CSS
-        * Bootswatch "cosmo" theme for Bootstrap (https://bootswatch.com/cosmo).
-        * Bootstrap TOC plugin v0.4.1 (https://afeld.github.io/bootstrap-toc/) for the table of contents.
-        * jQuery (necessary for Bootstrap's JavaScript plugins)
-        * Font-Awesome for some icons used by Asciidoctor
-        NOTE: tried using Font-Awesome CSS hosted locally but then fails to work!
-    -->
-    <link href="css/bootswatch/3.3.7/bootstrap-cosmo.css" rel="stylesheet"/>
-    <link href="css/bootstrap-toc/0.4.1/bootstrap-toc.min.css" rel="stylesheet"/>
-
-    <link href="css/asciidoctor/foundation.css" rel="stylesheet"/>
-    <link href="css/datanucleus_theme.css" rel="stylesheet"/>
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-    
-
-    
-
-    
-    
-    
-    
-    
-    
-
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap/3.3.7/bootstrap.min.js"></script>
-    <script src="js/bootstrap-toc/0.4.1/bootstrap-toc.min.js"></script>
-
-    <!-- Coderay syntax formatter -->
-    <style type="text/css">
-        /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
-/*pre.CodeRay {background-color:#f7f7f8;}*/
-.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
-.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
-.CodeRay .line-numbers strong{color:rgba(0,0,0,.4)}
-table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
-table.CodeRay td{vertical-align: top;line-height:1.45}
-table.CodeRay td.line-numbers{text-align:right}
-table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
-table.CodeRay td.code{padding:0 0 0 .5em}
-table.CodeRay td.code>pre{padding:0}
-.CodeRay .debug{color:#fff !important;background:#000080 !important}
-.CodeRay .annotation{color:#007}
-.CodeRay .attribute-name{color:#000080}
-.CodeRay .attribute-value{color:#700}
-.CodeRay .binary{color:#509}
-.CodeRay .comment{color:#998;font-style:italic}
-.CodeRay .char{color:#04d}
-.CodeRay .char .content{color:#04d}
-.CodeRay .char .delimiter{color:#039}
-.CodeRay .class{color:#458;font-weight:bold}
-.CodeRay .complex{color:#a08}
-.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
-.CodeRay .color{color:#099}
-.CodeRay .class-variable{color:#369}
-.CodeRay .decorator{color:#b0b}
-.CodeRay .definition{color:#099}
-.CodeRay .delimiter{color:#000}
-.CodeRay .doc{color:#970}
-.CodeRay .doctype{color:#34b}
-.CodeRay .doc-string{color:#d42}
-.CodeRay .escape{color:#666}
-.CodeRay .entity{color:#800}
-.CodeRay .error{color:#808}
-.CodeRay .exception{color:inherit}
-.CodeRay .filename{color:#099}
-.CodeRay .function{color:#900;font-weight:bold}
-.CodeRay .global-variable{color:#008080}
-.CodeRay .hex{color:#058}
-.CodeRay .integer,.CodeRay .float{color:#099}
-.CodeRay .include{color:#555}
-.CodeRay .inline{color:#000}
-.CodeRay .inline .inline{background:#ccc}
-.CodeRay .inline .inline .inline{background:#bbb}
-.CodeRay .inline .inline-delimiter{color:#d14}
-.CodeRay .inline-delimiter{color:#d14}
-.CodeRay .important{color:#555;font-weight:bold}
-.CodeRay .interpreted{color:#b2b}
-.CodeRay .instance-variable{color:#008080}
-.CodeRay .label{color:#970}
-.CodeRay .local-variable{color:#963}
-.CodeRay .octal{color:#40e}
-.CodeRay .predefined{color:#369}
-.CodeRay .preprocessor{color:#579}
-.CodeRay .pseudo-class{color:#555}
-.CodeRay .directive{font-weight:bold}
-.CodeRay .type{font-weight:bold}
-.CodeRay .predefined-type{color:inherit}
-.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
-.CodeRay .key{color:#808}
-.CodeRay .key .delimiter{color:#606}
-.CodeRay .key .char{color:#80f}
-.CodeRay .value{color:#088}
-.CodeRay .regexp .delimiter{color:#808}
-.CodeRay .regexp .content{color:#808}
-.CodeRay .regexp .modifier{color:#808}
-.CodeRay .regexp .char{color:#d14}
-.CodeRay .regexp .function{color:#404;font-weight:bold}
-.CodeRay .string{color:#d20}
-.CodeRay .string .string .string{background:#ffd0d0}
-.CodeRay .string .content{color:#d14}
-.CodeRay .string .char{color:#d14}
-.CodeRay .string .delimiter{color:#d14}
-.CodeRay .shell{color:#d14}
-.CodeRay .shell .delimiter{color:#d14}
-.CodeRay .symbol{color:#990073}
-.CodeRay .symbol .content{color:#a60}
-.CodeRay .symbol .delimiter{color:#630}
-.CodeRay .tag{color:#008080}
-.CodeRay .tag-special{color:#d70}
-.CodeRay .variable{color:#036}
-.CodeRay .insert{background:#afa}
-.CodeRay .delete{background:#faa}
-.CodeRay .change{color:#aaf;background:#007}
-.CodeRay .head{color:#f8f;background:#505}
-.CodeRay .insert .insert{color:#080}
-.CodeRay .delete .delete{color:#800}
-.CodeRay .change .change{color:#66f}
-.CodeRay .head .head{color:#f4f}
-    </style>
-</head>
-<body data-spy="scroll" data-target="#toc">
-<!-- Navbar -->
-<nav class="navbar navbar-default navbar-static-top">
-    <div class="container">
-        <div class="navbar-header">
-            <!-- Three line menu button for use on mobile screens -->
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <!-- 'style' added to align image with navbar. FIX THIS -->
-            <a class="navbar-brand" href="https://db.apache.org/jdo/">
-                <img style="margin-top: -12px;" alt="Brand" src="images/JDO_44x44.png"/>
-            </a>
-            <!-- TODO Any way to abstract the version from Maven? -->
-            <a class="navbar-brand" href="index.html">Apache JDO</a>
-        </div>
-        <!-- Navbar that will collapse on mobile screens -->
-        <div id="navbar" class="navbar-collapse collapse">
-            <ul class="nav navbar-nav">
-                <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">General <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="why_jdo.html">Why JDO?</a></li>
-                        <li><a href="jdo_v_jpa.html">JDO v JPA</a></li>
-                        <li><a href="jdo_v_jpa_api.html">JDO v JPA : API</a></li>
-                        <li><a href="jdo_v_jpa_orm.html">JDO v JPA : ORM</a></li>
-                        <li><a href="downloads.html">Downloads</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                    </ul>
-                </li>
-                <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">JDO Implementation <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="specifications.html">Specifications</a></li>
-                        <li><a href="tck.html">TCK</a></li>
-                    </ul>
-                </li>
-                <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">JDO Usage <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="impls.html">Implementations</a></li>
-                        <li><a href="javadoc.html">API Javadoc</a></li>
-                        <li><a href="class_types.html">Types of Classes</a></li>
-                        <li><a href="field_types.html">Types of Fields</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">Metadata</li>
-                        <li><a href="metadata.html">MetaData</a></li>
-                        <li><a href="annotations.html">Annotations</a></li>
-                        <li><a href="jdo_dtd.html">jdo DTD/XSD</a></li>
-                        <li><a href="orm_dtd.html">orm DTD/XSD</a></li>
-                        <li><a href="jdoquery_dtd.html">jdoquery DTD/XSD</a></li>
-                        <li><a href="jdoconfig_dtd.html">jdoconfig DTD/XSD</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="enhancement.html">Bytecode Enhancement</a></li>
-                        <li><a href="jdohelper.html">JDO Helper</a></li>
-                        <li><a href="pmf.html">PersistenceManagerFactory</a></li>
-                        <li><a href="pm.html">PersistenceManager</a></li>
-                        <li><a href="transactions.html">Transactions</a></li>
-                        <li><a href="attach_detach.html">Attach-Detach</a></li>
-                        <li><a href="fetchgroups.html">Fetch Groups</a></li>
-                        <li><a href="state_transition.html">Object States</a></li>
-                        <li><a href="object_retrieval.html">Object Retrieval</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">JDOQL</li>
-                        <li><a href="jdoql.html">JDOQL</a></li>
-                        <li><a href="jdoql_result.html">Result</a></li>
-                        <li><a href="jdoql_methods.html">Methods</a></li>
-                        <li><a href="jdoql_quickref.pdf">Quick Ref PDF</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="extents.html">Extents</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
-                        <li><a href="guides-replication.html">Datastore Replication</a></li>
-                        <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="references.html">References</a></li>
-                        <li><a href="exceptions.html">Exceptions</a></li>
-                        <li><a href="glossary.html">Glossary</a></li>
-                    </ul>
-                </li>
-               <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Articles <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="jdo_3_0_overview.html">JDO 3.0 Overview</a></li>
-                    </ul>
-                </li>
-               <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="get-involved.html">Get Involved</a></li>
-                        <li><a href="team-list.html">Project Team</a></li>
-                        <li><a href="mail-lists.html">Mailing Lists</a></li>
-                        <li><a href="faq.html">FAQ</a></li>
-                    </ul>
-                </li>
-               <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Development <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="roadmap.html">RoadMap / TODO</a></li>
-                        <li><a href="svn.html">Source Code</a></li>
-                        <li><a href="http://cwiki.apache.org/GMOxDEV/Coding+standards">Coding Standards</a></li>
-                        <li><a href="issuetracking.html">Issue Tracking</a></li>
-                        <li><a href="dependencies.html">Dependencies</a></li>
-                    </ul>
-                </li>
-            </ul>
-           <!-- 'style' added to fix height of input box. FIX THIS -->
-            <form class="navbar-form navbar-left" role="search" id="search-form" action="https://www.google.com/search" method="get" style="padding: 1px 15px;">
-                <div class="form-group">
-                    <input name="sitesearch" value="db.apache.org" type="hidden">
-                    <input name="q" type="text" class="form-control" placeholder="Search" style="margin-top: 7px; padding: 1px; border-radius: 5px; height: 30px; vertical-align: middle;">
-                </div>
-            </form>
-        </div>
-    </div>
-</nav>
-<div class="container">
-    
-        <div class="row-fluid">
-            <div class="col-sm-9">
-<!--                <div class="page-title">
-                    <h3></h3>
-                </div>
--->
-                <div id="doc-content">
-                    <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
-</div>
-<hr>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <nav id="toc" data-spy="affix" data-toggle="toc"></nav>
-            </div>
-        </div>
-    
-</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>
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/asciidoc/cvs-usage.adoc b/src/main/asciidoc/cvs-usage.adoc
deleted file mode 100644
index ed482d3..0000000
--- a/src/main/asciidoc/cvs-usage.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-[[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
-
-:_basedir: 
-:_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
-:grid: cols
-
diff --git a/src/main/asciidoc/issue-tracking.adoc b/src/main/asciidoc/issue-tracking.adoc
deleted file mode 100644
index ed482d3..0000000
--- a/src/main/asciidoc/issue-tracking.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-[[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
-
-:_basedir: 
-:_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
-:grid: cols
-
diff --git a/src/main/asciidoc/maven-reports.adoc b/src/main/asciidoc/maven-reports.adoc
deleted file mode 100644
index ed482d3..0000000
--- a/src/main/asciidoc/maven-reports.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-[[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
-
-:_basedir: 
-:_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
-:grid: cols
-
diff --git a/src/main/asciidoc/project-info.adoc b/src/main/asciidoc/project-info.adoc
deleted file mode 100644
index ed482d3..0000000
--- a/src/main/asciidoc/project-info.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-[[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
-
-:_basedir: 
-:_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
-:grid: cols
-
diff --git a/src/main/asciidoc/types.adoc b/src/main/asciidoc/types.adoc
deleted file mode 100644
index ed482d3..0000000
--- a/src/main/asciidoc/types.adoc
+++ /dev/null
@@ -1,13 +0,0 @@
-[[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
-
-:_basedir: 
-:_imagesdir: images/
-:notoc:
-:nofooter:
-:titlepage:
-:grid: cols
-
diff --git a/src/main/template/document.html.erb b/src/main/template/document.html.erb
index a331149..9b4b839 100644
--- a/src/main/template/document.html.erb
+++ b/src/main/template/document.html.erb
@@ -174,7 +174,6 @@
                         <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.html">Guides</a></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>


[db-jdo-site] 02/05: Removed title images from all pages except index.html

Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 739de930d8091d71f6c006cacd17d26c88ac85c0
Author: Tilmann <zo...@gmx.de>
AuthorDate: Wed Apr 15 22:53:26 2020 +0200

    Removed title images from all pages except index.html
---
 src/main/asciidoc/annotations.adoc        | 5 +----
 src/main/asciidoc/attach_detach.adoc      | 5 +----
 src/main/asciidoc/class_types.adoc        | 5 +----
 src/main/asciidoc/dependencies.adoc       | 5 +----
 src/main/asciidoc/downloads.adoc          | 5 +----
 src/main/asciidoc/enhancement.adoc        | 5 +----
 src/main/asciidoc/exceptions.adoc         | 5 +----
 src/main/asciidoc/extents.adoc            | 5 +----
 src/main/asciidoc/faq.adoc                | 5 +----
 src/main/asciidoc/fetchgroups.adoc        | 5 +----
 src/main/asciidoc/field_types.adoc        | 5 +----
 src/main/asciidoc/get-involved.adoc       | 5 +----
 src/main/asciidoc/glossary.adoc           | 5 +----
 src/main/asciidoc/guides-maven-jdo.adoc   | 5 +----
 src/main/asciidoc/guides-replication.adoc | 5 +----
 src/main/asciidoc/guides.adoc             | 5 +----
 src/main/asciidoc/impls.adoc              | 5 +----
 src/main/asciidoc/issuetracking.adoc      | 5 +----
 src/main/asciidoc/javadoc.adoc            | 5 +----
 src/main/asciidoc/jdo_3_0_overview.adoc   | 5 +----
 src/main/asciidoc/jdo_dtd.adoc            | 5 +----
 src/main/asciidoc/jdo_v_jpa.adoc          | 5 +----
 src/main/asciidoc/jdo_v_jpa_api.adoc      | 5 +----
 src/main/asciidoc/jdo_v_jpa_orm.adoc      | 5 +----
 src/main/asciidoc/jdocentral.adoc         | 5 +----
 src/main/asciidoc/jdoconfig_dtd.adoc      | 5 +----
 src/main/asciidoc/jdohelper.adoc          | 5 +----
 src/main/asciidoc/jdoql.adoc              | 5 +----
 src/main/asciidoc/jdoql_methods.adoc      | 5 +----
 src/main/asciidoc/jdoql_result.adoc       | 5 +----
 src/main/asciidoc/jdoquery_dtd.adoc       | 5 +----
 src/main/asciidoc/mail-lists.adoc         | 5 +----
 src/main/asciidoc/metadata.adoc           | 5 +----
 src/main/asciidoc/newshistory.adoc        | 5 +----
 src/main/asciidoc/object_retrieval.adoc   | 5 +----
 src/main/asciidoc/orm_dtd.adoc            | 5 +----
 src/main/asciidoc/pm.adoc                 | 5 +----
 src/main/asciidoc/pmf.adoc                | 5 +----
 src/main/asciidoc/references.adoc         | 5 +----
 src/main/asciidoc/release-3.0.1.adoc      | 5 +----
 src/main/asciidoc/release-3.1-rc1.adoc    | 6 +-----
 src/main/asciidoc/release-3.1.adoc        | 5 +----
 src/main/asciidoc/roadmap.adoc            | 5 +----
 src/main/asciidoc/specifications.adoc     | 5 +----
 src/main/asciidoc/state_transition.adoc   | 5 +----
 src/main/asciidoc/svn.adoc                | 5 +----
 src/main/asciidoc/tck.adoc                | 5 +----
 src/main/asciidoc/team-list.adoc          | 5 +----
 src/main/asciidoc/transactions.adoc       | 5 +----
 src/main/asciidoc/why_jdo.adoc            | 5 +----
 50 files changed, 50 insertions(+), 201 deletions(-)

diff --git a/src/main/asciidoc/annotations.adoc b/src/main/asciidoc/annotations.adoc
index bd26c72..50d29ed 100644
--- a/src/main/asciidoc/annotations.adoc
+++ b/src/main/asciidoc/annotations.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/attach_detach.adoc b/src/main/asciidoc/attach_detach.adoc
index b759264..9c7bf34 100644
--- a/src/main/asciidoc/attach_detach.adoc
+++ b/src/main/asciidoc/attach_detach.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/class_types.adoc b/src/main/asciidoc/class_types.adoc
index e45f11d..506acab 100644
--- a/src/main/asciidoc/class_types.adoc
+++ b/src/main/asciidoc/class_types.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/dependencies.adoc b/src/main/asciidoc/dependencies.adoc
index 0d908df..8c2fab2 100644
--- a/src/main/asciidoc/dependencies.adoc
+++ b/src/main/asciidoc/dependencies.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/downloads.adoc b/src/main/asciidoc/downloads.adoc
index 59bf33b..c1aed42 100644
--- a/src/main/asciidoc/downloads.adoc
+++ b/src/main/asciidoc/downloads.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/enhancement.adoc b/src/main/asciidoc/enhancement.adoc
index 4e1aa62..c6480cb 100644
--- a/src/main/asciidoc/enhancement.adoc
+++ b/src/main/asciidoc/enhancement.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/exceptions.adoc b/src/main/asciidoc/exceptions.adoc
index 237e1d6..11cca84 100644
--- a/src/main/asciidoc/exceptions.adoc
+++ b/src/main/asciidoc/exceptions.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/extents.adoc b/src/main/asciidoc/extents.adoc
index 6e07f1c..237731c 100644
--- a/src/main/asciidoc/extents.adoc
+++ b/src/main/asciidoc/extents.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/faq.adoc b/src/main/asciidoc/faq.adoc
index 9814b1c..a0a02c7 100644
--- a/src/main/asciidoc/faq.adoc
+++ b/src/main/asciidoc/faq.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/fetchgroups.adoc b/src/main/asciidoc/fetchgroups.adoc
index 3de7b32..c1acd5d 100644
--- a/src/main/asciidoc/fetchgroups.adoc
+++ b/src/main/asciidoc/fetchgroups.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/field_types.adoc b/src/main/asciidoc/field_types.adoc
index d16724e..d102a03 100644
--- a/src/main/asciidoc/field_types.adoc
+++ b/src/main/asciidoc/field_types.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/get-involved.adoc b/src/main/asciidoc/get-involved.adoc
index 9788dda..fe88054 100644
--- a/src/main/asciidoc/get-involved.adoc
+++ b/src/main/asciidoc/get-involved.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/glossary.adoc b/src/main/asciidoc/glossary.adoc
index 11ebba8..8196507 100644
--- a/src/main/asciidoc/glossary.adoc
+++ b/src/main/asciidoc/glossary.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/guides-maven-jdo.adoc b/src/main/asciidoc/guides-maven-jdo.adoc
index e8df646..80331ed 100644
--- a/src/main/asciidoc/guides-maven-jdo.adoc
+++ b/src/main/asciidoc/guides-maven-jdo.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/guides-replication.adoc b/src/main/asciidoc/guides-replication.adoc
index d2cbc4c..6c5d120 100644
--- a/src/main/asciidoc/guides-replication.adoc
+++ b/src/main/asciidoc/guides-replication.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/guides.adoc b/src/main/asciidoc/guides.adoc
index 64eba35..277da88 100644
--- a/src/main/asciidoc/guides.adoc
+++ b/src/main/asciidoc/guides.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/impls.adoc b/src/main/asciidoc/impls.adoc
index d3f307f..b60259f 100644
--- a/src/main/asciidoc/impls.adoc
+++ b/src/main/asciidoc/impls.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/issuetracking.adoc b/src/main/asciidoc/issuetracking.adoc
index a4e8b9d..c413d35 100644
--- a/src/main/asciidoc/issuetracking.adoc
+++ b/src/main/asciidoc/issuetracking.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/javadoc.adoc b/src/main/asciidoc/javadoc.adoc
index bcd5652..bf5e5b2 100644
--- a/src/main/asciidoc/javadoc.adoc
+++ b/src/main/asciidoc/javadoc.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/jdo_3_0_overview.adoc b/src/main/asciidoc/jdo_3_0_overview.adoc
index bbf5446..4c99f04 100644
--- a/src/main/asciidoc/jdo_3_0_overview.adoc
+++ b/src/main/asciidoc/jdo_3_0_overview.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/jdo_dtd.adoc b/src/main/asciidoc/jdo_dtd.adoc
index 37fb0e0..9aaf074 100644
--- a/src/main/asciidoc/jdo_dtd.adoc
+++ b/src/main/asciidoc/jdo_dtd.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/jdo_v_jpa.adoc b/src/main/asciidoc/jdo_v_jpa.adoc
index b124527..7c9db49 100644
--- a/src/main/asciidoc/jdo_v_jpa.adoc
+++ b/src/main/asciidoc/jdo_v_jpa.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/jdo_v_jpa_api.adoc b/src/main/asciidoc/jdo_v_jpa_api.adoc
index 3638af4..90ed9d9 100644
--- a/src/main/asciidoc/jdo_v_jpa_api.adoc
+++ b/src/main/asciidoc/jdo_v_jpa_api.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/jdo_v_jpa_orm.adoc b/src/main/asciidoc/jdo_v_jpa_orm.adoc
index aeaaee9..efb3c22 100644
--- a/src/main/asciidoc/jdo_v_jpa_orm.adoc
+++ b/src/main/asciidoc/jdo_v_jpa_orm.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/jdocentral.adoc b/src/main/asciidoc/jdocentral.adoc
index 33a8ab2..f21688a 100644
--- a/src/main/asciidoc/jdocentral.adoc
+++ b/src/main/asciidoc/jdocentral.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/jdoconfig_dtd.adoc b/src/main/asciidoc/jdoconfig_dtd.adoc
index ac94a51..0475458 100644
--- a/src/main/asciidoc/jdoconfig_dtd.adoc
+++ b/src/main/asciidoc/jdoconfig_dtd.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/jdohelper.adoc b/src/main/asciidoc/jdohelper.adoc
index 0407a95..a52f083 100644
--- a/src/main/asciidoc/jdohelper.adoc
+++ b/src/main/asciidoc/jdohelper.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/jdoql.adoc b/src/main/asciidoc/jdoql.adoc
index bcf28af..255ee12 100644
--- a/src/main/asciidoc/jdoql.adoc
+++ b/src/main/asciidoc/jdoql.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/jdoql_methods.adoc b/src/main/asciidoc/jdoql_methods.adoc
index bc47813..fd7cfdd 100644
--- a/src/main/asciidoc/jdoql_methods.adoc
+++ b/src/main/asciidoc/jdoql_methods.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/jdoql_result.adoc b/src/main/asciidoc/jdoql_result.adoc
index e15ff85..8b0d19a 100644
--- a/src/main/asciidoc/jdoql_result.adoc
+++ b/src/main/asciidoc/jdoql_result.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/jdoquery_dtd.adoc b/src/main/asciidoc/jdoquery_dtd.adoc
index 05d36ce..f48737f 100644
--- a/src/main/asciidoc/jdoquery_dtd.adoc
+++ b/src/main/asciidoc/jdoquery_dtd.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/mail-lists.adoc b/src/main/asciidoc/mail-lists.adoc
index 31434cd..0705025 100644
--- a/src/main/asciidoc/mail-lists.adoc
+++ b/src/main/asciidoc/mail-lists.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/metadata.adoc b/src/main/asciidoc/metadata.adoc
index 907cfef..0eac44b 100644
--- a/src/main/asciidoc/metadata.adoc
+++ b/src/main/asciidoc/metadata.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/newshistory.adoc b/src/main/asciidoc/newshistory.adoc
index 30e5de4..111d7d7 100644
--- a/src/main/asciidoc/newshistory.adoc
+++ b/src/main/asciidoc/newshistory.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/object_retrieval.adoc b/src/main/asciidoc/object_retrieval.adoc
index f75dfb9..e316843 100644
--- a/src/main/asciidoc/object_retrieval.adoc
+++ b/src/main/asciidoc/object_retrieval.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/orm_dtd.adoc b/src/main/asciidoc/orm_dtd.adoc
index 89fe6b8..089c2a5 100644
--- a/src/main/asciidoc/orm_dtd.adoc
+++ b/src/main/asciidoc/orm_dtd.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/pm.adoc b/src/main/asciidoc/pm.adoc
index b8ab3fb..c99f0d3 100644
--- a/src/main/asciidoc/pm.adoc
+++ b/src/main/asciidoc/pm.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/pmf.adoc b/src/main/asciidoc/pmf.adoc
index b9df076..1643640 100644
--- a/src/main/asciidoc/pmf.adoc
+++ b/src/main/asciidoc/pmf.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/references.adoc b/src/main/asciidoc/references.adoc
index 9b79642..3d95678 100644
--- a/src/main/asciidoc/references.adoc
+++ b/src/main/asciidoc/references.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/release-3.0.1.adoc b/src/main/asciidoc/release-3.0.1.adoc
index fbcb49b..baa54f5 100644
--- a/src/main/asciidoc/release-3.0.1.adoc
+++ b/src/main/asciidoc/release-3.0.1.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/release-3.1-rc1.adoc b/src/main/asciidoc/release-3.1-rc1.adoc
index 06016e2..bb3e93b 100644
--- a/src/main/asciidoc/release-3.1-rc1.adoc
+++ b/src/main/asciidoc/release-3.1-rc1.adoc
@@ -1,9 +1,5 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
+{empty} +
 :_basedir: 
 :_imagesdir: images/
 :notoc:
diff --git a/src/main/asciidoc/release-3.1.adoc b/src/main/asciidoc/release-3.1.adoc
index 601f92f..f4ebc87 100644
--- a/src/main/asciidoc/release-3.1.adoc
+++ b/src/main/asciidoc/release-3.1.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/roadmap.adoc b/src/main/asciidoc/roadmap.adoc
index 4c70cb0..bac6bad 100644
--- a/src/main/asciidoc/roadmap.adoc
+++ b/src/main/asciidoc/roadmap.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/specifications.adoc b/src/main/asciidoc/specifications.adoc
index a19fe81..42cab08 100644
--- a/src/main/asciidoc/specifications.adoc
+++ b/src/main/asciidoc/specifications.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/state_transition.adoc b/src/main/asciidoc/state_transition.adoc
index a00c27e..dd85c98 100644
--- a/src/main/asciidoc/state_transition.adoc
+++ b/src/main/asciidoc/state_transition.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/svn.adoc b/src/main/asciidoc/svn.adoc
index c5ccfc6..559e5ef 100644
--- a/src/main/asciidoc/svn.adoc
+++ b/src/main/asciidoc/svn.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/tck.adoc b/src/main/asciidoc/tck.adoc
index 1665bcb..35ab47c 100644
--- a/src/main/asciidoc/tck.adoc
+++ b/src/main/asciidoc/tck.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/team-list.adoc b/src/main/asciidoc/team-list.adoc
index 2095f35..0ee48da 100644
--- a/src/main/asciidoc/team-list.adoc
+++ b/src/main/asciidoc/team-list.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/transactions.adoc b/src/main/asciidoc/transactions.adoc
index 8272b6a..06bc605 100644
--- a/src/main/asciidoc/transactions.adoc
+++ b/src/main/asciidoc/transactions.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/
diff --git a/src/main/asciidoc/why_jdo.adoc b/src/main/asciidoc/why_jdo.adoc
index 54a6416..614c453 100644
--- a/src/main/asciidoc/why_jdo.adoc
+++ b/src/main/asciidoc/why_jdo.adoc
@@ -1,8 +1,5 @@
 [[index]]
-image:images/JDOx100.png[float="left"]
-image:images/jdo_text.png[float="right"]
-
-'''''
+{empty} +
 
 :_basedir: 
 :_imagesdir: images/


[db-jdo-site] 03/05: Removed weird '-' after ':'

Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 03413586f16f9985101d87ea7a658ac033241ff7
Author: Tilmann <zo...@gmx.de>
AuthorDate: Wed Apr 15 22:56:45 2020 +0200

    Removed weird '-' after ':'
---
 src/main/asciidoc/annotations.adoc   | 2 +-
 src/main/asciidoc/attach_detach.adoc | 2 +-
 src/main/asciidoc/fetchgroups.adoc   | 2 +-
 src/main/asciidoc/metadata.adoc      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/asciidoc/annotations.adoc b/src/main/asciidoc/annotations.adoc
index 50d29ed..83c88e8 100644
--- a/src/main/asciidoc/annotations.adoc
+++ b/src/main/asciidoc/annotations.adoc
@@ -12,7 +12,7 @@
 
 One of the things that JDK 1.5 provides that can be of some use is
 annotations, and JDO provides its own set. When selecting to use
-annotations please bear in mind the following :-
+annotations please bear in mind the following :
 
 * You must have the *jdo-api* jar in your CLASSPATH since this provides
 the annotations
diff --git a/src/main/asciidoc/attach_detach.adoc b/src/main/asciidoc/attach_detach.adoc
index 9c7bf34..a614457 100644
--- a/src/main/asciidoc/attach_detach.adoc
+++ b/src/main/asciidoc/attach_detach.adoc
@@ -89,7 +89,7 @@ finally
 
 So we now don't need to do any manual copying of object fields just
 using a simple call to detach the object, and then attach it again
-later. Here are a few things to note with _attach/detach_ :-
+later. Here are a few things to note with _attach/detach_ :
 
 * Calling _detachCopy_ on an object that is not detachable will return a
 *transient* instance that is a COPY of the original, so use the COPY
diff --git a/src/main/asciidoc/fetchgroups.adoc b/src/main/asciidoc/fetchgroups.adoc
index c1acd5d..b06e768 100644
--- a/src/main/asciidoc/fetchgroups.adoc
+++ b/src/main/asciidoc/fetchgroups.adoc
@@ -43,7 +43,7 @@ anchor:dfg[]
 JDO provides an initial fetch group, comprising the fields that will be
 retrieved when an object is retrieved if the user does nothing to define
 the required behaviour. By default the _default fetch group_ comprises
-all fields of the following types :-
+all fields of the following types :
 
 * primitives : boolean, byte, char, double, float, int, long, short
 * Object wrappers of primitives : Boolean, Byte, Character, Double,
diff --git a/src/main/asciidoc/metadata.adoc b/src/main/asciidoc/metadata.adoc
index 0eac44b..8aa5fcb 100644
--- a/src/main/asciidoc/metadata.adoc
+++ b/src/main/asciidoc/metadata.adoc
@@ -19,7 +19,7 @@ annotations.
 JDO expects any XML MetaData to be specified in a file or files in
 particular positions in the file system. For example, if you have a
 class _com.mycompany.sample.MyExample_, JDO will look for any of the
-following files until it finds one (in the order stated) :-
+following files until it finds one (in the order stated) :
 
 ....
 META-INF/package.jdo


[db-jdo-site] 01/05: Fixed htm tab tooltip & pom cleanup

Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit cd7af3c3bac51371e825406f2f1b4e0e9e1089e6
Author: Tilmann <zo...@gmx.de>
AuthorDate: Wed Apr 15 21:58:23 2020 +0200

    Fixed htm tab tooltip & pom cleanup
---
 pom.xml                             | 60 +------------------------------------
 src/main/template/document.html.erb |  2 +-
 2 files changed, 2 insertions(+), 60 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5ae1790..c2e1fdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
                         -->
                         <!-- Attributes common to all output formats -->
                         <attributes>
-                            <endpoint-url>http://www.datanucleus.org</endpoint-url>
+                            <endpoint-url>http://db.apache.org/jdo</endpoint-url>
                             <sourcedir>${project.build.sourceDirectory}</sourcedir>
                             <project-version>${project.version}</project-version>
                         </attributes>
@@ -130,64 +130,6 @@
                                         <toc>left</toc>
                                         <icons>font</icons>
                                         <version>${project.version}</version>
-
-                                        <!-- improvethisdoc.rootDir>/</improvethisdoc.rootDir>
-                                        <improvethisdoc.srcDir>/src/main/asciidoc</improvethisdoc.srcDir>
-                                        <improvethisdoc.organisation>datanucleus</improvethisdoc.organisation>
-                                        <improvethisdoc.repo>docs-accessplatform</improvethisdoc.repo>
-                                        <improvethisdoc.branch>master</improvethisdoc.branch>
-                                        <improvethisdoc.label>Edit</improvethisdoc.label-->
-                                    </attributes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>pdf</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-<!--                 <property>
-                    <name>!skip.pdf</name>
-                </property> -->
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctor-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>generate-pdf-doc</id>
-                                <phase>generate-resources</phase>
-                                <goals>
-                                    <goal>process-asciidoc</goal>
-                                </goals>
-                                <configuration>
-                                    <backend>pdf</backend>
-
-                                    <sourceDirectory>src/main/asciidoc/</sourceDirectory>
-                                    <outputDirectory>${project.reporting.outputDirectory}/</outputDirectory>
-
-                                    <sourceHighlighter>rouge</sourceHighlighter>
-                                    <preserveDirectories>true</preserveDirectories>
-                                    <relativeBaseDir>true</relativeBaseDir>
-                                    <doctype>book</doctype>
-
-                                    <attributes>
-                                        <sourcedir>${project.build.sourceDirectory}</sourcedir>
-                                        <imagesdir/>
-
-                                        <icons>font</icons>
-                                        <pagenums/>
-                                        <toc/>
-                                        <idprefix/>
-                                        <idseparator>-</idseparator>
-                                        <version>${project.version}</version>
-                                        <title-logo-image>${project.reporting.outputDirectory}/images/DataNucleus16-300.jpg</title-logo-image>
                                     </attributes>
                                 </configuration>
                             </execution>
diff --git a/src/main/template/document.html.erb b/src/main/template/document.html.erb
index 368180f..a331149 100644
--- a/src/main/template/document.html.erb
+++ b/src/main/template/document.html.erb
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title><%= document.name %></title>
+    <title><%= doctitle(:sanitize => true) || (attr 'untitled-label') %></title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 


[db-jdo-site] 05/05: Rebuilt website

Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit d15bb238e893ce3041cc3a2672e10ad7f62303ac
Author: Tilmann <zo...@gmx.de>
AuthorDate: Wed Apr 15 23:07:40 2020 +0200

    Rebuilt website
---
 docs/annotations.html        |   9 +-
 docs/attach_detach.html      |   9 +-
 docs/class_types.html        |   7 +-
 docs/dependencies.html       |   7 +-
 docs/downloads.html          |   7 +-
 docs/enhancement.html        |   7 +-
 docs/exceptions.html         |   7 +-
 docs/extents.html            |   7 +-
 docs/faq.html                |   7 +-
 docs/fetchgroups.html        |   9 +-
 docs/field_types.html        |   7 +-
 docs/get-involved.html       |   7 +-
 docs/glossary.html           |   7 +-
 docs/guides-maven-jdo.html   |   7 +-
 docs/guides-replication.html |   7 +-
 docs/guides.html             | 332 -------------------------------------------
 docs/impls.html              |   7 +-
 docs/index.html              |   3 +-
 docs/issuetracking.html      |   7 +-
 docs/javadoc.html            |   7 +-
 docs/jdo_3_0_overview.html   |   7 +-
 docs/jdo_dtd.html            |   7 +-
 docs/jdo_v_jpa.html          |   7 +-
 docs/jdo_v_jpa_api.html      |   7 +-
 docs/jdo_v_jpa_orm.html      |   7 +-
 docs/jdocentral.html         |   7 +-
 docs/jdoconfig_dtd.html      |   7 +-
 docs/jdohelper.html          |   7 +-
 docs/jdoql.html              |   7 +-
 docs/jdoql_methods.html      |   7 +-
 docs/jdoql_result.html       |   7 +-
 docs/jdoquery_dtd.html       |   7 +-
 docs/mail-lists.html         |   7 +-
 docs/metadata.html           |   9 +-
 docs/newshistory.html        |   7 +-
 docs/object_retrieval.html   |   7 +-
 docs/orm_dtd.html            |   7 +-
 docs/pm.html                 |   7 +-
 docs/pmf.html                |   7 +-
 docs/references.html         |   7 +-
 docs/release-3.0.1.html      |   7 +-
 docs/release-3.1-rc1.html    |  12 +-
 docs/release-3.1.html        |   7 +-
 docs/roadmap.html            |   7 +-
 docs/specifications.html     |   7 +-
 docs/state_transition.html   |   7 +-
 docs/svn.html                |   7 +-
 docs/tck.html                |   7 +-
 docs/team-list.html          |   7 +-
 docs/transactions.html       |   7 +-
 docs/why_jdo.html            |   7 +-
 51 files changed, 108 insertions(+), 583 deletions(-)

diff --git a/docs/annotations.html b/docs/annotations.html
index 3048336..833bdc9 100644
--- a/docs/annotations.html
+++ b/docs/annotations.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDO : Annotations<a id="JDO_:_Annotations"></a></title>
+    <title>JDO : Annotations</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,17 +284,15 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdo_annotations_a_id_jdo_annotations_a">JDO : Annotations<a id="JDO_:_Annotations"></a></h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>One of the things that JDK 1.5 provides that can be of some use is
 annotations, and JDO provides its own set. When selecting to use
-annotations please bear in mind the following :-</p>
+annotations please bear in mind the following :</p>
 </div>
 <div class="ulist">
 <ul>
diff --git a/docs/attach_detach.html b/docs/attach_detach.html
index 9d8d550..e4c82e0 100644
--- a/docs/attach_detach.html
+++ b/docs/attach_detach.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDO Attach/Detach<a id="JDO_AttachDetach"></a></title>
+    <title>JDO Attach/Detach</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdo_attach_detach_a_id_jdo_attachdetach_a">JDO Attach/Detach<a id="JDO_AttachDetach"></a></h2>
 <div class="sectionbody">
@@ -377,7 +374,7 @@ finally
 <div class="paragraph">
 <p>So we now don&#8217;t need to do any manual copying of object fields just
 using a simple call to detach the object, and then attach it again
-later. Here are a few things to note with <em>attach/detach</em> :-</p>
+later. Here are a few things to note with <em>attach/detach</em> :</p>
 </div>
 <div class="ulist">
 <ul>
diff --git a/docs/class_types.html b/docs/class_types.html
index 4cf2d9c..0453a20 100644
--- a/docs/class_types.html
+++ b/docs/class_types.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDO Class Types<a id="JDO_Class_Types"></a></title>
+    <title>JDO Class Types</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdo_class_types_a_id_jdo_class_types_a">JDO Class Types<a id="JDO_Class_Types"></a></h2>
 <div class="sectionbody">
diff --git a/docs/dependencies.html b/docs/dependencies.html
index 525f105..8e044c7 100644
--- a/docs/dependencies.html
+++ b/docs/dependencies.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>The Apache JDO Project<a id="The_Apache_JDO_Project"></a></title>
+    <title>The Apache JDO Project</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_the_apache_jdo_project_a_id_the_apache_jdo_project_a">The Apache JDO Project<a id="The_Apache_JDO_Project"></a></h2>
 <div class="sectionbody">
diff --git a/docs/downloads.html b/docs/downloads.html
index 5a75d13..60c05e3 100644
--- a/docs/downloads.html
+++ b/docs/downloads.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Latest Official Release<a id="Latest_Official_Release"></a></title>
+    <title>Latest Official Release</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_latest_official_release_a_id_latest_official_release_a">Latest Official Release<a id="Latest_Official_Release"></a></h2>
 <div class="sectionbody">
diff --git a/docs/enhancement.html b/docs/enhancement.html
index 56a15ce..515f756 100644
--- a/docs/enhancement.html
+++ b/docs/enhancement.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDO Enhancement<a id="JDO_Enhancement"></a></title>
+    <title>JDO Enhancement</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdo_enhancement_a_id_jdo_enhancement_a">JDO Enhancement<a id="JDO_Enhancement"></a></h2>
 <div class="sectionbody">
diff --git a/docs/exceptions.html b/docs/exceptions.html
index e37d98e..6efbc47 100644
--- a/docs/exceptions.html
+++ b/docs/exceptions.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDO Exceptions<a id="JDO_Exceptions"></a></title>
+    <title>JDO Exceptions</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdo_exceptions_a_id_jdo_exceptions_a">JDO Exceptions<a id="JDO_Exceptions"></a></h2>
 <div class="sectionbody">
diff --git a/docs/extents.html b/docs/extents.html
index 021ef0a..16da884 100644
--- a/docs/extents.html
+++ b/docs/extents.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDO Extents<a id="JDO_Extents"></a></title>
+    <title>JDO Extents</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdo_extents_a_id_jdo_extents_a">JDO Extents<a id="JDO_Extents"></a></h2>
 <div class="sectionbody">
diff --git a/docs/faq.html b/docs/faq.html
index ea5202c..a5fd504 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>General<a id="General"></a></title>
+    <title>General</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_general_a_id_general_a">General<a id="General"></a></h2>
 <div class="sectionbody">
diff --git a/docs/fetchgroups.html b/docs/fetchgroups.html
index 868a565..b4307f5 100644
--- a/docs/fetchgroups.html
+++ b/docs/fetchgroups.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Fetch Groups<a id="Fetch_Groups"></a></title>
+    <title>Fetch Groups</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_fetch_groups_a_id_fetch_groups_a">Fetch Groups<a id="Fetch_Groups"></a></h2>
 <div class="sectionbody">
@@ -340,7 +337,7 @@ interface. To get a handle on the current <em>FetchPlan</em> we do</p>
 <p>JDO provides an initial fetch group, comprising the fields that will be
 retrieved when an object is retrieved if the user does nothing to define
 the required behaviour. By default the <em>default fetch group</em> comprises
-all fields of the following types :-</p>
+all fields of the following types :</p>
 </div>
 <div class="ulist">
 <ul>
diff --git a/docs/field_types.html b/docs/field_types.html
index 2c19bff..ed5387a 100644
--- a/docs/field_types.html
+++ b/docs/field_types.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Supported Java Types<a id="Supported_Java_Types"></a></title>
+    <title>Supported Java Types</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_supported_java_types_a_id_supported_java_types_a">Supported Java Types<a id="Supported_Java_Types"></a></h2>
 <div class="sectionbody">
diff --git a/docs/get-involved.html b/docs/get-involved.html
index 941dbb2..02861b8 100644
--- a/docs/get-involved.html
+++ b/docs/get-involved.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>How do I contribute, give feedback, fix bugs and so on?<a id="How_do_I_contribute_give_feedback_fix_bugs_and_so_on"></a></title>
+    <title>How do I contribute, give feedback, fix bugs and so on?</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_how_do_i_contribute_give_feedback_fix_bugs_and_so_on_a_id_how_do_i_contribute_give_feedback_fix_bugs_and_so_on_a">How do I contribute, give feedback, fix bugs and so on?<a id="How_do_I_contribute_give_feedback_fix_bugs_and_so_on"></a></h2>
 <div class="sectionbody">
diff --git a/docs/glossary.html b/docs/glossary.html
index 41fb3f1..832091b 100644
--- a/docs/glossary.html
+++ b/docs/glossary.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDO Glossary<a id="JDO_Glossary"></a></title>
+    <title>JDO Glossary</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdo_glossary_a_id_jdo_glossary_a">JDO Glossary<a id="JDO_Glossary"></a></h2>
 <div class="sectionbody">
diff --git a/docs/guides-maven-jdo.html b/docs/guides-maven-jdo.html
index b9e323d..06a26a7 100644
--- a/docs/guides-maven-jdo.html
+++ b/docs/guides-maven-jdo.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDO Meets Maven<a id="JDO_Meets_Maven"></a></title>
+    <title>JDO Meets Maven</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
-<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdo_meets_maven_a_id_jdo_meets_maven_a">JDO Meets Maven<a id="JDO_Meets_Maven"></a></h2>
 <div class="sectionbody">
diff --git a/docs/guides-replication.html b/docs/guides-replication.html
index 5768745..bdcb9ef 100644
--- a/docs/guides-replication.html
+++ b/docs/guides-replication.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Data Replication<a id="Data_Replication"></a></title>
+    <title>Data Replication</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
-<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_data_replication_a_id_data_replication_a">Data Replication<a id="Data_Replication"></a></h2>
 <div class="sectionbody">
diff --git a/docs/guides.html b/docs/guides.html
deleted file mode 100644
index 4078f67..0000000
--- a/docs/guides.html
+++ /dev/null
@@ -1,332 +0,0 @@
-<!DOCTYPE html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- No caching headers -->
-    <meta http-equiv="cache-control" content="no-cache"/>
-    <meta http-equiv="pragma" content="no-cache"/>
-    <meta http-equiv="expires" content="-1"/>
-    <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
-    <meta name="description" content="Apache JDO - Java Data Objects"/>
-
-    <title>Guides<a id="Guides"></a></title>
-
-    <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
-
-    <!--
-        Apache JDO Documentation Template
-        ==================================
-        This template derived various aspects from Apache Deltaspike template, the Apache ISIS template and the Datanucleus template.
-        This template uses 
-        * Bootstrap v3.3.7 (https://getbootstrap.com/) for navbar.
-        * Asciidoctor "foundation" CSS
-        * Bootswatch "cosmo" theme for Bootstrap (https://bootswatch.com/cosmo).
-        * Bootstrap TOC plugin v0.4.1 (https://afeld.github.io/bootstrap-toc/) for the table of contents.
-        * jQuery (necessary for Bootstrap's JavaScript plugins)
-        * Font-Awesome for some icons used by Asciidoctor
-        NOTE: tried using Font-Awesome CSS hosted locally but then fails to work!
-    -->
-    <link href="css/bootswatch/3.3.7/bootstrap-cosmo.css" rel="stylesheet"/>
-    <link href="css/bootstrap-toc/0.4.1/bootstrap-toc.min.css" rel="stylesheet"/>
-
-    <link href="css/asciidoctor/foundation.css" rel="stylesheet"/>
-    <link href="css/datanucleus_theme.css" rel="stylesheet"/>
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
-
-    
-
-    
-
-    
-    
-    
-    
-    
-    
-
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script src="js/bootstrap/3.3.7/bootstrap.min.js"></script>
-    <script src="js/bootstrap-toc/0.4.1/bootstrap-toc.min.js"></script>
-
-    <!-- Coderay syntax formatter -->
-    <style type="text/css">
-        /* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
-/*pre.CodeRay {background-color:#f7f7f8;}*/
-.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
-.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
-.CodeRay .line-numbers strong{color:rgba(0,0,0,.4)}
-table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
-table.CodeRay td{vertical-align: top;line-height:1.45}
-table.CodeRay td.line-numbers{text-align:right}
-table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
-table.CodeRay td.code{padding:0 0 0 .5em}
-table.CodeRay td.code>pre{padding:0}
-.CodeRay .debug{color:#fff !important;background:#000080 !important}
-.CodeRay .annotation{color:#007}
-.CodeRay .attribute-name{color:#000080}
-.CodeRay .attribute-value{color:#700}
-.CodeRay .binary{color:#509}
-.CodeRay .comment{color:#998;font-style:italic}
-.CodeRay .char{color:#04d}
-.CodeRay .char .content{color:#04d}
-.CodeRay .char .delimiter{color:#039}
-.CodeRay .class{color:#458;font-weight:bold}
-.CodeRay .complex{color:#a08}
-.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
-.CodeRay .color{color:#099}
-.CodeRay .class-variable{color:#369}
-.CodeRay .decorator{color:#b0b}
-.CodeRay .definition{color:#099}
-.CodeRay .delimiter{color:#000}
-.CodeRay .doc{color:#970}
-.CodeRay .doctype{color:#34b}
-.CodeRay .doc-string{color:#d42}
-.CodeRay .escape{color:#666}
-.CodeRay .entity{color:#800}
-.CodeRay .error{color:#808}
-.CodeRay .exception{color:inherit}
-.CodeRay .filename{color:#099}
-.CodeRay .function{color:#900;font-weight:bold}
-.CodeRay .global-variable{color:#008080}
-.CodeRay .hex{color:#058}
-.CodeRay .integer,.CodeRay .float{color:#099}
-.CodeRay .include{color:#555}
-.CodeRay .inline{color:#000}
-.CodeRay .inline .inline{background:#ccc}
-.CodeRay .inline .inline .inline{background:#bbb}
-.CodeRay .inline .inline-delimiter{color:#d14}
-.CodeRay .inline-delimiter{color:#d14}
-.CodeRay .important{color:#555;font-weight:bold}
-.CodeRay .interpreted{color:#b2b}
-.CodeRay .instance-variable{color:#008080}
-.CodeRay .label{color:#970}
-.CodeRay .local-variable{color:#963}
-.CodeRay .octal{color:#40e}
-.CodeRay .predefined{color:#369}
-.CodeRay .preprocessor{color:#579}
-.CodeRay .pseudo-class{color:#555}
-.CodeRay .directive{font-weight:bold}
-.CodeRay .type{font-weight:bold}
-.CodeRay .predefined-type{color:inherit}
-.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
-.CodeRay .key{color:#808}
-.CodeRay .key .delimiter{color:#606}
-.CodeRay .key .char{color:#80f}
-.CodeRay .value{color:#088}
-.CodeRay .regexp .delimiter{color:#808}
-.CodeRay .regexp .content{color:#808}
-.CodeRay .regexp .modifier{color:#808}
-.CodeRay .regexp .char{color:#d14}
-.CodeRay .regexp .function{color:#404;font-weight:bold}
-.CodeRay .string{color:#d20}
-.CodeRay .string .string .string{background:#ffd0d0}
-.CodeRay .string .content{color:#d14}
-.CodeRay .string .char{color:#d14}
-.CodeRay .string .delimiter{color:#d14}
-.CodeRay .shell{color:#d14}
-.CodeRay .shell .delimiter{color:#d14}
-.CodeRay .symbol{color:#990073}
-.CodeRay .symbol .content{color:#a60}
-.CodeRay .symbol .delimiter{color:#630}
-.CodeRay .tag{color:#008080}
-.CodeRay .tag-special{color:#d70}
-.CodeRay .variable{color:#036}
-.CodeRay .insert{background:#afa}
-.CodeRay .delete{background:#faa}
-.CodeRay .change{color:#aaf;background:#007}
-.CodeRay .head{color:#f8f;background:#505}
-.CodeRay .insert .insert{color:#080}
-.CodeRay .delete .delete{color:#800}
-.CodeRay .change .change{color:#66f}
-.CodeRay .head .head{color:#f4f}
-    </style>
-</head>
-<body data-spy="scroll" data-target="#toc">
-<!-- Navbar -->
-<nav class="navbar navbar-default navbar-static-top">
-    <div class="container">
-        <div class="navbar-header">
-            <!-- Three line menu button for use on mobile screens -->
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <!-- 'style' added to align image with navbar. FIX THIS -->
-            <a class="navbar-brand" href="https://db.apache.org/jdo/">
-                <img style="margin-top: -12px;" alt="Brand" src="images/JDO_44x44.png"/>
-            </a>
-            <!-- TODO Any way to abstract the version from Maven? -->
-            <a class="navbar-brand" href="index.html">Apache JDO</a>
-        </div>
-        <!-- Navbar that will collapse on mobile screens -->
-        <div id="navbar" class="navbar-collapse collapse">
-            <ul class="nav navbar-nav">
-                <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">General <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="why_jdo.html">Why JDO?</a></li>
-                        <li><a href="jdo_v_jpa.html">JDO v JPA</a></li>
-                        <li><a href="jdo_v_jpa_api.html">JDO v JPA : API</a></li>
-                        <li><a href="jdo_v_jpa_orm.html">JDO v JPA : ORM</a></li>
-                        <li><a href="downloads.html">Downloads</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                    </ul>
-                </li>
-                <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">JDO Implementation <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="specifications.html">Specifications</a></li>
-                        <li><a href="tck.html">TCK</a></li>
-                    </ul>
-                </li>
-                <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">JDO Usage <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="impls.html">Implementations</a></li>
-                        <li><a href="javadoc.html">API Javadoc</a></li>
-                        <li><a href="class_types.html">Types of Classes</a></li>
-                        <li><a href="field_types.html">Types of Fields</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">Metadata</li>
-                        <li><a href="metadata.html">MetaData</a></li>
-                        <li><a href="annotations.html">Annotations</a></li>
-                        <li><a href="jdo_dtd.html">jdo DTD/XSD</a></li>
-                        <li><a href="orm_dtd.html">orm DTD/XSD</a></li>
-                        <li><a href="jdoquery_dtd.html">jdoquery DTD/XSD</a></li>
-                        <li><a href="jdoconfig_dtd.html">jdoconfig DTD/XSD</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="enhancement.html">Bytecode Enhancement</a></li>
-                        <li><a href="jdohelper.html">JDO Helper</a></li>
-                        <li><a href="pmf.html">PersistenceManagerFactory</a></li>
-                        <li><a href="pm.html">PersistenceManager</a></li>
-                        <li><a href="transactions.html">Transactions</a></li>
-                        <li><a href="attach_detach.html">Attach-Detach</a></li>
-                        <li><a href="fetchgroups.html">Fetch Groups</a></li>
-                        <li><a href="state_transition.html">Object States</a></li>
-                        <li><a href="object_retrieval.html">Object Retrieval</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">JDOQL</li>
-                        <li><a href="jdoql.html">JDOQL</a></li>
-                        <li><a href="jdoql_result.html">Result</a></li>
-                        <li><a href="jdoql_methods.html">Methods</a></li>
-                        <li><a href="jdoql_quickref.pdf">Quick Ref PDF</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="extents.html">Extents</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
-                        <li><a href="guides-replication.html">Datastore Replication</a></li>
-                        <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li><a href="references.html">References</a></li>
-                        <li><a href="exceptions.html">Exceptions</a></li>
-                        <li><a href="glossary.html">Glossary</a></li>
-                    </ul>
-                </li>
-               <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Articles <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="jdo_3_0_overview.html">JDO 3.0 Overview</a></li>
-                    </ul>
-                </li>
-               <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="get-involved.html">Get Involved</a></li>
-                        <li><a href="team-list.html">Project Team</a></li>
-                        <li><a href="mail-lists.html">Mailing Lists</a></li>
-                        <li><a href="faq.html">FAQ</a></li>
-                    </ul>
-                </li>
-               <li class="dropdown">
-                  
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Development <span class="caret"></span></a>
-                  
-                    <ul class="dropdown-menu">
-                        <li><a href="roadmap.html">RoadMap / TODO</a></li>
-                        <li><a href="svn.html">Source Code</a></li>
-                        <li><a href="http://cwiki.apache.org/GMOxDEV/Coding+standards">Coding Standards</a></li>
-                        <li><a href="issuetracking.html">Issue Tracking</a></li>
-                        <li><a href="dependencies.html">Dependencies</a></li>
-                    </ul>
-                </li>
-            </ul>
-           <!-- 'style' added to fix height of input box. FIX THIS -->
-            <form class="navbar-form navbar-left" role="search" id="search-form" action="https://www.google.com/search" method="get" style="padding: 1px 15px;">
-                <div class="form-group">
-                    <input name="sitesearch" value="db.apache.org" type="hidden">
-                    <input name="q" type="text" class="form-control" placeholder="Search" style="margin-top: 7px; padding: 1px; border-radius: 5px; height: 30px; vertical-align: middle;">
-                </div>
-            </form>
-        </div>
-    </div>
-</nav>
-<div class="container">
-    
-        <div class="row-fluid">
-            <div class="col-sm-9">
-<!--                <div class="page-title">
-                    <h3>Guides<a id="Guides"></a></h3>
-                </div>
--->
-                <div id="doc-content">
-                    <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
-</div>
-<hr>
-<div class="sect1">
-<h2 id="_guides_a_id_guides_a">Guides<a id="Guides"></a></h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>This section provides guides to the process of introducing JDO into your
-application.</p>
-</div>
-</div>
-</div>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <nav id="toc" data-spy="affix" data-toggle="toc"></nav>
-            </div>
-        </div>
-    
-</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>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/impls.html b/docs/impls.html
index b3c1ca1..422b571 100644
--- a/docs/impls.html
+++ b/docs/impls.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDO Implementations<a id="JDO_Implementations"></a></title>
+    <title>JDO Implementations</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdo_implementations_a_id_jdo_implementations_a">JDO Implementations<a id="JDO_Implementations"></a></h2>
 <div class="sectionbody">
diff --git a/docs/index.html b/docs/index.html
index 35179f7..8810a10 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>About Apache JDO<a id="About_Apache_JDO"></a></title>
+    <title>About Apache JDO</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
diff --git a/docs/issuetracking.html b/docs/issuetracking.html
index 1e8fb55..5566d0a 100644
--- a/docs/issuetracking.html
+++ b/docs/issuetracking.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Process<a id="Process"></a></title>
+    <title>Process</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_process_a_id_process_a">Process<a id="Process"></a></h2>
 <div class="sectionbody">
diff --git a/docs/javadoc.html b/docs/javadoc.html
index de3269b..cfeba81 100644
--- a/docs/javadoc.html
+++ b/docs/javadoc.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Javadoc Formats<a id="Javadoc_Formats"></a></title>
+    <title>Javadoc Formats</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_javadoc_formats_a_id_javadoc_formats_a">Javadoc Formats<a id="Javadoc_Formats"></a></h2>
 <div class="sectionbody">
diff --git a/docs/jdo_3_0_overview.html b/docs/jdo_3_0_overview.html
index bca2125..60c61e0 100644
--- a/docs/jdo_3_0_overview.html
+++ b/docs/jdo_3_0_overview.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDO 3.0 Overview<a id="JDO_3.0_Overview"></a></title>
+    <title>JDO 3.0 Overview</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdo_3_0_overview_a_id_jdo_3_0_overview_a">JDO 3.0 Overview<a id="JDO_3.0_Overview"></a></h2>
 <div class="sectionbody">
diff --git a/docs/jdo_dtd.html b/docs/jdo_dtd.html
index 640ab01..d6ccd02 100644
--- a/docs/jdo_dtd.html
+++ b/docs/jdo_dtd.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Meta-Data - JDO<a id="Meta-Data_-_JDO"></a></title>
+    <title>Meta-Data - JDO</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_meta_data_jdo_a_id_meta_data_jdo_a">Meta-Data - JDO<a id="Meta-Data_-_JDO"></a></h2>
 <div class="sectionbody">
diff --git a/docs/jdo_v_jpa.html b/docs/jdo_v_jpa.html
index 9af9035..89232c8 100644
--- a/docs/jdo_v_jpa.html
+++ b/docs/jdo_v_jpa.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Which Persistence Specification ?<a id="Which_Persistence_Specification_"></a></title>
+    <title>Which Persistence Specification ?</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_which_persistence_specification_a_id_which_persistence_specification_a">Which Persistence Specification ?<a id="Which_Persistence_Specification_"></a></h2>
 <div class="sectionbody">
diff --git a/docs/jdo_v_jpa_api.html b/docs/jdo_v_jpa_api.html
index b8531f5..2f6fdbd 100644
--- a/docs/jdo_v_jpa_api.html
+++ b/docs/jdo_v_jpa_api.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDO .v. JPA : API<a id="JDO_.v.<em>JPA</em>:_API"></a></title>
+    <title>JDO .v. JPA : APIJPA:_API"></title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdo_v_jpa_api_a_id_jdo_v_em_jpa_em_api_a">JDO .v. JPA : API<a id="JDO_.v.<em>JPA</em>:_API"></a></h2>
 <div class="sectionbody">
diff --git a/docs/jdo_v_jpa_orm.html b/docs/jdo_v_jpa_orm.html
index 048cd48..dfd8278 100644
--- a/docs/jdo_v_jpa_orm.html
+++ b/docs/jdo_v_jpa_orm.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Which ORM specification ?<a id="Which_ORM_specification_"></a></title>
+    <title>Which ORM specification ?</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_which_orm_specification_a_id_which_orm_specification_a">Which ORM specification ?<a id="Which_ORM_specification_"></a></h2>
 <div class="sectionbody">
diff --git a/docs/jdocentral.html b/docs/jdocentral.html
index df45594..a8e2b75 100644
--- a/docs/jdocentral.html
+++ b/docs/jdocentral.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDOCentral at Apache JDO<a id="JDOCentral_at_Apache_JDO"></a></title>
+    <title>JDOCentral at Apache JDO</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdocentral_at_apache_jdo_a_id_jdocentral_at_apache_jdo_a">JDOCentral at Apache JDO<a id="JDOCentral_at_Apache_JDO"></a></h2>
 <div class="sectionbody">
diff --git a/docs/jdoconfig_dtd.html b/docs/jdoconfig_dtd.html
index 16d4ad9..8631d24 100644
--- a/docs/jdoconfig_dtd.html
+++ b/docs/jdoconfig_dtd.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Meta-Data - JDOConfig<a id="Meta-Data_-_JDOConfig"></a></title>
+    <title>Meta-Data - JDOConfig</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_meta_data_jdoconfig_a_id_meta_data_jdoconfig_a">Meta-Data - JDOConfig<a id="Meta-Data_-_JDOConfig"></a></h2>
 <div class="sectionbody">
diff --git a/docs/jdohelper.html b/docs/jdohelper.html
index 0432d30..8c0e6ec 100644
--- a/docs/jdohelper.html
+++ b/docs/jdohelper.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDOHelper<a id="JDOHelper"></a></title>
+    <title>JDOHelper</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdohelper_a_id_jdohelper_a">JDOHelper<a id="JDOHelper"></a></h2>
 <div class="sectionbody">
diff --git a/docs/jdoql.html b/docs/jdoql.html
index 59b0dd3..505d402 100644
--- a/docs/jdoql.html
+++ b/docs/jdoql.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDOQL<a id="JDOQL"></a></title>
+    <title>JDOQL</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdoql_a_id_jdoql_a">JDOQL<a id="JDOQL"></a></h2>
 <div class="sectionbody">
diff --git a/docs/jdoql_methods.html b/docs/jdoql_methods.html
index 460332e..8fa4960 100644
--- a/docs/jdoql_methods.html
+++ b/docs/jdoql_methods.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDOQL : Methods<a id="JDOQL_:_Methods"></a></title>
+    <title>JDOQL : Methods</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdoql_methods_a_id_jdoql_methods_a">JDOQL : Methods<a id="JDOQL_:_Methods"></a></h2>
 <div class="sectionbody">
diff --git a/docs/jdoql_result.html b/docs/jdoql_result.html
index 3e01815..60b4e60 100644
--- a/docs/jdoql_result.html
+++ b/docs/jdoql_result.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDOQL : Result<a id="JDOQL_:_Result"></a></title>
+    <title>JDOQL : Result</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdoql_result_a_id_jdoql_result_a">JDOQL : Result<a id="JDOQL_:_Result"></a></h2>
 <div class="sectionbody">
diff --git a/docs/jdoquery_dtd.html b/docs/jdoquery_dtd.html
index 7e2e6f8..ef82606 100644
--- a/docs/jdoquery_dtd.html
+++ b/docs/jdoquery_dtd.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Meta-Data - JDOQuery<a id="Meta-Data_-_JDOQuery"></a></title>
+    <title>Meta-Data - JDOQuery</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_meta_data_jdoquery_a_id_meta_data_jdoquery_a">Meta-Data - JDOQuery<a id="Meta-Data_-_JDOQuery"></a></h2>
 <div class="sectionbody">
diff --git a/docs/mail-lists.html b/docs/mail-lists.html
index 738f19e..54c7ba8 100644
--- a/docs/mail-lists.html
+++ b/docs/mail-lists.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Apache JDO Mailing Lists<a id="Apache_JDO_Mailing_Lists"></a></title>
+    <title>Apache JDO Mailing Lists</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_apache_jdo_mailing_lists_a_id_apache_jdo_mailing_lists_a">Apache JDO Mailing Lists<a id="Apache_JDO_Mailing_Lists"></a></h2>
 <div class="sectionbody">
diff --git a/docs/metadata.html b/docs/metadata.html
index 6c0f746..f0a3334 100644
--- a/docs/metadata.html
+++ b/docs/metadata.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Persistence MetaData<a id="Persistence_MetaData"></a></title>
+    <title>Persistence MetaData</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_persistence_metadata_a_id_persistence_metadata_a">Persistence MetaData<a id="Persistence_MetaData"></a></h2>
 <div class="sectionbody">
@@ -303,7 +300,7 @@ annotations.</p>
 <p>JDO expects any XML MetaData to be specified in a file or files in
 particular positions in the file system. For example, if you have a
 class <em>com.mycompany.sample.MyExample</em>, JDO will look for any of the
-following files until it finds one (in the order stated) :-</p>
+following files until it finds one (in the order stated) :</p>
 </div>
 <div class="literalblock">
 <div class="content">
diff --git a/docs/newshistory.html b/docs/newshistory.html
index 7d97751..2562c74 100644
--- a/docs/newshistory.html
+++ b/docs/newshistory.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Older JDO News<a id="Older_JDO_News"></a></title>
+    <title>Older JDO News</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_older_jdo_news_a_id_older_jdo_news_a">Older JDO News<a id="Older_JDO_News"></a></h2>
 <div class="sectionbody">
diff --git a/docs/object_retrieval.html b/docs/object_retrieval.html
index b1c9b27..67246e8 100644
--- a/docs/object_retrieval.html
+++ b/docs/object_retrieval.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Object Retrieval<a id="Object_Retrieval"></a></title>
+    <title>Object Retrieval</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_object_retrieval_a_id_object_retrieval_a">Object Retrieval<a id="Object_Retrieval"></a></h2>
 <div class="sectionbody">
diff --git a/docs/orm_dtd.html b/docs/orm_dtd.html
index fb5272d..b5aee22 100644
--- a/docs/orm_dtd.html
+++ b/docs/orm_dtd.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Meta-Data - ORM<a id="Meta-Data_-_ORM"></a></title>
+    <title>Meta-Data - ORM</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_meta_data_orm_a_id_meta_data_orm_a">Meta-Data - ORM<a id="Meta-Data_-_ORM"></a></h2>
 <div class="sectionbody">
diff --git a/docs/pm.html b/docs/pm.html
index 14570d9..a40ec2c 100644
--- a/docs/pm.html
+++ b/docs/pm.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Persistence Manager<a id="Persistence_Manager"></a></title>
+    <title>Persistence Manager</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_persistence_manager_a_id_persistence_manager_a">Persistence Manager<a id="Persistence_Manager"></a></h2>
 <div class="sectionbody">
diff --git a/docs/pmf.html b/docs/pmf.html
index 83c727a..a389942 100644
--- a/docs/pmf.html
+++ b/docs/pmf.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Persistence Manager Factory<a id="Persistence_Manager_Factory"></a></title>
+    <title>Persistence Manager Factory</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_persistence_manager_factory_a_id_persistence_manager_factory_a">Persistence Manager Factory<a id="Persistence_Manager_Factory"></a></h2>
 <div class="sectionbody">
diff --git a/docs/references.html b/docs/references.html
index b2bcae2..3ff7d6b 100644
--- a/docs/references.html
+++ b/docs/references.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDO References<a id="JDO_References"></a></title>
+    <title>JDO References</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdo_references_a_id_jdo_references_a">JDO References<a id="JDO_References"></a></h2>
 <div class="sectionbody">
diff --git a/docs/release-3.0.1.html b/docs/release-3.0.1.html
index a5ccd86..3a52ef4 100644
--- a/docs/release-3.0.1.html
+++ b/docs/release-3.0.1.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDO 3.0.1 Distributions<a id="JDO_3.0.1_Distributions"></a></title>
+    <title>JDO 3.0.1 Distributions</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
-<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdo_3_0_1_distributions_a_id_jdo_3_0_1_distributions_a">JDO 3.0.1 Distributions<a id="JDO_3.0.1_Distributions"></a></h2>
 <div class="sectionbody">
diff --git a/docs/release-3.1-rc1.html b/docs/release-3.1-rc1.html
index fe2568c..37336fb 100644
--- a/docs/release-3.1-rc1.html
+++ b/docs/release-3.1-rc1.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDO 3.1-rc1 Distributions<a id="JDO_3.1-rc1_Distributions"></a></title>
+    <title>JDO 3.1-rc1 Distributions</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,13 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
-<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br>
+:_basedir:
+:_imagesdir: images/
+:notoc:
+:titlepage:
+:grid: cols</p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdo_3_1_rc1_distributions_a_id_jdo_3_1_rc1_distributions_a">JDO 3.1-rc1 Distributions<a id="JDO_3.1-rc1_Distributions"></a></h2>
 <div class="sectionbody">
diff --git a/docs/release-3.1.html b/docs/release-3.1.html
index 349a368..72329b2 100644
--- a/docs/release-3.1.html
+++ b/docs/release-3.1.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDO 3.1 Distributions<a id="JDO_3.1_Distributions"></a></title>
+    <title>JDO 3.1 Distributions</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx150.png" alt="JDOx150"></span>
-<span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdo_3_1_distributions_a_id_jdo_3_1_distributions_a">JDO 3.1 Distributions<a id="JDO_3.1_Distributions"></a></h2>
 <div class="sectionbody">
diff --git a/docs/roadmap.html b/docs/roadmap.html
index 9568738..8a8ab87 100644
--- a/docs/roadmap.html
+++ b/docs/roadmap.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Roadmap and TODO<a id="Roadmap_and_TODO"></a></title>
+    <title>Roadmap and TODO</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_roadmap_and_todo_a_id_roadmap_and_todo_a">Roadmap and TODO<a id="Roadmap_and_TODO"></a></h2>
 <div class="sectionbody">
diff --git a/docs/specifications.html b/docs/specifications.html
index bea7cbd..c24edb1 100644
--- a/docs/specifications.html
+++ b/docs/specifications.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDO Final Specifications<a id="JDO_Final_Specifications"></a></title>
+    <title>JDO Final Specifications</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdo_final_specifications_a_id_jdo_final_specifications_a">JDO Final Specifications<a id="JDO_Final_Specifications"></a></h2>
 <div class="sectionbody">
diff --git a/docs/state_transition.html b/docs/state_transition.html
index 288a356..a9cb7d6 100644
--- a/docs/state_transition.html
+++ b/docs/state_transition.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>JDO State Transition<a id="JDO_State_Transition"></a></title>
+    <title>JDO State Transition</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_jdo_state_transition_a_id_jdo_state_transition_a">JDO State Transition<a id="JDO_State_Transition"></a></h2>
 <div class="sectionbody">
diff --git a/docs/svn.html b/docs/svn.html
index 5f558d7..0fef113 100644
--- a/docs/svn.html
+++ b/docs/svn.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Source Code Version Control<a id="Source_Code_Version_Control"></a></title>
+    <title>Source Code Version Control</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_source_code_version_control_a_id_source_code_version_control_a">Source Code Version Control<a id="Source_Code_Version_Control"></a></h2>
 <div class="sectionbody">
diff --git a/docs/tck.html b/docs/tck.html
index 2389084..2082235 100644
--- a/docs/tck.html
+++ b/docs/tck.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>About the Technology Compatibility Kit<a id="About_the_Technology_Compatibility_Kit"></a></title>
+    <title>About the Technology Compatibility Kit</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_about_the_technology_compatibility_kit_a_id_about_the_technology_compatibility_kit_a">About the Technology Compatibility Kit<a id="About_the_Technology_Compatibility_Kit"></a></h2>
 <div class="sectionbody">
diff --git a/docs/team-list.html b/docs/team-list.html
index 7d5f6d4..7f3cbc9 100644
--- a/docs/team-list.html
+++ b/docs/team-list.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>The Apache JDO Team<a id="The_Apache_JDO_Team"></a></title>
+    <title>The Apache JDO Team</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_the_apache_jdo_team_a_id_the_apache_jdo_team_a">The Apache JDO Team<a id="The_Apache_JDO_Team"></a></h2>
 <div class="sectionbody">
diff --git a/docs/transactions.html b/docs/transactions.html
index 2d07867..bd1ddec 100644
--- a/docs/transactions.html
+++ b/docs/transactions.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Transactions<a id="Transactions"></a></title>
+    <title>Transactions</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_transactions_a_id_transactions_a">Transactions<a id="Transactions"></a></h2>
 <div class="sectionbody">
diff --git a/docs/why_jdo.html b/docs/why_jdo.html
index 933b67c..5a28e91 100644
--- a/docs/why_jdo.html
+++ b/docs/why_jdo.html
@@ -11,7 +11,7 @@
     <meta name="keywords" content="JDO, Apache, Java, Data, Objects"/>
     <meta name="description" content="Apache JDO - Java Data Objects"/>
 
-    <title>Why JDO ?<a id="Why_JDO_"></a></title>
+    <title>Why JDO ?</title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -224,7 +224,6 @@ table.CodeRay td.code>pre{padding:0}
                         <li><a href="extents.html">Extents</a></li>
                         <li role="separator" class="divider"></li>
                         <li class="dropdown-header">Guides</li>
-                        <li><a href="guides.html">Guides</a></li>
                         <li><a href="guides-replication.html">Datastore Replication</a></li>
                         <li><a href="guides-maven-jdo.html">JDO and Maven1</a></li>
                         <li role="separator" class="divider"></li>
@@ -285,10 +284,8 @@ table.CodeRay td.code>pre{padding:0}
 -->
                 <div id="doc-content">
                     <div id="index" class="paragraph">
-<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
-<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<p><br></p>
 </div>
-<hr>
 <div class="sect1">
 <h2 id="_why_jdo_a_id_why_jdo_a">Why JDO ?<a id="Why_JDO_"></a></h2>
 <div class="sectionbody">