You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by gi...@apache.org on 2022/03/15 11:33:46 UTC

[jena-site] branch asf-site updated: Updated site from main (a734b143afba04a191f5b34768d0b6e4a7dd0ed1)

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

git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/jena-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new f3cd84b  Updated site from main (a734b143afba04a191f5b34768d0b6e4a7dd0ed1)
f3cd84b is described below

commit f3cd84b174dced619aadc6e4d6d8f02350f54a15
Author: jenkins <bu...@apache.org>
AuthorDate: Tue Mar 15 11:33:43 2022 +0000

    Updated site from main (a734b143afba04a191f5b34768d0b6e4a7dd0ed1)
---
 content/about_jena.html                            | 55 +++++++++++-----------
 content/about_jena/about.html                      | 55 +++++++++++-----------
 content/about_jena/architecture.html               | 55 +++++++++++-----------
 content/about_jena/citing.html                     | 55 +++++++++++-----------
 content/about_jena/contributions.html              | 55 +++++++++++-----------
 content/about_jena/index.html                      | 55 +++++++++++-----------
 content/about_jena/roadmap.html                    | 55 +++++++++++-----------
 content/about_jena/team.html                       | 55 +++++++++++-----------
 content/documentation.html                         | 55 +++++++++++-----------
 content/documentation/archive/csv/csv_index.html   | 55 +++++++++++-----------
 content/documentation/archive/csv/design.html      | 55 +++++++++++-----------
 content/documentation/archive/csv/get_started.html | 55 +++++++++++-----------
 .../documentation/archive/csv/implementation.html  | 55 +++++++++++-----------
 content/documentation/archive/csv/index.html       | 55 +++++++++++-----------
 .../archive/eyeball/eyeball-getting-started.html   | 55 +++++++++++-----------
 .../archive/eyeball/eyeball-guide.html             | 55 +++++++++++-----------
 .../archive/eyeball/eyeball-manual.html            | 55 +++++++++++-----------
 .../documentation/archive/hadoop/artifacts.html    | 55 +++++++++++-----------
 content/documentation/archive/hadoop/common.html   | 55 +++++++++++-----------
 content/documentation/archive/hadoop/demo.html     | 55 +++++++++++-----------
 .../archive/hadoop/elephas_index.html              | 55 +++++++++++-----------
 content/documentation/archive/hadoop/index.html    | 55 +++++++++++-----------
 content/documentation/archive/hadoop/io.html       | 55 +++++++++++-----------
 content/documentation/archive/hadoop/mapred.html   | 55 +++++++++++-----------
 content/documentation/archive/larq/index.html      | 55 +++++++++++-----------
 content/documentation/archive/sdb/commands.html    | 55 +++++++++++-----------
 .../documentation/archive/sdb/configuration.html   | 55 +++++++++++-----------
 .../archive/sdb/database_layouts.html              | 55 +++++++++++-----------
 .../archive/sdb/databases_supported.html           | 55 +++++++++++-----------
 .../archive/sdb/dataset_description.html           | 55 +++++++++++-----------
 content/documentation/archive/sdb/db_notes.html    | 55 +++++++++++-----------
 content/documentation/archive/sdb/faq.html         | 55 +++++++++++-----------
 .../archive/sdb/fuseki_integration.html            | 55 +++++++++++-----------
 content/documentation/archive/sdb/index.html       | 55 +++++++++++-----------
 .../documentation/archive/sdb/installation.html    | 55 +++++++++++-----------
 content/documentation/archive/sdb/javaapi.html     | 55 +++++++++++-----------
 .../documentation/archive/sdb/loading_data.html    | 55 +++++++++++-----------
 .../archive/sdb/loading_performance.html           | 55 +++++++++++-----------
 .../archive/sdb/query_performance.html             | 55 +++++++++++-----------
 content/documentation/archive/sdb/quickstart.html  | 55 +++++++++++-----------
 content/documentation/archive/sdb/sdb_index.html   | 55 +++++++++++-----------
 .../archive/sdb/store_description.html             | 55 +++++++++++-----------
 .../archive/serving_data/fuseki1.html              | 55 +++++++++++-----------
 .../archive/versions/http-auth-old.html            | 55 +++++++++++-----------
 .../documentation/assembler/assembler-howto.html   | 55 +++++++++++-----------
 content/documentation/assembler/index.html         | 55 +++++++++++-----------
 .../documentation/assembler/inside-assemblers.html | 55 +++++++++++-----------
 content/documentation/extras/index.html            | 55 +++++++++++-----------
 .../documentation/extras/querybuilder/index.html   | 55 +++++++++++-----------
 .../fuseki2/fuseki-config-endpoint.html            | 55 +++++++++++-----------
 .../fuseki2/fuseki-configuration.html              | 55 +++++++++++-----------
 .../fuseki2/fuseki-data-access-control.html        | 55 +++++++++++-----------
 content/documentation/fuseki2/fuseki-docker.html   | 55 +++++++++++-----------
 content/documentation/fuseki2/fuseki-embedded.html | 55 +++++++++++-----------
 content/documentation/fuseki2/fuseki-layout.html   | 55 +++++++++++-----------
 content/documentation/fuseki2/fuseki-logging.html  | 55 +++++++++++-----------
 .../fuseki2/fuseki-main-security.html              | 55 +++++++++++-----------
 content/documentation/fuseki2/fuseki-main.html     | 55 +++++++++++-----------
 content/documentation/fuseki2/fuseki-modules.html  | 55 +++++++++++-----------
 .../fuseki2/fuseki-old-config-endpoint.html        | 55 +++++++++++-----------
 .../documentation/fuseki2/fuseki-quick-start.html  | 55 +++++++++++-----------
 content/documentation/fuseki2/fuseki-security.html | 55 +++++++++++-----------
 .../documentation/fuseki2/fuseki-server-info.html  | 55 +++++++++++-----------
 .../fuseki2/fuseki-server-protocol.html            | 55 +++++++++++-----------
 content/documentation/fuseki2/fuseki-webapp.html   | 55 +++++++++++-----------
 content/documentation/fuseki2/index.html           | 55 +++++++++++-----------
 .../fuseki2/rdf-sparql-standards.html              | 55 +++++++++++-----------
 content/documentation/fuseki2/soh.html             | 55 +++++++++++-----------
 .../geosparql/geosparql-assembler.html             | 55 +++++++++++-----------
 .../documentation/geosparql/geosparql-fuseki.html  | 55 +++++++++++-----------
 content/documentation/geosparql/index.html         | 55 +++++++++++-----------
 content/documentation/index.html                   | 55 +++++++++++-----------
 content/documentation/inference/index.html         | 55 +++++++++++-----------
 content/documentation/io/arp.html                  | 55 +++++++++++-----------
 content/documentation/io/arp_sax.html              | 55 +++++++++++-----------
 content/documentation/io/arp_standalone.html       | 55 +++++++++++-----------
 content/documentation/io/index.html                | 55 +++++++++++-----------
 content/documentation/io/json-ld-11.html           | 55 +++++++++++-----------
 content/documentation/io/rdf-binary.html           | 55 +++++++++++-----------
 content/documentation/io/rdf-input.html            | 55 +++++++++++-----------
 content/documentation/io/rdf-output.html           | 55 +++++++++++-----------
 content/documentation/io/rdfxml_howto.html         | 55 +++++++++++-----------
 content/documentation/io/streaming-io.html         | 55 +++++++++++-----------
 content/documentation/io/trix.html                 | 55 +++++++++++-----------
 content/documentation/javadoc.html                 | 55 +++++++++++-----------
 content/documentation/jdbc/artifacts.html          | 55 +++++++++++-----------
 content/documentation/jdbc/custom_driver.html      | 55 +++++++++++-----------
 content/documentation/jdbc/drivers.html            | 55 +++++++++++-----------
 content/documentation/jdbc/index.html              | 55 +++++++++++-----------
 content/documentation/migrate_jena2_jena3.html     | 55 +++++++++++-----------
 content/documentation/notes/concurrency-howto.html | 55 +++++++++++-----------
 content/documentation/notes/datasetgraph.html      | 55 +++++++++++-----------
 .../documentation/notes/event-handler-howto.html   | 55 +++++++++++-----------
 content/documentation/notes/index.html             | 55 +++++++++++-----------
 content/documentation/notes/iri.html               | 55 +++++++++++-----------
 content/documentation/notes/jena-internals.html    | 55 +++++++++++-----------
 content/documentation/notes/jena-repack.html       | 55 +++++++++++-----------
 content/documentation/notes/model-factory.html     | 55 +++++++++++-----------
 content/documentation/notes/rdf-frames.html        | 55 +++++++++++-----------
 content/documentation/notes/reification.html       | 55 +++++++++++-----------
 .../documentation/notes/reification_previous.html  | 55 +++++++++++-----------
 content/documentation/notes/sse.html               | 55 +++++++++++-----------
 content/documentation/notes/stream-manager.html    | 55 +++++++++++-----------
 .../documentation/notes/system-initialization.html | 55 +++++++++++-----------
 content/documentation/notes/typed-literals.html    | 55 +++++++++++-----------
 content/documentation/ontology/index.html          | 55 +++++++++++-----------
 content/documentation/ontology/toc-test.html       | 55 +++++++++++-----------
 content/documentation/permissions/assembler.html   | 55 +++++++++++-----------
 content/documentation/permissions/design.html      | 55 +++++++++++-----------
 content/documentation/permissions/evaluator.html   | 55 +++++++++++-----------
 content/documentation/permissions/example.html     | 55 +++++++++++-----------
 content/documentation/permissions/index.html       | 55 +++++++++++-----------
 .../documentation/permissions/migration2To3.html   | 55 +++++++++++-----------
 content/documentation/query/algebra.html           | 55 +++++++++++-----------
 content/documentation/query/app_api.html           | 55 +++++++++++-----------
 content/documentation/query/architecture.html      | 55 +++++++++++-----------
 content/documentation/query/arq-query-eval.html    | 55 +++++++++++-----------
 content/documentation/query/assignment.html        | 55 +++++++++++-----------
 content/documentation/query/cmds.html              | 55 +++++++++++-----------
 content/documentation/query/collation.html         | 55 +++++++++++-----------
 content/documentation/query/construct-quad.html    | 55 +++++++++++-----------
 content/documentation/query/custom_aggregates.html | 55 +++++++++++-----------
 content/documentation/query/download.html          | 55 +++++++++++-----------
 content/documentation/query/explain.html           | 55 +++++++++++-----------
 content/documentation/query/extension.html         | 55 +++++++++++-----------
 content/documentation/query/faq.html               | 55 +++++++++++-----------
 content/documentation/query/function_forms.html    | 55 +++++++++++-----------
 .../query/generate-json-from-sparql.html           | 55 +++++++++++-----------
 content/documentation/query/group-by.html          | 55 +++++++++++-----------
 content/documentation/query/index.html             | 55 +++++++++++-----------
 content/documentation/query/java-uri.html          | 55 +++++++++++-----------
 .../documentation/query/javascript-functions.html  | 55 +++++++++++-----------
 content/documentation/query/library-function.html  | 55 +++++++++++-----------
 content/documentation/query/library-propfunc.html  | 55 +++++++++++-----------
 content/documentation/query/logging.html           | 55 +++++++++++-----------
 .../query/manipulating_sparql_using_arq.html       | 55 +++++++++++-----------
 .../query/manipulating_sparql_using_arq_pt.html    | 55 +++++++++++-----------
 content/documentation/query/negation.html          | 55 +++++++++++-----------
 .../query/parameterized-sparql-strings.html        | 55 +++++++++++-----------
 content/documentation/query/programmatic.html      | 55 +++++++++++-----------
 content/documentation/query/property_paths.html    | 55 +++++++++++-----------
 content/documentation/query/rdf_lists.html         | 55 +++++++++++-----------
 content/documentation/query/select_expr.html       | 55 +++++++++++-----------
 content/documentation/query/service.html           | 55 +++++++++++-----------
 content/documentation/query/sparql-remote.html     | 55 +++++++++++-----------
 content/documentation/query/spatial-query-doc.html | 55 +++++++++++-----------
 content/documentation/query/spatial-query.html     | 55 +++++++++++-----------
 content/documentation/query/sub-select.html        | 55 +++++++++++-----------
 content/documentation/query/support.html           | 55 +++++++++++-----------
 content/documentation/query/support_request.html   | 55 +++++++++++-----------
 content/documentation/query/text-query.html        | 55 +++++++++++-----------
 content/documentation/query/update.html            | 55 +++++++++++-----------
 content/documentation/query/writing_functions.html | 55 +++++++++++-----------
 content/documentation/query/writing_propfuncs.html | 55 +++++++++++-----------
 content/documentation/query/xsd-support.html       | 55 +++++++++++-----------
 content/documentation/rdf-star/index.html          | 55 +++++++++++-----------
 content/documentation/rdf/datasets.html            | 55 +++++++++++-----------
 content/documentation/rdf/index.html               | 55 +++++++++++-----------
 content/documentation/rdfconnection/index.html     | 55 +++++++++++-----------
 content/documentation/rdfs/index.html              | 55 +++++++++++-----------
 content/documentation/shacl/index.html             | 55 +++++++++++-----------
 content/documentation/shex/index.html              | 55 +++++++++++-----------
 content/documentation/sparql-apis/http-auth.html   | 55 +++++++++++-----------
 content/documentation/sparql-apis/index.html       | 55 +++++++++++-----------
 content/documentation/tdb/architecture.html        | 55 +++++++++++-----------
 content/documentation/tdb/assembler.html           | 55 +++++++++++-----------
 content/documentation/tdb/commands.html            | 55 +++++++++++-----------
 content/documentation/tdb/configuration.html       | 55 +++++++++++-----------
 content/documentation/tdb/datasets.html            | 55 +++++++++++-----------
 content/documentation/tdb/dynamic_datasets.html    | 55 +++++++++++-----------
 content/documentation/tdb/faqs.html                | 55 +++++++++++-----------
 content/documentation/tdb/index.html               | 55 +++++++++++-----------
 content/documentation/tdb/java_api.html            | 55 +++++++++++-----------
 content/documentation/tdb/optimizer.html           | 55 +++++++++++-----------
 content/documentation/tdb/quadfilter.html          | 55 +++++++++++-----------
 content/documentation/tdb/requirements.html        | 55 +++++++++++-----------
 content/documentation/tdb/store-parameters.html    | 55 +++++++++++-----------
 content/documentation/tdb/tdb-xloader.html         | 55 +++++++++++-----------
 content/documentation/tdb/tdb_system.html          | 55 +++++++++++-----------
 content/documentation/tdb/tdb_transactions.html    | 55 +++++++++++-----------
 .../documentation/tdb/value_canonicalization.html  | 55 +++++++++++-----------
 content/documentation/tdb2/index.html              | 55 +++++++++++-----------
 content/documentation/tdb2/tdb2_admin.html         | 55 +++++++++++-----------
 content/documentation/tdb2/tdb2_cmds.html          | 55 +++++++++++-----------
 content/documentation/tdb2/tdb2_fuseki.html        | 55 +++++++++++-----------
 content/documentation/tdb2/tdb2_migration.html     | 55 +++++++++++-----------
 content/documentation/tools/index.html             | 55 +++++++++++-----------
 content/documentation/tools/schemagen-maven.html   | 55 +++++++++++-----------
 content/documentation/tools/schemagen.html         | 55 +++++++++++-----------
 content/documentation/txn/index.html               | 55 +++++++++++-----------
 content/documentation/txn/transactions_api.html    | 55 +++++++++++-----------
 content/documentation/txn/transactions_tdb.html    | 55 +++++++++++-----------
 content/documentation/txn/txn.html                 | 55 +++++++++++-----------
 content/download.html                              | 55 +++++++++++-----------
 content/download/index.html                        | 55 +++++++++++-----------
 content/download/maven.html                        | 55 +++++++++++-----------
 content/getting_involved.html                      | 55 +++++++++++-----------
 content/getting_involved/index.html                | 55 +++++++++++-----------
 .../getting_involved/reviewing_contributions.html  | 55 +++++++++++-----------
 content/getting_started.html                       | 55 +++++++++++-----------
 content/getting_started/index.html                 | 55 +++++++++++-----------
 content/help_and_support.html                      | 55 +++++++++++-----------
 content/help_and_support/bugs_and_suggestions.html | 55 +++++++++++-----------
 content/help_and_support/faq.html                  | 55 +++++++++++-----------
 content/help_and_support/index.html                | 55 +++++++++++-----------
 content/index.html                                 | 55 +++++++++++-----------
 content/tutorials.html                             | 55 +++++++++++-----------
 content/tutorials/index.html                       | 55 +++++++++++-----------
 content/tutorials/rdf_api.html                     | 55 +++++++++++-----------
 content/tutorials/rdf_api_pt.html                  | 55 +++++++++++-----------
 content/tutorials/sparql.html                      | 55 +++++++++++-----------
 content/tutorials/sparql_basic_patterns.html       | 55 +++++++++++-----------
 content/tutorials/sparql_basic_patterns_pt.html    | 55 +++++++++++-----------
 content/tutorials/sparql_data.html                 | 55 +++++++++++-----------
 content/tutorials/sparql_data_pt.html              | 55 +++++++++++-----------
 content/tutorials/sparql_datasets.html             | 55 +++++++++++-----------
 content/tutorials/sparql_datasets_pt.html          | 55 +++++++++++-----------
 content/tutorials/sparql_filters.html              | 55 +++++++++++-----------
 content/tutorials/sparql_filters_pt.html           | 55 +++++++++++-----------
 content/tutorials/sparql_optionals.html            | 55 +++++++++++-----------
 content/tutorials/sparql_optionals_pt.html         | 55 +++++++++++-----------
 content/tutorials/sparql_page.html                 | 55 +++++++++++-----------
 content/tutorials/sparql_pt.html                   | 55 +++++++++++-----------
 content/tutorials/sparql_query1.html               | 55 +++++++++++-----------
 content/tutorials/sparql_query1_pt.html            | 55 +++++++++++-----------
 content/tutorials/sparql_results.html              | 55 +++++++++++-----------
 content/tutorials/sparql_results_pt.html           | 55 +++++++++++-----------
 content/tutorials/sparql_union.html                | 55 +++++++++++-----------
 content/tutorials/sparql_union_pt.html             | 55 +++++++++++-----------
 content/tutorials/using_jena_with_eclipse.html     | 55 +++++++++++-----------
 content/tutorials/using_jena_with_eclipse_pt.html  | 55 +++++++++++-----------
 231 files changed, 6468 insertions(+), 6237 deletions(-)

