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/01/11 18:59:56 UTC

[db-jdo-site] branch master updated (591f40c -> 828cb85)

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 591f40c  Create apidocs.zip
     new 1e38690  Some minor fix and added JDOx100.png
     new 828cb85  Fix logos & a typo & 3.0 ref in footer, removed trailing rule and Google+

The 2 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:
 README.md                                  |   2 +-
 docs/annotations.html                      |  11 ++---
 docs/attach_detach.html                    |  11 ++---
 docs/class_types.html                      |  11 ++---
 docs/{guides.html => cvs-usage.html}       |  26 ++++--------
 docs/dependencies.html                     |  11 ++---
 docs/downloads.html                        |  23 +++++------
 docs/enhancement.html                      |  11 ++---
 docs/exceptions.html                       |  11 ++---
 docs/extents.html                          |  11 ++---
 docs/faq.html                              |  11 ++---
 docs/fetchgroups.html                      |  11 ++---
 docs/field_types.html                      |  11 ++---
 docs/get-involved.html                     |  11 ++---
 docs/glossary.html                         |  11 ++---
 docs/guides-maven-jdo.html                 |   6 +--
 docs/guides-replication.html               |   6 +--
 docs/guides.html                           |  11 ++---
 docs/images/JDOx100.png                    | Bin 0 -> 7037 bytes
 docs/impls.html                            |  11 ++---
 docs/index.html                            |  64 +++++++++++++----------------
 docs/{guides.html => issue-tracking.html}  |  26 ++++--------
 docs/issuetracking.html                    |  11 ++---
 docs/javadoc.html                          |  11 ++---
 docs/jdo_3_0_overview.html                 |  11 ++---
 docs/jdo_dtd.html                          |  11 ++---
 docs/jdo_v_jpa.html                        |  11 ++---
 docs/jdo_v_jpa_api.html                    |  11 ++---
 docs/jdo_v_jpa_orm.html                    |  11 ++---
 docs/{newshistory.html => jdocentral.html} |  32 +++++++--------
 docs/jdoconfig_dtd.html                    |  11 ++---
 docs/jdohelper.html                        |  11 ++---
 docs/jdoql.html                            |  11 ++---
 docs/jdoql_methods.html                    |  11 ++---
 docs/jdoql_result.html                     |  11 ++---
 docs/jdoquery_dtd.html                     |  11 ++---
 docs/mail-lists.html                       |  11 ++---
 docs/{guides.html => maven-reports.html}   |  26 ++++--------
 docs/metadata.html                         |  11 ++---
 docs/newshistory.html                      |  11 ++---
 docs/object_retrieval.html                 |  11 ++---
 docs/orm_dtd.html                          |  11 ++---
 docs/pm.html                               |  11 ++---
 docs/pmf.html                              |  11 ++---
 docs/{guides.html => project-info.html}    |  26 ++++--------
 docs/references.html                       |  11 ++---
 docs/release-3.0.1.html                    |   6 +--
 docs/release-3.1-rc1.html                  |   6 +--
 docs/release-3.1.html                      |   6 +--
 docs/roadmap.html                          |  11 ++---
 docs/specifications.html                   |  11 ++---
 docs/state_transition.html                 |  11 ++---
 docs/svn.html                              |  11 ++---
 docs/tck.html                              |  14 +++----
 docs/team-list.html                        |  11 ++---
 docs/transactions.html                     |  11 ++---
 docs/{guides.html => types.html}           |  26 ++++--------
 docs/why_jdo.html                          |  11 ++---
 src/main/asciidoc/annotations.adoc         |   7 ++--
 src/main/asciidoc/attach_detach.adoc       |   7 ++--
 src/main/asciidoc/class_types.adoc         |   7 ++--
 src/main/asciidoc/cvs-usage.adoc           |  13 ++++++
 src/main/asciidoc/dependencies.adoc        |   7 ++--
 src/main/asciidoc/downloads.adoc           |  19 ++++-----
 src/main/asciidoc/enhancement.adoc         |   7 ++--
 src/main/asciidoc/exceptions.adoc          |   7 ++--
 src/main/asciidoc/extents.adoc             |   7 ++--
 src/main/asciidoc/faq.adoc                 |   7 ++--
 src/main/asciidoc/fetchgroups.adoc         |   7 ++--
 src/main/asciidoc/field_types.adoc         |   7 ++--
 src/main/asciidoc/get-involved.adoc        |   7 ++--
 src/main/asciidoc/glossary.adoc            |   7 ++--
 src/main/asciidoc/guides.adoc              |   7 ++--
 src/main/asciidoc/images/JDOx100.png       | Bin 0 -> 7037 bytes
 src/main/asciidoc/impls.adoc               |   7 ++--
 src/main/asciidoc/index.adoc               |  60 +++++++++++++--------------
 src/main/asciidoc/issue-tracking.adoc      |  13 ++++++
 src/main/asciidoc/issuetracking.adoc       |   7 ++--
 src/main/asciidoc/javadoc.adoc             |  11 +++--
 src/main/asciidoc/jdo_3_0_overview.adoc    |   7 ++--
 src/main/asciidoc/jdo_dtd.adoc             |   7 ++--
 src/main/asciidoc/jdo_v_jpa.adoc           |   7 ++--
 src/main/asciidoc/jdo_v_jpa_api.adoc       |   7 ++--
 src/main/asciidoc/jdo_v_jpa_orm.adoc       |   7 ++--
 src/main/asciidoc/jdocentral.adoc          |  26 ++++++++++++
 src/main/asciidoc/jdoconfig_dtd.adoc       |   7 ++--
 src/main/asciidoc/jdohelper.adoc           |   7 ++--
 src/main/asciidoc/jdoql.adoc               |   7 ++--
 src/main/asciidoc/jdoql_methods.adoc       |   7 ++--
 src/main/asciidoc/jdoql_result.adoc        |   7 ++--
 src/main/asciidoc/jdoquery_dtd.adoc        |   7 ++--
 src/main/asciidoc/mail-lists.adoc          |   7 ++--
 src/main/asciidoc/maven-reports.adoc       |  13 ++++++
 src/main/asciidoc/metadata.adoc            |   7 ++--
 src/main/asciidoc/newshistory.adoc         |   7 ++--
 src/main/asciidoc/object_retrieval.adoc    |   7 ++--
 src/main/asciidoc/orm_dtd.adoc             |   7 ++--
 src/main/asciidoc/pm.adoc                  |   7 ++--
 src/main/asciidoc/pmf.adoc                 |   7 ++--
 src/main/asciidoc/project-info.adoc        |  13 ++++++
 src/main/asciidoc/references.adoc          |   7 ++--
 src/main/asciidoc/roadmap.adoc             |   7 ++--
 src/main/asciidoc/specifications.adoc      |   7 ++--
 src/main/asciidoc/state_transition.adoc    |   7 ++--
 src/main/asciidoc/svn.adoc                 |   7 ++--
 src/main/asciidoc/tck.adoc                 |  10 ++---
 src/main/asciidoc/team-list.adoc           |   7 ++--
 src/main/asciidoc/transactions.adoc        |   7 ++--
 src/main/asciidoc/types.adoc               |  13 ++++++
 src/main/asciidoc/why_jdo.adoc             |   7 ++--
 src/main/java/ConvertHtml2Adoc.java        |  17 ++++++--
 src/main/resources/images/JDOx100.gif      | Bin 0 -> 3235 bytes
 src/main/template/document.html.erb        |   6 +--
 113 files changed, 551 insertions(+), 707 deletions(-)
 copy docs/{guides.html => cvs-usage.html} (93%)
 create mode 100644 docs/images/JDOx100.png
 copy docs/{guides.html => issue-tracking.html} (93%)
 copy docs/{newshistory.html => jdocentral.html} (91%)
 copy docs/{guides.html => maven-reports.html} (93%)
 copy docs/{guides.html => project-info.html} (93%)
 copy docs/{guides.html => types.html} (93%)
 create mode 100644 src/main/asciidoc/cvs-usage.adoc
 create mode 100644 src/main/asciidoc/images/JDOx100.png
 create mode 100644 src/main/asciidoc/issue-tracking.adoc
 create mode 100644 src/main/asciidoc/jdocentral.adoc
 create mode 100644 src/main/asciidoc/maven-reports.adoc
 create mode 100644 src/main/asciidoc/project-info.adoc
 create mode 100644 src/main/asciidoc/types.adoc
 create mode 100644 src/main/resources/images/JDOx100.gif


[db-jdo-site] 02/02: Fix logos & a typo & 3.0 ref in footer, removed trailing rule and Google+

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 828cb858add52bb576b0d26ac421e48013b11124
Author: Tilmann <zo...@gmx.de>
AuthorDate: Sat Jan 11 19:59:46 2020 +0100

    Fix logos & a typo & 3.0 ref in footer, removed trailing rule and Google+
