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 2021/04/01 08:20:18 UTC

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

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 726f721  Updated site from main (0af4fc961e586370a6f3b0d0019d7e2beb8c9b36)
726f721 is described below

commit 726f7217d8a7a330884b6a2b3e8c5b41ee4abe1b
Author: jenkins <bu...@apache.org>
AuthorDate: Thu Apr 1 08:20:14 2021 +0000

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

diff --git a/content/about_jena.html b/content/about_jena.html
index 91b4496..40a5c5c 100644
--- a/content/about_jena.html
+++ b/content/about_jena.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/about_jena/about.html b/content/about_jena/about.html
index ec565ea..7135e47 100644
--- a/content/about_jena/about.html
+++ b/content/about_jena/about.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/about_jena/architecture.html b/content/about_jena/architecture.html
index 6df4dba..bf25dd7 100644
--- a/content/about_jena/architecture.html
+++ b/content/about_jena/architecture.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/about_jena/contributions.html b/content/about_jena/contributions.html
index 9822f05..eda548c 100644
--- a/content/about_jena/contributions.html
+++ b/content/about_jena/contributions.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/about_jena/index.html b/content/about_jena/index.html
index de2fc69..11baeab 100644
--- a/content/about_jena/index.html
+++ b/content/about_jena/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/about_jena/roadmap.html b/content/about_jena/roadmap.html
index 51919a0..8052e70 100644
--- a/content/about_jena/roadmap.html
+++ b/content/about_jena/roadmap.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/about_jena/team.html b/content/about_jena/team.html
index 3baecfa..bed434a 100644
--- a/content/about_jena/team.html
+++ b/content/about_jena/team.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/docimentation/rdfstar/index.html b/content/docimentation/rdfstar/index.html
new file mode 100644
index 0000000..2d0d95c
--- /dev/null
+++ b/content/docimentation/rdfstar/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><html><head><title>https://jena.apache.org/documentation/rdf-star/</title><link rel="canonical" href="https://jena.apache.org/documentation/rdf-star/"/><meta name="robots" content="noindex"><meta charset="utf-8" /><meta http-equiv="refresh" content="0; url=https://jena.apache.org/documentation/rdf-star/" /></head></html>
\ No newline at end of file
diff --git a/content/documentation.html b/content/documentation.html
index c44e1c7..53b719b 100644
--- a/content/documentation.html
+++ b/content/documentation.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/archive/eyeball/eyeball-getting-started.html b/content/documentation/archive/eyeball/eyeball-getting-started.html
index c507a5d..ef23a82 100644
--- a/content/documentation/archive/eyeball/eyeball-getting-started.html
+++ b/content/documentation/archive/eyeball/eyeball-getting-started.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/archive/eyeball/eyeball-guide.html b/content/documentation/archive/eyeball/eyeball-guide.html
index 9950011..81ae075 100644
--- a/content/documentation/archive/eyeball/eyeball-guide.html
+++ b/content/documentation/archive/eyeball/eyeball-guide.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/archive/eyeball/eyeball-manual.html b/content/documentation/archive/eyeball/eyeball-manual.html
index 1c7eaa3..1cffa45 100644
--- a/content/documentation/archive/eyeball/eyeball-manual.html
+++ b/content/documentation/archive/eyeball/eyeball-manual.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/archive/larq/index.html b/content/documentation/archive/larq/index.html
index b124e20..7c6aa51 100644
--- a/content/documentation/archive/larq/index.html
+++ b/content/documentation/archive/larq/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/archive/serving_data/fuseki1.html b/content/documentation/archive/serving_data/fuseki1.html
index 6aacf9b..8b1fa6d 100644
--- a/content/documentation/archive/serving_data/fuseki1.html
+++ b/content/documentation/archive/serving_data/fuseki1.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/assembler/assembler-howto.html b/content/documentation/assembler/assembler-howto.html
index e678a3e..ad9d2e7 100644
--- a/content/documentation/assembler/assembler-howto.html
+++ b/content/documentation/assembler/assembler-howto.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/assembler/index.html b/content/documentation/assembler/index.html
index b24625f..678f547 100644
--- a/content/documentation/assembler/index.html
+++ b/content/documentation/assembler/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/assembler/inside-assemblers.html b/content/documentation/assembler/inside-assemblers.html
index de737f5..b560fb3 100644
--- a/content/documentation/assembler/inside-assemblers.html
+++ b/content/documentation/assembler/inside-assemblers.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/csv/csv_index.html b/content/documentation/csv/csv_index.html
index 0bc7936..1535b2a 100644
--- a/content/documentation/csv/csv_index.html
+++ b/content/documentation/csv/csv_index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/csv/design.html b/content/documentation/csv/design.html
index 295bf0d..f7f5752 100644
--- a/content/documentation/csv/design.html
+++ b/content/documentation/csv/design.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/csv/get_started.html b/content/documentation/csv/get_started.html
index afe5383..2150fc3 100644
--- a/content/documentation/csv/get_started.html
+++ b/content/documentation/csv/get_started.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/csv/implementation.html b/content/documentation/csv/implementation.html
index 59e6f94..3db4801 100644
--- a/content/documentation/csv/implementation.html
+++ b/content/documentation/csv/implementation.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/csv/index.html b/content/documentation/csv/index.html
index 03f4e3b..faf4264 100644
--- a/content/documentation/csv/index.html
+++ b/content/documentation/csv/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/extras/index.html b/content/documentation/extras/index.html
index 1e2d911..0afc4de 100644
--- a/content/documentation/extras/index.html
+++ b/content/documentation/extras/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/extras/querybuilder/index.html b/content/documentation/extras/querybuilder/index.html
index d923255..400bf41 100644
--- a/content/documentation/extras/querybuilder/index.html
+++ b/content/documentation/extras/querybuilder/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/fuseki2/fuseki-config-endpoint.html b/content/documentation/fuseki2/fuseki-config-endpoint.html
index 7e3ba86..eda7a51 100644
--- a/content/documentation/fuseki2/fuseki-config-endpoint.html
+++ b/content/documentation/fuseki2/fuseki-config-endpoint.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/fuseki2/fuseki-configuration.html b/content/documentation/fuseki2/fuseki-configuration.html
index 53a2f1e..31fa0b8 100644
--- a/content/documentation/fuseki2/fuseki-configuration.html
+++ b/content/documentation/fuseki2/fuseki-configuration.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/fuseki2/fuseki-data-access-control.html b/content/documentation/fuseki2/fuseki-data-access-control.html
index 23d65f0..66d7047 100644
--- a/content/documentation/fuseki2/fuseki-data-access-control.html
+++ b/content/documentation/fuseki2/fuseki-data-access-control.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/fuseki2/fuseki-docker.html b/content/documentation/fuseki2/fuseki-docker.html
index c8c0daa..ae4813a 100644
--- a/content/documentation/fuseki2/fuseki-docker.html
+++ b/content/documentation/fuseki2/fuseki-docker.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/fuseki2/fuseki-embedded.html b/content/documentation/fuseki2/fuseki-embedded.html
index 0912d4f..f61719a 100644
--- a/content/documentation/fuseki2/fuseki-embedded.html
+++ b/content/documentation/fuseki2/fuseki-embedded.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/fuseki2/fuseki-layout.html b/content/documentation/fuseki2/fuseki-layout.html
index 4c88c9c..7418ce9 100644
--- a/content/documentation/fuseki2/fuseki-layout.html
+++ b/content/documentation/fuseki2/fuseki-layout.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/fuseki2/fuseki-logging.html b/content/documentation/fuseki2/fuseki-logging.html
index 73ff3c7..cc41c2e 100644
--- a/content/documentation/fuseki2/fuseki-logging.html
+++ b/content/documentation/fuseki2/fuseki-logging.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/fuseki2/fuseki-main.html b/content/documentation/fuseki2/fuseki-main.html
index ec7de2c..143ab8c 100644
--- a/content/documentation/fuseki2/fuseki-main.html
+++ b/content/documentation/fuseki2/fuseki-main.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/fuseki2/fuseki-old-config-endpoint.html b/content/documentation/fuseki2/fuseki-old-config-endpoint.html
index 00d0e75..9a1bd46 100644
--- a/content/documentation/fuseki2/fuseki-old-config-endpoint.html
+++ b/content/documentation/fuseki2/fuseki-old-config-endpoint.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/fuseki2/fuseki-quick-start.html b/content/documentation/fuseki2/fuseki-quick-start.html
index 716449f..8920320 100644
--- a/content/documentation/fuseki2/fuseki-quick-start.html
+++ b/content/documentation/fuseki2/fuseki-quick-start.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/fuseki2/fuseki-security.html b/content/documentation/fuseki2/fuseki-security.html
index 970d6bd..f6e166c 100644
--- a/content/documentation/fuseki2/fuseki-security.html
+++ b/content/documentation/fuseki2/fuseki-security.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/fuseki2/fuseki-server-info.html b/content/documentation/fuseki2/fuseki-server-info.html
index 8e7a7ef..8ca0f97 100644
--- a/content/documentation/fuseki2/fuseki-server-info.html
+++ b/content/documentation/fuseki2/fuseki-server-info.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/fuseki2/fuseki-server-protocol.html b/content/documentation/fuseki2/fuseki-server-protocol.html
index 63fe953..56296cc 100644
--- a/content/documentation/fuseki2/fuseki-server-protocol.html
+++ b/content/documentation/fuseki2/fuseki-server-protocol.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
@@ -193,6 +193,7 @@ its administrative interface.</p>
 dataset names and this prefix is reserved for the Fuseki control functions.
 Further operations may be added within this naming scheme.</p>
 <h2 id="operations">Operations</h2>
+<p>Replace <code>{name}</code> with a dataset name: e.g. <code>/$/backup/myDataset</code>.</p>
 <table>
 <thead>
 <tr>
@@ -244,22 +245,22 @@ Further operations may be added within this naming scheme.</p>
 </tr>
 <tr>
 <td><tt>DELETE</tt></td>