diff --git a/content/about_jena.html b/content/about_jena.html
index 211c667..c12965a 100644
--- a/content/about_jena.html
+++ b/content/about_jena.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/about_jena/about.html b/content/about_jena/about.html
index 280aa43..d13ba83 100644
--- a/content/about_jena/about.html
+++ b/content/about_jena/about.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/about_jena/architecture.html b/content/about_jena/architecture.html
index f279924..542fb29 100644
--- a/content/about_jena/architecture.html
+++ b/content/about_jena/architecture.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/about_jena/citing.html b/content/about_jena/citing.html
index 7a6cc00..4d32566 100644
--- a/content/about_jena/citing.html
+++ b/content/about_jena/citing.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/about_jena/contributions.html b/content/about_jena/contributions.html
index 357a903..9031f61 100644
--- a/content/about_jena/contributions.html
+++ b/content/about_jena/contributions.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/about_jena/index.html b/content/about_jena/index.html
index 7f2f895..cb467da 100644
--- a/content/about_jena/index.html
+++ b/content/about_jena/index.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/about_jena/roadmap.html b/content/about_jena/roadmap.html
index b346dc7..e6d7c1f 100644
--- a/content/about_jena/roadmap.html
+++ b/content/about_jena/roadmap.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/about_jena/team.html b/content/about_jena/team.html
index f97d339..c70797b 100644
--- a/content/about_jena/team.html
+++ b/content/about_jena/team.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation.html b/content/documentation.html
index 9c3cde6..19e7006 100644
--- a/content/documentation.html
+++ b/content/documentation.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/csv/csv_index.html b/content/documentation/archive/csv/csv_index.html
index c7168ef..7d842de 100644
--- a/content/documentation/archive/csv/csv_index.html
+++ b/content/documentation/archive/csv/csv_index.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/csv/design.html b/content/documentation/archive/csv/design.html
index 14b8003..ebd009b 100644
--- a/content/documentation/archive/csv/design.html
+++ b/content/documentation/archive/csv/design.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/csv/get_started.html b/content/documentation/archive/csv/get_started.html
index d348bde..0d0c47e 100644
--- a/content/documentation/archive/csv/get_started.html
+++ b/content/documentation/archive/csv/get_started.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/csv/implementation.html b/content/documentation/archive/csv/implementation.html
index b51c53c..2b5b28b 100644
--- a/content/documentation/archive/csv/implementation.html
+++ b/content/documentation/archive/csv/implementation.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/csv/index.html b/content/documentation/archive/csv/index.html
index dc46828..dc0e500 100644
--- a/content/documentation/archive/csv/index.html
+++ b/content/documentation/archive/csv/index.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/eyeball/eyeball-getting-started.html b/content/documentation/archive/eyeball/eyeball-getting-started.html
index 2a34793..555a328 100644
--- a/content/documentation/archive/eyeball/eyeball-getting-started.html
+++ b/content/documentation/archive/eyeball/eyeball-getting-started.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/eyeball/eyeball-guide.html b/content/documentation/archive/eyeball/eyeball-guide.html
index 076c99b..c54d293 100644
--- a/content/documentation/archive/eyeball/eyeball-guide.html
+++ b/content/documentation/archive/eyeball/eyeball-guide.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/eyeball/eyeball-manual.html b/content/documentation/archive/eyeball/eyeball-manual.html
index a2ee498..ec436eb 100644
--- a/content/documentation/archive/eyeball/eyeball-manual.html
+++ b/content/documentation/archive/eyeball/eyeball-manual.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/hadoop/artifacts.html b/content/documentation/archive/hadoop/artifacts.html
index 0e964c2..c13a208 100644
--- a/content/documentation/archive/hadoop/artifacts.html
+++ b/content/documentation/archive/hadoop/artifacts.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/hadoop/common.html b/content/documentation/archive/hadoop/common.html
index 7748b3b..25cbd88 100644
--- a/content/documentation/archive/hadoop/common.html
+++ b/content/documentation/archive/hadoop/common.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/hadoop/demo.html b/content/documentation/archive/hadoop/demo.html
index e415891..62232cd 100644
--- a/content/documentation/archive/hadoop/demo.html
+++ b/content/documentation/archive/hadoop/demo.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/hadoop/elephas_index.html b/content/documentation/archive/hadoop/elephas_index.html
index 3135b34..60abc13 100644
--- a/content/documentation/archive/hadoop/elephas_index.html
+++ b/content/documentation/archive/hadoop/elephas_index.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/hadoop/index.html b/content/documentation/archive/hadoop/index.html
index fcd2650..3a29bf0 100644
--- a/content/documentation/archive/hadoop/index.html
+++ b/content/documentation/archive/hadoop/index.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/hadoop/io.html b/content/documentation/archive/hadoop/io.html
index c6ad16c..a2ef442 100644
--- a/content/documentation/archive/hadoop/io.html
+++ b/content/documentation/archive/hadoop/io.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/hadoop/mapred.html b/content/documentation/archive/hadoop/mapred.html
index 6e61929..2991a7b 100644
--- a/content/documentation/archive/hadoop/mapred.html
+++ b/content/documentation/archive/hadoop/mapred.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/larq/index.html b/content/documentation/archive/larq/index.html
index b868bd7..96df936 100644
--- a/content/documentation/archive/larq/index.html
+++ b/content/documentation/archive/larq/index.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/sdb/commands.html b/content/documentation/archive/sdb/commands.html
index e62aa02..67f3b8f 100644
--- a/content/documentation/archive/sdb/commands.html
+++ b/content/documentation/archive/sdb/commands.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/sdb/configuration.html b/content/documentation/archive/sdb/configuration.html
index 92347a0..95c8a8e 100644
--- a/content/documentation/archive/sdb/configuration.html
+++ b/content/documentation/archive/sdb/configuration.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/sdb/database_layouts.html b/content/documentation/archive/sdb/database_layouts.html
index 08fa93c..4354cb7 100644
--- a/content/documentation/archive/sdb/database_layouts.html
+++ b/content/documentation/archive/sdb/database_layouts.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/sdb/databases_supported.html b/content/documentation/archive/sdb/databases_supported.html
index b313d38..720a575 100644
--- a/content/documentation/archive/sdb/databases_supported.html
+++ b/content/documentation/archive/sdb/databases_supported.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/sdb/dataset_description.html b/content/documentation/archive/sdb/dataset_description.html
index d277b66..d684bf1 100644
--- a/content/documentation/archive/sdb/dataset_description.html
+++ b/content/documentation/archive/sdb/dataset_description.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/sdb/db_notes.html b/content/documentation/archive/sdb/db_notes.html
index c2eee3f..03a6bc7 100644
--- a/content/documentation/archive/sdb/db_notes.html
+++ b/content/documentation/archive/sdb/db_notes.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/sdb/faq.html b/content/documentation/archive/sdb/faq.html
index e1421d2..950f529 100644
--- a/content/documentation/archive/sdb/faq.html
+++ b/content/documentation/archive/sdb/faq.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/sdb/fuseki_integration.html b/content/documentation/archive/sdb/fuseki_integration.html
index 0535496..a409af1 100644
--- a/content/documentation/archive/sdb/fuseki_integration.html
+++ b/content/documentation/archive/sdb/fuseki_integration.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/sdb/index.html b/content/documentation/archive/sdb/index.html
index cc1e01d..6622474 100644
--- a/content/documentation/archive/sdb/index.html
+++ b/content/documentation/archive/sdb/index.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/sdb/installation.html b/content/documentation/archive/sdb/installation.html
index 973804b..b1febbd 100644
--- a/content/documentation/archive/sdb/installation.html
+++ b/content/documentation/archive/sdb/installation.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/sdb/javaapi.html b/content/documentation/archive/sdb/javaapi.html
index b63f959..df49ab6 100644
--- a/content/documentation/archive/sdb/javaapi.html
+++ b/content/documentation/archive/sdb/javaapi.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/sdb/loading_data.html b/content/documentation/archive/sdb/loading_data.html
index 26e2316..e4ba709 100644
--- a/content/documentation/archive/sdb/loading_data.html
+++ b/content/documentation/archive/sdb/loading_data.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/sdb/loading_performance.html b/content/documentation/archive/sdb/loading_performance.html
index d3920cb..f19d125 100644
--- a/content/documentation/archive/sdb/loading_performance.html
+++ b/content/documentation/archive/sdb/loading_performance.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/sdb/query_performance.html b/content/documentation/archive/sdb/query_performance.html
index f9547c7..4a6d3e1 100644
--- a/content/documentation/archive/sdb/query_performance.html
+++ b/content/documentation/archive/sdb/query_performance.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/sdb/quickstart.html b/content/documentation/archive/sdb/quickstart.html
index f47f27a..c32fb66 100644
--- a/content/documentation/archive/sdb/quickstart.html
+++ b/content/documentation/archive/sdb/quickstart.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/sdb/sdb_index.html b/content/documentation/archive/sdb/sdb_index.html
index c5cbbca..c9db2a8 100644
--- a/content/documentation/archive/sdb/sdb_index.html
+++ b/content/documentation/archive/sdb/sdb_index.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/sdb/store_description.html b/content/documentation/archive/sdb/store_description.html
index bc781a9..29079c7 100644
--- a/content/documentation/archive/sdb/store_description.html
+++ b/content/documentation/archive/sdb/store_description.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/serving_data/fuseki1.html b/content/documentation/archive/serving_data/fuseki1.html
index 1004677..e164974 100644
--- a/content/documentation/archive/serving_data/fuseki1.html
+++ b/content/documentation/archive/serving_data/fuseki1.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/archive/versions/http-auth-old.html b/content/documentation/archive/versions/http-auth-old.html
index 0ec99c9..d596652 100644
--- a/content/documentation/archive/versions/http-auth-old.html
+++ b/content/documentation/archive/versions/http-auth-old.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/assembler/assembler-howto.html b/content/documentation/assembler/assembler-howto.html
index 4a46108..616e55f 100644
--- a/content/documentation/assembler/assembler-howto.html
+++ b/content/documentation/assembler/assembler-howto.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/assembler/index.html b/content/documentation/assembler/index.html
index 02c783f..442878f 100644
--- a/content/documentation/assembler/index.html
+++ b/content/documentation/assembler/index.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/assembler/inside-assemblers.html b/content/documentation/assembler/inside-assemblers.html
index 3edca13..a01ef6b 100644
--- a/content/documentation/assembler/inside-assemblers.html
+++ b/content/documentation/assembler/inside-assemblers.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/extras/index.html b/content/documentation/extras/index.html
index b93552a..8cbd090 100644
--- a/content/documentation/extras/index.html
+++ b/content/documentation/extras/index.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/extras/querybuilder/index.html b/content/documentation/extras/querybuilder/index.html
index 24d5485..a31d73e 100644
--- a/content/documentation/extras/querybuilder/index.html
+++ b/content/documentation/extras/querybuilder/index.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/fuseki2/fuseki-config-endpoint.html b/content/documentation/fuseki2/fuseki-config-endpoint.html
index 71a66e6..80fb67e 100644
--- a/content/documentation/fuseki2/fuseki-config-endpoint.html
+++ b/content/documentation/fuseki2/fuseki-config-endpoint.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/fuseki2/fuseki-configuration.html b/content/documentation/fuseki2/fuseki-configuration.html
index 7bf38d9..31d9dce 100644
--- a/content/documentation/fuseki2/fuseki-configuration.html
+++ b/content/documentation/fuseki2/fuseki-configuration.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/fuseki2/fuseki-data-access-control.html b/content/documentation/fuseki2/fuseki-data-access-control.html
index 88c927f..344caae 100644
--- a/content/documentation/fuseki2/fuseki-data-access-control.html
+++ b/content/documentation/fuseki2/fuseki-data-access-control.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/fuseki2/fuseki-docker.html b/content/documentation/fuseki2/fuseki-docker.html
index 5dfe1a6..838ba63 100644
--- a/content/documentation/fuseki2/fuseki-docker.html
+++ b/content/documentation/fuseki2/fuseki-docker.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/fuseki2/fuseki-embedded.html b/content/documentation/fuseki2/fuseki-embedded.html
index bd26d23..9736caf 100644
--- a/content/documentation/fuseki2/fuseki-embedded.html
+++ b/content/documentation/fuseki2/fuseki-embedded.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/fuseki2/fuseki-layout.html b/content/documentation/fuseki2/fuseki-layout.html
index 49af418..6c77e38 100644
--- a/content/documentation/fuseki2/fuseki-layout.html
+++ b/content/documentation/fuseki2/fuseki-layout.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/fuseki2/fuseki-logging.html b/content/documentation/fuseki2/fuseki-logging.html
index 763f52c..452bb35 100644
--- a/content/documentation/fuseki2/fuseki-logging.html
+++ b/content/documentation/fuseki2/fuseki-logging.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/fuseki2/fuseki-main-security.html b/content/documentation/fuseki2/fuseki-main-security.html
index eefb792..2390a69 100644
--- a/content/documentation/fuseki2/fuseki-main-security.html
+++ b/content/documentation/fuseki2/fuseki-main-security.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/fuseki2/fuseki-main.html b/content/documentation/fuseki2/fuseki-main.html
index bd8c101..27537e8 100644
--- a/content/documentation/fuseki2/fuseki-main.html
+++ b/content/documentation/fuseki2/fuseki-main.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/fuseki2/fuseki-modules.html b/content/documentation/fuseki2/fuseki-modules.html
index 045ee69..c7ae64b 100644
--- a/content/documentation/fuseki2/fuseki-modules.html
+++ b/content/documentation/fuseki2/fuseki-modules.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/fuseki2/fuseki-old-config-endpoint.html b/content/documentation/fuseki2/fuseki-old-config-endpoint.html
index abbbaa0..fb2edd8 100644
--- a/content/documentation/fuseki2/fuseki-old-config-endpoint.html
+++ b/content/documentation/fuseki2/fuseki-old-config-endpoint.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/fuseki2/fuseki-quick-start.html b/content/documentation/fuseki2/fuseki-quick-start.html
index 9d5f521..d80b078 100644
--- a/content/documentation/fuseki2/fuseki-quick-start.html
+++ b/content/documentation/fuseki2/fuseki-quick-start.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/fuseki2/fuseki-security.html b/content/documentation/fuseki2/fuseki-security.html
index e9eea9f..db841cd 100644
--- a/content/documentation/fuseki2/fuseki-security.html
+++ b/content/documentation/fuseki2/fuseki-security.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/fuseki2/fuseki-server-info.html b/content/documentation/fuseki2/fuseki-server-info.html
index 999ea9d..bdb398b 100644
--- a/content/documentation/fuseki2/fuseki-server-info.html
+++ b/content/documentation/fuseki2/fuseki-server-info.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/fuseki2/fuseki-server-protocol.html b/content/documentation/fuseki2/fuseki-server-protocol.html
index 167082d..f80c8c5 100644
--- a/content/documentation/fuseki2/fuseki-server-protocol.html
+++ b/content/documentation/fuseki2/fuseki-server-protocol.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/fuseki2/fuseki-webapp.html b/content/documentation/fuseki2/fuseki-webapp.html
index d7e5f91..6b0df2c 100644
--- a/content/documentation/fuseki2/fuseki-webapp.html
+++ b/content/documentation/fuseki2/fuseki-webapp.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/fuseki2/index.html b/content/documentation/fuseki2/index.html
index 84dfce9..cc6f3f6 100644
--- a/content/documentation/fuseki2/index.html
+++ b/content/documentation/fuseki2/index.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/fuseki2/rdf-sparql-standards.html b/content/documentation/fuseki2/rdf-sparql-standards.html
index 4c1a330..1e57522 100644
--- a/content/documentation/fuseki2/rdf-sparql-standards.html
+++ b/content/documentation/fuseki2/rdf-sparql-standards.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/fuseki2/soh.html b/content/documentation/fuseki2/soh.html
index f8fd74d..9c163ca 100644
--- a/content/documentation/fuseki2/soh.html
+++ b/content/documentation/fuseki2/soh.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/geosparql/geosparql-assembler.html b/content/documentation/geosparql/geosparql-assembler.html
index dfadcdd..4be90e3 100644
--- a/content/documentation/geosparql/geosparql-assembler.html
+++ b/content/documentation/geosparql/geosparql-assembler.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/geosparql/geosparql-fuseki.html b/content/documentation/geosparql/geosparql-fuseki.html
index 9ffb803..e6038c8 100644
--- a/content/documentation/geosparql/geosparql-fuseki.html
+++ b/content/documentation/geosparql/geosparql-fuseki.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/geosparql/index.html b/content/documentation/geosparql/index.html
index 4f7f5ea..02f2e83 100644
--- a/content/documentation/geosparql/index.html
+++ b/content/documentation/geosparql/index.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/index.html b/content/documentation/index.html
index c6617da..3c30be8 100644
--- a/content/documentation/index.html
+++ b/content/documentation/index.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/inference/index.html b/content/documentation/inference/index.html
index 39bdbdd..7ef317d 100644
--- a/content/documentation/inference/index.html
+++ b/content/documentation/inference/index.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/io/arp.html b/content/documentation/io/arp.html
index 3f757c5..2eb9c78 100644
--- a/content/documentation/io/arp.html
+++ b/content/documentation/io/arp.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/io/arp_sax.html b/content/documentation/io/arp_sax.html
index 63a3965..1e325d2 100644
--- a/content/documentation/io/arp_sax.html
+++ b/content/documentation/io/arp_sax.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/io/arp_standalone.html b/content/documentation/io/arp_standalone.html
index edb7e8b..80d2b0a 100644
--- a/content/documentation/io/arp_standalone.html
+++ b/content/documentation/io/arp_standalone.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/io/index.html b/content/documentation/io/index.html
index 12de837..9921b27 100644
--- a/content/documentation/io/index.html
+++ b/content/documentation/io/index.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/io/json-ld-11.html b/content/documentation/io/json-ld-11.html
index 175765b..717f22c 100644
--- a/content/documentation/io/json-ld-11.html
+++ b/content/documentation/io/json-ld-11.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/io/rdf-binary.html b/content/documentation/io/rdf-binary.html
index 2de8fe8..6d04d28 100644
--- a/content/documentation/io/rdf-binary.html
+++ b/content/documentation/io/rdf-binary.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/io/rdf-input.html b/content/documentation/io/rdf-input.html
index 5e76211..f79b080 100644
--- a/content/documentation/io/rdf-input.html
+++ b/content/documentation/io/rdf-input.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/io/rdf-output.html b/content/documentation/io/rdf-output.html
index e0be2be..803db25 100644
--- a/content/documentation/io/rdf-output.html
+++ b/content/documentation/io/rdf-output.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/io/rdfxml_howto.html b/content/documentation/io/rdfxml_howto.html
index 82ad5f6..4a5ab62 100644
--- a/content/documentation/io/rdfxml_howto.html
+++ b/content/documentation/io/rdfxml_howto.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/io/streaming-io.html b/content/documentation/io/streaming-io.html
index 94604cb..490aacb 100644
--- a/content/documentation/io/streaming-io.html
+++ b/content/documentation/io/streaming-io.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/io/trix.html b/content/documentation/io/trix.html
index 9d62be6..633ab04 100644
--- a/content/documentation/io/trix.html
+++ b/content/documentation/io/trix.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/javadoc.html b/content/documentation/javadoc.html
index 57c81ab..2f150f5 100644
--- a/content/documentation/javadoc.html
+++ b/content/documentation/javadoc.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/jdbc/artifacts.html b/content/documentation/jdbc/artifacts.html
index d6a3668..57ff700 100644
--- a/content/documentation/jdbc/artifacts.html
+++ b/content/documentation/jdbc/artifacts.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/jdbc/custom_driver.html b/content/documentation/jdbc/custom_driver.html
index be7f6f5..94cea0c 100644
--- a/content/documentation/jdbc/custom_driver.html
+++ b/content/documentation/jdbc/custom_driver.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/jdbc/drivers.html b/content/documentation/jdbc/drivers.html
index 203d0da..3a46f15 100644
--- a/content/documentation/jdbc/drivers.html
+++ b/content/documentation/jdbc/drivers.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/jdbc/index.html b/content/documentation/jdbc/index.html
index 1b0f0a0..b4a736f 100644
--- a/content/documentation/jdbc/index.html
+++ b/content/documentation/jdbc/index.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/migrate_jena2_jena3.html b/content/documentation/migrate_jena2_jena3.html
index 9e53997..e082669 100644
--- a/content/documentation/migrate_jena2_jena3.html
+++ b/content/documentation/migrate_jena2_jena3.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/notes/concurrency-howto.html b/content/documentation/notes/concurrency-howto.html
index 095ef72..0070824 100644
--- a/content/documentation/notes/concurrency-howto.html
+++ b/content/documentation/notes/concurrency-howto.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/notes/datasetgraph.html b/content/documentation/notes/datasetgraph.html
index 9578d19..91fc42a 100644
--- a/content/documentation/notes/datasetgraph.html
+++ b/content/documentation/notes/datasetgraph.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/notes/event-handler-howto.html b/content/documentation/notes/event-handler-howto.html
index e0d7a50..0857421 100644
--- a/content/documentation/notes/event-handler-howto.html
+++ b/content/documentation/notes/event-handler-howto.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
-                        <li><a href="/about_jena/citing.html">Citing</a></li>
-                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li><a href="/about_jena/architecture.html">Architecture</a></li>
+                        <li><a href="/about_jena/citing.html">Citing</a></li>
                         <li><a href="/about_jena/team.html">Project team</a></li>
                         <li><a href="/about_jena/contributions.html">Related projects</a></li>