---
 README.md                                  |   2 +-
 docs/annotations.html                      |  11 ++---
 docs/attach_detach.html                    |  11 ++---
 docs/class_types.html                      |  11 ++---
 docs/{guides.html => cvs-usage.html}       |  26 ++++--------
 docs/dependencies.html                     |  11 ++---
 docs/downloads.html                        |  23 +++++------
 docs/enhancement.html                      |  11 ++---
 docs/exceptions.html                       |  11 ++---
 docs/extents.html                          |  11 ++---
 docs/faq.html                              |  11 ++---
 docs/fetchgroups.html                      |  11 ++---
 docs/field_types.html                      |  11 ++---
 docs/get-involved.html                     |  11 ++---
 docs/glossary.html                         |  11 ++---
 docs/guides-maven-jdo.html                 |   6 +--
 docs/guides-replication.html               |   6 +--
 docs/guides.html                           |  11 ++---
 docs/impls.html                            |  11 ++---
 docs/index.html                            |  62 +++++++++++++----------------
 docs/{guides.html => issue-tracking.html}  |  26 ++++--------
 docs/issuetracking.html                    |  11 ++---
 docs/javadoc.html                          |  11 ++---
 docs/jdo_3_0_overview.html                 |  11 ++---
 docs/jdo_dtd.html                          |  11 ++---
 docs/jdo_v_jpa.html                        |  11 ++---
 docs/jdo_v_jpa_api.html                    |  11 ++---
 docs/jdo_v_jpa_orm.html                    |  11 ++---
 docs/{newshistory.html => jdocentral.html} |  32 +++++++--------
 docs/jdoconfig_dtd.html                    |  11 ++---
 docs/jdohelper.html                        |  11 ++---
 docs/jdoql.html                            |  11 ++---
 docs/jdoql_methods.html                    |  11 ++---
 docs/jdoql_result.html                     |  11 ++---
 docs/jdoquery_dtd.html                     |  11 ++---
 docs/mail-lists.html                       |  11 ++---
 docs/{guides.html => maven-reports.html}   |  26 ++++--------
 docs/metadata.html                         |  11 ++---
 docs/newshistory.html                      |  11 ++---
 docs/object_retrieval.html                 |  11 ++---
 docs/orm_dtd.html                          |  11 ++---
 docs/pm.html                               |  11 ++---
 docs/pmf.html                              |  11 ++---
 docs/{guides.html => project-info.html}    |  26 ++++--------
 docs/references.html                       |  11 ++---
 docs/release-3.0.1.html                    |   6 +--
 docs/release-3.1-rc1.html                  |   6 +--
 docs/release-3.1.html                      |   6 +--
 docs/roadmap.html                          |  11 ++---
 docs/specifications.html                   |  11 ++---
 docs/state_transition.html                 |  11 ++---
 docs/svn.html                              |  11 ++---
 docs/tck.html                              |  14 +++----
 docs/team-list.html                        |  11 ++---
 docs/transactions.html                     |  11 ++---
 docs/{guides.html => types.html}           |  26 ++++--------
 docs/why_jdo.html                          |  11 ++---
 src/main/asciidoc/annotations.adoc         |   7 ++--
 src/main/asciidoc/attach_detach.adoc       |   7 ++--
 src/main/asciidoc/class_types.adoc         |   7 ++--
 src/main/asciidoc/cvs-usage.adoc           |  13 ++++++
 src/main/asciidoc/dependencies.adoc        |   7 ++--
 src/main/asciidoc/downloads.adoc           |  19 +++++----
 src/main/asciidoc/enhancement.adoc         |   7 ++--
 src/main/asciidoc/exceptions.adoc          |   7 ++--
 src/main/asciidoc/extents.adoc             |   7 ++--
 src/main/asciidoc/faq.adoc                 |   7 ++--
 src/main/asciidoc/fetchgroups.adoc         |   7 ++--
 src/main/asciidoc/field_types.adoc         |   7 ++--
 src/main/asciidoc/get-involved.adoc        |   7 ++--
 src/main/asciidoc/glossary.adoc            |   7 ++--
 src/main/asciidoc/guides.adoc              |   7 ++--
 src/main/asciidoc/images/JDOx100.png       | Bin 0 -> 7037 bytes
 src/main/asciidoc/impls.adoc               |   7 ++--
 src/main/asciidoc/index.adoc               |  60 +++++++++++++---------------
 src/main/asciidoc/issue-tracking.adoc      |  13 ++++++
 src/main/asciidoc/issuetracking.adoc       |   7 ++--
 src/main/asciidoc/javadoc.adoc             |  11 +++--
 src/main/asciidoc/jdo_3_0_overview.adoc    |   7 ++--
 src/main/asciidoc/jdo_dtd.adoc             |   7 ++--
 src/main/asciidoc/jdo_v_jpa.adoc           |   7 ++--
 src/main/asciidoc/jdo_v_jpa_api.adoc       |   7 ++--
 src/main/asciidoc/jdo_v_jpa_orm.adoc       |   7 ++--
 src/main/asciidoc/jdocentral.adoc          |  26 ++++++++++++
 src/main/asciidoc/jdoconfig_dtd.adoc       |   7 ++--
 src/main/asciidoc/jdohelper.adoc           |   7 ++--
 src/main/asciidoc/jdoql.adoc               |   7 ++--
 src/main/asciidoc/jdoql_methods.adoc       |   7 ++--
 src/main/asciidoc/jdoql_result.adoc        |   7 ++--
 src/main/asciidoc/jdoquery_dtd.adoc        |   7 ++--
 src/main/asciidoc/mail-lists.adoc          |   7 ++--
 src/main/asciidoc/maven-reports.adoc       |  13 ++++++
 src/main/asciidoc/metadata.adoc            |   7 ++--
 src/main/asciidoc/newshistory.adoc         |   7 ++--
 src/main/asciidoc/object_retrieval.adoc    |   7 ++--
 src/main/asciidoc/orm_dtd.adoc             |   7 ++--
 src/main/asciidoc/pm.adoc                  |   7 ++--
 src/main/asciidoc/pmf.adoc                 |   7 ++--
 src/main/asciidoc/project-info.adoc        |  13 ++++++
 src/main/asciidoc/references.adoc          |   7 ++--
 src/main/asciidoc/roadmap.adoc             |   7 ++--
 src/main/asciidoc/specifications.adoc      |   7 ++--
 src/main/asciidoc/state_transition.adoc    |   7 ++--
 src/main/asciidoc/svn.adoc                 |   7 ++--
 src/main/asciidoc/tck.adoc                 |  10 ++---
 src/main/asciidoc/team-list.adoc           |   7 ++--
 src/main/asciidoc/transactions.adoc        |   7 ++--
 src/main/asciidoc/types.adoc               |  13 ++++++
 src/main/asciidoc/why_jdo.adoc             |   7 ++--
 src/main/java/ConvertHtml2Adoc.java        |  17 ++++++--
 110 files changed, 548 insertions(+), 702 deletions(-)