-<td><code>/$/datasets/*{name}*</code></td>
+<td><code>/$/datasets/{name}</code></td>
 <td></td>
 </tr>
 <tr>
 <td><tt>GET</tt></td>
-<td><code>/$/datasets/*{name}*</code></td>
+<td><code>/$/datasets/{name}</code></td>
 <td></td>
 </tr>
 <tr>
 <td><tt>POST</tt></td>
-<td><code>/$/datasets/*{name}*?state=offline</code></td>
+<td><code>/$/datasets/{name}?state=offline</code></td>
 <td></td>
 </tr>
 <tr>
 <td><tt>POST</tt></td>
-<td><code>/$/datasets/*{name}*?state=active</code></td>
+<td><code>/$/datasets/{name}?state=active</code></td>
 <td></td>
 </tr>
 <tr>
@@ -284,7 +285,7 @@ Further operations may be added within this naming scheme.</p>
 </tr>
 <tr>
 <td><tt>GET</tt></td>
-<td><code>/$/stats/*{name}*</code></td>
+<td><code>/$/stats/{name}</code></td>
 <td></td>
 </tr>
 <tr>
@@ -294,7 +295,7 @@ Further operations may be added within this naming scheme.</p>
 </tr>
 <tr>
 <td><tt>POST</tt></td>
-<td><code>/$/backup/*{name}*</code></td>
+<td><code>/$/backup/{name}</code></td>
 <td></td>
 </tr>
 <tr>
@@ -304,7 +305,7 @@ Further operations may be added within this naming scheme.</p>
 </tr>
 <tr>
 <td><tt>POST</tt></td>
-<td><code>/$/compact/*{name}*</code></td>
+<td><code>/$/compact/{name}</code></td>
 <td></td>
 </tr>
 <tr>
@@ -324,7 +325,7 @@ Further operations may be added within this naming scheme.</p>
 </tr>
 <tr>
 <td><tt>GET</tt></td>
-<td><code>/$/tasks/*{name}*</code></td>
+<td><code>/$/tasks/{name}</code></td>
 <td></td>
 </tr>
 </tbody>
@@ -342,7 +343,7 @@ request over <code>GET</code> or <code>POST</code> (to avoid any HTTP caching) w
 <h2 id="datasets-and-services">Datasets and Services</h2>
 <p>Pattern: <code>/$/datasets</code></p>
 <p><code>/$/datasets</code> is a container representing all datasets present in the server.
-<code>/$/datasets/*{name}*</code> names a specific dataset.  As a container, operations on items
+<code>/$/datasets/{name}</code> names a specific dataset.  As a container, operations on items
 in the container, via <code>GET</code>, <code>POST</code> and <code>DELETE</code>, operate on specific dataset.</p>
 <h3 id="adding-a-dataset-and-its-services">Adding a Dataset and its Services.</h3>
 <blockquote>
@@ -403,7 +404,7 @@ any persistent data can be manipulated outside the server.</p>
 <p>Datasets are initially &ldquo;active&rdquo;.  The transition from &ldquo;active&rdquo; to &ldquo;offline&rdquo; is graceful - all outstanding requests are completed.</p>
 <h2 id="statistics">Statistics</h2>
 <blockquote>
-<p><strong><code>/$/stats/*{name}*</code></strong></p>
+<p><strong><code>/$/stats/{name}</code></strong></p>
 </blockquote>
 <p>Statistics can be obtained for each dataset or all datasets in a single response.
 <code>/$/stats</code> is  treated as a container for this information.</p>
@@ -412,21 +413,21 @@ any persistent data can be manipulated outside the server.</p>
 See <a href="fuseki-server-info.html">Fuseki Server Information</a> for details of statistics kept by a Fuseki server.</p>
 </blockquote>
 <h3 id="backup">Backup</h3>
-<p>Pattern: <code>/$/backup/*{name}*</code></p>
+<p>Pattern: <code>/$/backup/{name}</code></p>
 <p>This operation initiates a backup and returns a JSON object with the task Id in it.</p>
 <p>Backups are written to the server local directory &lsquo;backups&rsquo; as gzip-compressed N-Quads files.</p>
 <p>See <a href="#tasks">Tasks</a> for how to monitor a backups progress.</p>
 <p>Return: A task is allocated a identifier (usually, a number).</p>
-<pre><code>{ &quot;taskId&quot; : &quot;*{taskId}*&quot; }
+<pre><code>{ &quot;taskId&quot; : &quot;{taskId}&quot; }
 </code></pre><p>The task id can be used to construct a URL to get details of the task:</p>
-<pre><code>/$/tasks/*{taskId}*
+<pre><code>/$/tasks/{taskId}
 </code></pre><p>Pattern: <code>/$/backups-list</code></p>
 <p>Returns a list of all the files in the backup area of the server. This is
 useful for managing the files externally.</p>
 <p>The returned JSON object will have the form <code>{ backups: [ ... ] }</code> where the <code>[]</code> array is
 a list of file names.</p>
 <h3 id="compact">Compact</h3>
-<p>Pattern: <code>/$/compact/*{name}*</code></p>
+<p>Pattern: <code>/$/compact/{name}</code></p>
 <p>This operations initiates a database compaction task and returns a JSON object with the task Id in it.</p>
 <p>Compaction <strong>ONLY</strong> applies to TDB2 datasets, see <a href="../tdb2/tdb2_admin.html#compaction">TDB2 Database Administration</a>
 for more details of this operation.</p>
@@ -438,9 +439,9 @@ The result of such operations includes a json object with the task id and
 also a <code>Location:</code> header with the URL of the task created.</p>
 <p>The progress of the task can be monitored with HTTP GET operations:</p>
 <p>Pattern: <code>/$/tasks</code> – All asynchronous tasks.<br/>
-Pattern: <code>/$/tasks/*{taskId}*</code> – A particular task.</p>
+Pattern: <code>/$/tasks/{taskId}</code> – A particular task.</p>
 <p>The URL <code>/$/tasks</code> returns a description of all running and recently tasks. A finished task can be identified by having a <code>finishPoint</code> and <code>success</code> fields.</p>
-<p>Each background task has an id.  The URL <code>/$/tasks/*{taskId}*</code> gets a description about one single task.</p>
+<p>Each background task has an id.  The URL <code>/$/tasks/{taskId}</code> gets a description about one single task.</p>
 <p>Details of the last few completed tasks are retained, up to a fixed number. The records will eventually be removed as later tasks complete, and the task URL will then return 404.</p>
 <p>Pattern: <code>/$/tasks</code> ; example:</p>
 <pre><code>[ { 
diff --git a/content/documentation/fuseki2/fuseki-webapp.html b/content/documentation/fuseki2/fuseki-webapp.html
index 8d28a2c..063f987 100644
--- a/content/documentation/fuseki2/fuseki-webapp.html
+++ b/content/documentation/fuseki2/fuseki-webapp.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
@@ -184,9 +184,8 @@
 <p>Fuseki is also packaged as a plain server <a href="fuseki-main.html">&ldquo;Fuseki Main&rdquo;</a>
 with no UI for use as a configurable SPARQL server, for <a href="fuseki-docker.html">building as a Docker
 container</a>, and as a deployment and development standalone
-server.</p>
-<p>Both packaging used the same configuration file format, and in standalone server
-mode, the same command line arguments.</p>
+server. It supports the arguments used by the standalone server.</p>
+<p>The configuration file is the same format for all forms of the Fuseki server.</p>
 <p>See &ldquo;<a href="fuseki-configuration.html">Fuseki Configuration</a>&rdquo; for information on
 how to provide datasets and configure services using the configuration file.</p>
 <h2 id="fuseki-standalone-server">Fuseki as a Standalone Server</h2>
diff --git a/content/documentation/fuseki2/index.html b/content/documentation/fuseki2/index.html
index 1ffa90e..ac45883 100644
--- a/content/documentation/fuseki2/index.html
+++ b/content/documentation/fuseki2/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/fuseki2/rdf-sparql-standards.html b/content/documentation/fuseki2/rdf-sparql-standards.html
index fa8e1e3..169d24a 100644
--- a/content/documentation/fuseki2/rdf-sparql-standards.html
+++ b/content/documentation/fuseki2/rdf-sparql-standards.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/fuseki2/soh.html b/content/documentation/fuseki2/soh.html
index a9a613a..c71c7e3 100644
--- a/content/documentation/fuseki2/soh.html
+++ b/content/documentation/fuseki2/soh.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/geosparql/geosparql-fuseki.html b/content/documentation/geosparql/geosparql-fuseki.html
index 620ad28..44aefbf 100644
--- a/content/documentation/geosparql/geosparql-fuseki.html
+++ b/content/documentation/geosparql/geosparql-fuseki.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/geosparql/index.html b/content/documentation/geosparql/index.html
index e517be5..d52840d 100644
--- a/content/documentation/geosparql/index.html
+++ b/content/documentation/geosparql/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/hadoop/artifacts.html b/content/documentation/hadoop/artifacts.html
index d25424b..a372aee 100644
--- a/content/documentation/hadoop/artifacts.html
+++ b/content/documentation/hadoop/artifacts.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/hadoop/common.html b/content/documentation/hadoop/common.html
index 51d9739..ef7d50c 100644
--- a/content/documentation/hadoop/common.html
+++ b/content/documentation/hadoop/common.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/hadoop/demo.html b/content/documentation/hadoop/demo.html
index 2e46543..e9a1543 100644
--- a/content/documentation/hadoop/demo.html
+++ b/content/documentation/hadoop/demo.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/hadoop/elephas_index.html b/content/documentation/hadoop/elephas_index.html
index 2585e8b..fe60721 100644
--- a/content/documentation/hadoop/elephas_index.html
+++ b/content/documentation/hadoop/elephas_index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/hadoop/index.html b/content/documentation/hadoop/index.html
index 0ed0e1f..9d6ef24 100644
--- a/content/documentation/hadoop/index.html
+++ b/content/documentation/hadoop/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/hadoop/io.html b/content/documentation/hadoop/io.html
index ac46a34..a0124d6 100644
--- a/content/documentation/hadoop/io.html
+++ b/content/documentation/hadoop/io.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/hadoop/mapred.html b/content/documentation/hadoop/mapred.html
index 6d02f80..b49f554 100644
--- a/content/documentation/hadoop/mapred.html
+++ b/content/documentation/hadoop/mapred.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/index.html b/content/documentation/index.html
index 37aeb20..8a9a0ca 100644
--- a/content/documentation/index.html
+++ b/content/documentation/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/index.xml b/content/documentation/index.xml
index db21e54..43b87ef 100644
--- a/content/documentation/index.xml
+++ b/content/documentation/index.xml
@@ -127,7 +127,7 @@ It implements the six Conformance Classes described in the GeoSPARQL document:</
       <description>Jena has a simple initialization sequence that is used to setup components available at runtime.
 Application code is welcome to also use this mechanism. This must be done with care. Java initialization can lead to visibility of uninitialized data.
 The standard initialization sequence is
-Core -&amp;gt; RIOT -&amp;gt; ARQ -&amp;gt; TDB -&amp;gt; other (SDB, jena text, jena spatial)
+Core -&amp;gt; RIOT -&amp;gt; ARQ -&amp;gt; TDB -&amp;gt; other (including jena text)
 The sequence from core to TDB should be executed before application components. See below for how to control the order.</description>
     </item>
     
@@ -787,16 +787,6 @@ The relevant SPARQL standards are:
     </item>
     
     <item>
-      <title>Fuseki: serving RDF data over HTTP</title>
-      <link>https://jena.apache.org/documentation/serving_data/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://jena.apache.org/documentation/serving_data/</guid>
-      <description>See the Fuseki2 documentation.   This page covers Fuseki1. Fuseki1 is deprecated and has been retired. Fuseki2 is current.  The last release of Jena with this module is Jena 3.9.0. The original documentation.
-  </description>
-    </item>
-    
-    <item>
       <title>Fuseki: SPARQL and RDF Standards</title>
       <link>https://jena.apache.org/documentation/fuseki2/rdf-sparql-standards.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
@@ -1490,14 +1480,24 @@ Contents  Need Design Intent Other Approaches  RDF Lisp XML JSON   Design  Token
     
     <item>
       <title>Spatial searches with SPARQL</title>
+      <link>https://jena.apache.org/documentation/query/spatial-query-doc.html</link>
+      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+      
+      <guid>https://jena.apache.org/documentation/query/spatial-query-doc.html</guid>
+      <description>This module was first released with Jena 2.11.0. It was last released in Jena 3.12.0.
+Jena provides a a GeoSPARQL implementation.
+ This is an extension to Apache Jena ARQ, which combines SPARQL and simple spatial query. It gives applications the ability to perform simple spatial searches within SPARQL queries. Spatial indexes are additional information for accessing the RDF graph.
+The spatial index can be either Apache Lucene for a same-machine spatial index, or Apache Solr for a large scale enterprise search application.</description>
+    </item>
+    
+    <item>
+      <title>Spatial searches with SPARQL</title>
       <link>https://jena.apache.org/documentation/query/spatial-query.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://jena.apache.org/documentation/query/spatial-query.html</guid>
-      <description>This module was first released with Jena 2.11.0.
-It is planned to retire this module in favour of a GeoSPARQL implementation.
-This is an extension to Apache Jena ARQ, which combines SPARQL and simple spatial query. It gives applications the ability to perform simple spatial searches within SPARQL queries. Spatial indexes are additional information for accessing the RDF graph.
-The spatial index can be either Apache Lucene for a same-machine spatial index, or Apache Solr for a large scale enterprise search application.</description>
+      <description>  The Jena Spatial module has been retired. The last release of Jena with jena-spatial was Jena 3.12.0. See jena-spatial/README.md. The original documentation is here
+  </description>
     </item>
     
     <item>
@@ -1529,16 +1529,15 @@ The supported datatypes (including those required by SPARQL 1.1), including full
     </item>
     
     <item>
-      <title>Support of RDF*</title>
-      <link>https://jena.apache.org/documentation/rdfstar/</link>
+      <title>Support of RDF-star</title>
+      <link>https://jena.apache.org/documentation/rdf-star/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/rdfstar/</guid>
-      <description>RDF* is an extension to RDF that provides a way for one triple to refer to another triple. Another resource about RDF* is Olaf Hartig&amp;rsquo;s blog entry.
+      <guid>https://jena.apache.org/documentation/rdf-star/</guid>
+      <description>RDF-star is an extension to RDF that provides a way for one triple to refer to another triple. RDF* is the name of the original work which is described in Olaf Hartig&amp;rsquo;s blog entry.
 Example:
-&amp;lt;&amp;lt;:johnfoaf:name&amp;#34;John Smith&amp;#34;&amp;gt;&amp;gt;dct:source&amp;lt;http://example/directory&amp;gt;.The part &amp;lt;&amp;lt; :john foaf:name &amp;quot;John Smith&amp;quot; &amp;gt;&amp;gt; is a triple term and refers to the triple with subject :john, property foaf:name and object &amp;quot;John Smith&amp;quot;.
-Triple terms can be in the subject or object position.
-Jena provides support for RDF* and the related SPARQL*.</description>
+&amp;lt;&amp;lt;:johnfoaf:name&amp;#34;John Smith&amp;#34;&amp;gt;&amp;gt;dct:source&amp;lt;http://example/directory&amp;gt;.The part &amp;lt;&amp;lt; :john foaf:name &amp;quot;John Smith&amp;quot; &amp;gt;&amp;gt; is an embedded triple and refers to the triple with subject :john, property foaf:name and object &amp;quot;John Smith&amp;quot;.
+Triple terms can be in the subject or object position.</description>
     </item>
     
     <item>
diff --git a/content/documentation/inference/index.html b/content/documentation/inference/index.html
index c042d7a..732e60e 100644
--- a/content/documentation/inference/index.html
+++ b/content/documentation/inference/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/io/arp.html b/content/documentation/io/arp.html
index 3707ced..50fc750 100644
--- a/content/documentation/io/arp.html
+++ b/content/documentation/io/arp.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/io/arp_sax.html b/content/documentation/io/arp_sax.html
index 355b087..a99f657 100644
--- a/content/documentation/io/arp_sax.html
+++ b/content/documentation/io/arp_sax.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/io/arp_standalone.html b/content/documentation/io/arp_standalone.html
index 15d5e85..99fe796 100644
--- a/content/documentation/io/arp_standalone.html
+++ b/content/documentation/io/arp_standalone.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/io/index.html b/content/documentation/io/index.html
index 723d7a6..84e3ff2 100644
--- a/content/documentation/io/index.html
+++ b/content/documentation/io/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/io/rdf-binary.html b/content/documentation/io/rdf-binary.html
index 56f1c8c..6e7f4fb 100644
--- a/content/documentation/io/rdf-binary.html
+++ b/content/documentation/io/rdf-binary.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/io/rdf-input.html b/content/documentation/io/rdf-input.html
index 995a286..7ba38de 100644
--- a/content/documentation/io/rdf-input.html
+++ b/content/documentation/io/rdf-input.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/io/rdf-output.html b/content/documentation/io/rdf-output.html
index 9593a3b..b26c181 100644
--- a/content/documentation/io/rdf-output.html
+++ b/content/documentation/io/rdf-output.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/io/rdfxml_howto.html b/content/documentation/io/rdfxml_howto.html
index de199d2..ab8770e 100644
--- a/content/documentation/io/rdfxml_howto.html
+++ b/content/documentation/io/rdfxml_howto.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/io/streaming-io.html b/content/documentation/io/streaming-io.html
index 8f5a5ef..f901369 100644
--- a/content/documentation/io/streaming-io.html
+++ b/content/documentation/io/streaming-io.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/javadoc.html b/content/documentation/javadoc.html
index 75aaaf1..02ef239 100644
--- a/content/documentation/javadoc.html
+++ b/content/documentation/javadoc.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/jdbc/artifacts.html b/content/documentation/jdbc/artifacts.html
index 68c1da8..8a1ef3c 100644
--- a/content/documentation/jdbc/artifacts.html
+++ b/content/documentation/jdbc/artifacts.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/jdbc/custom_driver.html b/content/documentation/jdbc/custom_driver.html
index e3d89f1..3ebf7db 100644
--- a/content/documentation/jdbc/custom_driver.html
+++ b/content/documentation/jdbc/custom_driver.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/jdbc/drivers.html b/content/documentation/jdbc/drivers.html
index d386232..02ab6c3 100644
--- a/content/documentation/jdbc/drivers.html
+++ b/content/documentation/jdbc/drivers.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/jdbc/index.html b/content/documentation/jdbc/index.html
index 197bf73..8a192a8 100644
--- a/content/documentation/jdbc/index.html
+++ b/content/documentation/jdbc/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/migrate_jena2_jena3.html b/content/documentation/migrate_jena2_jena3.html
index 7dda4e7..0075686 100644
--- a/content/documentation/migrate_jena2_jena3.html
+++ b/content/documentation/migrate_jena2_jena3.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/notes/concurrency-howto.html b/content/documentation/notes/concurrency-howto.html
index afe39cd..9fdc9e7 100644
--- a/content/documentation/notes/concurrency-howto.html
+++ b/content/documentation/notes/concurrency-howto.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/notes/datasetgraph.html b/content/documentation/notes/datasetgraph.html
index f523d1c..d164618 100644
--- a/content/documentation/notes/datasetgraph.html
+++ b/content/documentation/notes/datasetgraph.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/notes/event-handler-howto.html b/content/documentation/notes/event-handler-howto.html
index 8f4840b..40a9574 100644
--- a/content/documentation/notes/event-handler-howto.html
+++ b/content/documentation/notes/event-handler-howto.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/notes/index.html b/content/documentation/notes/index.html
index df8c792..c16af0c 100644
--- a/content/documentation/notes/index.html
+++ b/content/documentation/notes/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/notes/iri.html b/content/documentation/notes/iri.html
index d4bd30c..ea8acc4 100644
--- a/content/documentation/notes/iri.html
+++ b/content/documentation/notes/iri.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/notes/jena-internals.html b/content/documentation/notes/jena-internals.html
index e3c5ea9..b7ccbd6 100644
--- a/content/documentation/notes/jena-internals.html
+++ b/content/documentation/notes/jena-internals.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/notes/jena-repack.html b/content/documentation/notes/jena-repack.html
index 8360361..21f34f0 100644
--- a/content/documentation/notes/jena-repack.html
+++ b/content/documentation/notes/jena-repack.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/notes/model-factory.html b/content/documentation/notes/model-factory.html
index 74f7ec9..180430b 100644
--- a/content/documentation/notes/model-factory.html
+++ b/content/documentation/notes/model-factory.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/notes/rdf-frames.html b/content/documentation/notes/rdf-frames.html
index 9351195..e6bb070 100644
--- a/content/documentation/notes/rdf-frames.html
+++ b/content/documentation/notes/rdf-frames.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/notes/reification.html b/content/documentation/notes/reification.html
index 7f58c53..e0e9e64 100644
--- a/content/documentation/notes/reification.html
+++ b/content/documentation/notes/reification.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/notes/reification_previous.html b/content/documentation/notes/reification_previous.html
index e400af3..39467f4 100644
--- a/content/documentation/notes/reification_previous.html
+++ b/content/documentation/notes/reification_previous.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/notes/sse.html b/content/documentation/notes/sse.html
index 3287755..38ff453 100644
--- a/content/documentation/notes/sse.html
+++ b/content/documentation/notes/sse.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/notes/stream-manager.html b/content/documentation/notes/stream-manager.html
index acdf059..6159718 100644
--- a/content/documentation/notes/stream-manager.html
+++ b/content/documentation/notes/stream-manager.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/notes/system-initialization.html b/content/documentation/notes/system-initialization.html
index b753aea..b452a56 100644
--- a/content/documentation/notes/system-initialization.html
+++ b/content/documentation/notes/system-initialization.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
@@ -181,7 +181,7 @@ used to setup components available at runtime.</p>
 must be done with care. Java initialization can lead to
 visibility of uninitialized data.</p>
 <p>The standard initialization sequence is<br>
-Core -&gt; RIOT -&gt; ARQ -&gt; TDB -&gt; other (SDB, jena text, jena spatial)</p>
+Core -&gt; RIOT -&gt; ARQ -&gt; TDB -&gt; other (including jena text)</p>
 <p>The sequence from core to TDB should be executed before application
 components. See below for how to control the order.</p>
 <p>Initialization occurs when <code>JenaSystem.init()</code> is first called.  Jena ensures that this
diff --git a/content/documentation/notes/typed-literals.html b/content/documentation/notes/typed-literals.html
index aed6e04..9572d1a 100644
--- a/content/documentation/notes/typed-literals.html
+++ b/content/documentation/notes/typed-literals.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/ontology/index.html b/content/documentation/ontology/index.html
index c42b057..16b10c4 100644
--- a/content/documentation/ontology/index.html
+++ b/content/documentation/ontology/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/ontology/toc-test.html b/content/documentation/ontology/toc-test.html
index b1a11ed..c6f6a21 100644
--- a/content/documentation/ontology/toc-test.html
+++ b/content/documentation/ontology/toc-test.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/permissions/assembler.html b/content/documentation/permissions/assembler.html
index 80291ee..32ec26a 100644
--- a/content/documentation/permissions/assembler.html
+++ b/content/documentation/permissions/assembler.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/permissions/design.html b/content/documentation/permissions/design.html
index 1eece7f..237aba3 100644
--- a/content/documentation/permissions/design.html
+++ b/content/documentation/permissions/design.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/permissions/evaluator.html b/content/documentation/permissions/evaluator.html
index 5ce9f3f..b18ed1f 100644
--- a/content/documentation/permissions/evaluator.html
+++ b/content/documentation/permissions/evaluator.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/permissions/example.html b/content/documentation/permissions/example.html
index 946aa56..db08b4c 100644
--- a/content/documentation/permissions/example.html
+++ b/content/documentation/permissions/example.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/permissions/index.html b/content/documentation/permissions/index.html
index 57809fd..dedbe60 100644
--- a/content/documentation/permissions/index.html
+++ b/content/documentation/permissions/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/permissions/migration2To3.html b/content/documentation/permissions/migration2To3.html
index dc57266..2a79b24 100644
--- a/content/documentation/permissions/migration2To3.html
+++ b/content/documentation/permissions/migration2To3.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/algebra.html b/content/documentation/query/algebra.html
index f3549b2..271686b 100644
--- a/content/documentation/query/algebra.html
+++ b/content/documentation/query/algebra.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/app_api.html b/content/documentation/query/app_api.html
index 74e20a3..f4b8a0c 100644
--- a/content/documentation/query/app_api.html
+++ b/content/documentation/query/app_api.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/architecture.html b/content/documentation/query/architecture.html
index 47f8e5a..c9ffd8f 100644
--- a/content/documentation/query/architecture.html
+++ b/content/documentation/query/architecture.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/arq-query-eval.html b/content/documentation/query/arq-query-eval.html
index 65fdb1f..d20932d 100644
--- a/content/documentation/query/arq-query-eval.html
+++ b/content/documentation/query/arq-query-eval.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/assignment.html b/content/documentation/query/assignment.html
index e16004c..3f2a152 100644
--- a/content/documentation/query/assignment.html
+++ b/content/documentation/query/assignment.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/cmds.html b/content/documentation/query/cmds.html
index cd77def..3edd973 100644
--- a/content/documentation/query/cmds.html
+++ b/content/documentation/query/cmds.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/collation.html b/content/documentation/query/collation.html
index 1faeab9..d02cec1 100644
--- a/content/documentation/query/collation.html
+++ b/content/documentation/query/collation.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/construct-quad.html b/content/documentation/query/construct-quad.html
index aaaebd2..09db261 100644
--- a/content/documentation/query/construct-quad.html
+++ b/content/documentation/query/construct-quad.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/custom_aggregates.html b/content/documentation/query/custom_aggregates.html
index 28d7527..02598d2 100644
--- a/content/documentation/query/custom_aggregates.html
+++ b/content/documentation/query/custom_aggregates.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/download.html b/content/documentation/query/download.html
index cec67bc..4d2d951 100644
--- a/content/documentation/query/download.html
+++ b/content/documentation/query/download.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/explain.html b/content/documentation/query/explain.html
index 91e8501..911d7e0 100644
--- a/content/documentation/query/explain.html
+++ b/content/documentation/query/explain.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/extension.html b/content/documentation/query/extension.html
index f04da66..428f7db 100644
--- a/content/documentation/query/extension.html
+++ b/content/documentation/query/extension.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/faq.html b/content/documentation/query/faq.html
index c986d31..d3bef81 100644
--- a/content/documentation/query/faq.html
+++ b/content/documentation/query/faq.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/function_forms.html b/content/documentation/query/function_forms.html
index 78ceebd..590272f 100644
--- a/content/documentation/query/function_forms.html
+++ b/content/documentation/query/function_forms.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/generate-json-from-sparql.html b/content/documentation/query/generate-json-from-sparql.html
index 28e086f..cd68057 100644
--- a/content/documentation/query/generate-json-from-sparql.html
+++ b/content/documentation/query/generate-json-from-sparql.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/group-by.html b/content/documentation/query/group-by.html
index 8c48236..41d4266 100644
--- a/content/documentation/query/group-by.html
+++ b/content/documentation/query/group-by.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/http-auth.html b/content/documentation/query/http-auth.html
index e015f01..94f65f5 100644
--- a/content/documentation/query/http-auth.html
+++ b/content/documentation/query/http-auth.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/index.html b/content/documentation/query/index.html
index 73bfc0c..f5016c1 100644
--- a/content/documentation/query/index.html
+++ b/content/documentation/query/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/java-uri.html b/content/documentation/query/java-uri.html
index 6694ac5..6dbb8ab 100644
--- a/content/documentation/query/java-uri.html
+++ b/content/documentation/query/java-uri.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/javascript-functions.html b/content/documentation/query/javascript-functions.html
index 60985c6..ffc3617 100644
--- a/content/documentation/query/javascript-functions.html
+++ b/content/documentation/query/javascript-functions.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/library-function.html b/content/documentation/query/library-function.html
index dab9ce3..47741a6 100644
--- a/content/documentation/query/library-function.html
+++ b/content/documentation/query/library-function.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/library-propfunc.html b/content/documentation/query/library-propfunc.html
index 703af0c..f4d29be 100644
--- a/content/documentation/query/library-propfunc.html
+++ b/content/documentation/query/library-propfunc.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/logging.html b/content/documentation/query/logging.html
index 2052817..7025950 100644
--- a/content/documentation/query/logging.html
+++ b/content/documentation/query/logging.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/manipulating_sparql_using_arq.html b/content/documentation/query/manipulating_sparql_using_arq.html
index 31430e9..4f0d7e1 100644
--- a/content/documentation/query/manipulating_sparql_using_arq.html
+++ b/content/documentation/query/manipulating_sparql_using_arq.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/manipulating_sparql_using_arq_pt.html b/content/documentation/query/manipulating_sparql_using_arq_pt.html
index e098792..918deff 100644
--- a/content/documentation/query/manipulating_sparql_using_arq_pt.html
+++ b/content/documentation/query/manipulating_sparql_using_arq_pt.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/negation.html b/content/documentation/query/negation.html
index b2adf17..8db6836 100644
--- a/content/documentation/query/negation.html
+++ b/content/documentation/query/negation.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/parameterized-sparql-strings.html b/content/documentation/query/parameterized-sparql-strings.html
index 5a9bfff..c98d1e1 100644
--- a/content/documentation/query/parameterized-sparql-strings.html
+++ b/content/documentation/query/parameterized-sparql-strings.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/programmatic.html b/content/documentation/query/programmatic.html
index 3478277..2644f14 100644
--- a/content/documentation/query/programmatic.html
+++ b/content/documentation/query/programmatic.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/property_paths.html b/content/documentation/query/property_paths.html
index 7107114..0d1bd1f 100644
--- a/content/documentation/query/property_paths.html
+++ b/content/documentation/query/property_paths.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/rdf_lists.html b/content/documentation/query/rdf_lists.html
index f7d4892..06cc807 100644
--- a/content/documentation/query/rdf_lists.html
+++ b/content/documentation/query/rdf_lists.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/select_expr.html b/content/documentation/query/select_expr.html
index 4eda054..1b6464e 100644
--- a/content/documentation/query/select_expr.html
+++ b/content/documentation/query/select_expr.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/service.html b/content/documentation/query/service.html
index f985f98..b0eca15 100644
--- a/content/documentation/query/service.html
+++ b/content/documentation/query/service.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/sparql-remote.html b/content/documentation/query/sparql-remote.html
index 0544e05..4af9c24 100644
--- a/content/documentation/query/sparql-remote.html
+++ b/content/documentation/query/sparql-remote.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/spatial-query.html b/content/documentation/query/spatial-query-doc.html
similarity index 98%
copy from content/documentation/query/spatial-query.html
copy to content/documentation/query/spatial-query-doc.html
index 52161e7..10a85ba 100644
--- a/content/documentation/query/spatial-query.html
+++ b/content/documentation/query/spatial-query-doc.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
@@ -118,7 +118,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/query/spatial-query.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
+                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/query/spatial-query-doc.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -161,7 +161,7 @@
         
         
             
-                <li class="active">SPATIAL QUERY</li>
+                <li class="active">SPATIAL QUERY DOC</li>
             
             
         
@@ -175,9 +175,10 @@
             </div>
             <h1 class="title">Spatial searches with SPARQL</h1>
             
-	<p>This module was first released with Jena 2.11.0.</p>
-<p>It is planned to retire this module in favour of a <a href="https://github.com/galbiston/geosparql-jena">GeoSPARQL
-implementation</a>.</p>
+	<p>This module was first released with Jena 2.11.0.
+It was last released in Jena 3.12.0.</p>
+<p>Jena provides a  a <a href="../geosparql/">GeoSPARQL implementation</a>.</p>
+<hr>
 <p>This is an extension to Apache Jena ARQ, which combines SPARQL and simple spatial query.
 It gives applications the ability to perform simple spatial searches within SPARQL queries.
 Spatial indexes are additional information for accessing the RDF graph.</p>
diff --git a/content/documentation/query/spatial-query.html b/content/documentation/query/spatial-query.html
index 52161e7..216a496 100644
--- a/content/documentation/query/spatial-query.html
+++ b/content/documentation/query/spatial-query.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
@@ -175,272 +175,14 @@
             </div>
             <h1 class="title">Spatial searches with SPARQL</h1>
             
-	<p>This module was first released with Jena 2.11.0.</p>
-<p>It is planned to retire this module in favour of a <a href="https://github.com/galbiston/geosparql-jena">GeoSPARQL
-implementation</a>.</p>
-<p>This is an extension to Apache Jena ARQ, which combines SPARQL and simple spatial query.
-It gives applications the ability to perform simple spatial searches within SPARQL queries.
-Spatial indexes are additional information for accessing the RDF graph.</p>
-<p>The spatial index can be either <a href="http://lucene.apache.org/core">Apache Lucene</a> for a
-same-machine spatial index, or <a href="http://lucene.apache.org/solr/">Apache Solr</a>
-for a large scale enterprise search application.</p>
-<p>Some example code is <a href="https://github.com/apache/jena/tree/main/jena-spatial/src/main/java/examples/">available here</a>.</p>
-<p><em>Illustration</em></p>
-<p>This query makes a spatial query for the places within 10 kilometres of Bristol UK (which as latitude/longitude of 51.46, 2.6).</p>
-<pre><code>PREFIX spatial: &lt;http://jena.apache.org/spatial#&gt;
-PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
-
-SELECT ?placeName
-{
-    ?place spatial:nearby (51.46 2.6 10 'km') .
-    ?place rdfs:label ?placeName
-}
-</code></pre>
-<h2 id="table-of-contents">Table of Contents</h2>
-<ul>
-<li><a href="#how-to-use-it-by-code">How to Use it by Code</a>
-<ul>
-<li><a href="#create-spatial-dataset">Create Spatial Dataset</a></li>
-<li><a href="#supported-geo-data-for-indexing-and-querying">Supported Geo Data for Indexing and Querying</a>
-<ul>
-<li><a href="#builtin-geo-predicates">Builtin Geo Predicates</a></li>
-<li><a href="#custom-geo-predicates">Custom Geo Predicates</a></li>
-</ul>
-</li>
-<li><a href="#load-geo-data-into-spatial-dataset">Load Geo Data into Spatial Dataset</a></li>
-</ul>
-</li>
-<li><a href="#property-function-library">Property Function Library</a></li>
-<li><a href="#spatial-dataset-assembler">Spatial Dataset Assembler</a></li>
-<li><a href="#working-with-solr">Working with Solr</a></li>
-<li><a href="#working-with-fuseki">Working with Fuseki</a></li>
-<li><a href="#building-a-spatial-index">Building a Spatial Index</a></li>
-</ul>
-<h2 id="how-to-use-it-by-code">How to Use it by Code</h2>
-<h3 id="create-spatial-dataset">Create Spatial Dataset</h3>
-<pre><code>import org.apache.jena.query.spatial.EntityDefinition
-...
-// In Lucene, &quot;entityField&quot; stores the uri of the subject (e.g. a place), 
-// while &quot;geoField&quot; holds the indexed geo data (e.g. latitude/longitude).
-// Using fields &quot;uri&quot; and &quot;geo&quot;:
-EntityDefinition entDef = new EntityDefinition(&quot;uri&quot;, &quot;geo&quot;); 
-
-// index in File system (or use an in-memory one)
-Directory dir = FSDirectory.open(indexDir); 
-
-// The baseDataset can be an in-memory or TDB/SDB file based one which contains the geo data. Join together into a dataset.
-Dataset spatialDataset = SpatialDatasetFactory.createLucene(baseDataset, dir, entDef); 
-...
-</code></pre>
-<h3 id="supported-geo-data-for-indexing-and-querying">Supported Geo Data for Indexing and Querying</h3>
-<h4 id="builtin-geo-predicates">Builtin Geo Predicates</h4>
-<p>There are mainly 2 types of RDF representation of geo data, which are both supported by jena-spatial:</p>
-<p><strong>1) Latitude/Longitude Format (in gonames, DBPedia and Linked Geo Data)</strong></p>
-<pre><code>PREFIX geo: &lt;http://www.w3.org/2003/01/geo/wgs84_pos#&gt;
-:EGBB rdf:type :LargeAirport ;
-    geo:lat &quot;52.4539&quot;^^xsd:float ;
-    geo:long &quot;-1.74803&quot;^^xsd:float .
-:EGBB_String rdf:type :LargeAirport ;
-    geo:lat &quot;52.4539&quot; ;
-    geo:long &quot;-1.74803&quot; .
-</code></pre>
-<p><strong>2) Well Known Text (WKT) Literal (in DBPedia and Linked Geo Data)</strong></p>
-<pre><code>PREFIX ogc: &lt;http://www.opengis.net/ont/geosparql#&gt;
-:node1000032677 a :Geometry ;
-    ogc:asWKT &quot;POINT(7.338818000000001 51.4433324)&quot;^^ogc:wktLiteral .
-airports:EGBB_Fake_In_Box rdf:type airports_sc:LargeAirport ;
-    ogc:asWKT &quot;Polygon ((-2.0 51.2, 1.0 51.2, 1.0 51.8, -2.0 51.8, -2.0 51.2))&quot;^^wkt:wktLiteral.
-</code></pre>
-<p>For 2) WKT, DBPedia uses <code>geo:geometry</code>, while Linked Geo Data adopts <code>ogc:asWKT</code> and <code>geo:geometry</code>.</p>
-<p><strong>The builtin predicates that can be automatically processed by jena-spatial include: 1) <code>geo:lat</code>, <code>geo:long</code>; 2) <code>geo:geometry</code>, <code>ogc:asWKT</code>.</strong></p>
-<p><strong>Important note</strong> In order to read geo data in 2) WKT literal format, jena-spatial uses <a href="http://tsusiatsoftware.net/jts/main.html">JTS Topology Suite</a>,
-which is under LGPL licence. jena-spatial <strong>does not</strong> make a hard dependency on JTS. In other words,
-if an end user just uses the feature of 1), there&rsquo;s no need to depend on JTS (i.e. nothing needs to be done). If he wants 2),
-he can make it by setting the <code>SpatialContextFactory</code> of
-<a href="https://github.com/apache/jena/tree/main/jena-spatial/src/main/java/org/apache/jena/query/spatial/EntityDefinition.java">EntityDefinition</a>
-to <code>JtsSpatialContextFactory</code>, which is an optional choice. In this way, the JTS libs should be in the classpath. Here&rsquo;s the sample code:</p>
-<pre><code>import org.apache.jena.query.spatial.EntityDefinition
-...
-EntityDefinition entDef = new EntityDefinition(&quot;uri&quot;, &quot;geo&quot;);
-
-// use JtsSpatialContextFactory to support 2) WKT literals (optional)
-entDef.setSpatialContextFactory(&quot;com.spatial4j.core.context.jts.JtsSpatialContextFactory&quot;);
-...
-</code></pre>
-<h4 id="custom-geo-predicates">Custom Geo Predicates</h4>
-<p>However, there may be more predicates for other data sources for both 1) and 2).
-jena-spatial provides an interface for consuming all kinds of custom geo predicates.
-You can simply add predicates to let jena-spatial recognize them using
-<a href="https://github.com/apache/jena/tree/main/jena-spatial/src/main/java/org/apache/jena/query/spatial/EntityDefinition.java">EntityDefinition</a>:</p>
-<pre><code>import org.apache.jena.query.spatial.EntityDefinition
-...
-
-EntityDefinition entDef = new EntityDefinition(&quot;uri&quot;&quot;, &quot;geo&quot;);
-
-// custom geo predicates for 1) Latitude/Longitude Format
-Resource lat_1 = ResourceFactory.createResource(&quot;http://localhost/jena_example/#latitude_1&quot;) ;
-Resource long_1 ResourceFactory.createResource(&quot;http://localhost/jena_example/#longitude_1&quot;) ;
-entDef.addSpatialPredicatePair(lat_1, long_1) ;
-
-// custom geo predicates for Well Known Text (WKT) Literal
-Resource wkt_1 = ResourceFactory.createResource(&quot;http://localhost/jena_example/#wkt_1&quot;);
-entDef.addWKTPredicate( wkt_1 );
-</code></pre>
-<p>See more supported <a href="https://github.com/apache/jena/tree/main/jena-spatial/src/test/resources/geoarq-data-1.ttl">geo data examples</a></p>
-<h3 id="load-geo-data-into-spatial-dataset">Load Geo Data into Spatial Dataset</h3>
-<pre><code>spatialDataset.begin(ReadWrite.WRITE);
-try {
-    Model m = spatialDataset.getDefaultModel();
-    RDFDataMgr.read(m, file);
-    spatialDataset.commit();
-} finally {
-    spatialDataset.end();
-}
-</code></pre>
-<p>Now the spatial dataset is ready for spatial query.</p>
-<h2 id="property-function-library">Property Function Library</h2>
-<p>The prefix spatial is <code>&lt;http://jena.apache.org/spatial#&gt;</code>.</p>
-<table>
-<thead>
-<tr>
-<th> Property name </th>
-<th> Description </th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>*?place* **spatial:nearby** *(latitude, longitude, radius [, units, limit])*<br>*?place* **spatial:withinCircle** *(latitude, longitude, radius [, units, limit])*</td>
-<td>Query for the <em>?place</em> within the <em>radius</em> distance of the location of <em>(latitude, longitude)</em>. The distance <em>units</em> can be: &ldquo;kilometres&rdquo;/&ldquo;km&rdquo;, &ldquo;miles&rdquo;/&ldquo;mi&rdquo;, &ldquo;metres&rdquo;/&ldquo;m&rdquo;, &ldquo;centimetres&rdquo;/&ldquo;cm&rdquo;, &ldquo;millimetres&rdquo;/&ldquo;mm&rdquo; or &ldquo;degrees&rdquo;/&ldquo;de&rdquo;, which are delivered as the optional strings (the default value is &ldquo;kilometres&rd [...]
-</tr>
-<tr>
-<td>*?place* **spatial:withinBox** *(latitude_min, longitude_min, latitude_max, longitude_max [, limit])*</td>
-<td>Query for the <em>?place</em> within the box area of <em>(latitude_min, longitude_min, latitude_max, longitude_max)</em>.</td>
-</tr>
-<tr>
-<td>*?place* **spatial:intersectBox** *(latitude_min, longitude_min, latitude_max, longitude_max [, limit])*</td>
-<td>Query for the <em>?place</em> intersecting the box area of <em>(latitude_min, longitude_min, latitude_max, longitude_max)</em>.</td>
-</tr>
-<tr>
-<td>*?place* **spatial:north** *(latitude, longitude [, limit])*</td>
-<td>Query for the <em>?place</em> northing the location of <em>(latitude, longitude)</em>.</td>
-</tr>
-<tr>
-<td>*?place* **spatial:south** *(latitude, longitude [, limit])*</td>
-<td>Query for the <em>?place</em> southing the location of <em>(latitude, longitude)</em>.</td>
-</tr>
-<tr>
-<td>*?place* **spatial:west** *(latitude, longitude [, limit])*</td>
-<td>Query for the <em>?place</em> westing the location of <em>(latitude, longitude)</em>.</td>
-</tr>
-<tr>
-<td>*?place* **spatial:east** *(latitude, longitude [, limit])*</td>
-<td>Query for the <em>?place</em> easting the location of <em>(latitude, longitude)</em>.</td>
-</tr>
-</tbody>
-</table>
-<p>See <a href="http://edndoc.esri.com/arcsde/9.1/general_topics/understand_spatial_relations.htm">ESRIs docs on spatial relations</a></p>
-<h2 id="spatial-dataset-assembler">Spatial Dataset Assembler</h2>
-<p>The usual way to describe an index is with a <a href="/documentation/assembler/index.html">Jena assembler description</a>. Configurations can also be built with <a href="#how-to-use-it-by-code">code</a>. The assembler describes a &ldquo;spatial dataset&rdquo; which has an underlying RDF dataset and a spatial index. The spatial index describes the spatial index technology (Lucene or Solr) and the details needed for each.</p>
-<p>A spatial index has an
-<a href="https://github.com/apache/jena/tree/main/jena-spatial/src/main/java/org/apache/jena/query/spatial/EntityDefinition.java">EntityDefinition</a>
-which defines the properties to index, the name of the lucene/solr field used for storing the URI itself (e.g. &ldquo;entityField&rdquo;) and its geo information (e.g. latitude/longitude as &ldquo;geoField&rdquo;), and the custom geo predicates.</p>
-<p>For common RDF spatial query, only &ldquo;entityField&rdquo; and &ldquo;geoField&rdquo; are required with the <a href="#builtin-geo-predicates">builtin geo predicates</a> working well. More complex setups, with multiple <a href="#custom-geo-predicates">custom geo predicates</a> besides the two fields are possible.
-You also optionally use JtsSpatialContextFactory to support indexing WKT literals.</p>
-<p>Once setup this way, any data added to the spatial dataset is automatically indexed as well.</p>
-<p>The following is an example of a TDB dataset with a spatial index.</p>
-<pre><code>## Example of a TDB dataset and spatial index
-
-PREFIX :        &lt;http://localhost/jena_example/#&gt;
-PREFIX rdf:     &lt;http://www.w3.org/1999/02/22-rdf-syntax-ns#&gt;
-PREFIX rdfs:    &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
-PREFIX tdb:     &lt;http://jena.hpl.hp.com/2008/tdb#&gt;
-PREFIX ja:      &lt;http://jena.hpl.hp.com/2005/11/Assembler#&gt;
-PREFIX spatial: &lt;http://jena.apache.org/spatial#&gt;
-
-## ---------------------------------------------------------------
-## This URI must be fixed - it's used to assemble the spatial dataset.
-
-:spatial_dataset rdf:type     spatial:SpatialDataset ;
-    spatial:dataset   &lt;#dataset&gt; ;
-    ##spatial:index   &lt;#indexSolr&gt; ;
-    spatial:index     &lt;#indexLucene&gt; ;
-    .
-
-&lt;#dataset&gt; rdf:type      tdb:DatasetTDB ;
-    tdb:location &quot;--mem--&quot; ;
-    tdb:unionDefaultGraph true ;
-    .
-
-&lt;#indexLucene&gt; a spatial:SpatialIndexLucene ;
-    #spatial:directory &lt;file:Lucene&gt; ;
-    spatial:directory &quot;mem&quot; ;
-    spatial:definition &lt;#definition&gt; ;
-    .
-
-&lt;#definition&gt; a spatial:EntityDefinition ;
-    spatial:entityField      &quot;uri&quot; ;
-    spatial:geoField     &quot;geo&quot; ;
-    # custom geo predicates for 1) Latitude/Longitude Format
-    spatial:hasSpatialPredicatePairs (
-         [ spatial:latitude :latitude_1 ; spatial:longitude :longitude_1 ]
-         [ spatial:latitude :latitude_2 ; spatial:longitude :longitude_2 ]
-         ) ;
-    # custom geo predicates for 2) Well Known Text (WKT) Literal
-    spatial:hasWKTPredicates (:wkt_1 :wkt_2) ;
-    # custom SpatialContextFactory for 2) Well Known Text (WKT) Literal
-    spatial:spatialContextFactory
-         &quot;com.spatial4j.core.context.jts.JtsSpatialContextFactory&quot;
-    .
-</code></pre>
-<p>then use code such as:</p>
-<pre><code>Dataset spatialDataset = DatasetFactory.assemble( &quot;spatial-config.ttl&quot;, 
-    &quot;http://localhost/jena_example/#spatial_dataset&quot;) ;
-</code></pre>
-<p>Key here is that the assembler contains two dataset definitions, one for the spatial dataset, one for the base data. Therefore, the application needs to identify the text dataset by its URI &lsquo;http://localhost/jena_example/#spatial_dataset&rsquo;.</p>
-<h2 id="working-with-solr">Working with Solr</h2>
-<p>Besides Lucene, jena-spatial can work with Solr for spatial query, powered by <a href="http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4">Lucene / Solr 4 Spatial</a> and <a href="http://wiki.apache.org/solr/Solrj">Solrj</a>.</p>
-<p>It&rsquo;s required to add the field definitions for &ldquo;entityField&rdquo; and &ldquo;geoField&rdquo; respectively in <code>schema.xml</code> of Solr.
-The names of the fields in <a href="https://github.com/apache/jena/tree/main/jena-spatial/src/main/java/org/apache/jena/query/spatial/EntityDefinition.java">EntityDefinition</a> should be in accordance with those in <code>schema.xml</code>.
-Here is an example defining the names of &ldquo;entityField&rdquo; as &ldquo;uri&rdquo; and &ldquo;geoField&rdquo; as &ldquo;geo&rdquo;:</p>
-<pre><code>&lt;field name=&quot;uri&quot; type=&quot;string&quot; indexed=&quot;true&quot; stored=&quot;true&quot; required=&quot;true&quot; multiValued=&quot;false&quot; /&gt; 
-&lt;field name=&quot;geo&quot;  type=&quot;location_rpt&quot;  indexed=&quot;true&quot; stored=&quot;true&quot;  multiValued=&quot;true&quot; /&gt; 
-</code></pre>
-<p>The fieldType of &ldquo;entityField&rdquo; is <code>string</code>, while that of &ldquo;geoField&rdquo; is <code>location_rpt</code>:</p>
-<pre><code>&lt;fieldType name=&quot;string&quot; class=&quot;solr.StrField&quot; sortMissingLast=&quot;true&quot; /&gt;
-&lt;fieldType name=&quot;location_rpt&quot; class=&quot;solr.SpatialRecursivePrefixTreeFieldType&quot; geo=&quot;true&quot; distErrPct=&quot;0.025&quot; maxDistErr=&quot;0.000009&quot; units=&quot;degrees&quot; /&gt;
-</code></pre>
-<p>Additionally, in <code>solrconfig.xml</code>, there should be 2 <code>requestHandlers</code> defined for querying and updating the spatial data and the index.</p>
-<pre><code>&lt;requestHandler name=&quot;/select&quot; class=&quot;solr.SearchHandler&quot;&gt;&lt;/requestHandler&gt;
-&lt;requestHandler name=&quot;/update&quot; class=&quot;solr.UpdateRequestHandler&quot;&gt;&lt;/requestHandler&gt;
-</code></pre>
-<p>The above is the least required configuration to run jena-spatial in Solr.
-For more information about the configuration, please check the <a href="http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4">Lucene / Solr 4 Spatial</a> documentation.</p>
-<p>There are also some demonstrations of the usage of Solr in the <a href="https://github.com/apache/jena/tree/main/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/solr">unit tests</a> of jena-spatial.
-They use a <code>EmbeddedSolrServer</code>with a <code>SOLR_HOME</code> sample <a href="https://github.com/apache/jena/tree/main/jena-spatial/src/test/resources/SolrHome">here</a>.</p>
-<h2 id="working-with-fuseki">Working with Fuseki</h2>
-<p>The Fuseki configuration simply points to the spatial dataset as the fuseki:dataset of the service.</p>
-<pre><code>&lt;#service_spatial_tdb&gt; rdf:type fuseki:Service ;
-    rdfs:label                      &quot;TDB/spatial service&quot; ;
-    fuseki:name                     &quot;ds&quot; ;
-    fuseki:serviceQuery             &quot;query&quot; ;
-    fuseki:serviceQuery             &quot;sparql&quot; ;
-    fuseki:serviceUpdate            &quot;update&quot; ;
-    fuseki:serviceUpload            &quot;upload&quot; ;
-    fuseki:serviceReadGraphStore    &quot;get&quot; ;
-    fuseki:serviceReadWriteGraphStore    &quot;data&quot; ;
-    fuseki:dataset                  :spatial_dataset ;
-</code></pre>
-<h2 id="building-a-spatial-index">Building a Spatial Index</h2>
-<p>When working at scale, or when preparing a published, read-only, SPARQL service, creating the index by loading the spatial dataset is impractical. The index and the dataset can be built using command line tools in two steps: first load the RDF data, second create an index from the existing RDF dataset.</p>
-<p>Build the TDB dataset:</p>
-<pre><code>java -cp $FUSEKI_HOME/fuseki-server.jar tdb.tdbloader --tdb=assembler_file data_file
-</code></pre>
-<p>using the copy of TDB included with Fuseki. Alternatively, use one of the TDB utilities tdbloader or tdbloader2:</p>
-<pre><code>$JENA_HOME/bin/tdbloader --loc=directory  data_file
-</code></pre>
-<p>then build the spatial index with the jena.spatialindexer:</p>
-<pre><code>java -cp jena-spatial.jar jena.spatialindexer --desc=assembler_file
-</code></pre>
+	<hr>
+<blockquote>
+<p>The Jena Spatial module has been retired.<br/>
+The last release of Jena with jena-spatial was Jena 3.12.0.<br/>
+See <a href="https://github.com/apache/jena/tree/main/jena-spatial">jena-spatial/README.md</a>.<br/>
+The <a href="spatial-query-doc.md">original documentation is here</a></p>
+</blockquote>
+<hr>
 
 
         </div>
diff --git a/content/documentation/query/sub-select.html b/content/documentation/query/sub-select.html
index 1706438..0a88e36 100644
--- a/content/documentation/query/sub-select.html
+++ b/content/documentation/query/sub-select.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/support.html b/content/documentation/query/support.html
index 0350b3c..27c539f 100644
--- a/content/documentation/query/support.html
+++ b/content/documentation/query/support.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/support_request.html b/content/documentation/query/support_request.html
index 12dc180..b0a9efd 100644
--- a/content/documentation/query/support_request.html
+++ b/content/documentation/query/support_request.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/text-query.html b/content/documentation/query/text-query.html
index 166324b..139efc6 100644
--- a/content/documentation/query/text-query.html
+++ b/content/documentation/query/text-query.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/update.html b/content/documentation/query/update.html
index ef69f98..aaeef2d 100644
--- a/content/documentation/query/update.html
+++ b/content/documentation/query/update.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/writing_functions.html b/content/documentation/query/writing_functions.html
index cc92277..ae0a67c 100644
--- a/content/documentation/query/writing_functions.html
+++ b/content/documentation/query/writing_functions.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/writing_propfuncs.html b/content/documentation/query/writing_propfuncs.html
index 683ece7..3e21c2a 100644
--- a/content/documentation/query/writing_propfuncs.html
+++ b/content/documentation/query/writing_propfuncs.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/query/xsd-support.html b/content/documentation/query/xsd-support.html
index d9aa840..f38668b 100644
--- a/content/documentation/query/xsd-support.html
+++ b/content/documentation/query/xsd-support.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/rdfstar/index.html b/content/documentation/rdf-star/index.html
similarity index 75%
copy from content/documentation/rdfstar/index.html
copy to content/documentation/rdf-star/index.html
index 34b50fd..0252edd 100644
--- a/content/documentation/rdfstar/index.html
+++ b/content/documentation/rdf-star/index.html
@@ -3,7 +3,7 @@
 <head>
     
 
-    <title>Apache Jena - Support of RDF*</title>
+    <title>Apache Jena - Support of RDF-star</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
@@ -118,7 +118,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/rdfstar/__index.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
+                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/rdf-star/__index.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -156,7 +156,7 @@
         
         
             
-                <li class="active">RDFSTAR</li>
+                <li class="active">RDF STAR</li>
             
             
         
@@ -168,30 +168,33 @@
 
                 
             </div>
-            <h1 class="title">Support of RDF*</h1>
+            <h1 class="title">Support of RDF-star</h1>
             
-	<p><a href="https://arxiv.org/abs/1406.3399">RDF*</a> is an extension to RDF that provides
-a way for one triple to refer to another triple. Another resource about RDF* is
+	<p><a href="https://w3c.github.io/rdf-star/">RDF-star</a> is an extension to RDF that provides
+a way for one triple to refer to another triple. RDF* is the name of the
+original work which is described in
 <a href="https://blog.liu.se/olafhartig/2019/01/10/position-statement-rdf-star-and-sparql-star/">Olaf Hartig&rsquo;s blog entry</a>.</p>
 <p>Example:</p>
 <div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-turtle" data-lang="turtle"><span style="">&lt;&lt;</span><span style="color:#bbb"> </span><span style="color:#00f;font-weight:bold">:</span><span style="color:#008000;font-weight:bold">john</span><span style="color:#bbb"> </span><span style="color:#00f;font-weight:bold">foaf:</span><span style="color:#008000;font-weight:bold">name</span><span style="color:#bbb"> </s [...]
-</span></code></pre></div><p>The part <code>&lt;&lt; :john foaf:name &quot;John Smith&quot; &gt;&gt;</code> is a triple term and refers to the triple with subject <code>:john</code>, property <code>foaf:name</code> and object <code>&quot;John Smith&quot;</code>.</p>
+</span></code></pre></div><p>The part <code>&lt;&lt; :john foaf:name &quot;John Smith&quot; &gt;&gt;</code> is an embedded triple and refers to the triple with subject <code>:john</code>, property <code>foaf:name</code> and object <code>&quot;John Smith&quot;</code>.</p>
 <p>Triple terms can be in the subject or object position.</p>
-<p>Jena provides support for RDF* and the related SPARQL*.</p>
+<p>Jena provides support for RDF-star and the related SPARQL-star.</p>
 <ul>
-<li>Turtle, N-Triples, TriG and N-Quads extended for Triple Terms syntax.  There is no output in RDF/XML.</li>
-<li>SPARQL extended with Triple Term syntax for graph matching (in code, use <code>Syntax.syntaxARQ</code>).</li>
+<li>Turtle, N-Triples, TriG and N-Quads extended for Triple Terms syntax,
+input and output.  There is no output in RDF/XML.</li>
+<li>SPARQL extended with Triple Term syntax for graph matching</li>
 <li>SPARQL Result formats for JSON and XML extended to support Triple Terms in results.</li>
 <li>Support in the Model API.</li>
 </ul>
 <p>All this is active by default in Fuseki.</p>
-<p>The aim is to follow the definition of RDF* as well as emerging _de facto_ consensus in other implementations.</p>
-<p>Storage in databases <a href="/documentation/tdb">TDB1</a> and <a href="/documentation/tdb2/">TDB2</a> is supported as of Jena 3.16.0.</p>
-<h2 id="rdf">RDF*</h2>
-<p>RDF* syntax for triple terms is added to the parsers for Turtle, N-Triples, TriG and N-Quads.</p>
-<p>Datasets may have graphs that have triple terms that refer to triples anywhere, not just in the same graph.</p>
-<h2 id="sparql">SPARQL*</h2>
-<p>Matches for triple terms:</p>
+<p>The aim is to follow the definition of the <a href="https://w3c.github.io/rdf-star/">RDF-star community</a>.</p>
+<p>Storage in databases <a href="/documentation/tdb">TDB1</a> and <a href="/documentation/tdb2/">TDB2</a>
+as well as in-memory databases is supported.</p>
+<h2 id="rdf-star">RDF-star</h2>
+<p>RDF-star syntax for embedded triples is added to the parsers for Turtle, N-Triples, TriG and N-Quads.</p>
+<p>Datasets may have graphs that have embedded triples that refer to triples anywhere, not just in the same graph.</p>
+<h2 id="sparql-star">SPARQL-star</h2>
+<p>Matches for embedded triples:</p>
 <div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-sparql" data-lang="sparql"><span style="color:#a2f;font-weight:bold">SELECT</span> <span style="color:#b8860b">?name</span> { <span style="color:#666">&lt;&lt;</span>:<span style="color:#008000;font-weight:bold">john</span> <span style="color:#00f;font-weight:bold">foaf</span>:<span style="color:#008000;font-weight:bold">name</span> <span style="color:#b8860b">?name [...]
 </code></pre></div><p>Insert triples terms into the default graph to record the graph source.</p>
 <div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-sparql" data-lang="sparql"><span style="color:#a2f;font-weight:bold">INSERT</span> { <span style="color:#666">&lt;&lt;</span><span style="color:#b8860b">?s</span> <span style="color:#b8860b">?p</span> <span style="color:#b8860b">?o</span><span style="color:#666">&gt;&gt;</span> <span style="color:#00f;font-weight:bold">dct</span>:<span style="color:#008000;font-weig [...]
@@ -200,7 +203,15 @@ a way for one triple to refer to another triple. Another resource about RDF* is
         <span style="color:#b8860b">?s</span> <span style="color:#b8860b">?p</span> <span style="color:#b8860b">?o</span>
     }
 }
-</code></pre></div><h3 id="sparql-functions-related-to-triple-terms">SPARQL Functions related to triple terms</h3>
+</code></pre></div><p>Use in expressions:</p>
+<div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-sparql" data-lang="sparql"><span style="color:#a2f;font-weight:bold">SELECT</span> <span style="color:#b8860b">?t</span> {
+   <span style="color:#b8860b">?s</span> <span style="color:#b8860b">?p</span> <span style="color:#b8860b">?o</span> 
+   <span style="color:#a2f;font-weight:bold">BIND</span>(<span style="color:#666">&lt;&lt;</span> <span style="color:#b8860b">?s</span> <span style="color:#b8860b">?p</span> <span style="color:#b8860b">?o</span><span style="color:#666">&gt;&gt;</span> <span style="color:#a2f;font-weight:bold">AS</span> <span style="color:#b8860b">?t</span>)
+}
+</code></pre></div><div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-sparql" data-lang="sparql"><span style="color:#a2f;font-weight:bold">SELECT</span> (<span style="color:#666">&lt;&lt;</span> <span style="color:#b8860b">?s</span> <span style="color:#b8860b">?p</span> <span style="color:#b8860b">?o</span><span style="color:#666">&gt;&gt;</span> <span style="color:#a2f;font-weight:bold">AS</span> <span style="color [...]
+   <span style="color:#b8860b">?s</span> <span style="color:#b8860b">?p</span> <span style="color:#b8860b">?o</span> 
+}
+</code></pre></div><h3 id="sparql-functions-related-to-embedded-triples">SPARQL Functions related to embedded triples</h3>
 <p>These functions cause an expression error if passed the wrong type of arguments. <code>afn:</code>
 is a prefix for <code>&lt;http://jena.apache.org/ARQ/function#&gt;</code>.</p>
 <table>
@@ -212,73 +223,55 @@ is a prefix for <code>&lt;http://jena.apache.org/ARQ/function#&gt;</code>.</p>
 </thead>
 <tbody>
 <tr>
-<td><code>afn:subject(?t)</code></td>
-<td>Return the subject of the triple term</td>
-</tr>
-<tr>
-<td><code>afn:predicate(?t)</code></td>
-<td>Return the predicate (property) of the triple term</td>
+<td><code>TRIPLE(?s, ?p, ?o)</code></td>
+<td>Create an embedded triple from s/p/o</td>
 </tr>
 <tr>
-<td><code>afn:object(?t)</code></td>
-<td>Return the object of the triple term</td>
+<td><code>isTRIPLE(?t)</code></td>
+<td>Return true if the argument value is an embedded triple</td>
 </tr>
 <tr>
-<td><code>afn:triple(?s, ?p, ?o)</code></td>
-<td>Create a triple term from s/p/o</td>
+<td><code>SUBJECT(?t)</code></td>
+<td>Return the subject of the embedded triple</td>
 </tr>
 <tr>
-<td><code>afn:isTriple(?t)</code></td>
-<td>Return true if the argument value is a triple term</td>
+<td><code>PREDICATE(?t)</code></td>
+<td>Return the predicate (property) of the embedded triple</td>
 </tr>
-</tbody>
-</table>
-<h3 id="sparql-property-functions-related-to-triple-terms">SPARQL Property Functions related to triple terms</h3>
-<p><code>apf:</code> is a prefix for <code>&lt;http://jena.apache.org/ARQ/property#&gt;</code>.</p>
-<table>
-<thead>
-<tr>
-<th>Property Function</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
 <tr>
-<td><code>&lt;&lt; s p o &gt;&gt; apf:find t</code> .</td>
-<td>Match the triple term. Any <code>s</code>, <code>p</code>, <code>o</code>, and <code>t</code> can be RDF terms or variables.</td>
+<td><code>OBJECT(?t)</code></td>
+<td>Return the object of the embedded triple</td>
 </tr>
 </tbody>
 </table>
-<p><code>apf:find</code> will result in all the variables being set according to the match,
-If <code>t</code> is a variable, <code>?t</code>, it is bound to a triple term for the match of <code>&lt;&lt;s p o&gt;&gt;</code>.</p>
 <h3 id="sparql-results">SPARQL results</h3>
 <p>The syntaxes for SPARQL results from a SELECT query, <code>application/sparql-results+json</code>,
-<code>application/sparql-results+xml</code> are extended to include triple terms:</p>
-<p>The triple term <code>&lt;&lt; _:b0 &lt;http://example/p&gt; 123  &gt;&gt;</code> is encoded, in
+<code>application/sparql-results+xml</code> are extended to include embedded triples:</p>
+<p>The embedded triple <code>&lt;&lt; _:b0 &lt;http://example/p&gt; 123  &gt;&gt;</code> is encoded, in
 <code>application/sparql-results+json</code> as:</p>
 <div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-json" data-lang="json">    {
       <span style="color:#008000;font-weight:bold">&#34;type&#34;</span>: <span style="color:#b44">&#34;triple&#34;</span> ,
       <span style="color:#008000;font-weight:bold">&#34;value&#34;</span>: {
-        <span style="color:#008000;font-weight:bold">&#34;subject&#34;</span>:   { <span style="color:#008000;font-weight:bold">&#34;type&#34;</span>: <span style="color:#b44">&#34;bnode&#34;</span> , <span style="color:#008000;font-weight:bold">&#34;value&#34;</span>: <span style="color:#b44">&#34;b0&#34;</span> } ,
-        <span style="color:#008000;font-weight:bold">&#34;property&#34;</span>:  { <span style="color:#008000;font-weight:bold">&#34;type&#34;</span>: <span style="color:#b44">&#34;uri&#34;</span> , <span style="color:#008000;font-weight:bold">&#34;value&#34;</span>: <span style="color:#b44">&#34;http://example/p&#34;</span> } ,
-        <span style="color:#008000;font-weight:bold">&#34;object&#34;</span>:    { <span style="color:#008000;font-weight:bold">&#34;type&#34;</span>: <span style="color:#b44">&#34;literal&#34;</span> , <span style="color:#008000;font-weight:bold">&#34;datatype&#34;</span>: <span style="color:#b44">&#34;http://www.w3.org/2001/XMLSchema#integer&#34;</span> , <span style="color:#008000;font-weight:bold">&#34;value&#34;</span>: <span style="color:#b44">&#34;123&#34;</span> }
+        <span style="color:#008000;font-weight:bold">&#34;subject&#34;</span>:    { <span style="color:#008000;font-weight:bold">&#34;type&#34;</span>: <span style="color:#b44">&#34;bnode&#34;</span> , <span style="color:#008000;font-weight:bold">&#34;value&#34;</span>: <span style="color:#b44">&#34;b0&#34;</span> } ,
+        <span style="color:#008000;font-weight:bold">&#34;predicate&#34;</span>:  { <span style="color:#008000;font-weight:bold">&#34;type&#34;</span>: <span style="color:#b44">&#34;uri&#34;</span> , <span style="color:#008000;font-weight:bold">&#34;value&#34;</span>: <span style="color:#b44">&#34;http://example/p&#34;</span> } ,
+        <span style="color:#008000;font-weight:bold">&#34;object&#34;</span>:     { <span style="color:#008000;font-weight:bold">&#34;type&#34;</span>: <span style="color:#b44">&#34;literal&#34;</span> , <span style="color:#008000;font-weight:bold">&#34;datatype&#34;</span>: <span style="color:#b44">&#34;http://www.w3.org/2001/XMLSchema#integer&#34;</span> , <span style="color:#008000;font-weight:bold">&#34;value&#34;</span>: <span style="color:#b44">&#34;123&#34;</span> }
     }
 </code></pre></div><p>and similarly in <code>application/sparql-results+xml</code>:</p>
 <div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-xml" data-lang="xml">    <span style="color:#008000;font-weight:bold">&lt;triple&gt;</span>
       <span style="color:#008000;font-weight:bold">&lt;subject&gt;</span>
         <span style="color:#008000;font-weight:bold">&lt;bnode&gt;</span>b0<span style="color:#008000;font-weight:bold">&lt;/bnode&gt;</span>
       <span style="color:#008000;font-weight:bold">&lt;/subject&gt;</span>
-      <span style="color:#008000;font-weight:bold">&lt;property&gt;</span>
+      <span style="color:#008000;font-weight:bold">&lt;predicate&gt;</span>
         <span style="color:#008000;font-weight:bold">&lt;uri&gt;</span>http://example/p<span style="color:#008000;font-weight:bold">&lt;/uri&gt;</span>
-      <span style="color:#008000;font-weight:bold">&lt;/property&gt;</span>
+      <span style="color:#008000;font-weight:bold">&lt;/predicate&gt;</span>
       <span style="color:#008000;font-weight:bold">&lt;object&gt;</span>
         <span style="color:#008000;font-weight:bold">&lt;literal</span> <span style="color:#b44">datatype=</span><span style="color:#b44">&#34;http://www.w3.org/2001/XMLSchema#integer&#34;</span><span style="color:#008000;font-weight:bold">&gt;</span>123<span style="color:#008000;font-weight:bold">&lt;/literal&gt;</span>
       <span style="color:#008000;font-weight:bold">&lt;/object&gt;</span>
     <span style="color:#008000;font-weight:bold">&lt;/triple&gt;</span>
 </code></pre></div><h2 id="model-api">Model API</h2>
-<p>RDF* triple terms are treated as <code>Resource</code> to preserve the typed Model API.
+<p>RDF-star embedded triples are treated as <code>Resource</code> to preserve the typed Model API.
 They occur in the subject and object positions.</p>
-<p>A <code>Resource</code> contains a <code>Statement</code> object if the underlying RDF term is an RDF* triple term.</p>
+<p>A <code>Resource</code> contains a <code>Statement</code> object if the underlying RDF term is an RDF-star embedded triple.</p>
 <p>New methods include:</p>
 <ul>
 <li><code>Statement  Resource.getStatement()</code></li>
diff --git a/content/documentation/rdf/datasets.html b/content/documentation/rdf/datasets.html
index ec8716f..150f546 100644
--- a/content/documentation/rdf/datasets.html
+++ b/content/documentation/rdf/datasets.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/rdf/index.html b/content/documentation/rdf/index.html
index ceab9e5..5482109 100644
--- a/content/documentation/rdf/index.html
+++ b/content/documentation/rdf/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/rdfconnection/index.html b/content/documentation/rdfconnection/index.html
index 4966e23..0aca953 100644
--- a/content/documentation/rdfconnection/index.html
+++ b/content/documentation/rdfconnection/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/rdfstar/index.html b/content/documentation/rdfstar/index.html
index 34b50fd..2d0d95c 100644
--- a/content/documentation/rdfstar/index.html
+++ b/content/documentation/rdfstar/index.html
@@ -1,316 +1 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    
-
-    <title>Apache Jena - Support of RDF*</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
-    <link href="/css/bootstrap-extension.css" rel="stylesheet" type="text/css">
-    <link href="/css/jena.css" rel="stylesheet" type="text/css">
-    <link rel="shortcut icon" href="/images/favicon.ico" />
-
-    <script src="https://code.jquery.com/jquery-2.2.4.min.js"
-            integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44="
-            crossorigin="anonymous"></script>
-    <script src="/js/jena-navigation.js" type="text/javascript"></script>
-    <script src="/js/bootstrap.min.js" type="text/javascript"></script>
-
-    <script src="/js/improve.js" type="text/javascript"></script>
-
-    
-</head>
-
-<body>
-
-<nav class="navbar navbar-default" role="navigation">
-    <div class="container">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="/index.html">
-                <img class="logo-menu" src="/images/jena-logo/jena-logo-notext-small.png" alt="jena logo">Apache Jena</a>
-        </div>
-
-        <div class="collapse navbar-collapse navbar-ex1-collapse">
-            <ul class="nav navbar-nav">
-                <li id="homepage"><a href="/index.html"><span class="glyphicon glyphicon-home"></span> Home</a></li>
-                <li id="download"><a href="/download/index.cgi"><span class="glyphicon glyphicon-download-alt"></span> Download</a></li>
-                <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Learn <b class="caret"></b></a>
-                    <ul class="dropdown-menu">
-                        <li class="dropdown-header">Tutorials</li>
-                        <li><a href="/tutorials/index.html">Overview</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/javadoc.html">Javadoc</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/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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
-                        <li><a href="/documentation/hadoop/index.html">Elephas - tools for RDF on Hadoop</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>
-                    </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/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/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/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
-                    </ul>
-                </li>
-
-                <li id="ask"><a href="/help_and_support/index.html"><span class="glyphicon glyphicon-question-sign"></span> Ask</a></li>
-
-                <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-bullhorn"></span> Get involved <b class="caret"></b></a>
-                    <ul class="dropdown-menu">
-                        <li><a href="/getting_involved/index.html">Contribute</a></li>
-                        <li><a href="/help_and_support/bugs_and_suggestions.html">Report a bug</a></li>
-                        <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/roadmap.html">Roadmap</a></li>
-                        <li><a href="/about_jena/architecture.html">Architecture</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 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/security/">Security</a></li>
-                    </ul>
-                </li>
-
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/rdfstar/__index.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
-            </ul>
-        </div>
-    </div>
-</nav>
-
-
-<div class="container">
-    <div class="row">
-        <div class="col-md-12">
-            <div id="breadcrumbs">
-                
-                    
-
-
-
-
-    
-    
-
-
-<ol class="breadcrumb">
-    
-    
-        
-        
-    
-        
-        
-            
-                <li><a href='/documentation'>DOCUMENTATION</a></li>
-            
-            
-        
-    
-        
-        
-            
-                <li class="active">RDFSTAR</li>
-            
-            
-        
-    
-</ol>
-
-
-
-
-                
-            </div>
-            <h1 class="title">Support of RDF*</h1>
-            
-	<p><a href="https://arxiv.org/abs/1406.3399">RDF*</a> is an extension to RDF that provides
-a way for one triple to refer to another triple. Another resource about RDF* is
-<a href="https://blog.liu.se/olafhartig/2019/01/10/position-statement-rdf-star-and-sparql-star/">Olaf Hartig&rsquo;s blog entry</a>.</p>
-<p>Example:</p>
-<div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-turtle" data-lang="turtle"><span style="">&lt;&lt;</span><span style="color:#bbb"> </span><span style="color:#00f;font-weight:bold">:</span><span style="color:#008000;font-weight:bold">john</span><span style="color:#bbb"> </span><span style="color:#00f;font-weight:bold">foaf:</span><span style="color:#008000;font-weight:bold">name</span><span style="color:#bbb"> </s [...]
-</span></code></pre></div><p>The part <code>&lt;&lt; :john foaf:name &quot;John Smith&quot; &gt;&gt;</code> is a triple term and refers to the triple with subject <code>:john</code>, property <code>foaf:name</code> and object <code>&quot;John Smith&quot;</code>.</p>
-<p>Triple terms can be in the subject or object position.</p>
-<p>Jena provides support for RDF* and the related SPARQL*.</p>
-<ul>
-<li>Turtle, N-Triples, TriG and N-Quads extended for Triple Terms syntax.  There is no output in RDF/XML.</li>
-<li>SPARQL extended with Triple Term syntax for graph matching (in code, use <code>Syntax.syntaxARQ</code>).</li>
-<li>SPARQL Result formats for JSON and XML extended to support Triple Terms in results.</li>
-<li>Support in the Model API.</li>
-</ul>
-<p>All this is active by default in Fuseki.</p>
-<p>The aim is to follow the definition of RDF* as well as emerging _de facto_ consensus in other implementations.</p>
-<p>Storage in databases <a href="/documentation/tdb">TDB1</a> and <a href="/documentation/tdb2/">TDB2</a> is supported as of Jena 3.16.0.</p>
-<h2 id="rdf">RDF*</h2>
-<p>RDF* syntax for triple terms is added to the parsers for Turtle, N-Triples, TriG and N-Quads.</p>
-<p>Datasets may have graphs that have triple terms that refer to triples anywhere, not just in the same graph.</p>
-<h2 id="sparql">SPARQL*</h2>
-<p>Matches for triple terms:</p>
-<div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-sparql" data-lang="sparql"><span style="color:#a2f;font-weight:bold">SELECT</span> <span style="color:#b8860b">?name</span> { <span style="color:#666">&lt;&lt;</span>:<span style="color:#008000;font-weight:bold">john</span> <span style="color:#00f;font-weight:bold">foaf</span>:<span style="color:#008000;font-weight:bold">name</span> <span style="color:#b8860b">?name [...]
-</code></pre></div><p>Insert triples terms into the default graph to record the graph source.</p>
-<div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-sparql" data-lang="sparql"><span style="color:#a2f;font-weight:bold">INSERT</span> { <span style="color:#666">&lt;&lt;</span><span style="color:#b8860b">?s</span> <span style="color:#b8860b">?p</span> <span style="color:#b8860b">?o</span><span style="color:#666">&gt;&gt;</span> <span style="color:#00f;font-weight:bold">dct</span>:<span style="color:#008000;font-weig [...]
-<span style="color:#a2f;font-weight:bold">WHERE</span> {
-    <span style="color:#a2f;font-weight:bold">GRAPH</span> <span style="color:#a0a000">&lt;http://example/directory&gt;</span> {
-        <span style="color:#b8860b">?s</span> <span style="color:#b8860b">?p</span> <span style="color:#b8860b">?o</span>
-    }
-}
-</code></pre></div><h3 id="sparql-functions-related-to-triple-terms">SPARQL Functions related to triple terms</h3>
-<p>These functions cause an expression error if passed the wrong type of arguments. <code>afn:</code>
-is a prefix for <code>&lt;http://jena.apache.org/ARQ/function#&gt;</code>.</p>
-<table>
-<thead>
-<tr>
-<th>Function</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><code>afn:subject(?t)</code></td>
-<td>Return the subject of the triple term</td>
-</tr>
-<tr>
-<td><code>afn:predicate(?t)</code></td>
-<td>Return the predicate (property) of the triple term</td>
-</tr>
-<tr>
-<td><code>afn:object(?t)</code></td>
-<td>Return the object of the triple term</td>
-</tr>
-<tr>
-<td><code>afn:triple(?s, ?p, ?o)</code></td>
-<td>Create a triple term from s/p/o</td>
-</tr>
-<tr>
-<td><code>afn:isTriple(?t)</code></td>
-<td>Return true if the argument value is a triple term</td>
-</tr>
-</tbody>
-</table>
-<h3 id="sparql-property-functions-related-to-triple-terms">SPARQL Property Functions related to triple terms</h3>
-<p><code>apf:</code> is a prefix for <code>&lt;http://jena.apache.org/ARQ/property#&gt;</code>.</p>
-<table>
-<thead>
-<tr>
-<th>Property Function</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><code>&lt;&lt; s p o &gt;&gt; apf:find t</code> .</td>
-<td>Match the triple term. Any <code>s</code>, <code>p</code>, <code>o</code>, and <code>t</code> can be RDF terms or variables.</td>
-</tr>
-</tbody>
-</table>
-<p><code>apf:find</code> will result in all the variables being set according to the match,
-If <code>t</code> is a variable, <code>?t</code>, it is bound to a triple term for the match of <code>&lt;&lt;s p o&gt;&gt;</code>.</p>
-<h3 id="sparql-results">SPARQL results</h3>
-<p>The syntaxes for SPARQL results from a SELECT query, <code>application/sparql-results+json</code>,
-<code>application/sparql-results+xml</code> are extended to include triple terms:</p>
-<p>The triple term <code>&lt;&lt; _:b0 &lt;http://example/p&gt; 123  &gt;&gt;</code> is encoded, in
-<code>application/sparql-results+json</code> as:</p>
-<div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-json" data-lang="json">    {
-      <span style="color:#008000;font-weight:bold">&#34;type&#34;</span>: <span style="color:#b44">&#34;triple&#34;</span> ,
-      <span style="color:#008000;font-weight:bold">&#34;value&#34;</span>: {
-        <span style="color:#008000;font-weight:bold">&#34;subject&#34;</span>:   { <span style="color:#008000;font-weight:bold">&#34;type&#34;</span>: <span style="color:#b44">&#34;bnode&#34;</span> , <span style="color:#008000;font-weight:bold">&#34;value&#34;</span>: <span style="color:#b44">&#34;b0&#34;</span> } ,
-        <span style="color:#008000;font-weight:bold">&#34;property&#34;</span>:  { <span style="color:#008000;font-weight:bold">&#34;type&#34;</span>: <span style="color:#b44">&#34;uri&#34;</span> , <span style="color:#008000;font-weight:bold">&#34;value&#34;</span>: <span style="color:#b44">&#34;http://example/p&#34;</span> } ,
-        <span style="color:#008000;font-weight:bold">&#34;object&#34;</span>:    { <span style="color:#008000;font-weight:bold">&#34;type&#34;</span>: <span style="color:#b44">&#34;literal&#34;</span> , <span style="color:#008000;font-weight:bold">&#34;datatype&#34;</span>: <span style="color:#b44">&#34;http://www.w3.org/2001/XMLSchema#integer&#34;</span> , <span style="color:#008000;font-weight:bold">&#34;value&#34;</span>: <span style="color:#b44">&#34;123&#34;</span> }
-    }
-</code></pre></div><p>and similarly in <code>application/sparql-results+xml</code>:</p>
-<div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-xml" data-lang="xml">    <span style="color:#008000;font-weight:bold">&lt;triple&gt;</span>
-      <span style="color:#008000;font-weight:bold">&lt;subject&gt;</span>
-        <span style="color:#008000;font-weight:bold">&lt;bnode&gt;</span>b0<span style="color:#008000;font-weight:bold">&lt;/bnode&gt;</span>
-      <span style="color:#008000;font-weight:bold">&lt;/subject&gt;</span>
-      <span style="color:#008000;font-weight:bold">&lt;property&gt;</span>
-        <span style="color:#008000;font-weight:bold">&lt;uri&gt;</span>http://example/p<span style="color:#008000;font-weight:bold">&lt;/uri&gt;</span>
-      <span style="color:#008000;font-weight:bold">&lt;/property&gt;</span>
-      <span style="color:#008000;font-weight:bold">&lt;object&gt;</span>
-        <span style="color:#008000;font-weight:bold">&lt;literal</span> <span style="color:#b44">datatype=</span><span style="color:#b44">&#34;http://www.w3.org/2001/XMLSchema#integer&#34;</span><span style="color:#008000;font-weight:bold">&gt;</span>123<span style="color:#008000;font-weight:bold">&lt;/literal&gt;</span>
-      <span style="color:#008000;font-weight:bold">&lt;/object&gt;</span>
-    <span style="color:#008000;font-weight:bold">&lt;/triple&gt;</span>
-</code></pre></div><h2 id="model-api">Model API</h2>
-<p>RDF* triple terms are treated as <code>Resource</code> to preserve the typed Model API.
-They occur in the subject and object positions.</p>
-<p>A <code>Resource</code> contains a <code>Statement</code> object if the underlying RDF term is an RDF* triple term.</p>
-<p>New methods include:</p>
-<ul>
-<li><code>Statement  Resource.getStatement()</code></li>
-<li><code>Resource  Model.createResource(Statement)</code></li>
-<li><code>Resource  ResourceFactory.createStatement</code></li>
-</ul>
-
-
-        </div>
-    </div>
-
-</div>
-
-<footer class="footer">
-    <div class="container">
-        <p>
-            Copyright &copy; 2011&ndash;2021 The Apache Software Foundation, Licensed under the
-            <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        </p>
-        <p>
-            Apache Jena, Jena, the Apache Jena project logo, Apache and the Apache feather logos are trademarks of
-            The Apache Software Foundation.
-        </p>
-    </div>
-</footer>
-
-
-<script type="text/javascript">
-    var link = $('a[href="' + this.location.pathname + '"]');
-    if (link != undefined)
-        link.parents('li,ul').addClass('active');
-</script>
-
-</body>
-</html>
+<!DOCTYPE html><html><head><title>https://jena.apache.org/documentation/rdf-star/</title><link rel="canonical" href="https://jena.apache.org/documentation/rdf-star/"/><meta name="robots" content="noindex"><meta charset="utf-8" /><meta http-equiv="refresh" content="0; url=https://jena.apache.org/documentation/rdf-star/" /></head></html>
\ No newline at end of file
diff --git a/content/documentation/sdb/commands.html b/content/documentation/sdb/commands.html
index 797ea77..a868829 100644
--- a/content/documentation/sdb/commands.html
+++ b/content/documentation/sdb/commands.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/sdb/configuration.html b/content/documentation/sdb/configuration.html
index 23be743..e4d7989 100644
--- a/content/documentation/sdb/configuration.html
+++ b/content/documentation/sdb/configuration.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/sdb/database_layouts.html b/content/documentation/sdb/database_layouts.html
index 0d6bdfd..11a83eb 100644
--- a/content/documentation/sdb/database_layouts.html
+++ b/content/documentation/sdb/database_layouts.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/sdb/databases_supported.html b/content/documentation/sdb/databases_supported.html
index 53b8c86..d060cce 100644
--- a/content/documentation/sdb/databases_supported.html
+++ b/content/documentation/sdb/databases_supported.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/sdb/dataset_description.html b/content/documentation/sdb/dataset_description.html
index b1ff982..34f4b26 100644
--- a/content/documentation/sdb/dataset_description.html
+++ b/content/documentation/sdb/dataset_description.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/sdb/db_notes.html b/content/documentation/sdb/db_notes.html
index f343549..7eb6441 100644
--- a/content/documentation/sdb/db_notes.html
+++ b/content/documentation/sdb/db_notes.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/sdb/faq.html b/content/documentation/sdb/faq.html
index efd6261..9cd8c9d 100644
--- a/content/documentation/sdb/faq.html
+++ b/content/documentation/sdb/faq.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/sdb/fuseki_integration.html b/content/documentation/sdb/fuseki_integration.html
index de742ed..3d67e00 100644
--- a/content/documentation/sdb/fuseki_integration.html
+++ b/content/documentation/sdb/fuseki_integration.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/sdb/index.html b/content/documentation/sdb/index.html
index a570914..d50864c 100644
--- a/content/documentation/sdb/index.html
+++ b/content/documentation/sdb/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/sdb/installation.html b/content/documentation/sdb/installation.html
index 2099114..f48fb38 100644
--- a/content/documentation/sdb/installation.html
+++ b/content/documentation/sdb/installation.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/sdb/javaapi.html b/content/documentation/sdb/javaapi.html
index a4d3fd7..3b3076b 100644
--- a/content/documentation/sdb/javaapi.html
+++ b/content/documentation/sdb/javaapi.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/sdb/loading_data.html b/content/documentation/sdb/loading_data.html
index 3fe0fa4..bb7a9ff 100644
--- a/content/documentation/sdb/loading_data.html
+++ b/content/documentation/sdb/loading_data.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/sdb/loading_performance.html b/content/documentation/sdb/loading_performance.html
index 1f2821a..e0c2c60 100644
--- a/content/documentation/sdb/loading_performance.html
+++ b/content/documentation/sdb/loading_performance.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/sdb/query_performance.html b/content/documentation/sdb/query_performance.html
index 42adf18..759b289 100644
--- a/content/documentation/sdb/query_performance.html
+++ b/content/documentation/sdb/query_performance.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/sdb/quickstart.html b/content/documentation/sdb/quickstart.html
index 0c5960c..95ceefd 100644
--- a/content/documentation/sdb/quickstart.html
+++ b/content/documentation/sdb/quickstart.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/sdb/sdb_index.html b/content/documentation/sdb/sdb_index.html
index 42d63ec..6d7b256 100644
--- a/content/documentation/sdb/sdb_index.html
+++ b/content/documentation/sdb/sdb_index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/sdb/store_description.html b/content/documentation/sdb/store_description.html
index 6f0c5c4..f003a48 100644
--- a/content/documentation/sdb/store_description.html
+++ b/content/documentation/sdb/store_description.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/serving_data/index.html b/content/documentation/serving_data/index.html
index 7fdf351..dc1dea9 100644
--- a/content/documentation/serving_data/index.html
+++ b/content/documentation/serving_data/index.html
@@ -1,212 +1 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    
-
-    <title>Apache Jena - Fuseki: serving RDF data over HTTP</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
-    <link href="/css/bootstrap-extension.css" rel="stylesheet" type="text/css">
-    <link href="/css/jena.css" rel="stylesheet" type="text/css">
-    <link rel="shortcut icon" href="/images/favicon.ico" />
-
-    <script src="https://code.jquery.com/jquery-2.2.4.min.js"
-            integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44="
-            crossorigin="anonymous"></script>
-    <script src="/js/jena-navigation.js" type="text/javascript"></script>
-    <script src="/js/bootstrap.min.js" type="text/javascript"></script>
-
-    <script src="/js/improve.js" type="text/javascript"></script>
-
-    
-</head>
-
-<body>
-
-<nav class="navbar navbar-default" role="navigation">
-    <div class="container">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="/index.html">
-                <img class="logo-menu" src="/images/jena-logo/jena-logo-notext-small.png" alt="jena logo">Apache Jena</a>
-        </div>
-
-        <div class="collapse navbar-collapse navbar-ex1-collapse">
-            <ul class="nav navbar-nav">
-                <li id="homepage"><a href="/index.html"><span class="glyphicon glyphicon-home"></span> Home</a></li>
-                <li id="download"><a href="/download/index.cgi"><span class="glyphicon glyphicon-download-alt"></span> Download</a></li>
-                <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-book"></span> Learn <b class="caret"></b></a>
-                    <ul class="dropdown-menu">
-                        <li class="dropdown-header">Tutorials</li>
-                        <li><a href="/tutorials/index.html">Overview</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/javadoc.html">Javadoc</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/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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</a></li>
-                        <li><a href="/documentation/tools/index.html">Command-line tools</a></li>
-                        <li><a href="/documentation/hadoop/index.html">Elephas - tools for RDF on Hadoop</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>
-                    </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/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/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/extras/querybuilder/">Query Builder</a></li>
-                        <li><a href="/documentation/javadoc.html">All Javadoc</a></li>
-                    </ul>
-                </li>
-
-                <li id="ask"><a href="/help_and_support/index.html"><span class="glyphicon glyphicon-question-sign"></span> Ask</a></li>
-
-                <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-bullhorn"></span> Get involved <b class="caret"></b></a>
-                    <ul class="dropdown-menu">
-                        <li><a href="/getting_involved/index.html">Contribute</a></li>
-                        <li><a href="/help_and_support/bugs_and_suggestions.html">Report a bug</a></li>
-                        <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/roadmap.html">Roadmap</a></li>
-                        <li><a href="/about_jena/architecture.html">Architecture</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 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/security/">Security</a></li>
-                    </ul>
-                </li>
-
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/serving_data/__index.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
-            </ul>
-        </div>
-    </div>
-</nav>
-
-
-<div class="container">
-    <div class="row">
-        <div class="col-md-12">
-            <div id="breadcrumbs">
-                
-                    
-
-
-
-
-    
-    
-
-
-<ol class="breadcrumb">
-    
-    
-        
-        
-    
-        
-        
-            
-                <li><a href='/documentation'>DOCUMENTATION</a></li>
-            
-            
-        
-    
-        
-        
-            
-                <li class="active">SERVING DATA</li>
-            
-            
-        
-    
-</ol>
-
-
-
-
-                
-            </div>
-            <h1 class="title">Fuseki: serving RDF data over HTTP</h1>
-            
-	<h2 id="see-the-fuseki2-documentationdocumentationfuseki2">See the <a href="/documentation/fuseki2/">Fuseki2 documentation</a>.</h2>
-<hr>
-<blockquote>
-<p>This page covers Fuseki1.<br/>
-Fuseki1 is deprecated and has been retired.<br/>
-<a href="/documentation/fuseki2/">Fuseki2</a> is current.<br/>
-<br/>
-The last release of Jena with this module is Jena 3.9.0.<br/>
-The <a href="/documentation/archive/serving_data/fuseki1.html">original documentation</a>.</p>
-</blockquote>
-<hr>
-
-
-        </div>
-    </div>
-
-</div>
-
-<footer class="footer">
-    <div class="container">
-        <p>
-            Copyright &copy; 2011&ndash;2021 The Apache Software Foundation, Licensed under the
-            <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        </p>
-        <p>
-            Apache Jena, Jena, the Apache Jena project logo, Apache and the Apache feather logos are trademarks of
-            The Apache Software Foundation.
-        </p>
-    </div>
-</footer>
-
-
-<script type="text/javascript">
-    var link = $('a[href="' + this.location.pathname + '"]');
-    if (link != undefined)
-        link.parents('li,ul').addClass('active');
-</script>
-
-</body>
-</html>
+<!DOCTYPE html><html><head><title>https://jena.apache.org/documentation/fuseki2/</title><link rel="canonical" href="https://jena.apache.org/documentation/fuseki2/"/><meta name="robots" content="noindex"><meta charset="utf-8" /><meta http-equiv="refresh" content="0; url=https://jena.apache.org/documentation/fuseki2/" /></head></html>
\ No newline at end of file
diff --git a/content/documentation/shacl/index.html b/content/documentation/shacl/index.html
index b06a428..2464f76 100644
--- a/content/documentation/shacl/index.html
+++ b/content/documentation/shacl/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb/architecture.html b/content/documentation/tdb/architecture.html
index 973da78..3067008 100644
--- a/content/documentation/tdb/architecture.html
+++ b/content/documentation/tdb/architecture.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb/assembler.html b/content/documentation/tdb/assembler.html
index 6cac67d..380ff08 100644
--- a/content/documentation/tdb/assembler.html
+++ b/content/documentation/tdb/assembler.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb/commands.html b/content/documentation/tdb/commands.html
index 3259fb2..ea1ac8c 100644
--- a/content/documentation/tdb/commands.html
+++ b/content/documentation/tdb/commands.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb/configuration.html b/content/documentation/tdb/configuration.html
index 2a1c3a2..a30732c 100644
--- a/content/documentation/tdb/configuration.html
+++ b/content/documentation/tdb/configuration.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb/datasets.html b/content/documentation/tdb/datasets.html
index b6168a2..a22b814 100644
--- a/content/documentation/tdb/datasets.html
+++ b/content/documentation/tdb/datasets.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb/dynamic_datasets.html b/content/documentation/tdb/dynamic_datasets.html
index 8d37624..c6ce17c 100644
--- a/content/documentation/tdb/dynamic_datasets.html
+++ b/content/documentation/tdb/dynamic_datasets.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb/faqs.html b/content/documentation/tdb/faqs.html
index a983738..cdccce0 100644
--- a/content/documentation/tdb/faqs.html
+++ b/content/documentation/tdb/faqs.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb/index.html b/content/documentation/tdb/index.html
index 156ef62..209d540 100644
--- a/content/documentation/tdb/index.html
+++ b/content/documentation/tdb/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb/java_api.html b/content/documentation/tdb/java_api.html
index f6abecf..5d2384c 100644
--- a/content/documentation/tdb/java_api.html
+++ b/content/documentation/tdb/java_api.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb/optimizer.html b/content/documentation/tdb/optimizer.html
index 335b29a..2307b22 100644
--- a/content/documentation/tdb/optimizer.html
+++ b/content/documentation/tdb/optimizer.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb/quadfilter.html b/content/documentation/tdb/quadfilter.html
index c0ff90e..c0e6039 100644
--- a/content/documentation/tdb/quadfilter.html
+++ b/content/documentation/tdb/quadfilter.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb/requirements.html b/content/documentation/tdb/requirements.html
index 8a6c6a3..6899742 100644
--- a/content/documentation/tdb/requirements.html
+++ b/content/documentation/tdb/requirements.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb/store-parameters.html b/content/documentation/tdb/store-parameters.html
index 092faab..dffc0a3 100644
--- a/content/documentation/tdb/store-parameters.html
+++ b/content/documentation/tdb/store-parameters.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb/tdb_system.html b/content/documentation/tdb/tdb_system.html
index 212b82e..781ba24 100644
--- a/content/documentation/tdb/tdb_system.html
+++ b/content/documentation/tdb/tdb_system.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb/tdb_transactions.html b/content/documentation/tdb/tdb_transactions.html
index d4bf9fc..366d37e 100644
--- a/content/documentation/tdb/tdb_transactions.html
+++ b/content/documentation/tdb/tdb_transactions.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb/value_canonicalization.html b/content/documentation/tdb/value_canonicalization.html
index d6125cf..d86fcb4 100644
--- a/content/documentation/tdb/value_canonicalization.html
+++ b/content/documentation/tdb/value_canonicalization.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb2/index.html b/content/documentation/tdb2/index.html
index c159164..dbf369f 100644
--- a/content/documentation/tdb2/index.html
+++ b/content/documentation/tdb2/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb2/tdb2_admin.html b/content/documentation/tdb2/tdb2_admin.html
index ffe01a2..35d1d46 100644
--- a/content/documentation/tdb2/tdb2_admin.html
+++ b/content/documentation/tdb2/tdb2_admin.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb2/tdb2_cmds.html b/content/documentation/tdb2/tdb2_cmds.html
index b0f46bb..8ef55ff 100644
--- a/content/documentation/tdb2/tdb2_cmds.html
+++ b/content/documentation/tdb2/tdb2_cmds.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb2/tdb2_fuseki.html b/content/documentation/tdb2/tdb2_fuseki.html
index c3c6f06..56ba809 100644
--- a/content/documentation/tdb2/tdb2_fuseki.html
+++ b/content/documentation/tdb2/tdb2_fuseki.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tdb2/tdb2_migration.html b/content/documentation/tdb2/tdb2_migration.html
index 538964e..4bdbe4f 100644
--- a/content/documentation/tdb2/tdb2_migration.html
+++ b/content/documentation/tdb2/tdb2_migration.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tools/index.html b/content/documentation/tools/index.html
index d7d979e..2c7239f 100644
--- a/content/documentation/tools/index.html
+++ b/content/documentation/tools/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tools/schemagen-maven.html b/content/documentation/tools/schemagen-maven.html
index e3b5f6d..d49ffe4 100644
--- a/content/documentation/tools/schemagen-maven.html
+++ b/content/documentation/tools/schemagen-maven.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/tools/schemagen.html b/content/documentation/tools/schemagen.html
index 6a94e4e..bcac89e 100644
--- a/content/documentation/tools/schemagen.html
+++ b/content/documentation/tools/schemagen.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/txn/index.html b/content/documentation/txn/index.html
index 8db5223..f4095b2 100644
--- a/content/documentation/txn/index.html
+++ b/content/documentation/txn/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/txn/transactions_api.html b/content/documentation/txn/transactions_api.html
index 464cfcc..7d64803 100644
--- a/content/documentation/txn/transactions_api.html
+++ b/content/documentation/txn/transactions_api.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/txn/transactions_tdb.html b/content/documentation/txn/transactions_tdb.html
index 0245951..32b3edc 100644
--- a/content/documentation/txn/transactions_tdb.html
+++ b/content/documentation/txn/transactions_tdb.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/documentation/txn/txn.html b/content/documentation/txn/txn.html
index a860fa3..dedc913 100644
--- a/content/documentation/txn/txn.html
+++ b/content/documentation/txn/txn.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
@@ -197,9 +197,22 @@ try {
     dataset.end() ;
 }
 </code></pre>
-<p><code>Txn</code> simplifies writing transaction handling by wrapping application code,
-contained in a Java lambda expression or a Java Runnable object, in the correct entry
-and exit code for a transaction, eliminating coding errors.</p>
+<p>This can be simplified by wrapping application code, contained in a Java lambda
+expression or a Java Runnable object, and calling a method of the daatset or
+other transactional object.  This wil apply the correct entry and exit code for
+a transaction, eliminating coding errors.</p>
+<p>This is also available via transactional objects such as <code>Dataset</code>.</p>
+<p>The pattern is:</p>
+<pre><code>Dataset dataset = ...
+dataset.executeRead(()-&gt; {
+    . . .
+}) ;
+</code></pre>
+<p>and</p>
+<pre><code>dataset.executeWrite(()-&gt; {
+    . . .
+}) ;
+</code></pre>
 <p>The form is:</p>
 <pre><code>Txn.executeRead(ds, ()-&gt; {
     . . .
@@ -210,12 +223,14 @@ and exit code for a transaction, eliminating coding errors.</p>
     . . .
 }) ;
 </code></pre>
+<p>is also avilable (<code>Txn</code> is the implementation of this machinary). Using Txn is
+this way is necessary for Jena3.</p>
 <h2 id="usage">Usage</h2>
 <p>This first example shows how to write a SPARQL query .</p>
-<pre><code>Dataset ds = ... ;
+<pre><code>Dataset dataset = ... ;
 Query query = ... ;
-Txn.executeRead(ds, ()-&gt; {
-    try(QueryExecution qExec = QueryExecutionFactory.create(query, ds)) {
+dataset.executeRead(()-&gt; {
+    try(QueryExecution qExec = QueryExecutionFactory.create(query, dataset)) {
         ResultSetFormatter.out(qExec.execSelect()) ;
     }
 }) ;
@@ -224,45 +239,45 @@ Txn.executeRead(ds, ()-&gt; {
 <code>QueryExecution</code> inside a read transaction.</p>
 <p>Writing to a file is a read-action (it does not update the RDF data, the
 writer needs to read the dataset or model):</p>
-<pre><code>Dataset ds = ... ;
-Txn.executeRead(ds, ()-&gt; {
-    RDFDataMgr.write(System.out, ds, Lang.TRIG) ;
+<pre><code>Dataset dataset = ... ;
+dataset.executeRead(()-&gt; {
+    RDFDataMgr.write(System.out, dataset, Lang.TRIG) ;
 }) ;
 </code></pre>
 <p>whereas reading data into an RDF dataset needs to be a write transaction
 (the dataset or model is changed).</p>
-<pre><code>Dataset ds = ... ;
-Txn.executeWrite(ds, ()-&gt; {
-    RDFDataMgr.read(ds, &quot;data.ttl&quot;) ;
+<pre><code>Dataset dataset = ... ;
+dataset.executeWrite(()-&gt; {
+    RDFDataMgr.read(&quot;data.ttl&quot;) ;
 }) ;
 </code></pre>
 <p>Applications are not limited to a single operation inside a transaction. It
 can involve multiple applications read operations, such as making several
 queries:</p>
-<pre><code>Dataset ds = ... ;
+<pre><code>Dataset dataset = ... ;
 Query query1 = ... ;
 Query query2 = ... ;
-Txn.executeRead(ds, ()-&gt; {
-     try(QueryExecution qExec1 = QueryExecutionFactory.create(query1, ds)) {
+dataset.executeRead(()-&gt; {
+     try(QueryExecution qExec1 = QueryExecutionFactory.create(query1, dataset)) {
          ...
      }
-     try(QueryExecution qExec2 = QueryExecutionFactory.create(query2, ds)) {
+     try(QueryExecution qExec2 = QueryExecutionFactory.create(query2, dataset)) {
          ...
      }
 }) ;
 </code></pre>
-<p>A <code>Txn.calculateRead</code> block can return a result but only with the condition
+<p>A <code>calculateRead</code> block can return a result but only with the condition
 that what is returned does not touch the data again unless it uses a new
 transaction.</p>
 <p>This includes returning a result set or returning a model from a dataset.</p>
 <p><code>ResultSets</code> by default stream - each time <code>hasNext</code> or <code>next</code> is
 called, new data might be read from the RDF dataset.  A copy of the
 results needs to be take:</p>
-<pre><code>Dataset ds = ... ;
+<pre><code>Dataset dataset = ... ;
 Query query = ... ;
-List&lt;String&gt; results = Txn.calculateRead(ds, ()-&gt; {
+List&lt;String&gt; results = dataset.calculateRead(()-&gt; {
      List&lt;String&gt; accumulator = new ArrayList&lt;&gt;() ;
-     try(QueryExecution qExec = QueryExecutionFactory.create(query, ds)) {
+     try(QueryExecution qExec = QueryExecutionFactory.create(query, dataset)) {
          qExec.execSelect().forEachRemaining((row)-&gt;{
              String strThisRow = row.getLiteral(&quot;variable&quot;).getLexicalForm() ;
              accumulator.add(strThisRow) ;
@@ -272,39 +287,41 @@ List&lt;String&gt; results = Txn.calculateRead(ds, ()-&gt; {
 }) ;
 // use &quot;results&quot;
 
-Dataset ds = ... ;
+Dataset dataset = ... ;
 Query query = ... ;
-ResultSet List&lt;String&gt; resultSet = Txn.calculateRead(ds, ()-&gt; {
+ResultSet List&lt;String&gt; resultSet = dataset.calculateRead(()-&gt; {
      List&lt;String&gt; accumulator = new ArrayList&lt;&gt;() ;
-     try(QueryExecution qExec = QueryExecutionFactory.create(query, ds)) {
+     try(QueryExecution qExec = QueryExecutionFactory.create(query, dataset)) {
          return ResultSetFactory.copyResults(qExec.execSelect()) ;
      }
 }) ;
 // use &quot;resultSet&quot;
 </code></pre>
-<p>The functions <code>Txn.execute</code> and <code>Txn.calculate</code> start <code>READ_PROMOTE</code>
+<p>The functions <code>execute</code> and <code>calculate</code> start <code>READ_PROMOTE</code>
 transactions which start in &ldquo;read&rdquo; mode but convert to &ldquo;write&rdquo; mode if
 needed.  For details of transaction promotion see the
-c<a href="transactions_api.html#types-modes-promotion">section in the transaction API documentation</a>.</p>
+<a href="transactions_api.html#types-modes-promotion">section in the transaction API documentation</a>.</p>
 <h2 id="working-with-rdf-models">Working with RDF Models</h2>
 <p>The unit of transaction is the dataset.  Model in datasets are just views of that dataset.
 Model should not be passed out of a transaction because they are still attached to the
 dataset.</p>
 <h2 id="autocommit-and-transaction-continuation">Autocommit and Transaction continuation</h2>
-<p>If there is a transaction already started for the thread, the <code>Txn.execute...</code> will be performed as part of
+<p>If there is a transaction already started for the thread, then
+<code>execute...</code> or <code>calculate...</code> will be performed as part of
 the transaction and that transaction is not terminated.  If there is not transaction already started,
-a transaction is wrapped around the <code>Txn.execute...</code> action.</p>
+a transaction is wrapped around the <code>execute...</code> or <code>calculate...</code> action.</p>
 <pre><code>Dataset dataset = ...
 // Main transaction.
 dataset.begin(ReadWrite.WRITE) ;
 try {
   ...
   // Part of the transaction above.
-  Txn.executeRead(dataset, () -&gt; ...) ;
+  dataset.executeRead(() -&gt; ...) ;
   ...
   // Part of the transaction above - no commit/abort
-  Txn.executeWrite(dataset, () -&gt; ...) ;
+  dataset.executeWrite(() -&gt; ...) ;
 
+  // Outer transaction
   dataset.commit() ;
 } finally { dataset.end() ; }
 </code></pre>
diff --git a/content/download.html b/content/download.html
index 7fbdc0d..eefb08c 100644
--- a/content/download.html
+++ b/content/download.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/download/index.html b/content/download/index.html
index 9919cd3..b479d4f 100644
--- a/content/download/index.html
+++ b/content/download/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
@@ -162,12 +162,12 @@
             </div>
             <h1 class="title">Apache Jena Releases</h1>
             
-	<p>Jena is packaged as downloads which contain the most commonly used portions of the systems:</p>
+	<p>Apache Jena is packaged as downloads which contain the most commonly used portions of the systems:</p>
 <ul>
 <li><strong>apache-jena</strong> – contains the APIs, SPARQL engine, the TDB native RDF database and command line tools</li>
 <li><strong>apache-jena-fuseki</strong> – the Jena SPARQL server</li>
 </ul>
-<p>Jena requires Java8.</p>
+<p>Jena4 requires Java 11.</p>
 <h2 id="download-mirrors">Download Mirrors</h2>
 <p>[if-any logo]
 <a href="[link]">
@@ -194,25 +194,25 @@ Other mirrors: <select name="Preferred">
 <h3 id="apache-jena">Apache Jena</h3>
 <p>This distribution contains the APIs, SPARQL engine, the TDB native RDF database and a variety of command line scripts and tools for working with these systems.</p>
 <p>The binary distribution may be downloaded at:</p>
-<p><a href="[preferred]jena/binaries/apache-jena-3.17.0.tar.gz">apache-jena-3.17.0.tar.gz</a>
-(<a href="https://downloads.apache.org/jena/binaries/apache-jena-3.17.0.tar.gz.sha512">SHA512</a>,
-<a href="https://downloads.apache.org/jena/binaries/apache-jena-3.17.0.tar.gz.asc">PGP</a>)</p>
-<p><a href="[preferred]jena/binaries/apache-jena-3.17.0.zip">apache-jena-3.17.0.zip</a>
-(<a href="https://downloads.apache.org/jena/binaries/apache-jena-3.17.0.zip.sha512">SHA512</a>,
-<a href="https://downloads.apache.org/jena/binaries/apache-jena-3.17.0.zip.asc">PGP</a>)</p>
+<p><a href="[preferred]jena/binaries/apache-jena-4.0.0.tar.gz">apache-jena-4.0.0.tar.gz</a>
+(<a href="https://downloads.apache.org/jena/binaries/apache-jena-4.0.0.tar.gz.sha512">SHA512</a>,
+<a href="https://downloads.apache.org/jena/binaries/apache-jena-4.0.0.tar.gz.asc">PGP</a>)</p>
+<p><a href="[preferred]jena/binaries/apache-jena-4.0.0.zip">apache-jena-4.0.0.zip</a>
+(<a href="https://downloads.apache.org/jena/binaries/apache-jena-4.0.0.zip.sha512">SHA512</a>,
+<a href="https://downloads.apache.org/jena/binaries/apache-jena-4.0.0.zip.asc">PGP</a>)</p>
 <p>The source distribution, which includes the source for Fuseki and all modules in the release, may be downloaded at:</p>
-<p><a href="[preferred]jena/source/jena-3.17.0-source-release.zip">jena-3.17.0-source-release.zip</a>
-(<a href="https://downloads.apache.org/jena/source/jena-3.17.0-source-release.zip.sha512">SHA512</a>,
-<a href="https://downloads.apache.org/jena/source/jena-3.17.0-source-release.zip.asc">PGP</a>)</p>
+<p><a href="[preferred]jena/source/jena-4.0.0-source-release.zip">jena-4.0.0-source-release.zip</a>
+(<a href="https://downloads.apache.org/jena/source/jena-4.0.0-source-release.zip.sha512">SHA512</a>,
+<a href="https://downloads.apache.org/jena/source/jena-4.0.0-source-release.zip.asc">PGP</a>)</p>
 <h3 id="apache-jena-fuseki">Apache Jena Fuseki</h3>
 <p>The binary distribution of Fuseki2 (this includes both the standalone and
 WAR file packaging) may be downloaded at:</p>
-<p><a href="[preferred]jena/binaries/apache-jena-fuseki-3.17.0.tar.gz">apache-jena-fuseki-3.17.0.tar.gz</a>
-(<a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-3.17.0.tar.gz.sha512">SHA512</a>,
-<a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-3.17.0.tar.gz.asc">PGP</a>)</p>
-<p><a href="[preferred]jena/binaries/apache-jena-fuseki-3.17.0.zip">apache-jena-fuseki-3.17.0.zip</a>
-(<a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-3.17.0.zip.sha512">SHA512</a>,
-<a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-3.17.0.zip.asc">PGP</a>)</p>
+<p><a href="[preferred]jena/binaries/apache-jena-fuseki-4.0.0.tar.gz">apache-jena-fuseki-4.0.0.tar.gz</a>
+(<a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-4.0.0.tar.gz.sha512">SHA512</a>,
+<a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-4.0.0.tar.gz.asc">PGP</a>)</p>
+<p><a href="[preferred]jena/binaries/apache-jena-fuseki-4.0.0.zip">apache-jena-fuseki-4.0.0.zip</a>
+(<a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-4.0.0.zip.sha512">SHA512</a>,
+<a href="https://downloads.apache.org/jena/binaries/apache-jena-fuseki-4.0.0.zip.asc">PGP</a>)</p>
 <h3 id="individual-modules">Individual Modules</h3>
 <p>Apache Jena publishes a range of modules beyond those included in the binary distributions (code for all modules may be found in the source distribution).</p>
 <p>Individual modules may be obtained using a dependency manager which can talk to Maven repositories, some modules are only available via Maven.</p>
diff --git a/content/download/index.xml b/content/download/index.xml
index b3cf7bf..fb6f899 100644
--- a/content/download/index.xml
+++ b/content/download/index.xml
@@ -16,8 +16,8 @@
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://jena.apache.org/download/</guid>
-      <description>Jena is packaged as downloads which contain the most commonly used portions of the systems:
- apache-jena – contains the APIs, SPARQL engine, the TDB native RDF database and command line tools apache-jena-fuseki – the Jena SPARQL server  Jena requires Java8.
+      <description>Apache Jena is packaged as downloads which contain the most commonly used portions of the systems:
+ apache-jena – contains the APIs, SPARQL engine, the TDB native RDF database and command line tools apache-jena-fuseki – the Jena SPARQL server  Jena4 requires Java 11.
 Download Mirrors [if-any logo] [end] The currently selected mirror is [preferred]. If you encounter a problem with this mirror, please select another mirror. If all mirrors are failing, there are backup mirrors (at the end of the mirrors list) that should be available.</description>
     </item>
     
diff --git a/content/download/maven.html b/content/download/maven.html
index f0314c7..fbcc3ee 100644
--- a/content/download/maven.html
+++ b/content/download/maven.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/download/osgi.html b/content/download/osgi.html
index d39b0f6..6f34977 100644
--- a/content/download/osgi.html
+++ b/content/download/osgi.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/getting_involved.html b/content/getting_involved.html
index 06f16dd..89080dc 100644
--- a/content/getting_involved.html
+++ b/content/getting_involved.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/getting_involved/index.html b/content/getting_involved/index.html
index 55eb7e0..c33ad3c 100644
--- a/content/getting_involved/index.html
+++ b/content/getting_involved/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/getting_involved/reviewing_contributions.html b/content/getting_involved/reviewing_contributions.html
index 8b32862..fa2695e 100644
--- a/content/getting_involved/reviewing_contributions.html
+++ b/content/getting_involved/reviewing_contributions.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/getting_started.html b/content/getting_started.html
index f60212f..574f643 100644
--- a/content/getting_started.html
+++ b/content/getting_started.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/getting_started/fuseki.html b/content/getting_started/fuseki.html
index 523b306..797bc0f 100644
--- a/content/getting_started/fuseki.html
+++ b/content/getting_started/fuseki.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/getting_started/index.html b/content/getting_started/index.html
index 3559a06..efbf5b7 100644
--- a/content/getting_started/index.html
+++ b/content/getting_started/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/getting_started/rdf_api.html b/content/getting_started/rdf_api.html
index 356eaf4..d520e04 100644
--- a/content/getting_started/rdf_api.html
+++ b/content/getting_started/rdf_api.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/getting_started/sparql.html b/content/getting_started/sparql.html
index a24b25e..e09bbb8 100644
--- a/content/getting_started/sparql.html
+++ b/content/getting_started/sparql.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/getting_started/tell_me_how.html b/content/getting_started/tell_me_how.html
index 8f90e64..af5a9e8 100644
--- a/content/getting_started/tell_me_how.html
+++ b/content/getting_started/tell_me_how.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/help_and_support.html b/content/help_and_support.html
index ef0b98d..2446d48 100644
--- a/content/help_and_support.html
+++ b/content/help_and_support.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/help_and_support/bugs_and_suggestions.html b/content/help_and_support/bugs_and_suggestions.html
index b1410da..8e500af 100644
--- a/content/help_and_support/bugs_and_suggestions.html
+++ b/content/help_and_support/bugs_and_suggestions.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/help_and_support/faq.html b/content/help_and_support/faq.html
index e5bdacd..5fe9c96 100644
--- a/content/help_and_support/faq.html
+++ b/content/help_and_support/faq.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/help_and_support/index.html b/content/help_and_support/index.html
index aa54511..c335a9b 100644
--- a/content/help_and_support/index.html
+++ b/content/help_and_support/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
@@ -180,6 +180,7 @@ list, please send an email to: <a href="mailto:dev-subscribe@jena.apache.org">
 <code>dev-subscribe@jena.apache.org</code></a> from the email account you want
 to subscribe with. This list is a good place to discuss the development of the Jena
 platform itself, including patches you want to submit.</p>
+<p>To unsubscribe from a mailing list, send email to <code>LIST-unsubscribe@jena.apache.org</code>.</p>
 <p>Full details of Apache mailing lists: <a href="http://www.apache.org/foundation/mailinglists.html">http://www.apache.org/foundation/mailinglists.html</a>.</p>
 <h2 id="other-channels">Other channels</h2>
 <p>Some Jena developers hang out on <code>#jena</code> on <code>irc.freenode.net</code>.</p>
diff --git a/content/index.html b/content/index.html
index 6b871fe..df44d10 100644
--- a/content/index.html
+++ b/content/index.html
@@ -65,7 +65,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/index.xml b/content/index.xml
index 35e23c5..8902299 100644
--- a/content/index.xml
+++ b/content/index.xml
@@ -157,7 +157,7 @@ It implements the six Conformance Classes described in the GeoSPARQL document:</
       <description>Jena has a simple initialization sequence that is used to setup components available at runtime.
 Application code is welcome to also use this mechanism. This must be done with care. Java initialization can lead to visibility of uninitialized data.
 The standard initialization sequence is
-Core -&amp;gt; RIOT -&amp;gt; ARQ -&amp;gt; TDB -&amp;gt; other (SDB, jena text, jena spatial)
+Core -&amp;gt; RIOT -&amp;gt; ARQ -&amp;gt; TDB -&amp;gt; other (including jena text)
 The sequence from core to TDB should be executed before application components. See below for how to control the order.</description>
     </item>
     
@@ -177,8 +177,8 @@ The sequence from core to TDB should be executed before application components.
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://jena.apache.org/download/</guid>
-      <description>Jena is packaged as downloads which contain the most commonly used portions of the systems:
- apache-jena – contains the APIs, SPARQL engine, the TDB native RDF database and command line tools apache-jena-fuseki – the Jena SPARQL server  Jena requires Java8.
+      <description>Apache Jena is packaged as downloads which contain the most commonly used portions of the systems:
+ apache-jena – contains the APIs, SPARQL engine, the TDB native RDF database and command line tools apache-jena-fuseki – the Jena SPARQL server  Jena4 requires Java 11.
 Download Mirrors [if-any logo] [end] The currently selected mirror is [preferred]. If you encounter a problem with this mirror, please select another mirror. If all mirrors are failing, there are backup mirrors (at the end of the mirrors list) that should be available.</description>
     </item>
     
@@ -847,16 +847,6 @@ The relevant SPARQL standards are:
     </item>
     
     <item>
-      <title>Fuseki: serving RDF data over HTTP</title>
-      <link>https://jena.apache.org/documentation/serving_data/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://jena.apache.org/documentation/serving_data/</guid>
-      <description>See the Fuseki2 documentation.   This page covers Fuseki1. Fuseki1 is deprecated and has been retired. Fuseki2 is current.  The last release of Jena with this module is Jena 3.9.0. The original documentation.
-  </description>
-    </item>
-    
-    <item>
       <title>Fuseki: SPARQL and RDF Standards</title>
       <link>https://jena.apache.org/documentation/fuseki2/rdf-sparql-standards.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
@@ -1791,14 +1781,24 @@ PREFIX info: &amp;lt;http://somewhere/peopleInfo#&amp;gt; PREFIX vcard: &amp;lt;
     
     <item>
       <title>Spatial searches with SPARQL</title>
+      <link>https://jena.apache.org/documentation/query/spatial-query-doc.html</link>
+      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+      
+      <guid>https://jena.apache.org/documentation/query/spatial-query-doc.html</guid>
+      <description>This module was first released with Jena 2.11.0. It was last released in Jena 3.12.0.
+Jena provides a a GeoSPARQL implementation.
+ This is an extension to Apache Jena ARQ, which combines SPARQL and simple spatial query. It gives applications the ability to perform simple spatial searches within SPARQL queries. Spatial indexes are additional information for accessing the RDF graph.
+The spatial index can be either Apache Lucene for a same-machine spatial index, or Apache Solr for a large scale enterprise search application.</description>
+    </item>
+    
+    <item>
+      <title>Spatial searches with SPARQL</title>
       <link>https://jena.apache.org/documentation/query/spatial-query.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://jena.apache.org/documentation/query/spatial-query.html</guid>
-      <description>This module was first released with Jena 2.11.0.
-It is planned to retire this module in favour of a GeoSPARQL implementation.
-This is an extension to Apache Jena ARQ, which combines SPARQL and simple spatial query. It gives applications the ability to perform simple spatial searches within SPARQL queries. Spatial indexes are additional information for accessing the RDF graph.
-The spatial index can be either Apache Lucene for a same-machine spatial index, or Apache Solr for a large scale enterprise search application.</description>
+      <description>  The Jena Spatial module has been retired. The last release of Jena with jena-spatial was Jena 3.12.0. See jena-spatial/README.md. The original documentation is here
+  </description>
     </item>
     
     <item>
@@ -1830,16 +1830,15 @@ The supported datatypes (including those required by SPARQL 1.1), including full
     </item>
     
     <item>
-      <title>Support of RDF*</title>
-      <link>https://jena.apache.org/documentation/rdfstar/</link>
+      <title>Support of RDF-star</title>
+      <link>https://jena.apache.org/documentation/rdf-star/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/rdfstar/</guid>
-      <description>RDF* is an extension to RDF that provides a way for one triple to refer to another triple. Another resource about RDF* is Olaf Hartig&amp;rsquo;s blog entry.
+      <guid>https://jena.apache.org/documentation/rdf-star/</guid>
+      <description>RDF-star is an extension to RDF that provides a way for one triple to refer to another triple. RDF* is the name of the original work which is described in Olaf Hartig&amp;rsquo;s blog entry.
 Example:
-&amp;lt;&amp;lt;:johnfoaf:name&amp;#34;John Smith&amp;#34;&amp;gt;&amp;gt;dct:source&amp;lt;http://example/directory&amp;gt;.The part &amp;lt;&amp;lt; :john foaf:name &amp;quot;John Smith&amp;quot; &amp;gt;&amp;gt; is a triple term and refers to the triple with subject :john, property foaf:name and object &amp;quot;John Smith&amp;quot;.
-Triple terms can be in the subject or object position.
-Jena provides support for RDF* and the related SPARQL*.</description>
+&amp;lt;&amp;lt;:johnfoaf:name&amp;#34;John Smith&amp;#34;&amp;gt;&amp;gt;dct:source&amp;lt;http://example/directory&amp;gt;.The part &amp;lt;&amp;lt; :john foaf:name &amp;quot;John Smith&amp;quot; &amp;gt;&amp;gt; is an embedded triple and refers to the triple with subject :john, property foaf:name and object &amp;quot;John Smith&amp;quot;.
+Triple terms can be in the subject or object position.</description>
     </item>
     
     <item>
diff --git a/content/sitemap.xml b/content/sitemap.xml
index 4a4e945..c190b56 100644
--- a/content/sitemap.xml
+++ b/content/sitemap.xml
@@ -69,7 +69,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/fuseki2/</loc>
-    <lastmod>2021-02-19T15:39:55+13:00</lastmod>
+    <lastmod>2021-03-02T22:24:00+00:00</lastmod>
   </url>
   
   <url>
@@ -79,7 +79,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/notes/system-initialization.html</loc>
-    <lastmod>2020-06-29T18:06:08+01:00</lastmod>
+    <lastmod>2021-03-16T21:05:16+00:00</lastmod>
   </url>
   
   <url>
@@ -89,7 +89,7 @@
   
   <url>
     <loc>https://jena.apache.org/download/</loc>
-    <lastmod>2020-11-26T21:23:09+00:00</lastmod>
+    <lastmod>2021-03-26T16:45:50+00:00</lastmod>
   </url>
   
   <url>
@@ -309,12 +309,12 @@
   
   <url>
     <loc>https://jena.apache.org/documentation.html</loc>
-    <lastmod>2021-03-02T12:43:16+13:00</lastmod>
+    <lastmod>2021-03-29T09:48:59+01:00</lastmod>
   </url>
   
   <url>
     <loc>https://jena.apache.org/download.html</loc>
-    <lastmod>2021-02-20T13:42:28+00:00</lastmod>
+    <lastmod>2021-03-26T16:45:50+00:00</lastmod>
   </url>
   
   <url>
@@ -379,7 +379,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/fuseki2/fuseki-server-protocol.html</loc>
-    <lastmod>2021-02-10T15:35:55+00:00</lastmod>
+    <lastmod>2021-03-29T09:48:59+01:00</lastmod>
   </url>
   
   <url>
@@ -408,11 +408,6 @@
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/serving_data/</loc>
-    <lastmod>2020-04-29T21:07:36+01:00</lastmod>
-  </url>
-  
-  <url>
     <loc>https://jena.apache.org/documentation/fuseki2/rdf-sparql-standards.html</loc>
     <lastmod>2020-02-28T13:09:12+01:00</lastmod>
   </url>
@@ -429,7 +424,7 @@
   
   <url>
     <loc>https://jena.apache.org/help_and_support/</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <lastmod>2021-03-26T16:45:50+00:00</lastmod>
   </url>
   
   <url>
@@ -464,7 +459,7 @@
   
   <url>
     <loc>https://jena.apache.org/help_and_support.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <lastmod>2021-03-26T16:45:50+00:00</lastmod>
   </url>
   
   <url>
@@ -704,7 +699,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/fuseki2/fuseki-webapp.html</loc>
-    <lastmod>2021-01-05T11:19:10+08:00</lastmod>
+    <lastmod>2021-03-26T16:45:50+00:00</lastmod>
   </url>
   
   <url>
@@ -863,8 +858,13 @@
   </url>
   
   <url>
+    <loc>https://jena.apache.org/documentation/query/spatial-query-doc.html</loc>
+    <lastmod>2021-03-16T21:05:16+00:00</lastmod>
+  </url>
+  
+  <url>
     <loc>https://jena.apache.org/documentation/query/spatial-query.html</loc>
-    <lastmod>2021-02-19T15:39:55+13:00</lastmod>
+    <lastmod>2021-03-16T21:05:16+00:00</lastmod>
   </url>
   
   <url>
@@ -878,8 +878,8 @@
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/rdfstar/</loc>
-    <lastmod>2020-08-10T23:07:00+12:00</lastmod>
+    <loc>https://jena.apache.org/documentation/rdf-star/</loc>
+    <lastmod>2021-03-10T21:30:23+00:00</lastmod>
   </url>
   
   <url>
@@ -1069,7 +1069,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/txn/txn.html</loc>
-    <lastmod>2021-02-19T15:39:55+13:00</lastmod>
+    <lastmod>2021-03-26T16:47:58+00:00</lastmod>
   </url>
   
   <url>
diff --git a/content/tutorials.html b/content/tutorials.html
index e49bd8c..066f5ba 100644
--- a/content/tutorials.html
+++ b/content/tutorials.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/index.html b/content/tutorials/index.html
index e1e793f..cc9b216 100644
--- a/content/tutorials/index.html
+++ b/content/tutorials/index.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/rdf_api.html b/content/tutorials/rdf_api.html
index 454e9e0..dcdaf5d 100644
--- a/content/tutorials/rdf_api.html
+++ b/content/tutorials/rdf_api.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/rdf_api_pt.html b/content/tutorials/rdf_api_pt.html
index 0ca2ec4..7a44b52 100644
--- a/content/tutorials/rdf_api_pt.html
+++ b/content/tutorials/rdf_api_pt.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/sparql.html b/content/tutorials/sparql.html
index 522e954..6d3ab3d 100644
--- a/content/tutorials/sparql.html
+++ b/content/tutorials/sparql.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/sparql_basic_patterns.html b/content/tutorials/sparql_basic_patterns.html
index d22dc34..0728c73 100644
--- a/content/tutorials/sparql_basic_patterns.html
+++ b/content/tutorials/sparql_basic_patterns.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/sparql_basic_patterns_pt.html b/content/tutorials/sparql_basic_patterns_pt.html
index 6adab4e..ac0e7ef 100644
--- a/content/tutorials/sparql_basic_patterns_pt.html
+++ b/content/tutorials/sparql_basic_patterns_pt.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/sparql_data.html b/content/tutorials/sparql_data.html
index 0bc9742..054d625 100644
--- a/content/tutorials/sparql_data.html
+++ b/content/tutorials/sparql_data.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/sparql_data_pt.html b/content/tutorials/sparql_data_pt.html
index f95e392..dcb508c 100644
--- a/content/tutorials/sparql_data_pt.html
+++ b/content/tutorials/sparql_data_pt.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/sparql_datasets.html b/content/tutorials/sparql_datasets.html
index d572dca..c69d642 100644
--- a/content/tutorials/sparql_datasets.html
+++ b/content/tutorials/sparql_datasets.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/sparql_datasets_pt.html b/content/tutorials/sparql_datasets_pt.html
index 3fe6ca5..fff5283 100644
--- a/content/tutorials/sparql_datasets_pt.html
+++ b/content/tutorials/sparql_datasets_pt.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/sparql_filters.html b/content/tutorials/sparql_filters.html
index 1cf3c1a..b864694 100644
--- a/content/tutorials/sparql_filters.html
+++ b/content/tutorials/sparql_filters.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/sparql_filters_pt.html b/content/tutorials/sparql_filters_pt.html
index 3e566da..5c69e06 100644
--- a/content/tutorials/sparql_filters_pt.html
+++ b/content/tutorials/sparql_filters_pt.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/sparql_optionals.html b/content/tutorials/sparql_optionals.html
index f78cbe50..d0445c4 100644
--- a/content/tutorials/sparql_optionals.html
+++ b/content/tutorials/sparql_optionals.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/sparql_optionals_pt.html b/content/tutorials/sparql_optionals_pt.html
index 3ded6f6..335c742 100644
--- a/content/tutorials/sparql_optionals_pt.html
+++ b/content/tutorials/sparql_optionals_pt.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/sparql_page.html b/content/tutorials/sparql_page.html
index 21a92a8..13bcb1f 100644
--- a/content/tutorials/sparql_page.html
+++ b/content/tutorials/sparql_page.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/sparql_pt.html b/content/tutorials/sparql_pt.html
index 87dc44c..7204e1e 100644
--- a/content/tutorials/sparql_pt.html
+++ b/content/tutorials/sparql_pt.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/sparql_query1.html b/content/tutorials/sparql_query1.html
index 62f88bb..a8adf6c 100644
--- a/content/tutorials/sparql_query1.html
+++ b/content/tutorials/sparql_query1.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/sparql_query1_pt.html b/content/tutorials/sparql_query1_pt.html
index a171814..25f83a3 100644
--- a/content/tutorials/sparql_query1_pt.html
+++ b/content/tutorials/sparql_query1_pt.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/sparql_results.html b/content/tutorials/sparql_results.html
index df50cb4..8d9e654 100644
--- a/content/tutorials/sparql_results.html
+++ b/content/tutorials/sparql_results.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/sparql_results_pt.html b/content/tutorials/sparql_results_pt.html
index d446b8d..b649146 100644
--- a/content/tutorials/sparql_results_pt.html
+++ b/content/tutorials/sparql_results_pt.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/sparql_union.html b/content/tutorials/sparql_union.html
index 49cac4f..71dfc31 100644
--- a/content/tutorials/sparql_union.html
+++ b/content/tutorials/sparql_union.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/sparql_union_pt.html b/content/tutorials/sparql_union_pt.html
index 34041b8..0583b1a 100644
--- a/content/tutorials/sparql_union_pt.html
+++ b/content/tutorials/sparql_union_pt.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/using_jena_with_eclipse.html b/content/tutorials/using_jena_with_eclipse.html
index 1a8becd..e584227 100644
--- a/content/tutorials/using_jena_with_eclipse.html
+++ b/content/tutorials/using_jena_with_eclipse.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>
diff --git a/content/tutorials/using_jena_with_eclipse_pt.html b/content/tutorials/using_jena_with_eclipse_pt.html
index e1a7303..4cb7656 100644
--- a/content/tutorials/using_jena_with_eclipse_pt.html
+++ b/content/tutorials/using_jena_with_eclipse_pt.html
@@ -64,7 +64,7 @@
                         <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/shacl/index.html">SHACL</a></li>
-                        <li><a href="/documentation/rdfstar/index.html">RDF*</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/hadoop/index.html">Elephas - tools for RDF on Hadoop</a></li>
                         <li><a href="/documentation/jdbc/index.html">SPARQL over JDBC</a></li>