+                        <li><a href="/about_jena/roadmap.html">Roadmap</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">ASF</li>
                         <li><a href="http://www.apache.org/">Apache Software Foundation</a></li>
-                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                         <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
+                        <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
                         <li><a href="http://www.apache.org/security/">Security</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
                     </ul>
                 </li>
 
diff --git a/content/documentation/notes/index.html b/content/documentation/notes/index.html
index 5c086ec..ee755e8 100644
--- a/content/documentation/notes/index.html
+++ b/content/documentation/notes/index.html
@@ -46,52 +46,53 @@
                     <ul class="dropdown-menu">
                         <li class="dropdown-header">Tutorials</li>
                         <li><a href="/tutorials/index.html">Overview</a></li>
+                        <li><a href="/documentation/fuseki2/index.html">Fuseki Triplestore</a></li>
+                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
+                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/rdf_api.html">RDF core API tutorial</a></li>
                         <li><a href="/tutorials/sparql.html">SPARQL tutorial</a></li>
-                        <li><a href="/documentation/query/manipulating_sparql_using_arq.html">Manipulating SPARQL using ARQ</a></li>
                         <li><a href="/tutorials/using_jena_with_eclipse.html">Using Jena with Eclipse</a></li>
-                        <li><a href="/documentation/notes/index.html">How-To's</a></li>
                         <li class="divider"></li>
                         <li class="dropdown-header">References</li>
                         <li><a href="/documentation/index.html">Overview</a></li>