diff --git a/README.md b/README.md
index d8f1d9b..8970007 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ How to build the website:
  * Use `git pull`  to get the latest version from the repository.
  * Use `git branch MyBranchName` and `git checkout MyBranchName` to create a branch and check it out.
  * Adapt the asciidoc files in `src/main/asciidoc` or the website menu in  `src/main/template
- * Call `mvn clean build`. This generates html files in `target/site`. 
+ * Call `mvn clean compile`. This generates html files in `target/site`. 
  * Copy all files from `target/site` into the `docs` folder, do not forget subfolders.
  * Verify the generated website by viewing it locally with a web browser. 
  * Commit changes with `git commit -m 'my commit message' `.
diff --git a/docs/annotations.html b/docs/annotations.html
index e295c40..afe84ca 100644
--- a/docs/annotations.html
+++ b/docs/annotations.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -3964,7 +3964,6 @@ public class Person
 <div class="paragraph">
 <p><br></p>
 </div>
-<hr>
 </div>
 </div>
 </div>
@@ -3985,15 +3984,13 @@ public class Person
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/attach_detach.html b/docs/attach_detach.html
index dda63fd..07d1935 100644
--- a/docs/attach_detach.html
+++ b/docs/attach_detach.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -577,7 +577,6 @@ the <em>java.io.Serializable</em> interface, as the following example:</p>
 <div class="paragraph">
 <p><br></p>
 </div>
-<hr>
 </div>
 </div>
 </div>
@@ -598,15 +597,13 @@ the <em>java.io.Serializable</em> interface, as the following example:</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/class_types.html b/docs/class_types.html
index 93ef28b..80b9f42 100644
--- a/docs/class_types.html
+++ b/docs/class_types.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -373,7 +373,6 @@ public class MyClass
 <div class="paragraph">
 <p><br></p>
 </div>
-<hr>
 </div>
 </div>
 </div>
@@ -394,15 +393,13 @@ public class MyClass
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/guides.html b/docs/cvs-usage.html
similarity index 93%
copy from docs/guides.html
copy to docs/cvs-usage.html
index 121b8a4..b8dd071 100644
--- a/docs/guides.html
+++ b/docs/cvs-usage.html
@@ -11,7 +11,7 @@
     <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>
+    <title></title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -280,25 +280,15 @@ table.CodeRay td.code>pre{padding:0}
         <div class="row-fluid">
             <div class="col-sm-9">
 <!--                <div class="page-title">
-                    <h3>Guides<a id="Guides"></a></h3>
+                    <h3></h3>
                 </div>
 -->
                 <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><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>
-<hr>
-</div>
-</div>
+<hr>
                 </div>
             </div>
             <div class="col-sm-3">
@@ -316,15 +306,13 @@ application.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/dependencies.html b/docs/dependencies.html
index 8929a8f..0417d9b 100644
--- a/docs/dependencies.html
+++ b/docs/dependencies.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -390,7 +390,6 @@ and test it:</p>
 </li>
 </ul>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -410,15 +409,13 @@ and test it:</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/downloads.html b/docs/downloads.html
index 54a4f56..9a52ed5 100644
--- a/docs/downloads.html
+++ b/docs/downloads.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,16 +285,16 @@ 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><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="_latest_official_release_a_id_latest_official_release_a">Latest Official Release<a id="Latest_Official_Release"></a></h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p><a href="release-3.1.html">JDO 3.1</a> <span class="image"><img src="images/dot_clear.png" alt="image"></span> March
-20, 2015</p>
+<p><a href="releases/release-3.1.cgi">JDO 3.1</a> <span class="image"><img src="images/dot_clear.png" alt="image"></span>
+March 20, 2015</p>
 </div>
 </div>
 </div>
@@ -302,12 +302,12 @@ table.CodeRay td.code>pre{padding:0}
 <h2 id="_previous_official_releases_a_id_previous_official_releases_a">Previous Official Releases<a id="Previous_Official_Releases"></a></h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p><a href="release-3.1-rc1.html">JDO 3.1-rc1</a> <span class="image"><img src="images/dot_clear.png" alt="image"></span>
-September 22, 2013</p>
+<p><a href="releases/release-3.1-rc1.cgi">JDO 3.1-rc1</a>
+<span class="image"><img src="images/dot_clear.png" alt="image"></span> September 22, 2013</p>
 </div>
 <div class="paragraph">
-<p><a href="release-3.0.1.html">JDO 3.0.1</a> <span class="image"><img src="images/dot_clear.png" alt="image"></span>
-November 13, 2011</p>
+<p><a href="releases/release-3.0.1.cgi">JDO 3.0.1</a>
+<span class="image"><img src="images/dot_clear.png" alt="image"></span> November 13, 2011</p>
 </div>
 </div>
 </div>
@@ -353,7 +353,6 @@ projects.</p>
 <p>See <a href="svn.html">Source Code Version Control</a> for information about
 downloading the latest source code for all of the JDO projects.</p>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -373,15 +372,13 @@ downloading the latest source code for all of the JDO projects.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/enhancement.html b/docs/enhancement.html
index b620d50..a88cfb6 100644
--- a/docs/enhancement.html
+++ b/docs/enhancement.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -846,7 +846,6 @@ public class A implements PersistenceCapable, Detachable
 }</pre>
 </div>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -866,15 +865,13 @@ public class A implements PersistenceCapable, Detachable
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/exceptions.html b/docs/exceptions.html
index 5e80cab..29bf6c5 100644
--- a/docs/exceptions.html
+++ b/docs/exceptions.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -419,7 +419,6 @@ to the detached instance.</p></td>
 </tr>
 </tbody>
 </table>
-<hr>
 </div>
 </div>
 </div>
@@ -440,15 +439,13 @@ to the detached instance.</p></td>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/extents.html b/docs/extents.html
index fb91aa3..1daea18 100644
--- a/docs/extents.html
+++ b/docs/extents.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -312,7 +312,6 @@ over just that set of objects. It can also be used where you just want
 to retrieve all persisted objects of a type (as an alternative to using
 a Query).</p>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -332,15 +331,13 @@ a Query).</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/faq.html b/docs/faq.html
index bec046a..df7211e 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -318,7 +318,6 @@ The users mailing list is <a href="mailto:jdo-user@db.apache.org">jdo-user@db.ap
 <a href="http://wiki.apache.org/jdo">JDO wiki</a> complements the work taking place
 on the mailing list and provides additional information on the project.</p>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -338,15 +337,13 @@ on the mailing list and provides additional information on the project.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/fetchgroups.html b/docs/fetchgroups.html
index 64232e6..321c31f 100644
--- a/docs/fetchgroups.html
+++ b/docs/fetchgroups.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -651,7 +651,6 @@ defines the number of instances to be fetched. Using
 <em>FetchPlan.FETCH_SIZE_GREEDY</em> means that all instances will be fetched
 immediately.</p>
 </div>
-<hr>
 </div>
 </div>
 </div>
@@ -672,15 +671,13 @@ immediately.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/field_types.html b/docs/field_types.html
index 46ae88d..b122d1c 100644
--- a/docs/field_types.html
+++ b/docs/field_types.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -1159,7 +1159,6 @@ can be used as part of the primary key.</p>
 <div class="paragraph">
 <p><span class="image"><img src="images/icon_success_sml.png" alt="image"></span></p>
 </div>
-<hr>
 </div>
 </div>
 </div>
@@ -1180,15 +1179,13 @@ can be used as part of the primary key.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/get-involved.html b/docs/get-involved.html
index bc18e53..1f01e7a 100644
--- a/docs/get-involved.html
+++ b/docs/get-involved.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -361,7 +361,6 @@ account.</p>
 </li>
 </ul>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -381,15 +380,13 @@ account.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/glossary.html b/docs/glossary.html
index cc516e4..25ae1f6 100644
--- a/docs/glossary.html
+++ b/docs/glossary.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -476,7 +476,6 @@ not persistent.</p></td>
 </tr>
 </tbody>
 </table>
-<hr>
 </div>
 </div>
                 </div>
@@ -496,15 +495,13 @@ not persistent.</p></td>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/guides-maven-jdo.html b/docs/guides-maven-jdo.html
index f149fa0..4450626 100644
--- a/docs/guides-maven-jdo.html
+++ b/docs/guides-maven-jdo.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -609,15 +609,13 @@ projects, primarily JPOX, and Apache JDO, and a member of the JSR243
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/guides-replication.html b/docs/guides-replication.html
index a02f3c8..bd8fe98 100644
--- a/docs/guides-replication.html
+++ b/docs/guides-replication.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -465,15 +465,13 @@ extend this basic idea and replicate large amounts of data.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/guides.html b/docs/guides.html
index 121b8a4..48e74c7 100644
--- a/docs/guides.html
+++ b/docs/guides.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -296,7 +296,6 @@ table.CodeRay td.code>pre{padding:0}
 <p>This section provides guides to the process of introducing JDO into your
 application.</p>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -316,15 +315,13 @@ application.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/impls.html b/docs/impls.html
index ba6da22..0561b52 100644
--- a/docs/impls.html
+++ b/docs/impls.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -443,7 +443,6 @@ CRM,SFA&#8230;&#8203;), components (EJB&#8230;&#8203;).</p></td>
 </tr>
 </tbody>
 </table>
-<hr>
 </div>
 </div>
 </div>
@@ -464,15 +463,13 @@ CRM,SFA&#8230;&#8203;), components (EJB&#8230;&#8203;).</p></td>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/index.html b/docs/index.html
index 8c2d914..7fe5bc6 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -286,7 +286,7 @@ 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: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
+<span class="image" style="float: right"><img src="images/jdo_text.png" alt="jdo text"></span></p>
 </div>
 <hr>
 <div class="sect1">
@@ -336,8 +336,7 @@ is <a href="http://www.jcp.org/en/jsr/detail?id=243">JSR-243</a>.</p>
 for compatibility testing of JDO implementations. Commercial and open
 source implementations of JDO are available for relational databases,
 object databases, and file systems. If you need an implementation for
-building a JDO application, see
-<a href="http://db.apache.org/jdo/impls.html">Implementations</a>.</p>
+building a JDO application, see <a href="impls.html">Implementations</a>.</p>
 </div>
 </div>
 </div>
@@ -354,9 +353,9 @@ building a JDO application, see
 complete list of changes (features plus bug fixes) see
 <a href="https://issues.apache.org/jira/browse/JDO/fixforversion/12325878">JDO 3.1
 changes</a>. You can download the release from the
-<a href="http://db.apache.org/jdo/downloads.html">downloads page</a>. You can also
-use the new release in maven projects simply by referencing the jdo-api
-artifact in your pom.xml.</p>
+<a href="downloads.html">downloads page</a>. You can also use the new release in
+maven projects simply by referencing the jdo-api artifact in your
+pom.xml.</p>
 </div>
 </blockquote>
 </div>
@@ -370,9 +369,9 @@ artifact in your pom.xml.</p>
 For a complete list of changes (features plus bug fixes) see
 <a href="https://issues.apache.org/jira/browse/JDO/fixforversion/12314921">JDO
 3.1-rc1 changes</a>. You can download the release from the
-<a href="http://db.apache.org/jdo/downloads.html">downloads page</a>. You can also
-use the new release in maven projects simply by referencing the jdo-api
-artifact in your pom.xml.</p>
+<a href="downloads.html">downloads page</a>. You can also use the new release in
+maven projects simply by referencing the jdo-api artifact in your
+pom.xml.</p>
 </div>
 </blockquote>
 </div>
@@ -386,9 +385,9 @@ artifact in your pom.xml.</p>
 a complete list of changes (features plus bug fixes) see
 <a href="https://issues.apache.org/jira/browse/JDO/fixforversion/12317950">JDO
 3.0.1 changes</a>. You can download the release from the
-<a href="http://db.apache.org/jdo/downloads.html">downloads page</a>. You can also
-use the new release in maven projects simply by referencing the jdo-api
-artifact in your pom.xml.</p>
+<a href="downloads.html">downloads page</a>. You can also use the new release in
+maven projects simply by referencing the jdo-api artifact in your
+pom.xml.</p>
 </div>
 </blockquote>
 </div>
@@ -405,9 +404,9 @@ cancel, and exact object ids. For a complete list of changes (features
 plus bug fixes) see
 <a href="https://issues.apache.org/jira/browse/JDO/fixforversion/12313404">JDO 3.0
 changes</a>. You can download the release from the
-<a href="http://db.apache.org/jdo/downloads.html">downloads page</a>. You can also
-use the new release in maven projects simply by referencing the jdo-api
-artifact in your pom.xml.</p>
+<a href="downloads.html">downloads page</a>. You can also use the new release in
+maven projects simply by referencing the jdo-api artifact in your
+pom.xml.</p>
 </div>
 </blockquote>
 </div>
@@ -418,9 +417,9 @@ artifact in your pom.xml.</p>
 <blockquote>
 <div class="paragraph">
 <p>JDO 2.2 is now available for download from the
-<a href="http://db.apache.org/jdo/downloads.html">downloads page</a>. The JDO 2.2
-maintenance release provides support for copyOnAttach control, dynamic
-fetch groups, level2 caching control via metadata. For details, see
+<a href="downloads.html">downloads page</a>. The JDO 2.2 maintenance release
+provides support for copyOnAttach control, dynamic fetch groups, level2
+caching control via metadata. For details, see
 <a href="http://jcp.org/aboutJava/communityprocess/maintenance/jsr243/243MR2.html">ChangeLog
 for JSR-0243 JavaTM Data Objects 2.2</a></p>
 </div>
@@ -433,8 +432,7 @@ for JSR-0243 JavaTM Data Objects 2.2</a></p>
 <blockquote>
 <div class="paragraph">
 <p>JDO 2.1.1 is now available for download from the
-<a href="http://db.apache.org/jdo/downloads.html">downloads page</a>. This is a minor
-bug fix release.</p>
+<a href="downloads.html">downloads page</a>. This is a minor bug fix release.</p>
 </div>
 </blockquote>
 </div>
@@ -445,10 +443,10 @@ bug fix release.</p>
 <blockquote>
 <div class="paragraph">
 <p>JDO 2.1 is now available for download from the
-<a href="http://db.apache.org/jdo/downloads.html">downloads page</a>. The JDO 2.1
-maintenance release provides support for JDK 1.5 features,including the
-use of annotations as a means of specifying mapping. It also includes
-many corrections and minor changes. For details, see
+<a href="downloads.html">downloads page</a>. The JDO 2.1 maintenance release
+provides support for JDK 1.5 features,including the use of annotations
+as a means of specifying mapping. It also includes many corrections and
+minor changes. For details, see
 <a href="http://jcp.org/aboutJava/communityprocess/maintenance/jsr243/243ChangeLog.html">Change
 Log for JSR-000243 JavaTM Data Objects 2.0</a> (<em>2007-08-02</em>)</p>
 </div>
@@ -461,8 +459,8 @@ Log for JSR-000243 JavaTM Data Objects 2.0</a> (<em>2007-08-02</em>)</p>
 <blockquote>
 <div class="paragraph">
 <p>JDO 2.0 is now available for download from the
-<a href="http://db.apache.org/jdo/downloads.html">downloads page</a>. JDO 2.0 builds
-on JDO 1 and includes many features requested by users:</p>
+<a href="downloads.html">downloads page</a>. JDO 2.0 builds on JDO 1 and
+includes many features requested by users:</p>
 </div>
 <div class="ulist">
 <ul>
@@ -517,13 +515,11 @@ the JDO standard. (<em>2005-07-13</em>)</p>
 We&#8217;d love to have you involved. Check out the
 <a href="http://wiki.apache.org/jdo">Wiki</a>. Check out the
 <a href="http://www.jcp.org/en/jsr/detail?id=243">Specification</a>, which has been
-approved. <a href="http://db.apache.org/jdo/get-involved.html">Get Involved</a>!
-(<em>2005-07-13</em>)</p>
+approved. <a href="./get-involved.html">Get Involved</a>! (<em>2005-07-13</em>)</p>
 </div>
 <div class="paragraph">
-<p><em>Archived articles are <a href="http://db.apache.org/jdo/newshistory.html">here</a></em>.</p>
+<p><em>Archived articles are <a href="newshistory.html">here</a></em>.</p>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -543,15 +539,13 @@ approved. <a href="http://db.apache.org/jdo/get-involved.html">Get Involved</a>!
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/guides.html b/docs/issue-tracking.html
similarity index 93%
copy from docs/guides.html
copy to docs/issue-tracking.html
index 121b8a4..b8dd071 100644
--- a/docs/guides.html
+++ b/docs/issue-tracking.html
@@ -11,7 +11,7 @@
     <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>
+    <title></title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -280,25 +280,15 @@ table.CodeRay td.code>pre{padding:0}
         <div class="row-fluid">
             <div class="col-sm-9">
 <!--                <div class="page-title">
-                    <h3>Guides<a id="Guides"></a></h3>
+                    <h3></h3>
                 </div>
 -->
                 <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><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>
-<hr>
-</div>
-</div>
+<hr>
                 </div>
             </div>
             <div class="col-sm-3">
@@ -316,15 +306,13 @@ application.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/issuetracking.html b/docs/issuetracking.html
index e468d72..c45b873 100644
--- a/docs/issuetracking.html
+++ b/docs/issuetracking.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -347,7 +347,6 @@ Notes for released versions</a></p>
 </li>
 </ul>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -367,15 +366,13 @@ Notes for released versions</a></p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/javadoc.html b/docs/javadoc.html
index 355887d..7bf1080 100644
--- a/docs/javadoc.html
+++ b/docs/javadoc.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -391,7 +391,6 @@ online</a></p>
 <div class="paragraph">
 <p><a href="api11/apidocs.zip">Download JDO 1.1 javadoc</a></p>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -411,15 +410,13 @@ online</a></p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/jdo_3_0_overview.html b/docs/jdo_3_0_overview.html
index 092704f..1ba9d33 100644
--- a/docs/jdo_3_0_overview.html
+++ b/docs/jdo_3_0_overview.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -520,7 +520,6 @@ Boolean getSerializeRead();</pre>
 <div class="paragraph">
 <p>This concludes our simple overview of JDO3. We hope you enjoy using it</p>
 </div>
-<hr>
 </div>
 </div>
 </div>
@@ -541,15 +540,13 @@ Boolean getSerializeRead();</pre>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/jdo_dtd.html b/docs/jdo_dtd.html
index 17f0440..5a3284d 100644
--- a/docs/jdo_dtd.html
+++ b/docs/jdo_dtd.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -334,7 +334,6 @@ or SYSTEM versions of these.</p>
 <a href="http://xmlns.jcp.org/dtd/jdo_3_0.dtd">DTD</a> or the
 <a href="http://xmlns.jcp.org/xml/ns/jdo/jdo_3_0.xsd">XSD</a> specification.</p>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -354,15 +353,13 @@ or SYSTEM versions of these.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/jdo_v_jpa.html b/docs/jdo_v_jpa.html
index 1f45017..e20a2b3 100644
--- a/docs/jdo_v_jpa.html
+++ b/docs/jdo_v_jpa.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -513,7 +513,6 @@ Map, List, Array, 1-1, 1-N, M-N using PC, Non-PC and interface objects</strong><
 <p>As an overall conclusion "JPA" is a subset of what is available in
 "JDO".</p>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -533,15 +532,13 @@ Map, List, Array, 1-1, 1-N, M-N using PC, Non-PC and interface objects</strong><
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/jdo_v_jpa_api.html b/docs/jdo_v_jpa_api.html
index 18db922..d4d8b1d 100644
--- a/docs/jdo_v_jpa_api.html
+++ b/docs/jdo_v_jpa_api.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -369,7 +369,6 @@ pm.getExtent()</p></td>
 </tr>
 </tbody>
 </table>
-<hr>
 </div>
 </div>
                 </div>
@@ -389,15 +388,13 @@ pm.getExtent()</p></td>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/jdo_v_jpa_orm.html b/docs/jdo_v_jpa_orm.html
index 1b005ca..95e0d0e 100644
--- a/docs/jdo_v_jpa_orm.html
+++ b/docs/jdo_v_jpa_orm.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -616,7 +616,6 @@ JoinTable Unidirectional Array</a></p></td>
 </tr>
 </tbody>
 </table>
-<hr>
 </div>
 </div>
 </div>
@@ -637,15 +636,13 @@ JoinTable Unidirectional Array</a></p></td>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/newshistory.html b/docs/jdocentral.html
similarity index 91%
copy from docs/newshistory.html
copy to docs/jdocentral.html
index 8838751..f40268c 100644
--- a/docs/newshistory.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>Older JDO News<a id="Older_JDO_News"></a></title>
+    <title>JDOCentral at Apache JDO<a id="JDOCentral_at_Apache_JDO"></a></title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -280,32 +280,32 @@ table.CodeRay td.code>pre{padding:0}
         <div class="row-fluid">
             <div class="col-sm-9">
 <!--                <div class="page-title">
-                    <h3>Older JDO News<a id="Older_JDO_News"></a></h3>
+                    <h3>JDOCentral at Apache JDO<a id="JDOCentral_at_Apache_JDO"></a></h3>
                 </div>
 -->
                 <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><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="_older_jdo_news_a_id_older_jdo_news_a">Older JDO News<a id="Older_JDO_News"></a></h2>
+<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">
 <div class="paragraph">
-<p><strong>JDO code donated to Apache by Sun Microsystems, Inc.</strong></p>
+<p>Welcome to the new home of JDOCentral!</p>
 </div>
 <div class="paragraph">
-<p>On 9-Mar-2005 Sun Microsystems, Inc. officially donated to Apache
-Software Foundation the intellectual property known as Java Data
-Objects, v. 1.0.2 and successors thereto to the extent provided by Sun.</p>
+<p>JDOCentral was a privately maintained site. Apache JDO is home for the
+development of the JDO specification and the TCK. The
+<a href="http://www.datanucleus.org">DataNucleus</a> site is home for the development
+of the Reference Implementation of the JDO specification.</p>
 </div>
 <div class="paragraph">
-<p>This was accomplished via Schedule B-2 to the Software Grant and
-Corporate Contributor License Agreement (CCLA) between The Apache
-Software Foundation and Sun Microsystems, Inc.</p>
+<p>Visit the other pages on the Apache JDO site to find out what&#8217;s going on
+with JDO. Join the <a href="http://db.apache.org/jdo/mail-lists.html">mailing
+lists</a> to get involved and provide feedback.</p>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -325,15 +325,13 @@ Software Foundation and Sun Microsystems, Inc.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/jdoconfig_dtd.html b/docs/jdoconfig_dtd.html
index cb1b4ec..c4ab7e7 100644
--- a/docs/jdoconfig_dtd.html
+++ b/docs/jdoconfig_dtd.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -335,7 +335,6 @@ specifications</p>
 <a href="http://xmlns.jcp.org/dtd/jdoconfig_3_0.dtd">DTD</a> or the
 <a href="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig_3_0.xsd">XSD</a> specification.</p>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -355,15 +354,13 @@ specifications</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/jdohelper.html b/docs/jdohelper.html
index e5d23f2..56e38e0 100644
--- a/docs/jdohelper.html
+++ b/docs/jdohelper.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -426,7 +426,6 @@ detached</p>
 </li>
 </ul>
 </div>
-<hr>
 </div>
 </div>
 </div>
@@ -447,15 +446,13 @@ detached</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/jdoql.html b/docs/jdoql.html
index 57591b1..682a4b0 100644
--- a/docs/jdoql.html
+++ b/docs/jdoql.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -592,7 +592,6 @@ Query query = pm.newQuery("SELECT FROM mydomain.A WHERE b instanceof mydomain.B2
 List results = (List)query.execute();</pre>
 </div>
 </div>
-<hr>
 </div>
 </div>
 </div>
@@ -613,15 +612,13 @@ List results = (List)query.execute();</pre>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/jdoql_methods.html b/docs/jdoql_methods.html
index 7d2a528..e5cb644 100644
--- a/docs/jdoql_methods.html
+++ b/docs/jdoql_methods.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -675,7 +675,6 @@ persistent object</p></td>
 </tr>
 </tbody>
 </table>
-<hr>
 </div>
 </div>
 </div>
@@ -696,15 +695,13 @@ persistent object</p></td>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/jdoql_result.html b/docs/jdoql_result.html
index 551dd5a..b9a83c2 100644
--- a/docs/jdoql_result.html
+++ b/docs/jdoql_result.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -445,7 +445,6 @@ Double max_price = (Double)iter.next();</pre>
 <div class="paragraph">
 <p><br></p>
 </div>
-<hr>
 </div>
 </div>
 </div>
@@ -466,15 +465,13 @@ Double max_price = (Double)iter.next();</pre>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/jdoquery_dtd.html b/docs/jdoquery_dtd.html
index 06f549c..b69a086 100644
--- a/docs/jdoquery_dtd.html
+++ b/docs/jdoquery_dtd.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -335,7 +335,6 @@ specification</p>
 <a href="http://xmlns.jcp.org/dtd/jdoquery_3_0.dtd">DTD</a> or the
 <a href="http://xmlns.jcp.org/xml/ns/jdo/jdoquery_3_0.xsd">XSD</a> specification.</p>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -355,15 +354,13 @@ specification</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/mail-lists.html b/docs/mail-lists.html
index 4253de1..aa08e6a 100644
--- a/docs/mail-lists.html
+++ b/docs/mail-lists.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -329,7 +329,6 @@ list!</p>
 </tr>
 </tbody>
 </table>
-<hr>
 </div>
 </div>
                 </div>
@@ -349,15 +348,13 @@ list!</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/guides.html b/docs/maven-reports.html
similarity index 93%
copy from docs/guides.html
copy to docs/maven-reports.html
index 121b8a4..b8dd071 100644
--- a/docs/guides.html
+++ b/docs/maven-reports.html
@@ -11,7 +11,7 @@
     <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>
+    <title></title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -280,25 +280,15 @@ table.CodeRay td.code>pre{padding:0}
         <div class="row-fluid">
             <div class="col-sm-9">
 <!--                <div class="page-title">
-                    <h3>Guides<a id="Guides"></a></h3>
+                    <h3></h3>
                 </div>
 -->
                 <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><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>
-<hr>
-</div>
-</div>
+<hr>
                 </div>
             </div>
             <div class="col-sm-3">
@@ -316,15 +306,13 @@ application.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/metadata.html b/docs/metadata.html
index ff7bf39..8a1d14d 100644
--- a/docs/metadata.html
+++ b/docs/metadata.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -348,7 +348,6 @@ information for Oracle datastores, and so on.</p>
 can be annotated defining the persistence and, optionally, any ORM
 information.</p>
 </div>
-<hr>
 </div>
 </div>
 </div>
@@ -369,15 +368,13 @@ information.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/newshistory.html b/docs/newshistory.html
index 8838751..b5c498d 100644
--- a/docs/newshistory.html
+++ b/docs/newshistory.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -305,7 +305,6 @@ Objects, v. 1.0.2 and successors thereto to the extent provided by Sun.</p>
 Corporate Contributor License Agreement (CCLA) between The Apache
 Software Foundation and Sun Microsystems, Inc.</p>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -325,15 +324,13 @@ Software Foundation and Sun Microsystems, Inc.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/object_retrieval.html b/docs/object_retrieval.html
index a91f94d..5a481d5 100644
--- a/docs/object_retrieval.html
+++ b/docs/object_retrieval.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -371,7 +371,6 @@ retrieved from there, otherwise the JDO implementation goes to the
 datastore. When the objects are retrieved their fields are populated
 according to the Fetch Group.</p>
 </div>
-<hr>
 </div>
 </div>
 </div>
@@ -392,15 +391,13 @@ according to the Fetch Group.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/orm_dtd.html b/docs/orm_dtd.html
index 320dde7..a7bad0b 100644
--- a/docs/orm_dtd.html
+++ b/docs/orm_dtd.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -335,7 +335,6 @@ specification</p>
 <a href="http://xmlns.jcp.org/dtd/orm_3_0.dtd">DTD</a> or the
 <a href="http://xmlns.jcp.org/xml/ns/jdo/orm_3_0.xsd">XSD</a> specification.</p>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -355,15 +354,13 @@ specification</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/pm.html b/docs/pm.html
index bf23a0b..bc1f09a 100644
--- a/docs/pm.html
+++ b/docs/pm.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -529,7 +529,6 @@ catch (Exception e)
 ... (code to work on "my_obj")</pre>
 </div>
 </div>
-<hr>
 </div>
 </div>
 </div>
@@ -550,15 +549,13 @@ catch (Exception e)
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/pmf.html b/docs/pmf.html
index e9ad19c..f4f3cfa 100644
--- a/docs/pmf.html
+++ b/docs/pmf.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -786,7 +786,6 @@ serializable</p>
 <div class="paragraph">
 <p><br></p>
 </div>
-<hr>
 </div>
 </div>
 </div>
@@ -807,15 +806,13 @@ serializable</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/guides.html b/docs/project-info.html
similarity index 93%
copy from docs/guides.html
copy to docs/project-info.html
index 121b8a4..b8dd071 100644
--- a/docs/guides.html
+++ b/docs/project-info.html
@@ -11,7 +11,7 @@
     <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>
+    <title></title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -280,25 +280,15 @@ table.CodeRay td.code>pre{padding:0}
         <div class="row-fluid">
             <div class="col-sm-9">
 <!--                <div class="page-title">
-                    <h3>Guides<a id="Guides"></a></h3>
+                    <h3></h3>
                 </div>
 -->
                 <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><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>
-<hr>
-</div>
-</div>
+<hr>
                 </div>
             </div>
             <div class="col-sm-3">
@@ -316,15 +306,13 @@ application.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/references.html b/docs/references.html
index a98a06d..2e244a8 100644
--- a/docs/references.html
+++ b/docs/references.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -363,7 +363,6 @@ Heiko Bobzin. Publisher: Prentice Hall</p>
 <div class="paragraph">
 <p><br></p>
 </div>
-<hr>
 </div>
 </div>
 </div>
@@ -384,15 +383,13 @@ Heiko Bobzin. Publisher: Prentice Hall</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/release-3.0.1.html b/docs/release-3.0.1.html
index b567c89..700a312 100644
--- a/docs/release-3.0.1.html
+++ b/docs/release-3.0.1.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -453,15 +453,13 @@ SHA1.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/release-3.1-rc1.html b/docs/release-3.1-rc1.html
index 4781f67..3555e87 100644
--- a/docs/release-3.1-rc1.html
+++ b/docs/release-3.1-rc1.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -436,15 +436,13 @@ directory</a>, rather than from a mirror. Then verify the signatures using</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/release-3.1.html b/docs/release-3.1.html
index a6e7f1c..838e84f 100644
--- a/docs/release-3.1.html
+++ b/docs/release-3.1.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -563,15 +563,13 @@ directory</a>, rather than from a mirror. Then verify the signatures using</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/roadmap.html b/docs/roadmap.html
index c539f03..9c82e66 100644
--- a/docs/roadmap.html
+++ b/docs/roadmap.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -302,7 +302,6 @@ for details of the planned and completed work.</p>
 <p><a href="mailto:jdo-dev@db.apache.org?subject=New%20Feature%20Idea">Submit an
 Idea</a></p>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -322,15 +321,13 @@ Idea</a></p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/specifications.html b/docs/specifications.html
index 65c2d24..d50984e 100644
--- a/docs/specifications.html
+++ b/docs/specifications.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -349,7 +349,6 @@ to <a href="mailto:jdo-dev@db.apache.org">jdo-dev@db.apache.org</a>.</p>
 </li>
 </ul>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -369,15 +368,13 @@ to <a href="mailto:jdo-dev@db.apache.org">jdo-dev@db.apache.org</a>.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/state_transition.html b/docs/state_transition.html
index 6002037..6ef1b7a 100644
--- a/docs/state_transition.html
+++ b/docs/state_transition.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -534,7 +534,6 @@ this graphically</p>
 <div class="paragraph">
 <p><span class="image"><img src="images/state_transition.png" alt="JDO State Transition"></span><br></p>
 </div>
-<hr>
 </div>
 </div>
 </div>
@@ -555,15 +554,13 @@ this graphically</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/svn.html b/docs/svn.html
index 8bfa08a..99b7f31 100644
--- a/docs/svn.html
+++ b/docs/svn.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -589,7 +589,6 @@ child objects and enable propogations of inheritable permissions". Click
 Apply. OK. OK.) You will have to do this again when you do a clean
 checkout to a new directory.</p>
 </div>
-<hr>
 </div>
 </div>
 </div>
@@ -610,15 +609,13 @@ checkout to a new directory.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/tck.html b/docs/tck.html
index 5ecc93f..120c535 100644
--- a/docs/tck.html
+++ b/docs/tck.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -334,9 +334,9 @@ in the tck directory.</p>
 <p>Vendors must post test results on a publicly accessible web site for
 examination by the public. The posting includes the output of the test
 run, which consists of multiple log files containing configuration
-information and test results.</p>
+information and test results. For an example of the required posting,
+please see <a href="tck/final"><a href="http://db.apache.org/jdo/tck/final" class="bare">http://db.apache.org/jdo/tck/final</a></a>.</p>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -356,15 +356,13 @@ information and test results.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/team-list.html b/docs/team-list.html
index 3951119..d69fe2e 100644
--- a/docs/team-list.html
+++ b/docs/team-list.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -405,7 +405,6 @@ have ideas, please feel free to suggest them on the mailing list.</p>
 </tr>
 </tbody>
 </table>
-<hr>
 </div>
 </div>
                 </div>
@@ -425,15 +424,13 @@ have ideas, please feel free to suggest them on the mailing list.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/transactions.html b/docs/transactions.html
index e2e7f47..bec3a47 100644
--- a/docs/transactions.html
+++ b/docs/transactions.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -348,7 +348,6 @@ or on the transaction you call</p>
 <pre>pm.currentTransaction().setOptimistic(true);</pre>
 </div>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -368,15 +367,13 @@ or on the transaction you call</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/guides.html b/docs/types.html
similarity index 93%
copy from docs/guides.html
copy to docs/types.html
index 121b8a4..b8dd071 100644
--- a/docs/guides.html
+++ b/docs/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>Guides<a id="Guides"></a></title>
+    <title></title>
 
     <link rel="icon" type="image/png" href="https://apache.github.io/db-jdo-site/images/JDO_32x32.png"/>
 
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -280,25 +280,15 @@ table.CodeRay td.code>pre{padding:0}
         <div class="row-fluid">
             <div class="col-sm-9">
 <!--                <div class="page-title">
-                    <h3>Guides<a id="Guides"></a></h3>
+                    <h3></h3>
                 </div>
 -->
                 <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><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>
-<hr>
-</div>
-</div>
+<hr>
                 </div>
             </div>
             <div class="col-sm-3">
@@ -316,15 +306,13 @@ application.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/docs/why_jdo.html b/docs/why_jdo.html
index 0e66b53..ca5a52b 100644
--- a/docs/why_jdo.html
+++ b/docs/why_jdo.html
@@ -207,7 +207,7 @@ table.CodeRay td.code>pre{padding:0}
                         <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">PersistenceManagerFactoryr</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>
@@ -285,8 +285,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><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">
@@ -482,7 +482,6 @@ choosing a persistence layer for your application.</p>
 </li>
 </ol>
 </div>
-<hr>
 </div>
 </div>
                 </div>
@@ -502,15 +501,13 @@ choosing a persistence layer for your application.</p>
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>
diff --git a/src/main/asciidoc/annotations.adoc b/src/main/asciidoc/annotations.adoc
index f25db4a..bd26c72 100644
--- a/src/main/asciidoc/annotations.adoc
+++ b/src/main/asciidoc/annotations.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -1915,5 +1916,3 @@ public class Person
 {empty} +
 
 
-'''''
-
diff --git a/src/main/asciidoc/attach_detach.adoc b/src/main/asciidoc/attach_detach.adoc
index eb8a0af..b759264 100644
--- a/src/main/asciidoc/attach_detach.adoc
+++ b/src/main/asciidoc/attach_detach.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -256,5 +257,3 @@ class MyClass implements java.io.Serializable
 {empty} +
 
 
-'''''
-
diff --git a/src/main/asciidoc/class_types.adoc b/src/main/asciidoc/class_types.adoc
index 75bc2d7..e45f11d 100644
--- a/src/main/asciidoc/class_types.adoc
+++ b/src/main/asciidoc/class_types.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -74,5 +75,3 @@ public class MyClass
 {empty} +
 
 
-'''''
-
diff --git a/src/main/asciidoc/cvs-usage.adoc b/src/main/asciidoc/cvs-usage.adoc
new file mode 100644
index 0000000..ed482d3
--- /dev/null
+++ b/src/main/asciidoc/cvs-usage.adoc
@@ -0,0 +1,13 @@
+[[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/dependencies.adoc b/src/main/asciidoc/dependencies.adoc
index cb6c96b..0d908df 100644
--- a/src/main/asciidoc/dependencies.adoc
+++ b/src/main/asciidoc/dependencies.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -46,5 +47,3 @@ Other external dependencies of JDO are subproject-specific:
 *** Commons Pool
 *** Commons Collections
 
-'''''
-
diff --git a/src/main/asciidoc/downloads.adoc b/src/main/asciidoc/downloads.adoc
index 456eeeb..e230003 100644
--- a/src/main/asciidoc/downloads.adoc
+++ b/src/main/asciidoc/downloads.adoc
@@ -1,27 +1,28 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
 == Latest Official Releaseanchor:Latest_Official_Release[]
 
-link:release-3.1.html[JDO 3.1] image:images/dot_clear.png[image] March
-20, 2015
+link:releases/release-3.1.cgi[JDO 3.1] image:images/dot_clear.png[image]
+March 20, 2015
 
 == Previous Official Releasesanchor:Previous_Official_Releases[]
 
-link:release-3.1-rc1.html[JDO 3.1-rc1] image:images/dot_clear.png[image]
-September 22, 2013
+link:releases/release-3.1-rc1.cgi[JDO 3.1-rc1]
+image:images/dot_clear.png[image] September 22, 2013
 
-link:release-3.0.1.html[JDO 3.0.1] image:images/dot_clear.png[image]
-November 13, 2011
+link:releases/release-3.0.1.cgi[JDO 3.0.1]
+image:images/dot_clear.png[image] November 13, 2011
 
 == About JDO Releasesanchor:About_JDO_Releases[]
 
@@ -53,5 +54,3 @@ projects.
 See link:svn.html[Source Code Version Control] for information about
 downloading the latest source code for all of the JDO projects.
 
-'''''
-
diff --git a/src/main/asciidoc/enhancement.adoc b/src/main/asciidoc/enhancement.adoc
index 8d3d134..4e1aa62 100644
--- a/src/main/asciidoc/enhancement.adoc
+++ b/src/main/asciidoc/enhancement.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -561,5 +562,3 @@ public class A implements PersistenceCapable, Detachable
 }
 ....
 
-'''''
-
diff --git a/src/main/asciidoc/exceptions.adoc b/src/main/asciidoc/exceptions.adoc
index c330e42..237e1d6 100644
--- a/src/main/asciidoc/exceptions.adoc
+++ b/src/main/asciidoc/exceptions.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -91,5 +92,3 @@ accessing a field of a detached instance, where the field was not copied
 to the detached instance.
 |===
 
-'''''
-
diff --git a/src/main/asciidoc/extents.adoc b/src/main/asciidoc/extents.adoc
index 5de0790..6e07f1c 100644
--- a/src/main/asciidoc/extents.adoc
+++ b/src/main/asciidoc/extents.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -30,5 +31,3 @@ over just that set of objects. It can also be used where you just want
 to retrieve all persisted objects of a type (as an alternative to using
 a Query).
 
-'''''
-
diff --git a/src/main/asciidoc/faq.adoc b/src/main/asciidoc/faq.adoc
index 8d52f77..9814b1c 100644
--- a/src/main/asciidoc/faq.adoc
+++ b/src/main/asciidoc/faq.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -34,5 +35,3 @@ The users mailing list is jdo-user@db.apache.org.
 http://wiki.apache.org/jdo[JDO wiki] complements the work taking place
 on the mailing list and provides additional information on the project.
 
-'''''
-
diff --git a/src/main/asciidoc/fetchgroups.adoc b/src/main/asciidoc/fetchgroups.adoc
index 37909db..3de7b32 100644
--- a/src/main/asciidoc/fetchgroups.adoc
+++ b/src/main/asciidoc/fetchgroups.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -301,5 +302,3 @@ defines the number of instances to be fetched. Using
 _FetchPlan.FETCH_SIZE_GREEDY_ means that all instances will be fetched
 immediately.
 
-'''''
-
diff --git a/src/main/asciidoc/field_types.adoc b/src/main/asciidoc/field_types.adoc
index d338af3..d16724e 100644
--- a/src/main/asciidoc/field_types.adoc
+++ b/src/main/asciidoc/field_types.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -596,5 +597,3 @@ image:images/icon_success_sml.png[image]
 
 image:images/icon_success_sml.png[image]
 
-'''''
-
diff --git a/src/main/asciidoc/get-involved.adoc b/src/main/asciidoc/get-involved.adoc
index 264e741..9788dda 100644
--- a/src/main/asciidoc/get-involved.adoc
+++ b/src/main/asciidoc/get-involved.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -50,5 +51,3 @@ http://svn.apache.org/viewcvs.cgi/db/jdo/[SubversionRepository].
 account.
 * Sign up for an http://issues.apache.org/jira/[ASF JIRA] account.
 
-'''''
-
diff --git a/src/main/asciidoc/glossary.adoc b/src/main/asciidoc/glossary.adoc
index 5213c86..11ebba8 100644
--- a/src/main/asciidoc/glossary.adoc
+++ b/src/main/asciidoc/glossary.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -141,5 +142,3 @@ these, for use with RDBMS datastores, is SQL.
 not persistent.
 |===
 
-'''''
-
diff --git a/src/main/asciidoc/guides.adoc b/src/main/asciidoc/guides.adoc
index db556bf..64eba35 100644
--- a/src/main/asciidoc/guides.adoc
+++ b/src/main/asciidoc/guides.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -15,5 +16,3 @@ image:images/jdo_text.png[float="left"]
 This section provides guides to the process of introducing JDO into your
 application.
 
-'''''
-
diff --git a/src/main/asciidoc/images/JDOx100.png b/src/main/asciidoc/images/JDOx100.png
new file mode 100644
index 0000000..9dd13a6
Binary files /dev/null and b/src/main/asciidoc/images/JDOx100.png differ
diff --git a/src/main/asciidoc/impls.adoc b/src/main/asciidoc/impls.adoc
index b851461..d3f307f 100644
--- a/src/main/asciidoc/impls.adoc
+++ b/src/main/asciidoc/impls.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -87,5 +88,3 @@ transactions and screens (CICS, IMS...), packaged applications (ERP,
 CRM,SFA...), components (EJB...).
 |===
 
-'''''
-
diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc
index eee9dab..2938f36 100644
--- a/src/main/asciidoc/index.adoc
+++ b/src/main/asciidoc/index.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -42,8 +43,7 @@ The Apache JDO project is focused on building the JDO API and the TCK
 for compatibility testing of JDO implementations. Commercial and open
 source implementations of JDO are available for relational databases,
 object databases, and file systems. If you need an implementation for
-building a JDO application, see
-http://db.apache.org/jdo/impls.html[Implementations].
+building a JDO application, see link:impls.html[Implementations].
 
 == JDO Newsanchor:JDO_News[]
 
@@ -54,9 +54,9 @@ JDO 3.1 has been released. This release contains minor bug fixes. For a
 complete list of changes (features plus bug fixes) see
 https://issues.apache.org/jira/browse/JDO/fixforversion/12325878[JDO 3.1
 changes]. You can download the release from the
-http://db.apache.org/jdo/downloads.html[downloads page]. You can also
-use the new release in maven projects simply by referencing the jdo-api
-artifact in your pom.xml.
+link:downloads.html[downloads page]. You can also use the new release in
+maven projects simply by referencing the jdo-api artifact in your
+pom.xml.
 ____
 
 *JDO 3.1-rc1 is released* +
@@ -66,9 +66,9 @@ JDO 3.1-rc1 has been released. This release contains minor bug fixes.
 For a complete list of changes (features plus bug fixes) see
 https://issues.apache.org/jira/browse/JDO/fixforversion/12314921[JDO
 3.1-rc1 changes]. You can download the release from the
-http://db.apache.org/jdo/downloads.html[downloads page]. You can also
-use the new release in maven projects simply by referencing the jdo-api
-artifact in your pom.xml.
+link:downloads.html[downloads page]. You can also use the new release in
+maven projects simply by referencing the jdo-api artifact in your
+pom.xml.
 ____
 
 *JDO 3.0.1 is released* +
@@ -78,9 +78,9 @@ JDO 3.0.1 has been released. This release contains minor bug fixes. For
 a complete list of changes (features plus bug fixes) see
 https://issues.apache.org/jira/browse/JDO/fixforversion/12317950[JDO
 3.0.1 changes]. You can download the release from the
-http://db.apache.org/jdo/downloads.html[downloads page]. You can also
-use the new release in maven projects simply by referencing the jdo-api
-artifact in your pom.xml.
+link:downloads.html[downloads page]. You can also use the new release in
+maven projects simply by referencing the jdo-api artifact in your
+pom.xml.
 ____
 
 *JDO 3.0 is released* +
@@ -93,18 +93,18 @@ cancel, and exact object ids. For a complete list of changes (features
 plus bug fixes) see
 https://issues.apache.org/jira/browse/JDO/fixforversion/12313404[JDO 3.0
 changes]. You can download the release from the
-http://db.apache.org/jdo/downloads.html[downloads page]. You can also
-use the new release in maven projects simply by referencing the jdo-api
-artifact in your pom.xml.
+link:downloads.html[downloads page]. You can also use the new release in
+maven projects simply by referencing the jdo-api artifact in your
+pom.xml.
 ____
 
 *JDO 2.2 is released* +
 
 ____
 JDO 2.2 is now available for download from the
-http://db.apache.org/jdo/downloads.html[downloads page]. The JDO 2.2
-maintenance release provides support for copyOnAttach control, dynamic
-fetch groups, level2 caching control via metadata. For details, see
+link:downloads.html[downloads page]. The JDO 2.2 maintenance release
+provides support for copyOnAttach control, dynamic fetch groups, level2
+caching control via metadata. For details, see
 http://jcp.org/aboutJava/communityprocess/maintenance/jsr243/243MR2.html[ChangeLog
 for JSR-0243 JavaTM Data Objects 2.2]
 ____
@@ -113,18 +113,17 @@ ____
 
 ____
 JDO 2.1.1 is now available for download from the
-http://db.apache.org/jdo/downloads.html[downloads page]. This is a minor
-bug fix release.
+link:downloads.html[downloads page]. This is a minor bug fix release.
 ____
 
 *JDO 2.1 is released* +
 
 ____
 JDO 2.1 is now available for download from the
-http://db.apache.org/jdo/downloads.html[downloads page]. The JDO 2.1
-maintenance release provides support for JDK 1.5 features,including the
-use of annotations as a means of specifying mapping. It also includes
-many corrections and minor changes. For details, see
+link:downloads.html[downloads page]. The JDO 2.1 maintenance release
+provides support for JDK 1.5 features,including the use of annotations
+as a means of specifying mapping. It also includes many corrections and
+minor changes. For details, see
 http://jcp.org/aboutJava/communityprocess/maintenance/jsr243/243ChangeLog.html[Change
 Log for JSR-000243 JavaTM Data Objects 2.0] (_2007-08-02_)
 ____
@@ -133,8 +132,8 @@ ____
 
 ____
 JDO 2.0 is now available for download from the
-http://db.apache.org/jdo/downloads.html[downloads page]. JDO 2.0 builds
-on JDO 1 and includes many features requested by users:
+link:downloads.html[downloads page]. JDO 2.0 builds on JDO 1 and
+includes many features requested by users:
 
 * Standard mapping from objects to relational databases
 * Multi-tier support without use of Data Transfer Objects
@@ -160,10 +159,7 @@ the JDO standard. (_2005-07-13_)
 We'd love to have you involved. Check out the
 http://wiki.apache.org/jdo[Wiki]. Check out the
 http://www.jcp.org/en/jsr/detail?id=243[Specification], which has been
-approved. http://db.apache.org/jdo/get-involved.html[Get Involved]!
-(_2005-07-13_)
+approved. link:./get-involved.html[Get Involved]! (_2005-07-13_)
 
-_Archived articles are http://db.apache.org/jdo/newshistory.html[here]_.
-
-'''''
+_Archived articles are link:newshistory.html[here]_.
 
diff --git a/src/main/asciidoc/issue-tracking.adoc b/src/main/asciidoc/issue-tracking.adoc
new file mode 100644
index 0000000..ed482d3
--- /dev/null
+++ b/src/main/asciidoc/issue-tracking.adoc
@@ -0,0 +1,13 @@
+[[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/issuetracking.adoc b/src/main/asciidoc/issuetracking.adoc
index e9f7de8..a4e8b9d 100644
--- a/src/main/asciidoc/issuetracking.adoc
+++ b/src/main/asciidoc/issuetracking.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -44,5 +45,3 @@ Log for released versions]
 * http://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12310830&styleName=Html&projectId=10630&Create=Create[Release
 Notes for released versions]
 
-'''''
-
diff --git a/src/main/asciidoc/javadoc.adoc b/src/main/asciidoc/javadoc.adoc
index 8b7b4a2..bcd5652 100644
--- a/src/main/asciidoc/javadoc.adoc
+++ b/src/main/asciidoc/javadoc.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -21,9 +22,9 @@ directory.
 JDO 3.1 is the current release of the Apache JDO implementation of
 JSR-243.
 
-link:api31/jdo-api-3.1-javadoc/index.html[Browse JDO 3.1 javadoc online]
+link:api31/apidocs/index.html[Browse JDO 3.1 javadoc online]
 
-link:api31/jdo-api-3.1-javadoc.zip[Download JDO 3.1 javadoc]
+link:api31/apidocs.zip[Download JDO 3.1 javadoc]
 
 == JDO 3.0 javadocanchor:JDO_3.0_javadoc[]
 
@@ -72,5 +73,3 @@ link:api11/apidocs/index.html[Browse JDO 1.1 javadoc online]
 
 link:api11/apidocs.zip[Download JDO 1.1 javadoc]
 
-'''''
-
diff --git a/src/main/asciidoc/jdo_3_0_overview.adoc b/src/main/asciidoc/jdo_3_0_overview.adoc
index 4971624..bbf5446 100644
--- a/src/main/asciidoc/jdo_3_0_overview.adoc
+++ b/src/main/asciidoc/jdo_3_0_overview.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -197,5 +198,3 @@ Boolean getSerializeRead();
 
 This concludes our simple overview of JDO3. We hope you enjoy using it
 
-'''''
-
diff --git a/src/main/asciidoc/jdo_dtd.adoc b/src/main/asciidoc/jdo_dtd.adoc
index a779947..37fb0e0 100644
--- a/src/main/asciidoc/jdo_dtd.adoc
+++ b/src/main/asciidoc/jdo_dtd.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -48,5 +49,3 @@ Your MetaData should match either the
 http://xmlns.jcp.org/dtd/jdo_3_0.dtd[DTD] or the
 http://xmlns.jcp.org/xml/ns/jdo/jdo_3_0.xsd[XSD] specification.
 
-'''''
-
diff --git a/src/main/asciidoc/jdo_v_jpa.adoc b/src/main/asciidoc/jdo_v_jpa.adoc
index 2baddc3..b124527 100644
--- a/src/main/asciidoc/jdo_v_jpa.adoc
+++ b/src/main/asciidoc/jdo_v_jpa.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -129,5 +130,3 @@ Map, List, Array, 1-1, 1-N, M-N using PC, Non-PC and interface objects*]
 As an overall conclusion "JPA" is a subset of what is available in
 "JDO".
 
-'''''
-
diff --git a/src/main/asciidoc/jdo_v_jpa_api.adoc b/src/main/asciidoc/jdo_v_jpa_api.adoc
index 1dcdf10..3638af4 100644
--- a/src/main/asciidoc/jdo_v_jpa_api.adoc
+++ b/src/main/asciidoc/jdo_v_jpa_api.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -33,5 +34,3 @@ pm.getExtent() |em.find()
 |New SQL Query |pm.newQuery() |em.createNativeQuery()
 |===
 
-'''''
-
diff --git a/src/main/asciidoc/jdo_v_jpa_orm.adoc b/src/main/asciidoc/jdo_v_jpa_orm.adoc
index 6df341c..aeaaee9 100644
--- a/src/main/asciidoc/jdo_v_jpa_orm.adoc
+++ b/src/main/asciidoc/jdo_v_jpa_orm.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -261,5 +262,3 @@ JoinTable Unidirectional Array]
 |image:images/icon_error_sml.png[image]
 |===
 
-'''''
-
diff --git a/src/main/asciidoc/jdocentral.adoc b/src/main/asciidoc/jdocentral.adoc
new file mode 100644
index 0000000..33a8ab2
--- /dev/null
+++ b/src/main/asciidoc/jdocentral.adoc
@@ -0,0 +1,26 @@
+[[index]]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
+
+'''''
+
+:_basedir: 
+:_imagesdir: images/
+:notoc:
+:nofooter:
+:titlepage:
+:grid: cols
+
+== JDOCentral at Apache JDOanchor:JDOCentral_at_Apache_JDO[]
+
+Welcome to the new home of JDOCentral!
+
+JDOCentral was a privately maintained site. Apache JDO is home for the
+development of the JDO specification and the TCK. The
+http://www.datanucleus.org[DataNucleus] site is home for the development
+of the Reference Implementation of the JDO specification.
+
+Visit the other pages on the Apache JDO site to find out what's going on
+with JDO. Join the http://db.apache.org/jdo/mail-lists.html[mailing
+lists] to get involved and provide feedback.
+
diff --git a/src/main/asciidoc/jdoconfig_dtd.adoc b/src/main/asciidoc/jdoconfig_dtd.adoc
index 99413f5..ac94a51 100644
--- a/src/main/asciidoc/jdoconfig_dtd.adoc
+++ b/src/main/asciidoc/jdoconfig_dtd.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -49,5 +50,3 @@ Your MetaData should match either the
 http://xmlns.jcp.org/dtd/jdoconfig_3_0.dtd[DTD] or the
 http://xmlns.jcp.org/xml/ns/jdo/jdoconfig_3_0.xsd[XSD] specification.
 
-'''''
-
diff --git a/src/main/asciidoc/jdohelper.adoc b/src/main/asciidoc/jdohelper.adoc
index 22aa09b..0407a95 100644
--- a/src/main/asciidoc/jdohelper.adoc
+++ b/src/main/asciidoc/jdohelper.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -85,5 +86,3 @@ persistent
 * *isDetached(Object pc)* - returns whether the passed object is
 detached
 
-'''''
-
diff --git a/src/main/asciidoc/jdoql.adoc b/src/main/asciidoc/jdoql.adoc
index a7622f7..bcf28af 100644
--- a/src/main/asciidoc/jdoql.adoc
+++ b/src/main/asciidoc/jdoql.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -249,5 +250,3 @@ Query query = pm.newQuery("SELECT FROM mydomain.A WHERE b instanceof mydomain.B2
 List results = (List)query.execute();
 ....
 
-'''''
-
diff --git a/src/main/asciidoc/jdoql_methods.adoc b/src/main/asciidoc/jdoql_methods.adoc
index e2e64f5..bc47813 100644
--- a/src/main/asciidoc/jdoql_methods.adoc
+++ b/src/main/asciidoc/jdoql_methods.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -226,5 +227,3 @@ passed persistent object
 persistent object
 |===
 
-'''''
-
diff --git a/src/main/asciidoc/jdoql_result.adoc b/src/main/asciidoc/jdoql_result.adoc
index 2b7c79d..e15ff85 100644
--- a/src/main/asciidoc/jdoql_result.adoc
+++ b/src/main/asciidoc/jdoql_result.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -111,5 +112,3 @@ Double max_price = (Double)iter.next();
 {empty} +
 
 
-'''''
-
diff --git a/src/main/asciidoc/jdoquery_dtd.adoc b/src/main/asciidoc/jdoquery_dtd.adoc
index d3ddeff..05d36ce 100644
--- a/src/main/asciidoc/jdoquery_dtd.adoc
+++ b/src/main/asciidoc/jdoquery_dtd.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -49,5 +50,3 @@ Your MetaData should match either the
 http://xmlns.jcp.org/dtd/jdoquery_3_0.dtd[DTD] or the
 http://xmlns.jcp.org/xml/ns/jdo/jdoquery_3_0.xsd[XSD] specification.
 
-'''''
-
diff --git a/src/main/asciidoc/mail-lists.adoc b/src/main/asciidoc/mail-lists.adoc
index 43fe24d..31434cd 100644
--- a/src/main/asciidoc/mail-lists.adoc
+++ b/src/main/asciidoc/mail-lists.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -38,5 +39,3 @@ list!
 |http://mail-archives.apache.org/mod_mbox/db-jdo-commits/[Archive]
 |===
 
-'''''
-
diff --git a/src/main/asciidoc/maven-reports.adoc b/src/main/asciidoc/maven-reports.adoc
new file mode 100644
index 0000000..ed482d3
--- /dev/null
+++ b/src/main/asciidoc/maven-reports.adoc
@@ -0,0 +1,13 @@
+[[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/metadata.adoc b/src/main/asciidoc/metadata.adoc
index cd9fa98..907cfef 100644
--- a/src/main/asciidoc/metadata.adoc
+++ b/src/main/asciidoc/metadata.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -60,5 +61,3 @@ JDO 2.1 provides support for annotations. Classes and fields/properties
 can be annotated defining the persistence and, optionally, any ORM
 information.
 
-'''''
-
diff --git a/src/main/asciidoc/newshistory.adoc b/src/main/asciidoc/newshistory.adoc
index 3f37363..30e5de4 100644
--- a/src/main/asciidoc/newshistory.adoc
+++ b/src/main/asciidoc/newshistory.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -22,5 +23,3 @@ This was accomplished via Schedule B-2 to the Software Grant and
 Corporate Contributor License Agreement (CCLA) between The Apache
 Software Foundation and Sun Microsystems, Inc.
 
-'''''
-
diff --git a/src/main/asciidoc/object_retrieval.adoc b/src/main/asciidoc/object_retrieval.adoc
index 58270d4..f75dfb9 100644
--- a/src/main/asciidoc/object_retrieval.adoc
+++ b/src/main/asciidoc/object_retrieval.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -79,5 +80,3 @@ retrieved from there, otherwise the JDO implementation goes to the
 datastore. When the objects are retrieved their fields are populated
 according to the Fetch Group.
 
-'''''
-
diff --git a/src/main/asciidoc/orm_dtd.adoc b/src/main/asciidoc/orm_dtd.adoc
index f3d003e..89fe6b8 100644
--- a/src/main/asciidoc/orm_dtd.adoc
+++ b/src/main/asciidoc/orm_dtd.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -49,5 +50,3 @@ Your MetaData should match either the
 http://xmlns.jcp.org/dtd/orm_3_0.dtd[DTD] or the
 http://xmlns.jcp.org/xml/ns/jdo/orm_3_0.xsd[XSD] specification.
 
-'''''
-
diff --git a/src/main/asciidoc/pm.adoc b/src/main/asciidoc/pm.adoc
index 81d69cf..b8ab3fb 100644
--- a/src/main/asciidoc/pm.adoc
+++ b/src/main/asciidoc/pm.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -227,5 +228,3 @@ catch (Exception e)
 ... (code to work on "my_obj")
 ....
 
-'''''
-
diff --git a/src/main/asciidoc/pmf.adoc b/src/main/asciidoc/pmf.adoc
index 1d92a63..b9df076 100644
--- a/src/main/asciidoc/pmf.adoc
+++ b/src/main/asciidoc/pmf.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -391,5 +392,3 @@ serializable
 {empty} +
 
 
-'''''
-
diff --git a/src/main/asciidoc/project-info.adoc b/src/main/asciidoc/project-info.adoc
new file mode 100644
index 0000000..ed482d3
--- /dev/null
+++ b/src/main/asciidoc/project-info.adoc
@@ -0,0 +1,13 @@
+[[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/references.adoc b/src/main/asciidoc/references.adoc
index ccc8021..9b79642 100644
--- a/src/main/asciidoc/references.adoc
+++ b/src/main/asciidoc/references.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -54,5 +55,3 @@ Heiko Bobzin. Publisher: Prentice Hall
 {empty} +
 
 
-'''''
-
diff --git a/src/main/asciidoc/roadmap.adoc b/src/main/asciidoc/roadmap.adoc
index 72ba7ba..4c70cb0 100644
--- a/src/main/asciidoc/roadmap.adoc
+++ b/src/main/asciidoc/roadmap.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -20,5 +21,3 @@ for details of the planned and completed work.
 mailto:jdo-dev@db.apache.org?subject=New%20Feature%20Idea[Submit an
 Idea]
 
-'''''
-
diff --git a/src/main/asciidoc/specifications.adoc b/src/main/asciidoc/specifications.adoc
index ec92cdb..a19fe81 100644
--- a/src/main/asciidoc/specifications.adoc
+++ b/src/main/asciidoc/specifications.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -42,5 +43,3 @@ to jdo-dev@db.apache.org.
 
 * None at this time
 
-'''''
-
diff --git a/src/main/asciidoc/state_transition.adoc b/src/main/asciidoc/state_transition.adoc
index eeb6724..a00c27e 100644
--- a/src/main/asciidoc/state_transition.adoc
+++ b/src/main/asciidoc/state_transition.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -195,5 +196,3 @@ The following diagram shows the state transitions possible with JDO.
 
 image:images/state_transition.png[JDO State Transition] +
 
-'''''
-
diff --git a/src/main/asciidoc/svn.adoc b/src/main/asciidoc/svn.adoc
index da6d3f3..c5ccfc6 100644
--- a/src/main/asciidoc/svn.adoc
+++ b/src/main/asciidoc/svn.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -239,5 +240,3 @@ child objects and enable propogations of inheritable permissions". Click
 Apply. OK. OK.) You will have to do this again when you do a clean
 checkout to a new directory.
 
-'''''
-
diff --git a/src/main/asciidoc/tck.adoc b/src/main/asciidoc/tck.adoc
index cf98620..1665bcb 100644
--- a/src/main/asciidoc/tck.adoc
+++ b/src/main/asciidoc/tck.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -37,7 +38,6 @@ in the tck directory.
 Vendors must post test results on a publicly accessible web site for
 examination by the public. The posting includes the output of the test
 run, which consists of multiple log files containing configuration
-information and test results.
-
-'''''
+information and test results. For an example of the required posting,
+please see link:tck/final[http://db.apache.org/jdo/tck/final].
 
diff --git a/src/main/asciidoc/team-list.adoc b/src/main/asciidoc/team-list.adoc
index 07ef02a..a88b644 100644
--- a/src/main/asciidoc/team-list.adoc
+++ b/src/main/asciidoc/team-list.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -53,5 +54,3 @@ link:get-involved.html[Get Involved].
 |Ilan Kirsch |ObjectDB
 |===
 
-'''''
-
diff --git a/src/main/asciidoc/transactions.adoc b/src/main/asciidoc/transactions.adoc
index 5dc1e8e..8272b6a 100644
--- a/src/main/asciidoc/transactions.adoc
+++ b/src/main/asciidoc/transactions.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -56,5 +57,3 @@ or on the transaction you call
 pm.currentTransaction().setOptimistic(true);
 ....
 
-'''''
-
diff --git a/src/main/asciidoc/types.adoc b/src/main/asciidoc/types.adoc
new file mode 100644
index 0000000..ed482d3
--- /dev/null
+++ b/src/main/asciidoc/types.adoc
@@ -0,0 +1,13 @@
+[[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/why_jdo.adoc b/src/main/asciidoc/why_jdo.adoc
index 89e1c94..54a6416 100644
--- a/src/main/asciidoc/why_jdo.adoc
+++ b/src/main/asciidoc/why_jdo.adoc
@@ -1,12 +1,13 @@
 [[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
+image:images/JDOx100.png[float="left"]
+image:images/jdo_text.png[float="right"]
 
 '''''
 
 :_basedir: 
 :_imagesdir: images/
 :notoc:
+:nofooter:
 :titlepage:
 :grid: cols
 
@@ -136,5 +137,3 @@ choosing a persistence layer for your application.
 (e.g as with JDBC) or whether you can just persist by simple calls.
 . requires the developer to write this layer.
 
-'''''
-
diff --git a/src/main/java/ConvertHtml2Adoc.java b/src/main/java/ConvertHtml2Adoc.java
index cb6ff83..20dd657 100644
--- a/src/main/java/ConvertHtml2Adoc.java
+++ b/src/main/java/ConvertHtml2Adoc.java
@@ -35,7 +35,8 @@ public class ConvertHtml2Adoc {
 
 	private static final String NL = "\n"; 
 	// Base folder for src and output files
-	private static final Path basePath = Paths.get("C:\\work\\eclipse-workspace\\jdo.site");
+	//private static final Path basePath = Paths.get("C:\\work\\eclipse-workspace\\jdo.site");
+	private static final Path basePath = Paths.get("D:\\projects\\workspace-zoo\\jdo.site");
 	// Input folder
 	private static final String input = "docs";
 	// Output folder
@@ -125,6 +126,15 @@ public class ConvertHtml2Adoc {
 						// skip footer and everything after it.
 						break;
 					}
+					if (s.contains("'''''")) {
+						// weird ''''' at ends of files
+						break;
+					}
+					
+					// Move headers up by one level
+					if (s.startsWith("===")) {
+						s = s.substring(1);
+					} 
 					
 					// Handle select/option in 'release' files
 //					if (s.contains("<select name=")) {
@@ -223,8 +233,8 @@ public class ConvertHtml2Adoc {
 		s.append("[[index]]").append(NL);
 		
 //		s.append("--").append(NL);
-		s.append("image:images/JDOx150.png[float=\"left\"]").append(NL);
-		s.append("image:images/jdo_text.png[float=\"left\"]").append(NL);
+		s.append("image:images/JDOx100.png[float=\"left\"]").append(NL);
+		s.append("image:images/jdo_text.png[float=\"right\"]").append(NL);
 //		s.append("--").append(NL);
 	
 		// Hide title
@@ -239,6 +249,7 @@ public class ConvertHtml2Adoc {
 		s.append(":_basedir: ").append(NL);
 		s.append(":_imagesdir: images/").append(NL);
 		s.append(":notoc:").append(NL);
+		s.append(":nofooter:").append(NL);
 		s.append(":titlepage:").append(NL);
 		s.append(":grid: cols").append(NL);
 		s.append(NL);


[db-jdo-site] 01/02: Some minor fix and added JDOx100.png

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 1e38690771d096bb3619e523f5eaa5e8dd8ca181
Author: Tilmann <zo...@gmx.de>
AuthorDate: Sat Jan 11 19:01:46 2020 +0100

    Some minor fix and added JDOx100.png
---
 docs/images/JDOx100.png               | Bin 0 -> 7037 bytes
 docs/index.html                       |   2 +-
 src/main/resources/images/JDOx100.gif | Bin 0 -> 3235 bytes
 src/main/template/document.html.erb   |   6 ++----
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/docs/images/JDOx100.png b/docs/images/JDOx100.png
new file mode 100644
index 0000000..9dd13a6
Binary files /dev/null and b/docs/images/JDOx100.png differ
diff --git a/docs/index.html b/docs/index.html
index 9468458..8c2d914 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -285,7 +285,7 @@ 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>
+<p><span class="image" style="float: left"><img src="images/JDOx100.png" alt="JDOx100"></span>
 <span class="image" style="float: left"><img src="images/jdo_text.png" alt="jdo text"></span></p>
 </div>
 <hr>
diff --git a/src/main/resources/images/JDOx100.gif b/src/main/resources/images/JDOx100.gif
new file mode 100644
index 0000000..e02b144
Binary files /dev/null and b/src/main/resources/images/JDOx100.gif differ
diff --git a/src/main/template/document.html.erb b/src/main/template/document.html.erb
index b7d2dfa..bc99845 100644
--- a/src/main/template/document.html.erb
+++ b/src/main/template/document.html.erb
@@ -157,7 +157,7 @@
                         <li role="separator" class="divider"></li>
                         <li><a href="<%= (attr :_basedir) %>enhancement.html">Bytecode Enhancement</a></li>
                         <li><a href="<%= (attr :_basedir) %>jdohelper.html">JDO Helper</a></li>
-                        <li><a href="<%= (attr :_basedir) %>pmf.html">PersistenceManagerFactoryr</a></li>
+                        <li><a href="<%= (attr :_basedir) %>pmf.html">PersistenceManagerFactory</a></li>
                         <li><a href="<%= (attr :_basedir) %>pm.html">PersistenceManager</a></li>
                         <li><a href="<%= (attr :_basedir) %>transactions.html">Transactions</a></li>
                         <li><a href="<%= (attr :_basedir) %>attach_detach.html">Attach-Detach</a></li>
@@ -274,15 +274,13 @@
             |
                         <a href="https://twitter.com/JavaDataObjects" class="externalLink" title="Twitter">Twitter</a>
             |
-                        <a href="https://plus.google.com/106584233526334524963" class="externalLink" title="Google+">Google+</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="api30/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
+                        <a href="api31/apidocs/index.html" title="Latest Javadocs">Latest Javadocs</a>
         </div>
     </div>
     <hr/>