+                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
+                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
+                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
+                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
+                        <li><a href="/documentation/geosparql/index.html">GeoSPARQL</a></li>
+                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
                         <li><a href="/documentation/javadoc.html">Javadoc</a></li>
+                        <li><a href="/documentation/ontology/">Ontology API</a></li>
+                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
+                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
                         <li><a href="/documentation/rdf/index.html">RDF API</a></li>
-                        <li><a href="/documentation/io/">RDF I/O</a></li>
-                        <li><a href="/documentation/fuseki2/index.html">Fuseki</a></li>
-                        <li><a href="/documentation/query/index.html">ARQ (SPARQL)</a></li>
                         <li><a href="/documentation/rdfconnection/">RDF Connection - SPARQL API</a></li>
-                        <li><a href="/documentation/rdfs/">Data with RDFS Inferencing</a></li>
-                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
-                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
-                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
+                        <li><a href="/documentation/io/">RDF I/O</a></li>
+                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
                         <li><a href="/documentation/shacl/index.html">SHACL</a></li>
                         <li><a href="/documentation/shex/index.html">ShEx</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF-star</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
-                        <li><a href="/documentation/permissions/index.html">Permissions</a></li>
-                        <li><a href="/documentation/assembler/index.html">Assembler</a></li>
-                        <li><a href="/documentation/ontology/">Ontology API</a></li>
-                        <li><a href="/documentation/inference/index.html">Inference API</a></li>
-                        <li><a href="/documentation/extras/querybuilder/index.html">Query Builder</a></li>
+                        <li><a href="/documentation/tdb/index.html">TDB</a></li>
+                        <li><a href="/documentation/tdb2/index.html">TDB2</a></li>
+                        <li><a href="/documentation/query/text-query.html">Text Search</a></li>
                     </ul>
                 </li>
 
                 <li class="drop down">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Javadoc <b class="caret"></b></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
                         <li><a href="/documentation/javadoc/arq/">ARQ</a></li>
-                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
-                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc_elephas.html">Elephas</a></li>
-                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
-                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/fuseki2/">Fuseki</a></li>
                         <li><a href="/documentation/javadoc/geosparql/">GeoSPARQL</a></li>
-                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/jdbc/">JDBC</a></li>
+                        <li><a href="/documentation/javadoc/jena/">Jena Core</a></li>
+                        <li><a href="/documentation/javadoc/permissions/">Permissions</a></li>
                         <li><a href="/documentation/javadoc/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
+                        <li><a href="/documentation/javadoc/shacl/">SHACL</a></li>
+                        <li><a href="/documentation/javadoc/tdb/">TDB</a></li>
+                        <li><a href="/documentation/javadoc/text/">Text Search</a></li>
                     </ul>
                 </li>
 
@@ -105,18 +106,18 @@
                         <li class="divider"></li>
                         <li class="dropdown-header">Project</li>
                         <li><a href="/about_jena/about.html">About Jena</a></li>
... 14267 lines suppressed ...