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/11/15 17:06:19 UTC

[jena-site] branch asf-staging updated: Staged site from more-doc (8ea1cfb48a416119238be0d43658555c3569f9d6)

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

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


The following commit(s) were added to refs/heads/asf-staging by this push:
     new 04c0424  Staged site from more-doc (8ea1cfb48a416119238be0d43658555c3569f9d6)
04c0424 is described below

commit 04c0424fc481bc12f11a050ee203780c4c018452
Author: jenkins <bu...@apache.org>
AuthorDate: Mon Nov 15 17:06:15 2021 +0000

    Staged site from more-doc (8ea1cfb48a416119238be0d43658555c3569f9d6)
---
 .../documentation/{ => archive}/csv/csv_index.html |  12 +-
 .../documentation/{ => archive}/csv/design.html    |  12 +-
 .../{ => archive}/csv/get_started.html             |  12 +-
 .../{ => archive}/csv/implementation.html          |  12 +-
 content/documentation/{ => archive}/csv/index.html |  10 +-
 .../{ => archive}/hadoop/artifacts.html            |  12 +-
 .../documentation/{ => archive}/hadoop/common.html |  12 +-
 .../documentation/{ => archive}/hadoop/demo.html   |  12 +-
 .../{ => archive}/hadoop/elephas_index.html        |  12 +-
 .../documentation/{ => archive}/hadoop/index.html  |  10 +-
 content/documentation/{ => archive}/hadoop/io.html |  12 +-
 .../documentation/{ => archive}/hadoop/mapred.html |  12 +-
 .../documentation/{ => archive}/sdb/commands.html  |  12 +-
 .../{ => archive}/sdb/configuration.html           |  12 +-
 .../{ => archive}/sdb/database_layouts.html        |  12 +-
 .../{ => archive}/sdb/databases_supported.html     |  12 +-
 .../{ => archive}/sdb/dataset_description.html     |  12 +-
 .../documentation/{ => archive}/sdb/db_notes.html  |  12 +-
 content/documentation/{ => archive}/sdb/faq.html   |  12 +-
 .../{ => archive}/sdb/fuseki_integration.html      |  12 +-
 content/documentation/{ => archive}/sdb/index.html |  10 +-
 .../{ => archive}/sdb/installation.html            |  12 +-
 .../documentation/{ => archive}/sdb/javaapi.html   |  12 +-
 .../{ => archive}/sdb/loading_data.html            |  12 +-
 .../{ => archive}/sdb/loading_performance.html     |  12 +-
 .../{ => archive}/sdb/query_performance.html       |  12 +-
 .../{ => archive}/sdb/quickstart.html              |  12 +-
 .../documentation/{ => archive}/sdb/sdb_index.html |  12 +-
 .../{ => archive}/sdb/store_description.html       |  12 +-
 .../versions/http-auth-old.html}                   |  22 +-
 content/documentation/fuseki2/fuseki-embedded.html |   2 +-
 .../fuseki-main-security.html}                     |  34 +-
 .../documentation/geosparql/geosparql-fuseki.html  |   2 +-
 content/documentation/geosparql/index.html         |   2 +-
 content/documentation/index.xml                    | 165 +++++-----
 content/documentation/notes/model-factory.html     |   4 +-
 content/documentation/ontology/index.html          |   3 +-
 content/documentation/query/architecture.html      |   3 +-
 content/documentation/query/arq-query-eval.html    |  16 +-
 content/documentation/query/construct-quad.html    |   2 +-
 content/documentation/query/explain.html           |  13 +-
 content/documentation/query/logging.html           |   3 +-
 content/documentation/query/sparql-remote.html     |  13 +-
 content/documentation/rdfconnection/index.html     |  25 +-
 .../sparql-apis/{index.html => http-auth.html}     | 352 ++-------------------
 content/documentation/sparql-apis/index.html       | 128 +-------
 content/documentation/tdb/configuration.html       |   8 +-
 content/documentation/tdb/datasets.html            |   8 +-
 content/documentation/tdb/optimizer.html           |  10 +-
 content/documentation/tdb/quadfilter.html          |   6 +-
 content/documentation/tdb/tdb-xloader.html         |  11 +-
 content/documentation/tdb/tdb_transactions.html    |  14 +-
 content/documentation/txn/transactions_api.html    |  12 +-
 content/getting_started/index.html                 |   1 -
 content/index.xml                                  | 165 +++++-----
 content/sitemap.xml                                | 182 ++++++-----
 56 files changed, 718 insertions(+), 830 deletions(-)

diff --git a/content/documentation/csv/csv_index.html b/content/documentation/archive/csv/csv_index.html
similarity index 96%
rename from content/documentation/csv/csv_index.html
rename to content/documentation/archive/csv/csv_index.html
index b7f0b62..970f311 100644
--- a/content/documentation/csv/csv_index.html
+++ b/content/documentation/archive/csv/csv_index.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/csv/csv_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/archive/csv/csv_index.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/csv'>CSV</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/csv'>CSV</a></li>
             
             
         
diff --git a/content/documentation/csv/design.html b/content/documentation/archive/csv/design.html
similarity index 97%
rename from content/documentation/csv/design.html
rename to content/documentation/archive/csv/design.html
index 78d2c3a..c27f319 100644
--- a/content/documentation/csv/design.html
+++ b/content/documentation/archive/csv/design.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/csv/design.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/archive/csv/design.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/csv'>CSV</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/csv'>CSV</a></li>
             
             
         
diff --git a/content/documentation/csv/get_started.html b/content/documentation/archive/csv/get_started.html
similarity index 97%
rename from content/documentation/csv/get_started.html
rename to content/documentation/archive/csv/get_started.html
index de983b5..13ebbfa 100644
--- a/content/documentation/csv/get_started.html
+++ b/content/documentation/archive/csv/get_started.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/csv/get_started.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/archive/csv/get_started.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/csv'>CSV</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/csv'>CSV</a></li>
             
             
         
diff --git a/content/documentation/csv/implementation.html b/content/documentation/archive/csv/implementation.html
similarity index 96%
rename from content/documentation/csv/implementation.html
rename to content/documentation/archive/csv/implementation.html
index 00ede8f..babe3a3 100644
--- a/content/documentation/csv/implementation.html
+++ b/content/documentation/archive/csv/implementation.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/csv/implementation.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/archive/csv/implementation.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/csv'>CSV</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/csv'>CSV</a></li>
             
             
         
diff --git a/content/documentation/csv/index.html b/content/documentation/archive/csv/index.html
similarity index 96%
copy from content/documentation/csv/index.html
copy to content/documentation/archive/csv/index.html
index 458095e..0763284 100644
--- a/content/documentation/csv/index.html
+++ b/content/documentation/archive/csv/index.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/csv/__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/archive/csv/__index.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -157,6 +157,14 @@
         
         
             
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
                 <li class="active">CSV</li>
             
             
diff --git a/content/documentation/hadoop/artifacts.html b/content/documentation/archive/hadoop/artifacts.html
similarity index 96%
rename from content/documentation/hadoop/artifacts.html
rename to content/documentation/archive/hadoop/artifacts.html
index cede1c7..00ea8a2 100644
--- a/content/documentation/hadoop/artifacts.html
+++ b/content/documentation/archive/hadoop/artifacts.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/hadoop/artifacts.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/archive/hadoop/artifacts.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/hadoop'>HADOOP</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/hadoop'>HADOOP</a></li>
             
             
         
diff --git a/content/documentation/hadoop/common.html b/content/documentation/archive/hadoop/common.html
similarity index 97%
rename from content/documentation/hadoop/common.html
rename to content/documentation/archive/hadoop/common.html
index 368ed31..c3ce0d3 100644
--- a/content/documentation/hadoop/common.html
+++ b/content/documentation/archive/hadoop/common.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/hadoop/common.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/archive/hadoop/common.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/hadoop'>HADOOP</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/hadoop'>HADOOP</a></li>
             
             
         
diff --git a/content/documentation/hadoop/demo.html b/content/documentation/archive/hadoop/demo.html
similarity index 97%
rename from content/documentation/hadoop/demo.html
rename to content/documentation/archive/hadoop/demo.html
index f7c1cc9..bfebca5 100644
--- a/content/documentation/hadoop/demo.html
+++ b/content/documentation/archive/hadoop/demo.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/hadoop/demo.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/archive/hadoop/demo.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/hadoop'>HADOOP</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/hadoop'>HADOOP</a></li>
             
             
         
diff --git a/content/documentation/hadoop/elephas_index.html b/content/documentation/archive/hadoop/elephas_index.html
similarity index 97%
rename from content/documentation/hadoop/elephas_index.html
rename to content/documentation/archive/hadoop/elephas_index.html
index ca0e857..7ed1883 100644
--- a/content/documentation/hadoop/elephas_index.html
+++ b/content/documentation/archive/hadoop/elephas_index.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/hadoop/elephas_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/archive/hadoop/elephas_index.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/hadoop'>HADOOP</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/hadoop'>HADOOP</a></li>
             
             
         
diff --git a/content/documentation/hadoop/index.html b/content/documentation/archive/hadoop/index.html
similarity index 96%
rename from content/documentation/hadoop/index.html
rename to content/documentation/archive/hadoop/index.html
index e6bb187..0fffd2c 100644
--- a/content/documentation/hadoop/index.html
+++ b/content/documentation/archive/hadoop/index.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/hadoop/__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/archive/hadoop/__index.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -157,6 +157,14 @@
         
         
             
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
                 <li class="active">HADOOP</li>
             
             
diff --git a/content/documentation/hadoop/io.html b/content/documentation/archive/hadoop/io.html
similarity index 98%
rename from content/documentation/hadoop/io.html
rename to content/documentation/archive/hadoop/io.html
index dccff07..ca1f3d4 100644
--- a/content/documentation/hadoop/io.html
+++ b/content/documentation/archive/hadoop/io.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/hadoop/io.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/archive/hadoop/io.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/hadoop'>HADOOP</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/hadoop'>HADOOP</a></li>
             
             
         
diff --git a/content/documentation/hadoop/mapred.html b/content/documentation/archive/hadoop/mapred.html
similarity index 97%
rename from content/documentation/hadoop/mapred.html
rename to content/documentation/archive/hadoop/mapred.html
index 4a3881c..28b1a88 100644
--- a/content/documentation/hadoop/mapred.html
+++ b/content/documentation/archive/hadoop/mapred.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/hadoop/mapred.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/archive/hadoop/mapred.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/hadoop'>HADOOP</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/hadoop'>HADOOP</a></li>
             
             
         
diff --git a/content/documentation/sdb/commands.html b/content/documentation/archive/sdb/commands.html
similarity index 97%
rename from content/documentation/sdb/commands.html
rename to content/documentation/archive/sdb/commands.html
index dc53cbc..003d63b 100644
--- a/content/documentation/sdb/commands.html
+++ b/content/documentation/archive/sdb/commands.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/sdb/commands.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/archive/sdb/commands.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/sdb'>SDB</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/sdb'>SDB</a></li>
             
             
         
diff --git a/content/documentation/sdb/configuration.html b/content/documentation/archive/sdb/configuration.html
similarity index 97%
rename from content/documentation/sdb/configuration.html
rename to content/documentation/archive/sdb/configuration.html
index d6757f3..eb18749 100644
--- a/content/documentation/sdb/configuration.html
+++ b/content/documentation/archive/sdb/configuration.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/sdb/configuration.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/archive/sdb/configuration.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/sdb'>SDB</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/sdb'>SDB</a></li>
             
             
         
diff --git a/content/documentation/sdb/database_layouts.html b/content/documentation/archive/sdb/database_layouts.html
similarity index 96%
rename from content/documentation/sdb/database_layouts.html
rename to content/documentation/archive/sdb/database_layouts.html
index 7896a5a..9923351 100644
--- a/content/documentation/sdb/database_layouts.html
+++ b/content/documentation/archive/sdb/database_layouts.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/sdb/database_layouts.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/archive/sdb/database_layouts.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/sdb'>SDB</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/sdb'>SDB</a></li>
             
             
         
diff --git a/content/documentation/sdb/databases_supported.html b/content/documentation/archive/sdb/databases_supported.html
similarity index 96%
rename from content/documentation/sdb/databases_supported.html
rename to content/documentation/archive/sdb/databases_supported.html
index 1447c2a..a511506 100644
--- a/content/documentation/sdb/databases_supported.html
+++ b/content/documentation/archive/sdb/databases_supported.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/sdb/databases_supported.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/archive/sdb/databases_supported.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/sdb'>SDB</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/sdb'>SDB</a></li>
             
             
         
diff --git a/content/documentation/sdb/dataset_description.html b/content/documentation/archive/sdb/dataset_description.html
similarity index 96%
rename from content/documentation/sdb/dataset_description.html
rename to content/documentation/archive/sdb/dataset_description.html
index 0201d16..b38fccd 100644
--- a/content/documentation/sdb/dataset_description.html
+++ b/content/documentation/archive/sdb/dataset_description.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/sdb/dataset_description.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/archive/sdb/dataset_description.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/sdb'>SDB</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/sdb'>SDB</a></li>
             
             
         
diff --git a/content/documentation/sdb/db_notes.html b/content/documentation/archive/sdb/db_notes.html
similarity index 97%
rename from content/documentation/sdb/db_notes.html
rename to content/documentation/archive/sdb/db_notes.html
index a7c03af..d5efdfb 100644
--- a/content/documentation/sdb/db_notes.html
+++ b/content/documentation/archive/sdb/db_notes.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/sdb/db_notes.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/archive/sdb/db_notes.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/sdb'>SDB</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/sdb'>SDB</a></li>
             
             
         
diff --git a/content/documentation/sdb/faq.html b/content/documentation/archive/sdb/faq.html
similarity index 95%
rename from content/documentation/sdb/faq.html
rename to content/documentation/archive/sdb/faq.html
index 51ffd17..7fe6292 100644
--- a/content/documentation/sdb/faq.html
+++ b/content/documentation/archive/sdb/faq.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/sdb/faq.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/archive/sdb/faq.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/sdb'>SDB</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/sdb'>SDB</a></li>
             
             
         
diff --git a/content/documentation/sdb/fuseki_integration.html b/content/documentation/archive/sdb/fuseki_integration.html
similarity index 95%
rename from content/documentation/sdb/fuseki_integration.html
rename to content/documentation/archive/sdb/fuseki_integration.html
index 1f49189..2c314ab 100644
--- a/content/documentation/sdb/fuseki_integration.html
+++ b/content/documentation/archive/sdb/fuseki_integration.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/sdb/fuseki_integration.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/archive/sdb/fuseki_integration.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/sdb'>SDB</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/sdb'>SDB</a></li>
             
             
         
diff --git a/content/documentation/sdb/index.html b/content/documentation/archive/sdb/index.html
similarity index 96%
rename from content/documentation/sdb/index.html
rename to content/documentation/archive/sdb/index.html
index 82ba054..8e98aa4 100644
--- a/content/documentation/sdb/index.html
+++ b/content/documentation/archive/sdb/index.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/sdb/__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/archive/sdb/__index.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -157,6 +157,14 @@
         
         
             
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
                 <li class="active">SDB</li>
             
             
diff --git a/content/documentation/sdb/installation.html b/content/documentation/archive/sdb/installation.html
similarity index 96%
rename from content/documentation/sdb/installation.html
rename to content/documentation/archive/sdb/installation.html
index a4b3b2e..2d14f63 100644
--- a/content/documentation/sdb/installation.html
+++ b/content/documentation/archive/sdb/installation.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/sdb/installation.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/archive/sdb/installation.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/sdb'>SDB</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/sdb'>SDB</a></li>
             
             
         
diff --git a/content/documentation/sdb/javaapi.html b/content/documentation/archive/sdb/javaapi.html
similarity index 97%
rename from content/documentation/sdb/javaapi.html
rename to content/documentation/archive/sdb/javaapi.html
index 7df4b68..b9cf938 100644
--- a/content/documentation/sdb/javaapi.html
+++ b/content/documentation/archive/sdb/javaapi.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/sdb/javaapi.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/archive/sdb/javaapi.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/sdb'>SDB</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/sdb'>SDB</a></li>
             
             
         
diff --git a/content/documentation/sdb/loading_data.html b/content/documentation/archive/sdb/loading_data.html
similarity index 97%
rename from content/documentation/sdb/loading_data.html
rename to content/documentation/archive/sdb/loading_data.html
index eb70966..35f26e0 100644
--- a/content/documentation/sdb/loading_data.html
+++ b/content/documentation/archive/sdb/loading_data.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/sdb/loading_data.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/archive/sdb/loading_data.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/sdb'>SDB</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/sdb'>SDB</a></li>
             
             
         
diff --git a/content/documentation/sdb/loading_performance.html b/content/documentation/archive/sdb/loading_performance.html
similarity index 97%
rename from content/documentation/sdb/loading_performance.html
rename to content/documentation/archive/sdb/loading_performance.html
index 961879e..da1d2c2 100644
--- a/content/documentation/sdb/loading_performance.html
+++ b/content/documentation/archive/sdb/loading_performance.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/sdb/loading_performance.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/archive/sdb/loading_performance.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/sdb'>SDB</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/sdb'>SDB</a></li>
             
             
         
diff --git a/content/documentation/sdb/query_performance.html b/content/documentation/archive/sdb/query_performance.html
similarity index 96%
rename from content/documentation/sdb/query_performance.html
rename to content/documentation/archive/sdb/query_performance.html
index 689bebf..61757d5 100644
--- a/content/documentation/sdb/query_performance.html
+++ b/content/documentation/archive/sdb/query_performance.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/sdb/query_performance.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/archive/sdb/query_performance.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/sdb'>SDB</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/sdb'>SDB</a></li>
             
             
         
diff --git a/content/documentation/sdb/quickstart.html b/content/documentation/archive/sdb/quickstart.html
similarity index 96%
rename from content/documentation/sdb/quickstart.html
rename to content/documentation/archive/sdb/quickstart.html
index b788728..c28355b 100644
--- a/content/documentation/sdb/quickstart.html
+++ b/content/documentation/archive/sdb/quickstart.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/sdb/quickstart.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/archive/sdb/quickstart.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/sdb'>SDB</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/sdb'>SDB</a></li>
             
             
         
diff --git a/content/documentation/sdb/sdb_index.html b/content/documentation/archive/sdb/sdb_index.html
similarity index 96%
rename from content/documentation/sdb/sdb_index.html
rename to content/documentation/archive/sdb/sdb_index.html
index 5457d3d..5c89e9b 100644
--- a/content/documentation/sdb/sdb_index.html
+++ b/content/documentation/archive/sdb/sdb_index.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/sdb/sdb_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/archive/sdb/sdb_index.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/sdb'>SDB</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/sdb'>SDB</a></li>
             
             
         
diff --git a/content/documentation/sdb/store_description.html b/content/documentation/archive/sdb/store_description.html
similarity index 96%
rename from content/documentation/sdb/store_description.html
rename to content/documentation/archive/sdb/store_description.html
index 1c80348..24bb024 100644
--- a/content/documentation/sdb/store_description.html
+++ b/content/documentation/archive/sdb/store_description.html
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/sdb/store_description.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/archive/sdb/store_description.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,15 @@
         
         
             
-                <li><a href='/documentation/sdb'>SDB</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li><a href='/documentation/archive/sdb'>SDB</a></li>
             
             
         
diff --git a/content/documentation/query/http-auth.html b/content/documentation/archive/versions/http-auth-old.html
similarity index 94%
rename from content/documentation/query/http-auth.html
rename to content/documentation/archive/versions/http-auth-old.html
index 58d1d43..d80b324 100644
--- a/content/documentation/query/http-auth.html
+++ b/content/documentation/archive/versions/http-auth-old.html
@@ -3,7 +3,7 @@
 <head>
     
 
-    <title>Apache Jena - HTTP Authentication in ARQ</title>
+    <title>Apache Jena - HTTP Authentication in ARQ (Superseded)</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/query/http-auth.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/archive/versions/http-auth-old.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -154,7 +154,7 @@
         
         
             
-                <li><a href='/documentation/query'>QUERY</a></li>
+                <li><a href='/documentation/archive'>ARCHIVE</a></li>
             
             
         
@@ -162,7 +162,15 @@
         
         
             
-                <li class="active">HTTP AUTH</li>
+                <li><a href='/documentation/archive/versions'>VERSIONS</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li class="active">HTTP AUTH OLD</li>
             
             
         
@@ -174,9 +182,11 @@
 
                 
             </div>
-            <h1 class="title">HTTP Authentication in ARQ</h1>
+            <h1 class="title">HTTP Authentication in ARQ (Superseded)</h1>
             
-	<p>After <a href="#http-authentication-from-jena-311">Jena 3.1.0</a>, Jena exposes the underlying HTTP Commons functionality to support a range of authentication mechanisms as well as <a href="https://hc.apache.org/httpcomponents-client-ga/examples.html">other HTTP configuration</a>. From <a href="#http-authentication-from-jena-300-through-310">Jena 3.0.0 through Jena 3.1.0</a> there is a Jena-specific framework that provides a uniform mechanism for HTTP authentication. This documentati [...]
+	<p><i>Documentation for HTTP Authentication (Jena3.1.1 to Jena 4.2.0) using Apache Commons HttpClient.</i></p>
+<hr>
+<p>After <a href="#http-authentication-from-jena-311">Jena 3.1.0</a>, Jena exposes the underlying HTTP Commons functionality to support a range of authentication mechanisms as well as <a href="https://hc.apache.org/httpcomponents-client-ga/examples.html">other HTTP configuration</a>. From <a href="#http-authentication-from-jena-300-through-310">Jena 3.0.0 through Jena 3.1.0</a> there is a Jena-specific framework that provides a uniform mechanism for HTTP authentication. This documentatio [...]
 <h2 id="http-authentication-from-jena-311">HTTP Authentication from Jena 3.1.1</h2>
 <p>APIs that support authentication typically provide methods for providing an <a href="https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/org/apache/http/client/HttpClient.html">HttpClient</a> for use with the given instance of that API class. Since it may not always be possible/practical to configure authenticators on a per-request basis the API includes a means to specify a default client that is used when no other client is explicitly specified.  This may be configured [...]
 <code>setDefaultHttpClient(HttpClient httpClient)</code> method of the <a href="/documentation/javadoc/arq/org/apache/jena/riot/web/HttpOp.html">HttpOp</a> class. This allows for static-scoped configuration of HTTP behavior.</p>
diff --git a/content/documentation/fuseki2/fuseki-embedded.html b/content/documentation/fuseki2/fuseki-embedded.html
index 989db12..6400d2f 100644
--- a/content/documentation/fuseki2/fuseki-embedded.html
+++ b/content/documentation/fuseki2/fuseki-embedded.html
@@ -204,7 +204,7 @@ Txn.execWrite(dsg, ()-&gt;RDFDataMgr.read(dsg, &quot;D.trig&quot;)) ;
 // Read transaction.
 Txn.execRead(dsg, ()-&gt;{
 Dataset ds = DatasetFactory.wrap(dsg) ;
-try (QueryExecution qExec = QueryExecutionFactory.create(&quot;SELECT * { ?s  ?o}&quot;, ds) ) {
+try (QueryExecution qExec = QueryExecution.create(&quot;SELECT * { ?s  ?o}&quot;, ds) ) {
     ResultSet rs = qExec.execSelect() ;
     ResultSetFormatter.out(rs) ;
   }
diff --git a/content/documentation/csv/index.html b/content/documentation/fuseki2/fuseki-main-security.html
similarity index 89%
rename from content/documentation/csv/index.html
rename to content/documentation/fuseki2/fuseki-main-security.html
index 458095e..079612e 100644
--- a/content/documentation/csv/index.html
+++ b/content/documentation/fuseki2/fuseki-main-security.html
@@ -3,7 +3,7 @@
 <head>
     
 
-    <title>Apache Jena - CSV PropertyTable</title>
+    <title>Apache Jena - Security in Fuseki2 server</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/csv/__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/fuseki2/fuseki-main-security.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -136,9 +136,6 @@
 
 
 
-    
-    
-
 
 <ol class="breadcrumb">
     
@@ -157,7 +154,15 @@
         
         
             
-                <li class="active">CSV</li>
+                <li><a href='/documentation/fuseki2'>FUSEKI2</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li class="active">FUSEKI MAIN SECURITY</li>
             
             
         
@@ -169,16 +174,15 @@
 
                 
             </div>
-            <h1 class="title">CSV PropertyTable</h1>
+            <h1 class="title">Security in Fuseki2 server</h1>
             
-	<hr>
-<blockquote>
-<p>This page covers the jena-csv module which has been retired.<br/>
-The last release of Jena with this module is Jena 3.9.0.<br/>
-See <a href="https://github.com/apache/jena/tree/main/jena-csv">jena-csv/README.md</a>.<br/>
-The <a href="csv_index.html">original documentation</a>.</p>
-</blockquote>
-<hr>
+	<p>This page covers security for Fuseki Main.</p>
+<p>See other <a href="./fusek0-security.html">documentation</a> for the webapp packaging of Fuseki.</p>
+<h2 id="serving-rdf">Serving RDF</h2>
+<p>For any use of users-password information, and especially HTTP basic
+authentication, information is visible in the HTTP headers. When serving RDF and SPARQL requests, using HTTPS is necessary to avoid snooping.
+Digest authentication is also stronger over HTTPS
+because it protects against man-in-the-middle attacks.</p>
 
 
         </div>
diff --git a/content/documentation/geosparql/geosparql-fuseki.html b/content/documentation/geosparql/geosparql-fuseki.html
index 69c37f8..5d18b31 100644
--- a/content/documentation/geosparql/geosparql-fuseki.html
+++ b/content/documentation/geosparql/geosparql-fuseki.html
@@ -261,7 +261,7 @@ GeosparqlServer server =
 <p>Once the default server is running it can be queried using Jena as follows:</p>
 <pre><code>String service = &quot;http://localhost:3030/ds&quot;;
 String query = ....;
-try (QueryExecution qe = QueryExecutionFactory.sparqlService(service, query)) {
+try (QueryExecution qe = QueryExecution.service(service).query(query).build()) {
     ResultSet rs = qe.execSelect();
     ResultSetFormatter.outputAsTSV(rs);
 }
diff --git a/content/documentation/geosparql/index.html b/content/documentation/geosparql/index.html
index ca221d7..277c831 100644
--- a/content/documentation/geosparql/index.html
+++ b/content/documentation/geosparql/index.html
@@ -267,7 +267,7 @@ After it is setup querying is performed using Jena&rsquo;s standard query method
 Model model = .....;
 String query = ....;
 
-try (QueryExecution qe = QueryExecutionFactory.create(query, model)) {
+try (QueryExecution qe = QueryExecution.create(query, model)) {
     ResultSet rs = qe.execSelect();
     ResultSetFormatter.outputAsTSV(rs);
 }
diff --git a/content/documentation/index.xml b/content/documentation/index.xml
index 525bfea..d3a1227 100644
--- a/content/documentation/index.xml
+++ b/content/documentation/index.xml
@@ -44,30 +44,30 @@ Documentation index  The RDF API - the core RDF API in Jena SPARQL - querying an
     
     <item>
       <title>Apache Jena Elephas</title>
-      <link>https://jena.apache.org/documentation/hadoop/</link>
+      <link>https://jena.apache.org/documentation/archive/hadoop/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/hadoop/</guid>
+      <guid>https://jena.apache.org/documentation/archive/hadoop/</guid>
       <description>  The Jena Elephas module has been retired. The last release of Jena with Elephas is Jena 3.17.0. See jena-elephas/README.md. The original documentation.
   </description>
     </item>
     
     <item>
       <title>Apache Jena Elephas</title>
-      <link>https://jena.apache.org/documentation/hadoop/elephas_index.html</link>
+      <link>https://jena.apache.org/documentation/archive/hadoop/elephas_index.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/hadoop/elephas_index.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/hadoop/elephas_index.html</guid>
       <description>Apache Jena Elephas is a set of libraries which provide various basic building blocks which enable you to start writing Apache Hadoop based applications which work with RDF data.
 Historically there has been no serious support for RDF within the Hadoop ecosystem and what support has existed has often been limited and task specific. These libraries aim to be as generic as possible and provide the necessary infrastructure that enables developers to create their application specific logic without worrying about the underlying plumbing.</description>
     </item>
     
     <item>
       <title>Apache Jena Elephas - Common API</title>
-      <link>https://jena.apache.org/documentation/hadoop/common.html</link>
+      <link>https://jena.apache.org/documentation/archive/hadoop/common.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/hadoop/common.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/hadoop/common.html</guid>
       <description>The Common API provides the basic data model for representing RDF data within Apache Hadoop applications. This primarily takes the form of Writable implementations and the necessary machinery to efficiently serialise and deserialise these.
 Currently we represent the three main RDF primitives - Nodes, Triples and Quads - though in future a wider range of primitives may be supported if we receive contributions to implement them.
 RDF Primitives Nodes The Writable type for nodes is predictably enough called NodeWritable and it implements the WritableComparable interface which means it can be used as both a key and/or value in Map/Reduce.</description>
@@ -75,10 +75,10 @@ RDF Primitives Nodes The Writable type for nodes is predictably enough called No
     
     <item>
       <title>Apache Jena Elephas - IO API</title>
-      <link>https://jena.apache.org/documentation/hadoop/io.html</link>
+      <link>https://jena.apache.org/documentation/archive/hadoop/io.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/hadoop/io.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/hadoop/io.html</guid>
       <description>The IO API provides support for reading and writing RDF within Apache Hadoop applications. This is done by providing InputFormat and OutputFormat implementations that cover all the RDF serialisations that Jena supports.
 {% toc %}
 Background on Hadoop IO If you are already familiar with the Hadoop IO paradigm then please skip this section, if not please read as otherwise some of the later information will not make much sense.</description>
@@ -86,10 +86,10 @@ Background on Hadoop IO If you are already familiar with the Hadoop IO paradigm
     
     <item>
       <title>Apache Jena Elephas - Map/Reduce API</title>
-      <link>https://jena.apache.org/documentation/hadoop/mapred.html</link>
+      <link>https://jena.apache.org/documentation/archive/hadoop/mapred.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/hadoop/mapred.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/hadoop/mapred.html</guid>
       <description>The Map/Reduce API provides a range of building block Mapper and Reducer implementations that can be used as a starting point for building Map/Reduce applications that process RDF. Typically more complex applications will need to implement their own variants but these basic ones may still prove useful as part of a larger pipeline.
 {% toc %}
 Tasks The API is divided based upon implementations that support various common Hadoop tasks with appropriate Mapper and Reducer implementations provided for each.</description>
@@ -97,10 +97,10 @@ Tasks The API is divided based upon implementations that support various common
     
     <item>
       <title>Apache Jena Elephas - RDF Stats Demo</title>
-      <link>https://jena.apache.org/documentation/hadoop/demo.html</link>
+      <link>https://jena.apache.org/documentation/archive/hadoop/demo.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/hadoop/demo.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/hadoop/demo.html</guid>
       <description>The RDF Stats Demo is a pre-built application available as a ready to run Hadoop Job JAR with all dependencies embedded within it. The demo app uses the other libraries to allow calculating a number of basic statistics over any RDF data supported by Elephas.
 To use it you will first need to build it from source or download the relevant Maven artefact:
 &amp;lt;dependency&amp;gt; &amp;lt;groupId&amp;gt;org.apache.jena&amp;lt;/groupId&amp;gt; &amp;lt;artifactId&amp;gt;jena-elephas-stats&amp;lt;/artifactId&amp;gt; &amp;lt;version&amp;gt;x.y.z&amp;lt;/version&amp;gt; &amp;lt;classifier&amp;gt;hadoop-job&amp;lt;/classifier&amp;gt; &amp;lt;/dependency&amp;gt;  Where x.</description>
@@ -143,10 +143,10 @@ The sequence from core to TDB should be executed before application components.
     
     <item>
       <title>Apache Jena SDB - persistent triple stores using relational databases</title>
-      <link>https://jena.apache.org/documentation/sdb/</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/</guid>
       <description>  The Jena SDB module has been retired. The last release of Jena with this module is Jena 3.17.0. See jena-sdb/README.md. The original documentation.
   </description>
     </item>
@@ -304,7 +304,7 @@ See example code.</description>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://jena.apache.org/documentation/query/arq-query-eval.html</guid>
-      <description>This page describes the mechanisms that can be used to extend and modify query execution within ARQ. Through these mechanisms, ARQ can be used to query different graph implementations and to provide different query evaluation and optimization strategies for particular circumstances. These mechanisms are used by TDB and SDB.
+      <description>This page describes the mechanisms that can be used to extend and modify query execution within ARQ. Through these mechanisms, ARQ can be used to query different graph implementations and to provide different query evaluation and optimization strategies for particular circumstances. These mechanisms are used by TDB.
 ARQ can be extended in various ways to incorporate custom code into a query. Custom filter functions and property functions provide ways to add application specific code.</description>
     </item>
     
@@ -349,7 +349,7 @@ ARQ consists of the following parts:
   The SPARQL abstract syntax tree (AST) and the SPARQL parser
   The algebra generator that turns SPARQL AST into algebra expressions
  Implementation of the translation in the SPARQL specification. Quad version compiling SPARQL to quad expressions, not basic graph patterns.    Query engines to execute queries
- SPARQL protocol client - remote HTTP requests Reference engine - direct implementation of the algebra Quad engine - direct implementation of the algebra except The main engine SDB, a SPARQL database for large-sale persistent data (external system)    Result set handling for the SPARQL XML results format, the JSON and text versions.</description>
+ SPARQL protocol client - remote HTTP requests Reference engine - direct implementation of the algebra Quad engine - direct implementation of the algebra except The main engine TDB, a SPARQL database for large-sale persistent data    Result set handling for the SPARQL XML results format, the JSON and text versions.</description>
     </item>
     
     <item>
@@ -389,10 +389,10 @@ ARQ does not output any logging messages at level INFO in normal operation. The
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://jena.apache.org/documentation/query/sparql-remote.html</guid>
-      <description>SPARQL is a query language and a remote access protocol. The remote access protocol can be used with plain HTTP or over SOAP.
+      <description>SPARQL is a query language and a remote access protocol. The remote access protocol runs over HTTP.
 See Fuseki for an implementation of the SPARQL protocol over HTTP. Fuseki uses ARQ to provide SPARQL query access to Jena models, including Jena persistent models.
 ARQ includes a query engine capable of using the HTTP version.
-From your application The QueryExecutionFactory has methods for creating a QueryExecution object for remote use.</description>
+From your application The QueryExecutionHTTP has methods for creating a QueryExecution object for remote use. There are various HTTP specific settings; the default should work in most cases.</description>
     </item>
     
     <item>
@@ -574,40 +574,40 @@ Simple model creation The simplest way to create a model (if not the shortest) i
     
     <item>
       <title>CSV PropertyTable</title>
-      <link>https://jena.apache.org/documentation/csv/</link>
+      <link>https://jena.apache.org/documentation/archive/csv/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/csv/</guid>
+      <guid>https://jena.apache.org/documentation/archive/csv/</guid>
       <description>  This page covers the jena-csv module which has been retired. The last release of Jena with this module is Jena 3.9.0. See jena-csv/README.md. The original documentation.
   </description>
     </item>
     
     <item>
       <title>CSV PropertyTable</title>
-      <link>https://jena.apache.org/documentation/csv/csv_index.html</link>
+      <link>https://jena.apache.org/documentation/archive/csv/csv_index.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/csv/csv_index.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/csv/csv_index.html</guid>
       <description>This page covers the jena-csv module which has been retired. The last release of Jena with this module is Jena 3.9.0. See jena-csv/README.md. This is the original documentation.
   This module is about getting CSVs into a form that is amenable to Jena SPARQL processing, and doing so in a way that is not specific to CSV files. It includes getting the right architecture in place for regular table shaped data, using the core abstraction of PropertyTable.</description>
     </item>
     
     <item>
       <title>CSV PropertyTable - Design</title>
-      <link>https://jena.apache.org/documentation/csv/design.html</link>
+      <link>https://jena.apache.org/documentation/archive/csv/design.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/csv/design.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/csv/design.html</guid>
       <description>Architecture The architecture of CSV PropertyTable mainly involves 2 components:
  PropertyTable GraphPropertyTable  PropertyTable A PropertyTable is collection of data that is sufficiently regular in shape it can be treated as a table. That means each subject has a value for each one of the set of properties. Irregularity in terms of missing values needs to be handled but not multiple values for the same property. With special storage, a PropertyTable</description>
     </item>
     
     <item>
       <title>CSV PropertyTable - Get Started</title>
-      <link>https://jena.apache.org/documentation/csv/get_started.html</link>
+      <link>https://jena.apache.org/documentation/archive/csv/get_started.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/csv/get_started.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/csv/get_started.html</guid>
       <description>Using CSV PropertyTable with Apache Maven See &amp;ldquo;Using Jena with Apache Maven&amp;rdquo; for full details.
 &amp;lt;dependency&amp;gt; &amp;lt;groupId&amp;gt;org.apache.jena&amp;lt;/groupId&amp;gt; &amp;lt;artifactId&amp;gt;jena-csv&amp;lt;/artifactId&amp;gt; &amp;lt;version&amp;gt;X.Y.Z&amp;lt;/version&amp;gt; &amp;lt;/dependency&amp;gt;  Using CSV PropertyTable from Java through the API In order to switch on CSV PropertyTable, it&amp;rsquo;s required to register LangCSV into Jena RIOT, through a simple method call:
 import org.apache.jena.propertytable.lang.CSV2RDF; ... CSV2RDF.init() ;  It&amp;rsquo;s a static method call of registration, which needs to be run just one time for an application before using CSV PropertyTable (e.</description>
@@ -615,10 +615,10 @@ import org.apache.jena.propertytable.lang.CSV2RDF; ... CSV2RDF.init() ;  It&amp;
     
     <item>
       <title>CSV PropertyTable - Implementation</title>
-      <link>https://jena.apache.org/documentation/csv/implementation.html</link>
+      <link>https://jena.apache.org/documentation/archive/csv/implementation.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/csv/implementation.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/csv/implementation.html</guid>
       <description>PropertyTable Implementations There are 2 implementations for PropertyTable. The pros and cons are summarised in the following table:
    PropertyTable Implementation Description Supported Indexes Advantages Disadvantages     PropertyTableArrayImpl implemented by a two-dimensioned Java array of Nodes SPO, PSO compact memory usage, fast for querying with S and P, fast for query a whole Row slow for query with O, table Row/Column size provided   PropertyTableHashMapImpl implemented by several Java HashMaps PSO, POS fast for querying with O, table Row/Column size not required more memory usage for HashMaps    By default, [ [...]
     </item>
@@ -655,13 +655,13 @@ To monitor a Model, you must register a ModelChangedListener with that Model:</d
     </item>
     
     <item>
-      <title>explaining ARQ queries</title>
+      <title>Explaining ARQ queries</title>
       <link>https://jena.apache.org/documentation/query/explain.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://jena.apache.org/documentation/query/explain.html</guid>
-      <description>This page applies to ARQ version 2.8.6 and later. In this version query logging was consolidated and made uniform across ARQ, SDB and TDB. Details of TDB logging changed to use this logging and explanation framework from TDB version 0.8.8.
-Optimization in ARQ proceeds on two levels. After the query is parsed, the SPARQL algebra for the query is generated as described in the SPARQL specification. High-level optimization occurs by rewriting the algebra into new, equivalent algebra forms and introducing specialized algebra operators.</description>
+      <description>Optimization in ARQ proceeds on two levels. After the query is parsed, the SPARQL algebra for the query is generated as described in the SPARQL specification. High-level optimization occurs by rewriting the algebra into new, equivalent algebra forms and introducing specialized algebra operators. During query execution, the low-level, storage-specific optimization occurs such as choosing the order of triple patterns within basic graph patterns.
+The effect of high-level optimizations can be seen using arq.</description>
     </item>
     
     <item>
@@ -875,13 +875,25 @@ The intended usage is to specify a TDB folder (either TDB1 or TDB2, created if r
     </item>
     
     <item>
-      <title>HTTP Authentication in ARQ</title>
-      <link>https://jena.apache.org/documentation/query/http-auth.html</link>
+      <title>HTTP Authentication</title>
+      <link>https://jena.apache.org/documentation/sparql-apis/http-auth.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/query/http-auth.html</guid>
-      <description>After Jena 3.1.0, Jena exposes the underlying HTTP Commons functionality to support a range of authentication mechanisms as well as other HTTP configuration. From Jena 3.0.0 through Jena 3.1.0 there is a Jena-specific framework that provides a uniform mechanism for HTTP authentication. This documentation is therefore divided into two sections. The first explains how to use HTTP Commons code, and the second explains the older Jena-specific functionality.
-HTTP Authentication from Jena 3.</description>
+      <guid>https://jena.apache.org/documentation/sparql-apis/http-auth.html</guid>
+      <description>Old documentation (Jena 3.1.1 to Jena 4.2.0)
+Jena 4.3.0 and later uses the JDK java.net.http package. Jena adds API support for challenge-based authentication and also provide HTTP digest authentication.
+Authentication There are 5 variations:
+ Basic authentication Challenge-Basic authentication Challenge-Digest authentication URL user (that is, user@host.net in the URL) URL user and password in the URL (that is, user:password@host.net in the URL)  Basic authentication occurs where the app provides the user and password information to the JDK HttpClient and that information is always used when sending HTTP requests with that HttpClient.</description>
+    </item>
+    
+    <item>
+      <title>HTTP Authentication in ARQ (Superseded)</title>
+      <link>https://jena.apache.org/documentation/archive/versions/http-auth-old.html</link>
+      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+      
+      <guid>https://jena.apache.org/documentation/archive/versions/http-auth-old.html</guid>
+      <description>Documentation for HTTP Authentication (Jena3.1.1 to Jena 4.2.0) using Apache Commons HttpClient.
+ After Jena 3.1.0, Jena exposes the underlying HTTP Commons functionality to support a range of authentication mechanisms as well as other HTTP configuration. From Jena 3.0.0 through Jena 3.1.0 there is a Jena-specific framework that provides a uniform mechanism for HTTP authentication. This documentation is therefore divided into two sections. The first explains how to use HTTP Commons code, and the second explains the older Jena-specific functionality.</description>
     </item>
     
     <item>
@@ -1122,10 +1134,10 @@ LARQ is not compatible with jena-text; the index format has changed and the inte
     
     <item>
       <title>Maven Artifacts for Apache Jena Elephas</title>
-      <link>https://jena.apache.org/documentation/hadoop/artifacts.html</link>
+      <link>https://jena.apache.org/documentation/archive/hadoop/artifacts.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/hadoop/artifacts.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/hadoop/artifacts.html</guid>
       <description>The Apache Jena Elephas libraries for Apache Hadoop are a collection of maven artifacts which can be used individually or together as desired. These are available from the same locations as any other Jena artifact, see Using Jena with Maven for more information.
 Hadoop Dependencies The first thing to note is that although our libraries depend on relevant Hadoop libraries these dependencies are marked as provided and therefore are not transitive.</description>
     </item>
@@ -1326,10 +1338,10 @@ Contents  Overview Sample Code Initializing SAX event source Error Handler Optio
     
     <item>
       <title>SDB - persistent triple stores using relational databases</title>
-      <link>https://jena.apache.org/documentation/sdb/sdb_index.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/sdb_index.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/sdb_index.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/sdb_index.html</guid>
       <description>SDB uses an SQL database for the storage and query of RDF data. Many databases are supported, both Open Source and proprietary.
 An SDB store can be accessed and managed with the provided command line scripts and via the Jena API.
   Use of SDB for new applications is not recommended.   This component is &amp;ldquo;maintenance only&amp;rdquo;.
@@ -1339,20 +1351,20 @@ Status As of June 2013 the Jena developers agreed to treat SDB as being only mai
     
     <item>
       <title>SDB Configuration</title>
-      <link>https://jena.apache.org/documentation/sdb/configuration.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/configuration.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/configuration.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/configuration.html</guid>
       <description>This page describes the configuration options available. These are options for query processing, not for the database layout and storage, which is controlled by store descriptions.
 Contents  Setting Options Current Options  Queries over all Named Graphs Streaming over JDBC Annotated SQL    Setting Options Options can be set globally, throughout the JVM, or on a per query execution basis. SDB uses the same mechanism as ARQ.</description>
     </item>
     
     <item>
       <title>SDB Database Layouts</title>
-      <link>https://jena.apache.org/documentation/sdb/database_layouts.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/database_layouts.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/database_layouts.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/database_layouts.html</guid>
       <description>SDB does not have a single database layout. This page is an informal overview of the two main types (&amp;ldquo;layout2/hash&amp;rdquo; and &amp;ldquo;layout2/index&amp;rdquo;).
 In SDB one store is one RDF dataset is one SQL database.
 Databases of type layout2 have a triples table for the default graph, a quads table for the named graphs. In the triples and quads tables, the columns are integers referencing a nodes table.
@@ -1361,10 +1373,10 @@ In the hash form, the integers are 8-byte hashes of the node.</description>
     
     <item>
       <title>SDB Database Notes</title>
-      <link>https://jena.apache.org/documentation/sdb/db_notes.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/db_notes.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/db_notes.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/db_notes.html</guid>
       <description>DB2 Derby MS SQL MySQL PostgresQL  DB2 Database creation The database should be created with code set UTF-8 so unicode is enabled (SDB creates tables CCSID UNICODE for full internationalization support).
 Derby Loading Restriction Only one load operation can be active at any one time. Limitations on temporary tables in Derby mean the loader tables are not temporary and hence are shared by all connections.
 MS SQL The collation sequence for the database must be one that is binary (BIN in the name).</description>
@@ -1372,20 +1384,20 @@ MS SQL The collation sequence for the database must be one that is binary (BIN i
     
     <item>
       <title>SDB Databases Supported</title>
-      <link>https://jena.apache.org/documentation/sdb/databases_supported.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/databases_supported.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/databases_supported.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/databases_supported.html</guid>
       <description>Product Version     Oracle 10g Including OracleXE   Microsoft SQL Server 2005 Including MS SQL Express   DB2 9 Including DB2 9 Express   PostgreSQL v8.2   MySQL v5.0.22   Apache Derby v10.2.2.0   H2 1.0.71   HSQLDB 1.8.0    Support for a version implies support for later versions unless otherwise stated.
 Microsoft SQL Server 2000 is also reported to work.</description>
     </item>
     
     <item>
       <title>SDB Dataset Description</title>
-      <link>https://jena.apache.org/documentation/sdb/dataset_description.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/dataset_description.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/dataset_description.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/dataset_description.html</guid>
       <description>Assembler descriptions for RDF Datasets and individual models are built from Store Descriptions. A dataset assembler just points to the store to use; a model assembler points to the store and identifies the model within the store to use (or use the default model).
 Datasets The example below creates an in-memory store implemented by HSQLDB.
 PREFIX rdfs: &amp;lt;http://www.w3.org/2000/01/rdf-schema#&amp;gt; PREFIX rdf: &amp;lt;http://www.w3.org/1999/02/22-rdf-syntax-ns#&amp;gt; PREFIX xsd: &amp;lt;http://www.w3.org/2001/XMLSchema#&amp;gt; PREFIX ja: &amp;lt;http://jena.hpl.hp.com/2005/11/Assembler#&amp;gt; PREFIX sdb: &amp;lt;http://jena.hpl.hp.com/2007/sdb#&amp;gt; sdb:DatasetStore rdfs:subClassOf ja:RDFDataset .</description>
@@ -1393,10 +1405,10 @@ PREFIX rdfs: &amp;lt;http://www.w3.org/2000/01/rdf-schema#&amp;gt; PREFIX rdf: &
     
     <item>
       <title>SDB FAQ</title>
-      <link>https://jena.apache.org/documentation/sdb/faq.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/faq.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/faq.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/faq.html</guid>
       <description>Tune your database Database performance depends on the database being tuned. Some databases default to &amp;ldquo;developer setup&amp;rdquo; which does not use much of the RAM but is only for functional testing.
 Improving loading rates For a large bulk load into an existing store, dropping the indexes, doing the load and then recreating the indexes can be noticeably faster.
  sdbconfig --drop sdbload file sdbconfig --index  For a large bulk load into a new store, just format it, and not create the indexes, do the load and then recreating the indexes can be noticeably faster.</description>
@@ -1404,10 +1416,10 @@ Improving loading rates For a large bulk load into an existing store, dropping t
     
     <item>
       <title>SDB Fuseki Integration</title>
-      <link>https://jena.apache.org/documentation/sdb/fuseki_integration.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/fuseki_integration.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/fuseki_integration.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/fuseki_integration.html</guid>
       <description>Fuseki is a server that implements the SPARQL protocol for HTTP. It can be used to give a SPARQL interface to an SDB installation.
 The Fuseki server needs the SDB jar files on its classpath. The Fuseki server configuration file needs to contain two triples to integrate SDB:
 [] rdf:type fuseki:Server ; fuseki:services ( &amp;lt;#service1&amp;gt; ) . ## Declare that sdb:DatasetStore is an implementation of ja:RDFDataset . sdb:DatasetStore rdfs:subClassOf ja:RDFDataset .</description>
@@ -1415,10 +1427,10 @@ The Fuseki server needs the SDB jar files on its classpath. The Fuseki server co
     
     <item>
       <title>SDB Installation</title>
-      <link>https://jena.apache.org/documentation/sdb/installation.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/installation.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/installation.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/installation.html</guid>
       <description>A suitable database must be installed separately. Any database installation should be tuned according to the database documentation.
 The SDB distribution is zip file of a directory hierarchy.
 Unzip this. You may need to run chmod u+x on the scripts in the bin/ directory.
@@ -1428,10 +1440,10 @@ A database must be created before the tests can be run. Microsoft SQL server and
     
     <item>
       <title>SDB JavaAPI</title>
-      <link>https://jena.apache.org/documentation/sdb/javaapi.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/javaapi.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/javaapi.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/javaapi.html</guid>
       <description>This page describes how to use SDB from Java.
 Code examples are in src-examples/ in the SDB distribution.
 Contents  Concepts Obtaining the Store  From a configuration file In Java code Database User and Password   Connection Management Formatting or Emptying the Store Loading data Executing Queries Using the Jena Model API with SDB  Concepts  Store SDBFactory SDBConnection  SDB loads and queries data based on the unit of a Store.</description>
@@ -1439,10 +1451,10 @@ Contents  Concepts Obtaining the Store  From a configuration file In Java code D
     
     <item>
       <title>SDB Loading data</title>
-      <link>https://jena.apache.org/documentation/sdb/loading_data.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/loading_data.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/loading_data.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/loading_data.html</guid>
       <description>There are three ways to load data into SDB:
  Use the command utility sdbload Use one of the Jena model.read operations Use the Jena model.add  The last one of these requires the application to signal the beginning and end of batches.
 Loading with Model.read A Jena Model obtained from SDB via:
@@ -1452,39 +1464,39 @@ Loading with Model.</description>
     
     <item>
       <title>SDB Loading performance</title>
-      <link>https://jena.apache.org/documentation/sdb/loading_performance.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/loading_performance.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/loading_performance.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/loading_performance.html</guid>
       <description>Introduction The Databases and Hardware  Hardware Windows setup Linux setup   The Dataset and Queries  LUBM dbpedia   Loading Results Uniprot 700m loading: Tuning Helps  Introduction Performance reporting is an area prone to misinterpretation, and such reports should be liberally decorated with disclaimers. In our case there are an alarming number of variables: the hardware, the operating system, the database engine and its myriad parameters, the data itself, the queri [...]
     </item>
     
     <item>
       <title>SDB Query performance</title>
-      <link>https://jena.apache.org/documentation/sdb/query_performance.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/query_performance.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/query_performance.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/query_performance.html</guid>
       <description>This page compares the effect of SDB with RDB, Jena&amp;rsquo;s usual database layout. RDB was designed for supporting the fine-grained API calls as well as having some support for basic graph patterns. Therefore, the RDB design goals were not those of SDB.
 RDB uses a denormalised database layout in order that all statement-level operations do not require additional joins. The SDB layout is normalised so that the triple table is narrower and uses integers for RDF nodes, then does do joins to get the node representation.</description>
     </item>
     
     <item>
       <title>SDB Quickstart</title>
-      <link>https://jena.apache.org/documentation/sdb/quickstart.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/quickstart.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/quickstart.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/quickstart.html</guid>
       <description>SDB provides some command line tools to work with SDB triple stores. In the following it assumed that you have a store description set up for your database (sdb.ttl). See the store description format for details. The Store/ directory for some examples.
 Setting up your environment $ export SDBROOT=/path/to/sdb $ export PATH=$SDBROOT/bin:$PATH $ export SDB_USER=YourDatabaseUserName $ export SDB_PASSWORD=YourDatabasePassword $ export SDB_JDBC=YourJDBCdriver  Initialising the database Be aware that this will wipe existing data from the database.</description>
     </item>
     
     <item>
       <title>SDB Store Description</title>
-      <link>https://jena.apache.org/documentation/sdb/store_description.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/store_description.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/store_description.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/store_description.html</guid>
       <description>Use of an SDB store requires a Store object which is described in two parts:
  a connection to the database a description of the store configuration  These can be built from a Jena assembler description.
 Store objects themselves are lightweight so connections to an SDB database can be created on a per-request basis as required for use in J2EE application servers.
@@ -1493,10 +1505,10 @@ Contents  Store Descriptions SDB Connections Example Vocabulary  Store Connectio
     
     <item>
       <title>SDB/Commands</title>
-      <link>https://jena.apache.org/documentation/sdb/commands.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/commands.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/commands.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/commands.html</guid>
       <description>This page describes the command line programs that can be used to create an SDB store, load data into it and to issue queries.
 Contents   Scripts
  Script set up Argument Structure    Store Description
@@ -1515,6 +1527,17 @@ In its default configuration, SPARQL endpoints are open to the public but admini
     </item>
     
     <item>
+      <title>Security in Fuseki2 server</title>
+      <link>https://jena.apache.org/documentation/fuseki2/fuseki-main-security.html</link>
+      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+      
+      <guid>https://jena.apache.org/documentation/fuseki2/fuseki-main-security.html</guid>
+      <description>This page covers security for Fuseki Main.
+See other documentation for the webapp packaging of Fuseki.
+Serving RDF For any use of users-password information, and especially HTTP basic authentication, information is visible in the HTTP headers. When serving RDF and SPARQL requests, using HTTPS is necessary to avoid snooping. Digest authentication is also stronger over HTTPS because it protects against man-in-the-middle attacks.</description>
+    </item>
+    
+    <item>
       <title>SOH - SPARQL over HTTP</title>
       <link>https://jena.apache.org/documentation/fuseki2/soh.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
@@ -1795,7 +1818,7 @@ The file access mechanism can be set explicitly, but this is not a good idea for
       <guid>https://jena.apache.org/documentation/tdb/tdb-xloader.html</guid>
       <description>TDB xloader (&amp;ldquo;x&amp;rdquo; for external) is a bulkloader for very large datasets. The goal is stability and reliability for long running loading, running on modest and
 xloader is not a replacement for regular TDB1 and TDB2 loaders.
-Theer are two scripts to load data using the xlaoder subsystem.
+There are two scripts to load data using the xlaoder subsystem.
 &amp;ldquo;tdb1.xloader&amp;rdquo;, which was called &amp;ldquo;tdbloader2&amp;rdquo; and has some improvements.
 It is not as fast as other TDB loaders on dataset where the general loaders work on without encountering progressive slowdown.</description>
     </item>
diff --git a/content/documentation/notes/model-factory.html b/content/documentation/notes/model-factory.html
index 6355378..2412862 100644
--- a/content/documentation/notes/model-factory.html
+++ b/content/documentation/notes/model-factory.html
@@ -191,9 +191,7 @@ use.</p>
 plain RDF model, stored in-memory, that does no inference and has
 no special ontology interface.</p>
 <h2 id="database-model-creation">Database model creation</h2>
-<p><em>Note:</em> this section previously referred to creating database models
-with RDB, a now obsolete Jena features. For methods of creating models
-with <a href="/documentation/sdb/index.html">SDB</a> and <a href="/documentation/tdb/index.html">TDB</a>
+<p>For methods of creating models for <a href="/documentation/tdb/index.html">TDB</a>
 please see the relevant reference sections.</p>
 <h2 id="inference-model-creation">Inference model creation</h2>
 <p>An important feature of Jena is support for different kinds of
diff --git a/content/documentation/ontology/index.html b/content/documentation/ontology/index.html
index 5bd6a47..a4e47b4 100644
--- a/content/documentation/ontology/index.html
+++ b/content/documentation/ontology/index.html
@@ -2130,8 +2130,7 @@ database interaction) to retrieve and update RDF data from the
 model. In this section we briefly discuss using the ontology API with
 Jena&rsquo;s persistent database models.</p>
 <p>For information on setting-up and accessing the persistent models
-themselves, please see the
-<a href="/documentation/sdb/index.html">SDB</a> and <a href="/documentation/tdb/index.html">TDB</a>
+themselves, see the <a href="/documentation/tdb/index.html">TDB</a>
 reference sections.</p>
 <p>There are two somewhat separate requirements for persistently
 storing ontology data. The first is making the main or base model
diff --git a/content/documentation/query/architecture.html b/content/documentation/query/architecture.html
index 93e23a1..114515c 100644
--- a/content/documentation/query/architecture.html
+++ b/content/documentation/query/architecture.html
@@ -198,8 +198,7 @@ graph patterns.</li>
 <li>Reference engine - direct implementation of the algebra</li>
 <li>Quad engine - direct implementation of the algebra except</li>
 <li>The main engine</li>
-<li>SDB, a SPARQL database for large-sale persistent data (external
-system)</li>
+<li>TDB, a SPARQL database for large-sale persistent data</li>
 </ul>
 </li>
 <li>
diff --git a/content/documentation/query/arq-query-eval.html b/content/documentation/query/arq-query-eval.html
index 9770cfa..cc691f4 100644
--- a/content/documentation/query/arq-query-eval.html
+++ b/content/documentation/query/arq-query-eval.html
@@ -181,7 +181,7 @@ modify query execution within ARQ. Through these mechanisms, ARQ
 can be used to query different graph implementations and to provide
 different query evaluation and optimization strategies for
 particular circumstances. These mechanisms are used by
-<a href="../tdb">TDB</a> and <a href="../sdb/">SDB</a>.</p>
+<a href="../tdb">TDB</a>.</p>
 <p>ARQ can be <a href="extension.html">extended in various ways</a> to
 incorporate custom code into a query.
 <a href="extension.html#filter-functions">Custom filter functions</a> and
@@ -331,14 +331,14 @@ sub-operations.</p>
 out when a query is executed via the <code>QueryExecution.execSelect</code> or
 other <code>QueryExecution</code> exec operation. It is possible to carry out
 storage-specific operations when the query execution is created. A
-query engine works in conjunction with a <code>QueryExecution</code> created
-by the <code>QueryExecutionFactory</code> to provide the evaluation of a query
+query engine works in conjunction with a <code>QueryExecution</code>
+to provide the evaluation of a query
 pattern. <code>QueryExecutionBase</code> provides all the machinery for the
 different result types and does not need to be modified by
 extensions to query execution.</p>
 <p>ARQ provides three query engine factories; the main query engine
 factory, one for a reference query engine and one to remotely
-execute a query. SDB and TDB provide their own query engine
+execute a query. TDB provides its own query engine
 factories which they register during sub-system initialization.
 Both extend the main query engine described below.</p>
 <p>The reference query engine is a direct top-down evaluation of the
@@ -567,7 +567,7 @@ custom query engine and overriding <code>QueryEngineMain.modifyOp</code>:</p>
 </code></pre>
 <p>The extension may need to provide its own dataset implementation so
 that it can detect when queries are directed to its named graph
-storage. <a href="../tdb/">TDB</a> and <a href="../sdb/">SDB</a> are examples of this.</p>
+storage. <a href="../tdb/">TDB</a> are examples of this.</p>
 <h2 id="mixed-graph-implementation-datasets">Mixed Graph Implementation Datasets</h2>
 <p>The dataset implementation used in normal operation does not work
 on quads but instead can provide a dataset with a collection of
@@ -594,16 +594,14 @@ the initial setup. See the example in
 evaluation, this is a substantial endeavour. <code>QueryExecutionBase</code>
 provides the machinery for result presentation (<code>SELECT</code>,
 <code>CONSTRUCT</code>, <code>DESCRIBE</code>, <code>ASK</code>), leaving the work of pattern
-evaluation to the custom query engine. <code>QueryExecutionFactory</code>
-assumes that <code>QueryExecutionBase</code> will be used.</p>
+evaluation to the custom query engine.</p>
 <h2 id="algebra-extensions">Algebra Extensions</h2>
 <p>New operators can be added to the algebra using the <code>OpExt</code> class
 as the super-class of the new operator. They can be inserted into
 the expression to be evaluated using a custom query engine to
 intercept evaluation initialization.  When evaluation of a query
 requires the evaluation of a sub-class of <code>OpExt</code>, the <code>eval</code>
-method is called. SDB uses this to introduce an operator that is
-implemented in SQL.</p>
+method is called.</p>
 
 
         </div>
diff --git a/content/documentation/query/construct-quad.html b/content/documentation/query/construct-quad.html
index 783c48a..c46edae 100644
--- a/content/documentation/query/construct-quad.html
+++ b/content/documentation/query/construct-quad.html
@@ -301,7 +301,7 @@ for the client users to manipulate the programming API described in the
 previous sections, e.g.</p>
 <pre><code>String queryString = &quot; CONSTRUCT { GRAPH &lt;http://example/ns#g1&gt; {?s ?p ?o} } WHERE {?s ?p ?o}&quot; ;
 Query query = QueryFactory.create(queryString, Syntax.syntaxARQ);
-try ( QueryExecution qExec = QueryExecutionFactory.sparqlService(serviceQuery, query) ) { // serviceQuery is the URL of the remote service
+try ( QueryExecution qExec = QueryExecution.service(serviceQuery).query(query).build() ) { // serviceQuery is the URL of the remote service
     Iterator&lt;Quad&gt; result = qExec.execConstructQuads();
     ...
 }
diff --git a/content/documentation/query/explain.html b/content/documentation/query/explain.html
index 115216f..eabd8a7 100644
--- a/content/documentation/query/explain.html
+++ b/content/documentation/query/explain.html
@@ -3,7 +3,7 @@
 <head>
     
 
-    <title>Apache Jena - explaining ARQ queries</title>
+    <title>Apache Jena - Explaining ARQ queries</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -174,13 +174,9 @@
 
                 
             </div>
-            <h1 class="title">explaining ARQ queries</h1>
+            <h1 class="title">Explaining ARQ queries</h1>
             
-	<p><em>This page applies to ARQ version 2.8.6 and later. In this version query
-logging was consolidated and made uniform across ARQ, SDB and TDB.
-Details of TDB logging changed to use this logging and explanation
-framework from TDB version 0.8.8.</em></p>
-<p>Optimization in ARQ proceeds on two levels. After the query is parsed,
+	<p>Optimization in ARQ proceeds on two levels. After the query is parsed,
 the SPARQL algebra for the query is generated as described in the SPARQL
 specification. High-level optimization occurs by rewriting the algebra
 into new, equivalent algebra forms and introducing specialized algebra
@@ -258,8 +254,7 @@ globally:</p>
 </code></pre>
 <p>and it may also be set on an individual query execution using its local
 context.</p>
-<pre><code> try(QueryExecution qExec = QueryExecutionFactory.create(...)) {
-     qExec.getContext().set(ARQ.symLogExec, Explain.InfoLevel.ALL) ;
+<pre><code> try(QueryExecution qExec = QueryExecution.create() ... .set(ARQ.symLogExec, Explain.InfoLevel.ALL).build() ) {
      ResultSet rs = qExec.execSelect() ;
      ...
  }
diff --git a/content/documentation/query/logging.html b/content/documentation/query/logging.html
index cab762b..d3dd919 100644
--- a/content/documentation/query/logging.html
+++ b/content/documentation/query/logging.html
@@ -275,8 +275,7 @@ globally:</p>
 </code></pre>
 <p>and it may also be set on an individual query execution using its local
 context.</p>
-<pre><code> try(QueryExecution qExec = QueryExecutionFactory.create(...)) {
-    qExec.getContext().set(ARQ.symLogExec, Explain.InfoLevel.ALL) ;
+<pre><code> try(QueryExecution qExec = QueryExecution.create()... .set(ARQ.symLogExec, Explain.InfoLevel.ALL).build) {
     ...
  }
 </code></pre>
diff --git a/content/documentation/query/sparql-remote.html b/content/documentation/query/sparql-remote.html
index 8ee8cd6..4736af2 100644
--- a/content/documentation/query/sparql-remote.html
+++ b/content/documentation/query/sparql-remote.html
@@ -179,18 +179,15 @@
 	<p>SPARQL is a
 <a href="http://www.w3.org/TR/sparql11-query/">query language</a> and a
 <a href="http://www.w3.org/2001/sw/DataAccess/proto-wd/">remote access protocol</a>.
-The remote access protocol can be used with plain HTTP or over
-<a href="http://www.w3.org/TR/soap12-part0/">SOAP</a>.</p>
+The remote access protocol runs over HTTP.</p>
 <p>See <a href="../fuseki2/index.html">Fuseki</a> for an implementation of the
 SPARQL protocol over HTTP. Fuseki uses ARQ to provide SPARQL
 query access to Jena models, including Jena persistent models.</p>
 <p>ARQ includes a query engine capable of using the HTTP version.</p>
 <h2 id="from-your-application">From your application</h2>
-<p>The <code>QueryExecutionFactory</code> has methods for creating a
-<code>QueryExecution</code> object for remote use.
-<code>QueryExecutionFactory.sparqlService</code></p>
-<p>These methods build a query execution object that uses the query
-engine in <code>org.apache.jena.sparql.engine.http</code>.</p>
+<p>The <code>QueryExecutionHTTP</code> has methods for creating a
+<code>QueryExecution</code> object for remote use. There are various
+HTTP specific settings; the default should work in most cases.</p>
 <p>The remote request is made when the <code>execSelect</code>, <code>execConstruct</code>,
 <code>execDescribe</code> or <code>execAsk</code> method is called.</p>
 <p>The results are held locally after remote execution and can be
@@ -204,7 +201,7 @@ query requests using the <code>--service</code> argument:</p>
 <p>The query given is parsed locally to check for syntax errors before
 sending.</p>
 <h2 id="authentication">Authentication</h2>
-<p>ARQ provides a flexible API for authenticating against remote services, see the <a href="http-auth.html">HTTP Authentication</a> documentation for more details.</p>
+<p>ARQ provides a flexible API for authenticating against remote services, see the <a href="../sparql-apis/http-auth.html">HTTP Authentication</a> documentation for more details.</p>
 <h2 id="firewalls-and-proxies">Firewalls and Proxies</h2>
 <p>Don&rsquo;t forget to set the proxy for Java if you are accessing a
 public server from behind a blocking firewall. Most home firewalls
diff --git a/content/documentation/rdfconnection/index.html b/content/documentation/rdfconnection/index.html
index 1979aa3..fcb2986 100644
--- a/content/documentation/rdfconnection/index.html
+++ b/content/documentation/rdfconnection/index.html
@@ -188,7 +188,7 @@ data in Java.  It provides support for try-resource and functional code
 passing styles, as well the more basic sequence of methods calls.</p>
 <p>For example: using <code>try-resources</code> to manage the connection, and perform two operations, one to load
 some data, and one to make a query can be written as:</p>
-<pre><code>try ( RDFConnection conn = RDFConnectionFactory.connect(...) ) {
+<pre><code>try ( RDFConnection conn = RDFConnection.connect(...) ) {
     conn.load(&quot;data.ttl&quot;) ;
     conn.querySelect(&quot;SELECT DISTINCT ?s { ?s ?p ?o }&quot;, (qs)-&gt;
        Resource subject = qs.getResource(&quot;s&quot;) ;
@@ -198,7 +198,7 @@ some data, and one to make a query can be written as:</p>
 </code></pre>
 <p>This could have been written as (approximately &ndash; the error handling is better
 in the example above):</p>
-<pre><code>RDFConnection conn = RDFConnectionFactory.connect(...)
+<pre><code>RDFConnection conn = RDFConnection.connect(...)
 conn.load(&quot;data.ttl&quot;) ;
 QueryExecution qExec = conn.query(&quot;SELECT DISTINCT ?s { ?s ?p ?o }&quot;) ;
 ResultSet rs = qExec.execSelect() ;
@@ -210,9 +210,6 @@ while(rs.hasNext()) {
 qExec.close() ;
 conn.close() ;
 </code></pre>
-<p>Jena also provides a separate
-<a href="/documentation/jdbc/index.html">SPARQL over JDBC driver</a>
-library.</p>
 <h2 id="transactions">Transactions</h2>
 <p>Transactions are the preferred way to work with RDF data.
 Operations on an <code>RDFConnection</code> outside of an application-controlled
@@ -221,7 +218,7 @@ operation. This &ldquo;autocommit&rdquo; feature may lead to inefficient operati
 to excessive overhead.</p>
 <p>The <code>Txn</code> class provides a Java8-style transaction API.  Transactions are
 code passed in the <code>Txn</code> library that handles the transaction lifecycle.</p>
-<pre><code>try ( RDFConnection conn = RDFConnectionFactory.connect(...) ) {
+<pre><code>try ( RDFConnection conn = RDFConnection.connect(...) ) {
     Txn.execWrite(conn, ()-&gt; {
         conn.load(&quot;data1.ttl&quot;) ;
         conn.load(&quot;data2.ttl&quot;) ;
@@ -233,7 +230,7 @@ code passed in the <code>Txn</code> library that handles the transaction lifecyc
 }
 </code></pre>
 <p>The traditional style of explicit <code>begin</code>, <code>commit</code>, <code>abort</code> is also available.</p>
-<pre><code>try ( RDFConnection conn = RDFConnectionFactory.connect(...) ) {
+<pre><code>try ( RDFConnection conn = RDFConnection.connect(...) ) {
     conn.begin(ReadWrite.WRITE) ;
     try {
         conn.load(&quot;data1.ttl&quot;) ;
@@ -294,7 +291,7 @@ dataset.  It provides a standardised way to manage the data in a dataset.</p>
 <p>The operations are to fetch a graph, set the RDF data in a graph,
 add more RDF data into a graph, and delete a graph from a dataset.</p>
 <p>For example: load two files:</p>
-<pre><code>try ( RDFConnection conn = RDFConnectionFactory.connect(...) ) {
+<pre><code>try ( RDFConnection conn = RDFConnection.connect(...) ) {
     conn.load(&quot;data1.ttl&quot;) ;
     conn.load(&quot;data2.nt&quot;) ;
   }
@@ -328,14 +325,14 @@ accessing returned models must be done with <a href="../txn">transactions</a>
 in this mode.</p>
 <h2 id="query-usage">Query Usage</h2>
 <p><code>RDFConnection</code> provides methods for each of the SPARQL query forms (<code>SELECT</code>,
-<code>CONSTRUCT</code>, <code>DESCRIBE</code>, <code>ASK</code>) as well as a way to get the lower level
-<code>QueryExecution</code> for specialized configuration.</p>
-<p>When creating an <code>QueryExecution</code> explicitly, care should be taken to close
-it. If the application wishes to capture the result set from a SELECT query and
+<code>CONSTRUCT</code>, <code>DESCRIBE</code>, <code>ASK</code>) as well as a way to get the
+<code>QueryExecution</code> for specialized configuration. When creating an
+<code>QueryExecution</code> explicitly, care should be taken to close it.</p>
+<p>If the application wishes to capture the result set from a SELECT query and
 retain it across the lifetime of the transaction or <code>QueryExecution</code>, then
 the application should create a copy which is not attached to any external system
 with <code>ResultSetFactory.copyResults</code>.</p>
-<pre><code>  try ( RDFConnection conn = RDFConnectionFactory.connect(&quot;foo&quot;) ) {
+<pre><code>  try ( RDFConnection conn = RDFConnection.connect(&quot;https://...&quot;) ) {
       ResultSet safeCopy =
           Txn.execReadReturn(conn, ()-&gt; {
               // Process results by row:
@@ -350,7 +347,7 @@ with <code>ResultSetFactory.copyResults</code>.</p>
 </code></pre>
 <h2 id="update-usage">Update Usage</h2>
 <p>SPARQL Update operations can be performed and mixed with other operations.</p>
-<pre><code>  try ( RDFConnection conn = RDFConnectionFactory.connect(...) ) {
+<pre><code>  try ( RDFConnection conn = RDFConnection.connect(...) ) {
       Txn.execWrite(conn, ()-&gt; {
          conn.update(&quot;DELETE DATA { ... }&quot; ) ;
          conn.load(&quot;data.ttl&quot;) ;
diff --git a/content/documentation/sparql-apis/index.html b/content/documentation/sparql-apis/http-auth.html
similarity index 57%
copy from content/documentation/sparql-apis/index.html
copy to content/documentation/sparql-apis/http-auth.html
index 698cb1b..9e982a3 100644
--- a/content/documentation/sparql-apis/index.html
+++ b/content/documentation/sparql-apis/http-auth.html
@@ -3,7 +3,7 @@
 <head>
     
 
-    <title>Apache Jena - Apache Jena SPARQL APIs</title>
+    <title>Apache Jena - HTTP Authentication</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -119,7 +119,7 @@
                     </ul>
                 </li>
 
-                <li id="edit"><a href="https://github.com/apache/jena-site/edit/main/source/documentation/sparql-apis/__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/sparql-apis/http-auth.md" title="Edit this page on GitHub"><span class="glyphicon glyphicon-pencil"></span> Edit this page</a></li>
             </ul>
         </div>
     </div>
@@ -136,9 +136,6 @@
 
 
 
-    
-    
-
 
 <ol class="breadcrumb">
     
@@ -157,7 +154,15 @@
         
         
             
-                <li class="active">SPARQL APIS</li>
+                <li><a href='/documentation/sparql-apis'>SPARQL APIS</a></li>
+            
+            
+        
+    
+        
+        
+            
+                <li class="active">HTTP AUTH</li>
             
             
         
@@ -169,314 +174,12 @@
 
                 
             </div>
-            <h1 class="title">Apache Jena SPARQL APIs</h1>
+            <h1 class="title">HTTP Authentication</h1>
             
-	<p>Jump to the &ldquo;<a href="#changes">Changes</a>&rdquo; section.</p>
-<h2 id="overview">Overview</h2>
-<p>The SPARQL specifications provide
-<a href="https://www.w3.org/TR/sparql11-query/">query</a>,
-<a href="https://www.w3.org/TR/sparql11-update/">update</a> and the
-<a href="https://www.w3.org/TR/sparql11-http-rdf-update/">graph store protocol</a> (GSP).</p>
-<p>For working with RDF data:</p>
-<table>
-<thead>
-<tr>
-<th>API</th>
-<th>GPI</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><code>Model</code></td>
-<td><code>Graph</code></td>
-</tr>
-<tr>
-<td><code>Statement</code></td>
-<td><code>Triple</code></td>
-</tr>
-<tr>
-<td><code>Resource</code></td>
-<td><code>Node</code></td>
-</tr>
-<tr>
-<td><code>Literal</code></td>
-<td><code>Node</code></td>
-</tr>
-<tr>
-<td><code>String</code></td>
-<td><code>Var</code></td>
-</tr>
-<tr>
-<td><code>Dataset</code></td>
-<td><code>DatasetGraph</code></td>
-</tr>
-<tr>
-<td></td>
-<td><code>Quad</code></td>
-</tr>
-</tbody>
-</table>
-<p>and for SPARQL,</p>
-<table>
-<thead>
-<tr>
-<th>API</th>
-<th>GPI</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><code>RDFConnection</code></td>
-<td><code>RDFLink</code></td>
-</tr>
-<tr>
-<td><code>QueryExecution</code></td>
-<td><code>QueryExec</code></td>
-</tr>
-<tr>
-<td><code>UpdateExecution</code></td>
-<td><code>UpdateExec</code></td>
-</tr>
-<tr>
-<td><code>ResultSet</code></td>
-<td><code>RowSet</code></td>
-</tr>
-<tr>
-<td><code>ModelStore</code></td>
-<td><code>GSP</code></td>
-</tr>
-</tbody>
-</table>
-<p>Jena provides a single interface, <a href="../rdfconnection"><code>RDFConnection</code></a> for
-working with local and remote RDF data using these protocols in a unified way.
-This is most useful for remote data because the setup to connect is more
-complicated and can be done once and reused.</p>
-<p>HTTP authentication support is provided, supporting both basic and digest
-authentication in challenge-response scenarios. Most authentication setup is
-abstracted away from the particualr HTTP client library Jena is using.</p>
-<p>Applications can also use the various execution engines through
-<code>QueryExecution</code>, <code>UpdateExecution</code> and <code>ModelStore</code>.</p>
-<p>All the main implementations work at &ldquo;Graph SPI&rdquo; (GPI) level and an application
-may wish to work with this lower level interface that implements generalized RDF
-(i.e. a triple is any three nodes, including ones like variables, and subsystem
-extension nodes).</p>
-<p>The GPI version is the main machinery working at the storage and network level,
-and the API version is an adapter to convert to the Model API and related
-classes.</p>
-<p><code>UpdateProcessor</code> is a legacy name for <code>UpdateExecution</code></p>
-<p><code>GSP</code> provides the SPARQL Graph Store Protocol, including extensions for sending
-and receiving datasets, rather than individual graphs.</p>
-<p>Both API and GPI provide builders for detailed setup, particularly for remote
-usage over HTTP and HTTPS where detailed control of the HTTP requests is
-sometimes necessary to work with other triple stores.</p>
-<p>Factory style functions for many common usage patterns are retained in
-<code>QueryExecutionFactory</code>, <code>UpdateExecutionFactory</code>. Note that any methods that
-involved Apache HttpClient objects have been removed.</p>
-<h2 id="changes">Changes from Jena 4.2.0 to Jena 4.3.0</h2>
-<ul>
-<li>
-<p>Execution objects have a companion builder. This is especially important of
-HTTP as there many configuration options that may be needed. Local use is
-still covered by the existing <code>QueryExecutionFactory</code> as well as the new
-<code>QueryExecutionBuilder</code>.</p>
-</li>
-<li>
-<p>HTTP usage provided by the JDK <code>java.net.http</code> package, with challenge-based
-authentication provided on top by Jena. <a href="#auth">See below</a>.</p>
-</li>
-<li>
-<p>Authentication support is uniformly applied to query, update, GSP and <code>SERVICE</code>.</p>
-</li>
-<li>
-<p>HTTP/2 support</p>
-</li>
-<li>
-<p>Remove Apache HttpClient usage</p>
-<ul>
-<li>When using this for authentication, application code changes wil be
-necessary.</li>
-</ul>
-</li>
-<li>
-<p>Deprecate modifying <code>QueryExecution</code> after it is built.</p>
-</li>
-<li>
-<p>Substitution of variables for concrete values in query and update execution.
-This is a form of paramterization that works in both local and remnote usage
-(unlike &ldquo;intial bindings&rdquo; which are only available for lcoal query execution).
-See the <a href="#substitution">substitution section</a> section below.</p>
-</li>
-<li>
-<p><code>HttpOp</code>, using <code>java.net.http.HttpClient</code>, is split into <code>HttpRDF</code> for
-GET/POST/PUT/DELETE of graphs and datasets and new <code>HttpOp</code> for packaged-up
-common patterns of HTTP usage.</p>
-</li>
-<li>
-<p>The previous <code>HttpOp</code> is available as <code>HttpOp1</code> and Apache HttpClient is still
-a dependency. Eventually, `HttpOp`` and dependecy on  Apache HttpClient will be removed.</p>
-</li>
-<li>
-<p>GSP - support for dataset operations as well as graphs (also supported by Fuseki).</p>
-</li>
-<li>
-<p><code>DatasetAccessor</code>s removed - previously these were deprecated. <code>GSP</code> and
-<code>ModelStore</code> are the replacement for remote operations. <code>RDFConnection</code> and
-<code>RDFLink</code> provide APIs.</p>
-</li>
-</ul>
-<h2 id="substitution">Substitution</h2>
-<p>All query and update builders provide operations to uses a query and substitute
-variables for concrete RDF terms in the execution</p>
-<p>Unlike &ldquo;initial bindings&rdquo; substitution is provided in query and update builders
-for both local and remote cases.</p>
-<p>Substitution is always &ldquo;replace variable with RDF term&rdquo; in a query or update
-that is correct syntax. This means is does not apply to <code>INSERT DATA</code> or <code>DELETE DATA</code> but can be used with <code>INSERT { ?s ?p ?o } WHERE {}</code> and
-<code>DELETE { ?s ?p ?o } WHERE {}</code>.</p>
-<p>Full example:
-<a href="https://github.com/afs/jena/tree/main/jena-arq/src-examples/arq/examples/ExQuerySubstitute_01.java">ExQuerySubstitute_01.java</a>.</p>
-<pre><code>    ResultSet resultSet1 = QueryExecution.dataset(dataset)
-            .query(prefixes+&quot;SELECT * { ?person foaf:name ?name }&quot;)
-            .substitution(&quot;name&quot;, name1)
-            .select();
-    ResultSetFormatter.out(resultSet1);
-</code></pre><p>Substitution is to be preferred over &ldquo;initial bindings&rdquo; because it is clearly
-defined and applies to both query and update in both local and remote uses.</p>
-<p>&ldquo;Substitution&rdquo; and &ldquo;initial bindings&rdquo; are similar but not identical.</p>
-<p>See also</p>
-<ul>
-<li><a href="documentation/query/parameterized-sparql-strings.html">Parameterized Queries</a></li>
-<li><a href="https://jena.apache.org/documentation/extras/querybuilder/index.html">Jena Query Builder</a></li>
-</ul>
-<p>which provide a different ways to build a query.</p>
-<h2 id="ttrdfconnectiontt"><tt>RDFConnection</tt></h2>
-<p><a href="../rdfconnection/">RDFConnection</a></p>
-<pre><code>    try ( RDFConnection conn = RDFConnectionRemote.service(dataURL).build()) {
-        conn.update(&quot;INSERT DATA{}&quot;);
-        conn.queryAsk(&quot;ASK{}&quot;);
-    }
-</code></pre><p>or the less flexible:</p>
-<pre><code>    try ( RDFConnection conn = RDFConnectionFactory.connect(dataURL) ) {
-        conn.update(&quot;INSERT DATA{}&quot;);
-        conn.queryAsk(&quot;ASK{}&quot;);
-    }
-</code></pre><h2 id="query-execution">Query Execution</h2>
-<p>Factory Examples</p>
-<pre><code>  Dataset dataset = ...
-  Query query = ...
-  try ( QueryExecution qExec = QueryExecutionFactory.create(query, dataset) ) {
-       ResultSet results = qExec.execSelect();
-       ... use results ...
-  }
-</code></pre><p>Builder Examples
-Builders are reusable and modifiable after a &ldquo;build&rdquo; operation.</p>
-<pre><code>Dataset dataset = ...
-Query query = ...
-try ( QueryExecution qExec = QueryExecution.create()
-                                 .dataset(dataset)
-                                 .query(query)
-                                 .build() ) {
-    ResultSet results = qExec.execSelect();
-    ... use results ...
-}
-</code></pre><p>and remote calls:</p>
-<pre><code>try ( QueryExecution qExec = QueryExecutionHTTP.service(&quot;http://....&quot;)
-                                 .query(query)
-                                 .build() ) {
-    ResultSet results = qExec.execSelect();
-    ... use results ...
-}
-</code></pre><p>More complex setup:</p>
-<pre><code>// JDK HttpClient
-HttpClient httpClient = HttpClient.newBuilder()
-                .connectTimeout(Duration.ofSeconds(10))  // Timeout to connect
-                .followRedirects(Redirect.NORMAL)
-                .build();
-try ( QueryExecution qExec = QueryExecutionHTTP.create()
-                                 .service(&quot;http:// ....&quot;)
-                                 .httpClient(httpClient)
-                                 .query(query)
-                                 .sendMode(QuerySendMode.asPost)
-                                 .timeout(30, TimeUnit.SECONDS) // Timeout of request
-                                 .build() ) {
-    ResultSet results = qExec.execSelect();
-    ... use results ...
-}
-</code></pre><p>There is only one timeout setting for eacho HTTP query execution. The &ldquo;time to
-connect&rdquo; is handled by the JDK <code>HttpClient</code>. Timeouts for local execution are
-&ldquo;time to first result&rdquo; and &ldquo;time to all results&rdquo; as before.</p>
-<h2 id="ttmodelstorett-and-ttgsptt"><tt>ModelStore</tt> and <tt>GSP</tt></h2>
-<pre><code>   Model model = ModelStore.service(&quot;http://fuseki/dataset&quot;).defaultGraph().GET();
-</code></pre><pre><code>   Graph graph = GSP.service(&quot;http://fuseki/dataset&quot;).defaultGraph().GET();
-</code></pre><pre><code>  Graph graph = ... ; 
-  GSP.request(&quot;http://fuseki/dataset&quot;).graphName(&quot;http;//data/myGraph&quot;).POST(graph);
-</code></pre><pre><code>  DatasetGraph dataset = GSP.request(&quot;http://fuseki/dataset&quot;).getDataset();
-</code></pre><h2 id="ttservicett"><tt>SERVICE</tt></h2>
-<p><a href="../query/service.html">Old documentation </a> - configuration, especially for
-authentication, has changed.</p>
-<h2 id="service-configuration">SERVICE configuration</h2>
-<p>See below for more on HTTP authentication with <code>SERVICE</code>.</p>
-<p>The configuration of <code>SERVICE</code> operations has changed in Jena 4.3.0 and the
-paramter names have changed.</p>
-<table>
-<thead>
-<tr>
-<th>Symbol</th>
-<th>Java Constant</th>
-<th>Usage</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><code>arq:httpServiceAllowed</code></td>
-<td><code>ARQ.httpServiceAllowed</code></td>
-<td>False to disable</td>
-</tr>
-<tr>
-<td><code>arq:serviceParams</code></td>
-<td><code>ARQ.serviceParams</code></td>
-<td>Map</td>
-</tr>
-<tr>
-<td><code>arq:httpQueryTimeout</code></td>
-<td><code>ARQ.httpQueryTimeout</code></td>
-<td>Request timeout (time to completion)</td>
-</tr>
-<tr>
-<td><code>arq:httpQueryClient</code></td>
-<td><code>ARQ.httpQueryCient</code></td>
-<td>An <code>java.net.http.HttpClient</code> object</td>
-</tr>
-<tr>
-<td><code>arq:httpQueryCompression</code></td>
-<td></td>
-<td>no-op</td>
-</tr>
-</tbody>
-</table>
-<p>where <code>arq:</code> is prefix for <code>&lt;http://jena.apache.org/ARQ#&gt;</code>.</p>
-<p>The timeout is now only for the overall request and manged by the HTTP client
-code.</p>
-<p>Compression of responses is not currently supported.</p>
-<h2 id="customization-of-http-requests">Customization of HTTP requests</h2>
-<p>There is a mechanism to modify HTTP requests to specific endpoints or to a
-collection of endpoints with the same prefix.</p>
-<p>For example, to add a header <code>X-Tracker</code> to each request to a particular server:</p>
-<div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-java" data-lang="java">    AtomicLong counter <span style="color:#666">=</span> <span style="color:#a2f;font-weight:bold">new</span> AtomicLong<span style="color:#666">(</span>0<span style="color:#666">);</span>
-
-    HttpRequestModifier modifier <span style="color:#666">=</span> <span style="color:#666">(</span>params<span style="color:#666">,</span> headers<span style="color:#666">)-&gt;{</span>
-        <span style="color:#0b0;font-weight:bold">long</span> x <span style="color:#666">=</span> counter<span style="color:#666">.</span><span style="color:#b44">incrementAndGet</span><span style="color:#666">();</span>
-        headers<span style="color:#666">.</span><span style="color:#b44">put</span><span style="color:#666">(</span><span style="color:#b44">&#34;X-Tracker&#34;</span><span style="color:#666">,</span> <span style="color:#b44">&#34;Call=&#34;</span><span style="color:#666">+</span>x<span style="color:#666">);</span>
-    <span style="color:#666">};</span>
-    <span style="color:#080;font-style:italic">// serverURL is the HTTP URL for the server or part of the server HTTP space.
-</span><span style="color:#080;font-style:italic"></span>    RegistryRequestModifier<span style="color:#666">.</span><span style="color:#b44">get</span><span style="color:#666">().</span><span style="color:#b44">addPrefix</span><span style="color:#666">(</span>serverURL<span style="color:#666">,</span> modifier<span style="color:#666">);</span>
-</code></pre></div><p>The <code>RegistryRequestModifier</code> registry is checked on each HTTP operation. It
-maps URLs or prefix of URLs to a function of interface <code>HttpRequestModifier</code>
-which has access to the headers and the query string parameters of the request.</p>
+	<p><i><a href="../archive/versions/http-auth-old.html">Old documentation</a> (Jena 3.1.1 to Jena 4.2.0)</i></p>
+<p>Jena 4.3.0 and later uses the JDK <code>java.net.http</code> package. Jena adds API support
+for challenge-based authentication and also provide HTTP digest authentication.</p>
 <h2 id="auth">Authentication</h2>
-<p>For any use of users-password information, and especially HTTP basic
-authentication, information is visible in the HTTP headers. Using HTTPS is
-necessary to avoid snooping.  Digest authentication is also stronger over HTTPS
-because it protects against man-in-the-middle attacks.</p>
 <p>There are 5 variations:</p>
 <ol>
 <li>Basic authentication</li>
@@ -555,25 +258,22 @@ registration will apply to all URLs starting with a common root.</p>
 will will look for a suitable authentication registration (exact or longest prefix), and retry the
 request. If it succeeds, a modifier is installed so all subsequent request to the same endpoint will
 have the authentication header added and there is no challenge round-trip.</p>
-<h3 id="ttservicett-1"><tt>SERVICE</tt></h3>
+<h3 id="ttservicett"><tt>SERVICE</tt></h3>
 <p>The same mechanism is used for the URL in a SPARQL <code>SERVICE</code> clause.  If there is a 401 challenge,
-the registry is consulted and authetication applied.</p>
+the registry is consulted and authentication applied.</p>
 <p>In addition, if the SERVICE URL has a username as the <code>userinfo</code> (that is, <code>https://users@some.host/...</code>),
 that user name is used to look in the authentication registry.</p>
 <p>If the <code>userinfo</code> is of the form &ldquo;username:password&rdquo; then the information as given in the URL is
 used.</p>
-<pre><code>    AuthEnv.get().registerUsernamePassword(URI.create(&quot;http://host/sparql&quot;), &quot;u&quot;, &quot;p&quot;);
-     // Registration applies to SERVICE.
-    Query query = QueryFactory.create(&quot;SELECT * { SERVICE &lt;http://host/sparql&gt; { ?s ?p ?o } }&quot;);
-    try ( QueryExecution qExec = QueryExecution.create().query(query).dataset(...).build() ) {
-        System.out.println(&quot;Call using SERVICE...&quot;);
-        ResultSet rs = qExec.execSelect();
-        ResultSetFormatter.out(rs);
-    }
-</code></pre><h2 id="environment">Environment</h2>
-<p><code>AuthEnv</code> - passwordRegistry , authModifiers
-<code>RegistryHttpClient</code></p>
-
+<div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-java" data-lang="java">    AuthEnv<span style="color:#666">.</span><span style="color:#b44">get</span><span style="color:#666">().</span><span style="color:#b44">registerUsernamePassword</span><span style="color:#666">(</span>URI<span style="color:#666">.</span><span style="color:#b44">create</span><span style="color:#666">(</span><span style="color:#b44">&#34;http: [...]
+     <span style="color:#080;font-style:italic">// Registration applies to SERVICE.
+</span><span style="color:#080;font-style:italic"></span>    Query query <span style="color:#666">=</span> QueryFactory<span style="color:#666">.</span><span style="color:#b44">create</span><span style="color:#666">(</span><span style="color:#b44">&#34;SELECT * { SERVICE &lt;http://host/sparql&gt; { ?s ?p ?o } }&#34;</span><span style="color:#666">);</span>
+    <span style="color:#a2f;font-weight:bold">try</span> <span style="color:#666">(</span> QueryExecution qExec <span style="color:#666">=</span> QueryExecution<span style="color:#666">.</span><span style="color:#b44">create</span><span style="color:#666">().</span><span style="color:#b44">query</span><span style="color:#666">(</span>query<span style="color:#666">).</span><span style="color:#b44">dataset</span><span style="color:#666">(...).</span><span style="color:#b44">build</span><sp [...]
+        System<span style="color:#666">.</span><span style="color:#b44">out</span><span style="color:#666">.</span><span style="color:#b44">println</span><span style="color:#666">(</span><span style="color:#b44">&#34;Call using SERVICE...&#34;</span><span style="color:#666">);</span>
+        ResultSet rs <span style="color:#666">=</span> qExec<span style="color:#666">.</span><span style="color:#b44">execSelect</span><span style="color:#666">();</span>
+        ResultSetFormatter<span style="color:#666">.</span><span style="color:#b44">out</span><span style="color:#666">(</span>rs<span style="color:#666">);</span>
+    <span style="color:#666">}</span>
+</code></pre></div>
 
         </div>
     </div>
diff --git a/content/documentation/sparql-apis/index.html b/content/documentation/sparql-apis/index.html
index 698cb1b..7f6a91d 100644
--- a/content/documentation/sparql-apis/index.html
+++ b/content/documentation/sparql-apis/index.html
@@ -269,9 +269,10 @@ and receiving datasets, rather than individual graphs.</p>
 <p>Both API and GPI provide builders for detailed setup, particularly for remote
 usage over HTTP and HTTPS where detailed control of the HTTP requests is
 sometimes necessary to work with other triple stores.</p>
-<p>Factory style functions for many common usage patterns are retained in
-<code>QueryExecutionFactory</code>, <code>UpdateExecutionFactory</code>. Note that any methods that
-involved Apache HttpClient objects have been removed.</p>
+<p>Use of the builders is preferred to factories. Factory style functions for many
+common usage patterns are retained in <code>QueryExecutionFactory</code>,
+<code>UpdateExecutionFactory</code>. Note that any methods that involved Apache HttpClient
+objects have been removed.</p>
 <h2 id="changes">Changes from Jena 4.2.0 to Jena 4.3.0</h2>
 <ul>
 <li>
@@ -282,7 +283,7 @@ still covered by the existing <code>QueryExecutionFactory</code> as well as the
 </li>
 <li>
 <p>HTTP usage provided by the JDK <code>java.net.http</code> package, with challenge-based
-authentication provided on top by Jena. <a href="#auth">See below</a>.</p>
+authentication provided on top by Jena. <a href="./http-auth.html">See the authentiucation documentation</a>.</p>
 </li>
 <li>
 <p>Authentication support is uniformly applied to query, update, GSP and <code>SERVICE</code>.</p>
@@ -355,19 +356,12 @@ defined and applies to both query and update in both local and remote uses.</p>
         conn.queryAsk(&quot;ASK{}&quot;);
     }
 </code></pre><p>or the less flexible:</p>
-<pre><code>    try ( RDFConnection conn = RDFConnectionFactory.connect(dataURL) ) {
+<pre><code>    try ( RDFConnection conn = RDFConnection.connect(dataURL) ) {
         conn.update(&quot;INSERT DATA{}&quot;);
         conn.queryAsk(&quot;ASK{}&quot;);
     }
 </code></pre><h2 id="query-execution">Query Execution</h2>
-<p>Factory Examples</p>
-<pre><code>  Dataset dataset = ...
-  Query query = ...
-  try ( QueryExecution qExec = QueryExecutionFactory.create(query, dataset) ) {
-       ResultSet results = qExec.execSelect();
-       ... use results ...
-  }
-</code></pre><p>Builder Examples
+<p>Builder Examples
 Builders are reusable and modifiable after a &ldquo;build&rdquo; operation.</p>
 <pre><code>Dataset dataset = ...
 Query query = ...
@@ -385,6 +379,13 @@ try ( QueryExecution qExec = QueryExecution.create()
     ResultSet results = qExec.execSelect();
     ... use results ...
 }
+</code></pre><p>Factory Examples</p>
+<pre><code>  Dataset dataset = ...
+  Query query = ...
+  try ( QueryExecution qExec = QueryExecutionFactory.create(query, dataset) ) {
+       ResultSet results = qExec.execSelect();
+       ... use results ...
+  }
 </code></pre><p>More complex setup:</p>
 <pre><code>// JDK HttpClient
 HttpClient httpClient = HttpClient.newBuilder()
@@ -473,106 +474,7 @@ collection of endpoints with the same prefix.</p>
 maps URLs or prefix of URLs to a function of interface <code>HttpRequestModifier</code>
 which has access to the headers and the query string parameters of the request.</p>
 <h2 id="auth">Authentication</h2>
-<p>For any use of users-password information, and especially HTTP basic
-authentication, information is visible in the HTTP headers. Using HTTPS is
-necessary to avoid snooping.  Digest authentication is also stronger over HTTPS
-because it protects against man-in-the-middle attacks.</p>
-<p>There are 5 variations:</p>
-<ol>
-<li>Basic authentication</li>
-<li>Challenge-Basic authentication</li>
-<li>Challenge-Digest authentication</li>
-<li>URL user (that is, <code>user@host.net</code> in the URL)</li>
-<li>URL user and password in the URL (that is, <code>user:password@host.net</code> in the URL)</li>
-</ol>
-<p>Basic authentication occurs where the app provides the user and password
-information to the JDK <code>HttpClient</code> and that information is always used when
-sending HTTP requests with that <code>HttpClient</code>. It does not require an initial
-request-challenge-resend to initiate. This is provided natively by the <code>java.net.http</code>
-JDK code. See <code>HttpClient.newBuilder().authenticate(...)</code>.</p>
-<p>Challenge based authentication, for &ldquo;basic&rdquo; or &ldquo;digest&rdquo;, are provided by Jena.
-The challenge happens on the first contact with the remote endpoint and the
-server returns a 401 response with an HTTP header saying which style of
-authentication is required. There is a registry of users name and password for
-endpoints which is consulted and the appropriate
-<a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Authorization"><code>Authorization:</code></a>
-header is generated then the request resent. If no registration matches, the 401
-is passed back to the application as an exception.</p>
-<p>Because it is a challenge response to a request, the request must be sent twice,
-first to trigger the challenge and then again with the HTTP authentication
-information.  To make this automatic, the first request must not be a streaming
-request (the stream is not repeatable). All HTTP request generated by Jena are
-repeatable.</p>
-<p>The URL can contain a <code>userinfo</code> part, either the <code>users@host</code> form, or the <code>user:password@host</code> form.
-If just the user is given, the authentication environment is consulted for registered users-password information. If user and password is given, the details as given are used. This latter form is not recommended and should only be used if necessary because the password is in-clear in the SPARQL
-query.</p>
-<h3 id="jdk-httpclientauthenticator">JDK HttpClient.authenticator</h3>
-<div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-java" data-lang="java">    <span style="color:#080;font-style:italic">// Basic or Digest - determined when the challenge happens.
-</span><span style="color:#080;font-style:italic"></span>    AuthEnv<span style="color:#666">.</span><span style="color:#b44">get</span><span style="color:#666">().</span><span style="color:#b44">registerUsernamePassword</span><span style="color:#666">(</span>URI<span style="color:#666">.</span><span style="color:#b44">create</span><span style="color:#666">(</span>dataURL<span style="color:#666">),</span> <span style="color:#b44">&#34;user&#34;</span><span style="color:#666">,</span> <sp [...]
-    <span style="color:#a2f;font-weight:bold">try</span> <span style="color:#666">(</span> QueryExecution qExec <span style="color:#666">=</span> QueryExecutionHTTP<span style="color:#666">.</span><span style="color:#b44">service</span><span style="color:#666">(</span>dataURL<span style="color:#666">)</span>
-            <span style="color:#666">.</span><span style="color:#b44">endpoint</span><span style="color:#666">(</span>dataURL<span style="color:#666">)</span>
-            <span style="color:#666">.</span><span style="color:#b44">queryString</span><span style="color:#666">(</span><span style="color:#b44">&#34;ASK{}&#34;</span><span style="color:#666">)</span>
-            <span style="color:#666">.</span><span style="color:#b44">build</span><span style="color:#666">())</span> <span style="color:#666">{</span>
-        qExec<span style="color:#666">.</span><span style="color:#b44">execAsk</span><span style="color:#666">();</span>
-    <span style="color:#666">}</span>
-</code></pre></div><p>alternatively, the java platform provides basic authentication.
-This is not challenge based - any request sent using a <code>HttpClient</code> configured
-with an authenticator will include the authentication details.
-(Caution - including sending username/password to the wrong site!).
-Digest authentication must use <code>AuthEnv.get().registerUsernamePassword</code>.</p>
-<div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-java" data-lang="java">    Authenticator authenticator <span style="color:#666">=</span> AuthLib<span style="color:#666">.</span><span style="color:#b44">authenticator</span><span style="color:#666">(</span><span style="color:#b44">&#34;user&#34;</span><span style="color:#666">,</span> <span style="color:#b44">&#34;password&#34;</span><span style="color:#666">);</span>
-    HttpClient httpClient <span style="color:#666">=</span> HttpClient<span style="color:#666">.</span><span style="color:#b44">newBuilder</span><span style="color:#666">()</span>
-            <span style="color:#666">.</span><span style="color:#b44">authenticator</span><span style="color:#666">(</span>authenticator<span style="color:#666">)</span>
-            <span style="color:#666">.</span><span style="color:#b44">build</span><span style="color:#666">();</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-java" data-lang="java">    <span style="color:#080;font-style:italic">// Use with RDFConnection      
-</span><span style="color:#080;font-style:italic"></span>    <span style="color:#a2f;font-weight:bold">try</span> <span style="color:#666">(</span> RDFConnection conn <span style="color:#666">=</span> RDFConnectionRemote<span style="color:#666">.</span><span style="color:#b44">service</span><span style="color:#666">(</span>dataURL<span style="color:#666">)</span>
-            <span style="color:#666">.</span><span style="color:#b44">httpClient</span><span style="color:#666">(</span>httpClient<span style="color:#666">)</span>
-            <span style="color:#666">.</span><span style="color:#b44">build</span><span style="color:#666">())</span> <span style="color:#666">{</span>
-        conn<span style="color:#666">.</span><span style="color:#b44">queryAsk</span><span style="color:#666">(</span><span style="color:#b44">&#34;ASK{}&#34;</span><span style="color:#666">);</span>
-    <span style="color:#666">}</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-java" data-lang="java">    <span style="color:#a2f;font-weight:bold">try</span> <span style="color:#666">(</span> QueryExecution qExec <span style="color:#666">=</span> QueryExecutionHTTP<span style="color:#666">.</span><span style="color:#b44">service</span><span style="color:#666">(</span>dataURL<span style="color:#666">)</span>
-            <span style="color:#666">.</span><span style="color:#b44">httpClient</span><span style="color:#666">(</span>httpClient<span style="color:#666">)</span>
-            <span style="color:#666">.</span><span style="color:#b44">endpoint</span><span style="color:#666">(</span>dataURL<span style="color:#666">)</span>
-            <span style="color:#666">.</span><span style="color:#b44">queryString</span><span style="color:#666">(</span><span style="color:#b44">&#34;ASK{}&#34;</span><span style="color:#666">)</span>
-            <span style="color:#666">.</span><span style="color:#b44">build</span><span style="color:#666">())</span> <span style="color:#666">{</span>
-        qExec<span style="color:#666">.</span><span style="color:#b44">execAsk</span><span style="color:#666">();</span>
-    <span style="color:#666">}</span>
-</code></pre></div><h3 id="challenge-registration">Challenge registration</h3>
-<p><code>AuthEnv</code> maintains a registry of credentials and also a registry of which service URLs
-the credentials should be used. It supports registration of endpoint prefixes so that one
-registration will apply to all URLs starting with a common root.</p>
-<p>The main function is <code>AuthEnv.get().registerUsernamePassword</code>.</p>
-<div class="highlight"><pre style="background-color:#f8f8f8;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-java" data-lang="java">   <span style="color:#080;font-style:italic">// Application setup code 
-</span><span style="color:#080;font-style:italic"></span>   AuthEnv<span style="color:#666">.</span><span style="color:#b44">get</span><span style="color:#666">().</span><span style="color:#b44">registerUsernamePassword</span><span style="color:#666">(</span><span style="color:#b44">&#34;username&#34;</span><span style="color:#666">,</span> <span style="color:#b44">&#34;password&#34;</span><span style="color:#666">);</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-java" data-lang="java">   <span style="color:#666">...</span>
-   <span style="color:#a2f;font-weight:bold">try</span> <span style="color:#666">(</span> QueryExecution qExec <span style="color:#666">=</span> QueryExecutionHTTP<span style="color:#666">.</span><span style="color:#b44">service</span><span style="color:#666">(</span>dataURL<span style="color:#666">)</span>
-        <span style="color:#666">.</span><span style="color:#b44">endpoint</span><span style="color:#666">(</span>dataURL<span style="color:#666">)</span>
-        <span style="color:#666">.</span><span style="color:#b44">queryString</span><span style="color:#666">(</span><span style="color:#b44">&#34;ASK{}&#34;</span><span style="color:#666">)</span>
-        <span style="color:#666">.</span><span style="color:#b44">build</span><span style="color:#666">())</span> <span style="color:#666">{</span>
-       qExec<span style="color:#666">.</span><span style="color:#b44">execAsk</span><span style="color:#666">();</span>
-   <span style="color:#666">}</span>
-</code></pre></div><p>When an HTTP 401 response with an <code>WWW-Authenticate</code> header is received, the Jena http handling code
-will will look for a suitable authentication registration (exact or longest prefix), and retry the
-request. If it succeeds, a modifier is installed so all subsequent request to the same endpoint will
-have the authentication header added and there is no challenge round-trip.</p>
-<h3 id="ttservicett-1"><tt>SERVICE</tt></h3>
-<p>The same mechanism is used for the URL in a SPARQL <code>SERVICE</code> clause.  If there is a 401 challenge,
-the registry is consulted and authetication applied.</p>
-<p>In addition, if the SERVICE URL has a username as the <code>userinfo</code> (that is, <code>https://users@some.host/...</code>),
-that user name is used to look in the authentication registry.</p>
-<p>If the <code>userinfo</code> is of the form &ldquo;username:password&rdquo; then the information as given in the URL is
-used.</p>
-<pre><code>    AuthEnv.get().registerUsernamePassword(URI.create(&quot;http://host/sparql&quot;), &quot;u&quot;, &quot;p&quot;);
-     // Registration applies to SERVICE.
-    Query query = QueryFactory.create(&quot;SELECT * { SERVICE &lt;http://host/sparql&gt; { ?s ?p ?o } }&quot;);
-    try ( QueryExecution qExec = QueryExecution.create().query(query).dataset(...).build() ) {
-        System.out.println(&quot;Call using SERVICE...&quot;);
-        ResultSet rs = qExec.execSelect();
-        ResultSetFormatter.out(rs);
-    }
-</code></pre><h2 id="environment">Environment</h2>
-<p><code>AuthEnv</code> - passwordRegistry , authModifiers
-<code>RegistryHttpClient</code></p>
+<p><a href="./http-auth.html">Documentation for authentication</a>.</p>
 
 
         </div>
diff --git a/content/documentation/tdb/configuration.html b/content/documentation/tdb/configuration.html
index fc53f7f..4302b16 100644
--- a/content/documentation/tdb/configuration.html
+++ b/content/documentation/tdb/configuration.html
@@ -210,10 +210,10 @@ are short for the constants of class <code>java.lang.Boolean</code>.</p>
 <pre><code> TDB.getContext().set(symbol, value) ;
 </code></pre>
 <p>Per query execution:</p>
-<pre><code> try(QueryExecution qExec = QueryExecutionFactory.create(...)) {
-     qExec.getContext().set(symbol, value) ;
-     ...
- }
+<pre><code>try(QueryExecution qExec = QueryExecution.dataset(dataset)
+            .query(query).set(ARQ.symLogExec,true).build() ) {
+     ....
+}
 </code></pre>
 <p>Setting for a query execution happens before any query compilation
 or setup happens. Creation of a query execution object does not
diff --git a/content/documentation/tdb/datasets.html b/content/documentation/tdb/datasets.html
index 9228173..18f6c9c 100644
--- a/content/documentation/tdb/datasets.html
+++ b/content/documentation/tdb/datasets.html
@@ -211,9 +211,11 @@ pattern.</p>
 <pre><code>TDB.getContext().set(TDB.symUnionDefaultGraph, true) ;
 </code></pre>
 <p>or set on a per query basis:</p>
-<pre><code>try(QueryExecution qExec = QueryExecutionFactory.create(...)) {
-    qExec.getContext().set(TDB.symUnionDefaultGraph, true) ;
-    ...
+<pre><code>try(QueryExecution qExec = QueryExecution.dataset(dataset)
+        .query(query)
+        .set(TDB.symUnionDefaultGraph,true)
+        .build() ) {
+     ....
 }
 </code></pre>
 <h2 id="special-graph-names">Special Graph Names</h2>
diff --git a/content/documentation/tdb/optimizer.html b/content/documentation/tdb/optimizer.html
index d5ac3a9..2fad330 100644
--- a/content/documentation/tdb/optimizer.html
+++ b/content/documentation/tdb/optimizer.html
@@ -287,12 +287,14 @@ logger.arq-info.level = INFO
 set globally:</p>
 <pre><code>ARQ.getContext().set(ARQ.symLogExec,true) ;
 </code></pre>
-<p>and it may also be set on an individual query execution using it&rsquo;s
+<p>and it may also be set on an individual query execution using its
 local context.</p>
-<pre><code> try(QueryExecution qExec = QueryExecutionFactory.create(...)) {
-    qExec.getContext().set(ARQ.symLogExec,true) ;
+<pre><code>try(QueryExecution qExec = QueryExecution.dataset(dataset)
+          .query(query)
+          .set(ARQ.symLogExec,true)
+          .build() ) {
     ResultSet rs = qExec.execSelect() ;
- }
+}
 </code></pre>
 <p>On the command line:</p>
 <pre><code> tdbquery --set arq:logExec=true --file queryfile
diff --git a/content/documentation/tdb/quadfilter.html b/content/documentation/tdb/quadfilter.html
index 4b5dedc..47f5479 100644
--- a/content/documentation/tdb/quadfilter.html
+++ b/content/documentation/tdb/quadfilter.html
@@ -233,8 +233,10 @@ under the symbol <code>SystemTDB.symTupleFilter</code> then execute the query as
 <pre><code>    Dataset ds = ... ;
     Filter&lt;Tuple&lt;NodeId&gt;&gt; filter = createFilter(ds) ;
     Query query = ... ;
-    try (QueryExecution qExec = QueryExecutionFactory.create(query, ds)) {
-        qExec.getContext().set(SystemTDB.symTupleFilter, filter) ;
+    try (QueryExecution qExec = QueryExecution.dataset(ds)
+            .query(query)
+            .set(SystemTDB.symTupleFilter, filter)
+            .build() ) {}
         ResultSet rs = qExec.execSelect() ;
         ...
     }
diff --git a/content/documentation/tdb/tdb-xloader.html b/content/documentation/tdb/tdb-xloader.html
index dcb0a8b..d9138c7 100644
--- a/content/documentation/tdb/tdb-xloader.html
+++ b/content/documentation/tdb/tdb-xloader.html
@@ -179,13 +179,14 @@
 	<p>TDB xloader (&ldquo;x&rdquo; for external) is a bulkloader for very large datasets. The goal
 is stability and reliability for long running loading, running on modest and</p>
 <p>xloader is not a replacement for regular TDB1 and TDB2 loaders.</p>
-<p>Theer are two scripts to load data using the xlaoder subsystem.</p>
+<p>There are two scripts to load data using the xlaoder subsystem.</p>
 <p>&ldquo;tdb1.xloader&rdquo;, which was called &ldquo;tdbloader2&rdquo; and has some improvements.</p>
 <p>It is not as fast as other TDB loaders on dataset where the general loaders work
 on without encountering progressive slowdown.</p>
-<p>The xloaders for TDB1 and TDB2 are not identical. The TDB2 is more capable; it
-is based on the same design approach with further refinements to building the
-node table and to reduce the total amount of temporary file space used.</p>
+<p>The xloaders for TDB1 and TDB2 are not identical. The TDB2 xlaoder is more
+capable; it is based on the same design approach with further refinements to
+building the node table and to reduce the total amount of temporary file space
+used.</p>
 <p>The xloader does not run on MS Windows. It uses an external sort program from
 unix - <code>sort(1)</code>.</p>
 <p>The xloader only builds a fresh database from empty.
@@ -201,7 +202,7 @@ extension and can include an addtional &ldquo;.gz&rdquo; or &ldquo;.bz2&rdquo; f
 <h3 id="advice">Advice</h3>
 <p>To avoid a load failing due to a syntax or other data error, it is advisable to
 run <code>riot --check</code> on the data first. Parsing is faster than loading.</p>
-<p>The TDB databases will tak eup a lot of disk space and in addition during
+<p>The TDB databases will take up a lot of disk space and in addition during
 loading <code>xloader</code> uses a significant amout of temporary disk space.</p>
 <p>If desired, the data can be converted to <a href="../io/rdf-binary.html">RDF Thrift</a> at
 this stage by adding <code>--stream rdf-thrift</code> to the riot checking run.  Parsing
diff --git a/content/documentation/tdb/tdb_transactions.html b/content/documentation/tdb/tdb_transactions.html
index d3bdc61..d4c9658 100644
--- a/content/documentation/tdb/tdb_transactions.html
+++ b/content/documentation/tdb/tdb_transactions.html
@@ -256,13 +256,13 @@ actions that do not change the data.  The general pattern is:</p>
  dataset.begin(ReadWrite.READ) ;
  String qs1 = &quot;SELECT * {?s ?p ?o} LIMIT 10&quot; ;        
 
- try(QueryExecution qExec = QueryExecutionFactory.create(qs1, dataset)) {
+ try(QueryExecution qExec = QueryExecution.dataset(dataset).query(qs1).build() ) {
      ResultSet rs = qExec.execSelect() ;
      ResultSetFormatter.out(rs) ;
  } 
 
  String qs2 = &quot;SELECT * {?s ?p ?o} OFFSET 10 LIMIT 10&quot; ;  
- try(QueryExecution qExec = QueryExecutionFactory.create(qs2, dataset)) {
+ try(QueryExecution qExec = QueryExecution.dataset(dataset).query(qs2).build() ) {
      rs = qExec.execSelect() ;
      ResultSetFormatter.out(rs) ;
  }
@@ -296,23 +296,21 @@ dataset.</p>
      model.add( ... )
 
      // A SPARQL query will see the new statement added.
-     try (QueryExecution qExec = QueryExecutionFactory.create(
-             &quot;SELECT (count(*) AS ?count) { ?s ?p ?o} LIMIT 10&quot;, 
-           dataset)) {
+     try (QueryExecution qExec = QueryExecution.dataset(dataset)
+             .query(&quot;SELECT (count(*) AS ?count) { ?s ?p ?o} LIMIT 10&quot;)
+             .build() ) {
          ResultSet rs = qExec.execSelect() ;
          ResultSetFormatter.out(rs) ;
      }
 
      // ... perform a SPARQL Update
-     GraphStore graphStore = GraphStoreFactory.create(dataset) ;
      String sparqlUpdateString = StrUtils.strjoinNL(
           &quot;PREFIX . &lt;http://example/&gt;&quot;,
           &quot;INSERT { :s :p ?now } WHERE { BIND(now() AS ?now) }&quot;
           ) ;
 
      UpdateRequest request = UpdateFactory.create(sparqlUpdateString) ;
-     UpdateProcessor proc = UpdateExecutionFactory.create(request, graphStore) ;
-     proc.execute() ;
+     UpdateExecution.dataset(dataset).update(request).execute();
         
      // Finally, commit the transaction. 
      dataset.commit() ;
diff --git a/content/documentation/txn/transactions_api.html b/content/documentation/txn/transactions_api.html
index f529cde..dfc1955 100644
--- a/content/documentation/txn/transactions_api.html
+++ b/content/documentation/txn/transactions_api.html
@@ -206,13 +206,13 @@ this code even if another thread commits changes in the lifetime of this transac
  dataset.begin(ReadWrite.READ) ;
  try {
      String qs1 = &quot;SELECT * {?s ?p ?o} LIMIT 10&quot; ;        
-     try(QueryExecution qExec = QueryExecutionFactory.create(qs1, dataset)) {
+     try(QueryExecution qExec = QueryExecution.create(qs1, dataset)) {
          ResultSet rs = qExec.execSelect() ;
          ResultSetFormatter.out(rs) ;
      }
 
      String qs2 = &quot;SELECT * {?s ?p ?o} OFFSET 10 LIMIT 10&quot; ;  
-     try(QueryExecution qExec = QueryExecutionFactory.create(qs2, dataset)) {
+     try(QueryExecution qExec = QueryExecution.create(qs2, dataset)) {
          rs = qExec.execSelect() ;
          ResultSetFormatter.out(rs) ;
      }
@@ -247,23 +247,21 @@ dataset.</p>
      model.add( ... )
 
      // A SPARQL query will see the new statement added.
-     try (QueryExecution qExec = QueryExecutionFactory.create(
+     try (QueryExecution qExec = QueryExecution.create(
              &quot;SELECT (count(?s) AS ?count) { ?s ?p ?o} LIMIT 10&quot;,
-           dataset)) {
+             dataset)) {
          ResultSet rs = qExec.execSelect() ;
          ResultSetFormatter.out(rs) ;
      }
 
      // ... perform a SPARQL Update
-     GraphStore graphStore = GraphStoreFactory.create(dataset) ;
      String sparqlUpdateString = StrUtils.strjoinNL(
           &quot;PREFIX . &lt;http://example/&gt;&quot;,
           &quot;INSERT { :s :p ?now } WHERE { BIND(now() AS ?now) }&quot;
           ) ;
 
      UpdateRequest request = UpdateFactory.create(sparqlUpdateString) ;
-     UpdateProcessor proc = UpdateExecutionFactory.create(request, graphStore) ;
-     proc.execute() ;
+     UpdateExecution.dataset(dataset).update(request).execute();
 
      // Finally, commit the transaction.
      dataset.commit() ;
diff --git a/content/getting_started/index.html b/content/getting_started/index.html
index f6da690..299c7bc 100644
--- a/content/getting_started/index.html
+++ b/content/getting_started/index.html
@@ -193,7 +193,6 @@ usage of advanced semantic web features such as reasoning over your data using O
 <li><a href="/documentation/notes/">How-To&rsquo;s</a> - various topic-specific how-to documents</li>
 <li><a href="/documentation/ontology/">Ontology</a> - support for handling OWL models in Jena</li>
 <li><a href="/documentation/tdb/">TDB</a> - a fast persistent triple store that stores directly to disk</li>
-<li><a href="/documentation/sdb/">SQL DB</a> - constructing persistent Jena models using SQL databases as the storage layer</li>
 <li><a href="/documentation/tools/">Tools</a> - various command-line tools and utilities to help developers manage RDF data and other aspects of Jena</li>
 </ul>
 <h2><img class="logo-menu" src="/images/jena-logo/jena-logo-notext-small.png" alt="jena logo">Framework Architecture</h2>
diff --git a/content/index.xml b/content/index.xml
index 022cd5f..0c2b2c3 100644
--- a/content/index.xml
+++ b/content/index.xml
@@ -64,30 +64,30 @@ Documentation index  The RDF API - the core RDF API in Jena SPARQL - querying an
     
     <item>
       <title>Apache Jena Elephas</title>
-      <link>https://jena.apache.org/documentation/hadoop/</link>
+      <link>https://jena.apache.org/documentation/archive/hadoop/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/hadoop/</guid>
+      <guid>https://jena.apache.org/documentation/archive/hadoop/</guid>
       <description>  The Jena Elephas module has been retired. The last release of Jena with Elephas is Jena 3.17.0. See jena-elephas/README.md. The original documentation.
   </description>
     </item>
     
     <item>
       <title>Apache Jena Elephas</title>
-      <link>https://jena.apache.org/documentation/hadoop/elephas_index.html</link>
+      <link>https://jena.apache.org/documentation/archive/hadoop/elephas_index.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/hadoop/elephas_index.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/hadoop/elephas_index.html</guid>
       <description>Apache Jena Elephas is a set of libraries which provide various basic building blocks which enable you to start writing Apache Hadoop based applications which work with RDF data.
 Historically there has been no serious support for RDF within the Hadoop ecosystem and what support has existed has often been limited and task specific. These libraries aim to be as generic as possible and provide the necessary infrastructure that enables developers to create their application specific logic without worrying about the underlying plumbing.</description>
     </item>
     
     <item>
       <title>Apache Jena Elephas - Common API</title>
-      <link>https://jena.apache.org/documentation/hadoop/common.html</link>
+      <link>https://jena.apache.org/documentation/archive/hadoop/common.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/hadoop/common.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/hadoop/common.html</guid>
       <description>The Common API provides the basic data model for representing RDF data within Apache Hadoop applications. This primarily takes the form of Writable implementations and the necessary machinery to efficiently serialise and deserialise these.
 Currently we represent the three main RDF primitives - Nodes, Triples and Quads - though in future a wider range of primitives may be supported if we receive contributions to implement them.
 RDF Primitives Nodes The Writable type for nodes is predictably enough called NodeWritable and it implements the WritableComparable interface which means it can be used as both a key and/or value in Map/Reduce.</description>
@@ -95,10 +95,10 @@ RDF Primitives Nodes The Writable type for nodes is predictably enough called No
     
     <item>
       <title>Apache Jena Elephas - IO API</title>
-      <link>https://jena.apache.org/documentation/hadoop/io.html</link>
+      <link>https://jena.apache.org/documentation/archive/hadoop/io.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/hadoop/io.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/hadoop/io.html</guid>
       <description>The IO API provides support for reading and writing RDF within Apache Hadoop applications. This is done by providing InputFormat and OutputFormat implementations that cover all the RDF serialisations that Jena supports.
 {% toc %}
 Background on Hadoop IO If you are already familiar with the Hadoop IO paradigm then please skip this section, if not please read as otherwise some of the later information will not make much sense.</description>
@@ -106,10 +106,10 @@ Background on Hadoop IO If you are already familiar with the Hadoop IO paradigm
     
     <item>
       <title>Apache Jena Elephas - Map/Reduce API</title>
-      <link>https://jena.apache.org/documentation/hadoop/mapred.html</link>
+      <link>https://jena.apache.org/documentation/archive/hadoop/mapred.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/hadoop/mapred.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/hadoop/mapred.html</guid>
       <description>The Map/Reduce API provides a range of building block Mapper and Reducer implementations that can be used as a starting point for building Map/Reduce applications that process RDF. Typically more complex applications will need to implement their own variants but these basic ones may still prove useful as part of a larger pipeline.
 {% toc %}
 Tasks The API is divided based upon implementations that support various common Hadoop tasks with appropriate Mapper and Reducer implementations provided for each.</description>
@@ -117,10 +117,10 @@ Tasks The API is divided based upon implementations that support various common
     
     <item>
       <title>Apache Jena Elephas - RDF Stats Demo</title>
-      <link>https://jena.apache.org/documentation/hadoop/demo.html</link>
+      <link>https://jena.apache.org/documentation/archive/hadoop/demo.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/hadoop/demo.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/hadoop/demo.html</guid>
       <description>The RDF Stats Demo is a pre-built application available as a ready to run Hadoop Job JAR with all dependencies embedded within it. The demo app uses the other libraries to allow calculating a number of basic statistics over any RDF data supported by Elephas.
 To use it you will first need to build it from source or download the relevant Maven artefact:
 &amp;lt;dependency&amp;gt; &amp;lt;groupId&amp;gt;org.apache.jena&amp;lt;/groupId&amp;gt; &amp;lt;artifactId&amp;gt;jena-elephas-stats&amp;lt;/artifactId&amp;gt; &amp;lt;version&amp;gt;x.y.z&amp;lt;/version&amp;gt; &amp;lt;classifier&amp;gt;hadoop-job&amp;lt;/classifier&amp;gt; &amp;lt;/dependency&amp;gt;  Where x.</description>
@@ -186,10 +186,10 @@ Apache Jena Distributions The binary distribution of Fuseki (this includes both
     
     <item>
       <title>Apache Jena SDB - persistent triple stores using relational databases</title>
-      <link>https://jena.apache.org/documentation/sdb/</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/</guid>
       <description>  The Jena SDB module has been retired. The last release of Jena with this module is Jena 3.17.0. See jena-sdb/README.md. The original documentation.
   </description>
     </item>
@@ -347,7 +347,7 @@ See example code.</description>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://jena.apache.org/documentation/query/arq-query-eval.html</guid>
-      <description>This page describes the mechanisms that can be used to extend and modify query execution within ARQ. Through these mechanisms, ARQ can be used to query different graph implementations and to provide different query evaluation and optimization strategies for particular circumstances. These mechanisms are used by TDB and SDB.
+      <description>This page describes the mechanisms that can be used to extend and modify query execution within ARQ. Through these mechanisms, ARQ can be used to query different graph implementations and to provide different query evaluation and optimization strategies for particular circumstances. These mechanisms are used by TDB.
 ARQ can be extended in various ways to incorporate custom code into a query. Custom filter functions and property functions provide ways to add application specific code.</description>
     </item>
     
@@ -392,7 +392,7 @@ ARQ consists of the following parts:
   The SPARQL abstract syntax tree (AST) and the SPARQL parser
   The algebra generator that turns SPARQL AST into algebra expressions
  Implementation of the translation in the SPARQL specification. Quad version compiling SPARQL to quad expressions, not basic graph patterns.    Query engines to execute queries
- SPARQL protocol client - remote HTTP requests Reference engine - direct implementation of the algebra Quad engine - direct implementation of the algebra except The main engine SDB, a SPARQL database for large-sale persistent data (external system)    Result set handling for the SPARQL XML results format, the JSON and text versions.</description>
+ SPARQL protocol client - remote HTTP requests Reference engine - direct implementation of the algebra Quad engine - direct implementation of the algebra except The main engine TDB, a SPARQL database for large-sale persistent data    Result set handling for the SPARQL XML results format, the JSON and text versions.</description>
     </item>
     
     <item>
@@ -432,10 +432,10 @@ ARQ does not output any logging messages at level INFO in normal operation. The
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://jena.apache.org/documentation/query/sparql-remote.html</guid>
-      <description>SPARQL is a query language and a remote access protocol. The remote access protocol can be used with plain HTTP or over SOAP.
+      <description>SPARQL is a query language and a remote access protocol. The remote access protocol runs over HTTP.
 See Fuseki for an implementation of the SPARQL protocol over HTTP. Fuseki uses ARQ to provide SPARQL query access to Jena models, including Jena persistent models.
 ARQ includes a query engine capable of using the HTTP version.
-From your application The QueryExecutionFactory has methods for creating a QueryExecution object for remote use.</description>
+From your application The QueryExecutionHTTP has methods for creating a QueryExecution object for remote use. There are various HTTP specific settings; the default should work in most cases.</description>
     </item>
     
     <item>
@@ -617,40 +617,40 @@ Simple model creation The simplest way to create a model (if not the shortest) i
     
     <item>
       <title>CSV PropertyTable</title>
-      <link>https://jena.apache.org/documentation/csv/</link>
+      <link>https://jena.apache.org/documentation/archive/csv/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/csv/</guid>
+      <guid>https://jena.apache.org/documentation/archive/csv/</guid>
       <description>  This page covers the jena-csv module which has been retired. The last release of Jena with this module is Jena 3.9.0. See jena-csv/README.md. The original documentation.
   </description>
     </item>
     
     <item>
       <title>CSV PropertyTable</title>
-      <link>https://jena.apache.org/documentation/csv/csv_index.html</link>
+      <link>https://jena.apache.org/documentation/archive/csv/csv_index.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/csv/csv_index.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/csv/csv_index.html</guid>
       <description>This page covers the jena-csv module which has been retired. The last release of Jena with this module is Jena 3.9.0. See jena-csv/README.md. This is the original documentation.
   This module is about getting CSVs into a form that is amenable to Jena SPARQL processing, and doing so in a way that is not specific to CSV files. It includes getting the right architecture in place for regular table shaped data, using the core abstraction of PropertyTable.</description>
     </item>
     
     <item>
       <title>CSV PropertyTable - Design</title>
-      <link>https://jena.apache.org/documentation/csv/design.html</link>
+      <link>https://jena.apache.org/documentation/archive/csv/design.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/csv/design.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/csv/design.html</guid>
       <description>Architecture The architecture of CSV PropertyTable mainly involves 2 components:
  PropertyTable GraphPropertyTable  PropertyTable A PropertyTable is collection of data that is sufficiently regular in shape it can be treated as a table. That means each subject has a value for each one of the set of properties. Irregularity in terms of missing values needs to be handled but not multiple values for the same property. With special storage, a PropertyTable</description>
     </item>
     
     <item>
       <title>CSV PropertyTable - Get Started</title>
-      <link>https://jena.apache.org/documentation/csv/get_started.html</link>
+      <link>https://jena.apache.org/documentation/archive/csv/get_started.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/csv/get_started.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/csv/get_started.html</guid>
       <description>Using CSV PropertyTable with Apache Maven See &amp;ldquo;Using Jena with Apache Maven&amp;rdquo; for full details.
 &amp;lt;dependency&amp;gt; &amp;lt;groupId&amp;gt;org.apache.jena&amp;lt;/groupId&amp;gt; &amp;lt;artifactId&amp;gt;jena-csv&amp;lt;/artifactId&amp;gt; &amp;lt;version&amp;gt;X.Y.Z&amp;lt;/version&amp;gt; &amp;lt;/dependency&amp;gt;  Using CSV PropertyTable from Java through the API In order to switch on CSV PropertyTable, it&amp;rsquo;s required to register LangCSV into Jena RIOT, through a simple method call:
 import org.apache.jena.propertytable.lang.CSV2RDF; ... CSV2RDF.init() ;  It&amp;rsquo;s a static method call of registration, which needs to be run just one time for an application before using CSV PropertyTable (e.</description>
@@ -658,10 +658,10 @@ import org.apache.jena.propertytable.lang.CSV2RDF; ... CSV2RDF.init() ;  It&amp;
     
     <item>
       <title>CSV PropertyTable - Implementation</title>
-      <link>https://jena.apache.org/documentation/csv/implementation.html</link>
+      <link>https://jena.apache.org/documentation/archive/csv/implementation.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/csv/implementation.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/csv/implementation.html</guid>
       <description>PropertyTable Implementations There are 2 implementations for PropertyTable. The pros and cons are summarised in the following table:
    PropertyTable Implementation Description Supported Indexes Advantages Disadvantages     PropertyTableArrayImpl implemented by a two-dimensioned Java array of Nodes SPO, PSO compact memory usage, fast for querying with S and P, fast for query a whole Row slow for query with O, table Row/Column size provided   PropertyTableHashMapImpl implemented by several Java HashMaps PSO, POS fast for querying with O, table Row/Column size not required more memory usage for HashMaps    By default, [ [...]
     </item>
@@ -698,13 +698,13 @@ To monitor a Model, you must register a ModelChangedListener with that Model:</d
     </item>
     
     <item>
-      <title>explaining ARQ queries</title>
+      <title>Explaining ARQ queries</title>
       <link>https://jena.apache.org/documentation/query/explain.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
       <guid>https://jena.apache.org/documentation/query/explain.html</guid>
-      <description>This page applies to ARQ version 2.8.6 and later. In this version query logging was consolidated and made uniform across ARQ, SDB and TDB. Details of TDB logging changed to use this logging and explanation framework from TDB version 0.8.8.
-Optimization in ARQ proceeds on two levels. After the query is parsed, the SPARQL algebra for the query is generated as described in the SPARQL specification. High-level optimization occurs by rewriting the algebra into new, equivalent algebra forms and introducing specialized algebra operators.</description>
+      <description>Optimization in ARQ proceeds on two levels. After the query is parsed, the SPARQL algebra for the query is generated as described in the SPARQL specification. High-level optimization occurs by rewriting the algebra into new, equivalent algebra forms and introducing specialized algebra operators. During query execution, the low-level, storage-specific optimization occurs such as choosing the order of triple patterns within basic graph patterns.
+The effect of high-level optimizations can be seen using arq.</description>
     </item>
     
     <item>
@@ -959,13 +959,25 @@ Tutorials  RDF API tutorial - you will learn the essence of the semantic web and
     </item>
     
     <item>
-      <title>HTTP Authentication in ARQ</title>
-      <link>https://jena.apache.org/documentation/query/http-auth.html</link>
+      <title>HTTP Authentication</title>
+      <link>https://jena.apache.org/documentation/sparql-apis/http-auth.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/query/http-auth.html</guid>
-      <description>After Jena 3.1.0, Jena exposes the underlying HTTP Commons functionality to support a range of authentication mechanisms as well as other HTTP configuration. From Jena 3.0.0 through Jena 3.1.0 there is a Jena-specific framework that provides a uniform mechanism for HTTP authentication. This documentation is therefore divided into two sections. The first explains how to use HTTP Commons code, and the second explains the older Jena-specific functionality.
-HTTP Authentication from Jena 3.</description>
+      <guid>https://jena.apache.org/documentation/sparql-apis/http-auth.html</guid>
+      <description>Old documentation (Jena 3.1.1 to Jena 4.2.0)
+Jena 4.3.0 and later uses the JDK java.net.http package. Jena adds API support for challenge-based authentication and also provide HTTP digest authentication.
+Authentication There are 5 variations:
+ Basic authentication Challenge-Basic authentication Challenge-Digest authentication URL user (that is, user@host.net in the URL) URL user and password in the URL (that is, user:password@host.net in the URL)  Basic authentication occurs where the app provides the user and password information to the JDK HttpClient and that information is always used when sending HTTP requests with that HttpClient.</description>
+    </item>
+    
+    <item>
+      <title>HTTP Authentication in ARQ (Superseded)</title>
+      <link>https://jena.apache.org/documentation/archive/versions/http-auth-old.html</link>
+      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+      
+      <guid>https://jena.apache.org/documentation/archive/versions/http-auth-old.html</guid>
+      <description>Documentation for HTTP Authentication (Jena3.1.1 to Jena 4.2.0) using Apache Commons HttpClient.
+ After Jena 3.1.0, Jena exposes the underlying HTTP Commons functionality to support a range of authentication mechanisms as well as other HTTP configuration. From Jena 3.0.0 through Jena 3.1.0 there is a Jena-specific framework that provides a uniform mechanism for HTTP authentication. This documentation is therefore divided into two sections. The first explains how to use HTTP Commons code, and the second explains the older Jena-specific functionality.</description>
     </item>
     
     <item>
@@ -1248,10 +1260,10 @@ LARQ is not compatible with jena-text; the index format has changed and the inte
     
     <item>
       <title>Maven Artifacts for Apache Jena Elephas</title>
-      <link>https://jena.apache.org/documentation/hadoop/artifacts.html</link>
+      <link>https://jena.apache.org/documentation/archive/hadoop/artifacts.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/hadoop/artifacts.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/hadoop/artifacts.html</guid>
       <description>The Apache Jena Elephas libraries for Apache Hadoop are a collection of maven artifacts which can be used individually or together as desired. These are available from the same locations as any other Jena artifact, see Using Jena with Maven for more information.
 Hadoop Dependencies The first thing to note is that although our libraries depend on relevant Hadoop libraries these dependencies are marked as provided and therefore are not transitive.</description>
     </item>
@@ -1494,10 +1506,10 @@ Contents  Overview Sample Code Initializing SAX event source Error Handler Optio
     
     <item>
       <title>SDB - persistent triple stores using relational databases</title>
-      <link>https://jena.apache.org/documentation/sdb/sdb_index.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/sdb_index.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/sdb_index.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/sdb_index.html</guid>
       <description>SDB uses an SQL database for the storage and query of RDF data. Many databases are supported, both Open Source and proprietary.
 An SDB store can be accessed and managed with the provided command line scripts and via the Jena API.
   Use of SDB for new applications is not recommended.   This component is &amp;ldquo;maintenance only&amp;rdquo;.
@@ -1507,20 +1519,20 @@ Status As of June 2013 the Jena developers agreed to treat SDB as being only mai
     
     <item>
       <title>SDB Configuration</title>
-      <link>https://jena.apache.org/documentation/sdb/configuration.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/configuration.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/configuration.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/configuration.html</guid>
       <description>This page describes the configuration options available. These are options for query processing, not for the database layout and storage, which is controlled by store descriptions.
 Contents  Setting Options Current Options  Queries over all Named Graphs Streaming over JDBC Annotated SQL    Setting Options Options can be set globally, throughout the JVM, or on a per query execution basis. SDB uses the same mechanism as ARQ.</description>
     </item>
     
     <item>
       <title>SDB Database Layouts</title>
-      <link>https://jena.apache.org/documentation/sdb/database_layouts.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/database_layouts.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/database_layouts.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/database_layouts.html</guid>
       <description>SDB does not have a single database layout. This page is an informal overview of the two main types (&amp;ldquo;layout2/hash&amp;rdquo; and &amp;ldquo;layout2/index&amp;rdquo;).
 In SDB one store is one RDF dataset is one SQL database.
 Databases of type layout2 have a triples table for the default graph, a quads table for the named graphs. In the triples and quads tables, the columns are integers referencing a nodes table.
@@ -1529,10 +1541,10 @@ In the hash form, the integers are 8-byte hashes of the node.</description>
     
     <item>
       <title>SDB Database Notes</title>
-      <link>https://jena.apache.org/documentation/sdb/db_notes.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/db_notes.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/db_notes.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/db_notes.html</guid>
       <description>DB2 Derby MS SQL MySQL PostgresQL  DB2 Database creation The database should be created with code set UTF-8 so unicode is enabled (SDB creates tables CCSID UNICODE for full internationalization support).
 Derby Loading Restriction Only one load operation can be active at any one time. Limitations on temporary tables in Derby mean the loader tables are not temporary and hence are shared by all connections.
 MS SQL The collation sequence for the database must be one that is binary (BIN in the name).</description>
@@ -1540,20 +1552,20 @@ MS SQL The collation sequence for the database must be one that is binary (BIN i
     
     <item>
       <title>SDB Databases Supported</title>
-      <link>https://jena.apache.org/documentation/sdb/databases_supported.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/databases_supported.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/databases_supported.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/databases_supported.html</guid>
       <description>Product Version     Oracle 10g Including OracleXE   Microsoft SQL Server 2005 Including MS SQL Express   DB2 9 Including DB2 9 Express   PostgreSQL v8.2   MySQL v5.0.22   Apache Derby v10.2.2.0   H2 1.0.71   HSQLDB 1.8.0    Support for a version implies support for later versions unless otherwise stated.
 Microsoft SQL Server 2000 is also reported to work.</description>
     </item>
     
     <item>
       <title>SDB Dataset Description</title>
-      <link>https://jena.apache.org/documentation/sdb/dataset_description.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/dataset_description.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/dataset_description.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/dataset_description.html</guid>
       <description>Assembler descriptions for RDF Datasets and individual models are built from Store Descriptions. A dataset assembler just points to the store to use; a model assembler points to the store and identifies the model within the store to use (or use the default model).
 Datasets The example below creates an in-memory store implemented by HSQLDB.
 PREFIX rdfs: &amp;lt;http://www.w3.org/2000/01/rdf-schema#&amp;gt; PREFIX rdf: &amp;lt;http://www.w3.org/1999/02/22-rdf-syntax-ns#&amp;gt; PREFIX xsd: &amp;lt;http://www.w3.org/2001/XMLSchema#&amp;gt; PREFIX ja: &amp;lt;http://jena.hpl.hp.com/2005/11/Assembler#&amp;gt; PREFIX sdb: &amp;lt;http://jena.hpl.hp.com/2007/sdb#&amp;gt; sdb:DatasetStore rdfs:subClassOf ja:RDFDataset .</description>
@@ -1561,10 +1573,10 @@ PREFIX rdfs: &amp;lt;http://www.w3.org/2000/01/rdf-schema#&amp;gt; PREFIX rdf: &
     
     <item>
       <title>SDB FAQ</title>
-      <link>https://jena.apache.org/documentation/sdb/faq.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/faq.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/faq.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/faq.html</guid>
       <description>Tune your database Database performance depends on the database being tuned. Some databases default to &amp;ldquo;developer setup&amp;rdquo; which does not use much of the RAM but is only for functional testing.
 Improving loading rates For a large bulk load into an existing store, dropping the indexes, doing the load and then recreating the indexes can be noticeably faster.
  sdbconfig --drop sdbload file sdbconfig --index  For a large bulk load into a new store, just format it, and not create the indexes, do the load and then recreating the indexes can be noticeably faster.</description>
@@ -1572,10 +1584,10 @@ Improving loading rates For a large bulk load into an existing store, dropping t
     
     <item>
       <title>SDB Fuseki Integration</title>
-      <link>https://jena.apache.org/documentation/sdb/fuseki_integration.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/fuseki_integration.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/fuseki_integration.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/fuseki_integration.html</guid>
       <description>Fuseki is a server that implements the SPARQL protocol for HTTP. It can be used to give a SPARQL interface to an SDB installation.
 The Fuseki server needs the SDB jar files on its classpath. The Fuseki server configuration file needs to contain two triples to integrate SDB:
 [] rdf:type fuseki:Server ; fuseki:services ( &amp;lt;#service1&amp;gt; ) . ## Declare that sdb:DatasetStore is an implementation of ja:RDFDataset . sdb:DatasetStore rdfs:subClassOf ja:RDFDataset .</description>
@@ -1583,10 +1595,10 @@ The Fuseki server needs the SDB jar files on its classpath. The Fuseki server co
     
     <item>
       <title>SDB Installation</title>
-      <link>https://jena.apache.org/documentation/sdb/installation.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/installation.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/installation.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/installation.html</guid>
       <description>A suitable database must be installed separately. Any database installation should be tuned according to the database documentation.
 The SDB distribution is zip file of a directory hierarchy.
 Unzip this. You may need to run chmod u+x on the scripts in the bin/ directory.
@@ -1596,10 +1608,10 @@ A database must be created before the tests can be run. Microsoft SQL server and
     
     <item>
       <title>SDB JavaAPI</title>
-      <link>https://jena.apache.org/documentation/sdb/javaapi.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/javaapi.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/javaapi.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/javaapi.html</guid>
       <description>This page describes how to use SDB from Java.
 Code examples are in src-examples/ in the SDB distribution.
 Contents  Concepts Obtaining the Store  From a configuration file In Java code Database User and Password   Connection Management Formatting or Emptying the Store Loading data Executing Queries Using the Jena Model API with SDB  Concepts  Store SDBFactory SDBConnection  SDB loads and queries data based on the unit of a Store.</description>
@@ -1607,10 +1619,10 @@ Contents  Concepts Obtaining the Store  From a configuration file In Java code D
     
     <item>
       <title>SDB Loading data</title>
-      <link>https://jena.apache.org/documentation/sdb/loading_data.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/loading_data.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/loading_data.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/loading_data.html</guid>
       <description>There are three ways to load data into SDB:
  Use the command utility sdbload Use one of the Jena model.read operations Use the Jena model.add  The last one of these requires the application to signal the beginning and end of batches.
 Loading with Model.read A Jena Model obtained from SDB via:
@@ -1620,39 +1632,39 @@ Loading with Model.</description>
     
     <item>
       <title>SDB Loading performance</title>
-      <link>https://jena.apache.org/documentation/sdb/loading_performance.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/loading_performance.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/loading_performance.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/loading_performance.html</guid>
       <description>Introduction The Databases and Hardware  Hardware Windows setup Linux setup   The Dataset and Queries  LUBM dbpedia   Loading Results Uniprot 700m loading: Tuning Helps  Introduction Performance reporting is an area prone to misinterpretation, and such reports should be liberally decorated with disclaimers. In our case there are an alarming number of variables: the hardware, the operating system, the database engine and its myriad parameters, the data itself, the queri [...]
     </item>
     
     <item>
       <title>SDB Query performance</title>
-      <link>https://jena.apache.org/documentation/sdb/query_performance.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/query_performance.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/query_performance.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/query_performance.html</guid>
       <description>This page compares the effect of SDB with RDB, Jena&amp;rsquo;s usual database layout. RDB was designed for supporting the fine-grained API calls as well as having some support for basic graph patterns. Therefore, the RDB design goals were not those of SDB.
 RDB uses a denormalised database layout in order that all statement-level operations do not require additional joins. The SDB layout is normalised so that the triple table is narrower and uses integers for RDF nodes, then does do joins to get the node representation.</description>
     </item>
     
     <item>
       <title>SDB Quickstart</title>
-      <link>https://jena.apache.org/documentation/sdb/quickstart.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/quickstart.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/quickstart.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/quickstart.html</guid>
       <description>SDB provides some command line tools to work with SDB triple stores. In the following it assumed that you have a store description set up for your database (sdb.ttl). See the store description format for details. The Store/ directory for some examples.
 Setting up your environment $ export SDBROOT=/path/to/sdb $ export PATH=$SDBROOT/bin:$PATH $ export SDB_USER=YourDatabaseUserName $ export SDB_PASSWORD=YourDatabasePassword $ export SDB_JDBC=YourJDBCdriver  Initialising the database Be aware that this will wipe existing data from the database.</description>
     </item>
     
     <item>
       <title>SDB Store Description</title>
-      <link>https://jena.apache.org/documentation/sdb/store_description.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/store_description.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/store_description.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/store_description.html</guid>
       <description>Use of an SDB store requires a Store object which is described in two parts:
  a connection to the database a description of the store configuration  These can be built from a Jena assembler description.
 Store objects themselves are lightweight so connections to an SDB database can be created on a per-request basis as required for use in J2EE application servers.
@@ -1661,10 +1673,10 @@ Contents  Store Descriptions SDB Connections Example Vocabulary  Store Connectio
     
     <item>
       <title>SDB/Commands</title>
-      <link>https://jena.apache.org/documentation/sdb/commands.html</link>
+      <link>https://jena.apache.org/documentation/archive/sdb/commands.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
       
-      <guid>https://jena.apache.org/documentation/sdb/commands.html</guid>
+      <guid>https://jena.apache.org/documentation/archive/sdb/commands.html</guid>
       <description>This page describes the command line programs that can be used to create an SDB store, load data into it and to issue queries.
 Contents   Scripts
  Script set up Argument Structure    Store Description
@@ -1683,6 +1695,17 @@ In its default configuration, SPARQL endpoints are open to the public but admini
     </item>
     
     <item>
+      <title>Security in Fuseki2 server</title>
+      <link>https://jena.apache.org/documentation/fuseki2/fuseki-main-security.html</link>
+      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+      
+      <guid>https://jena.apache.org/documentation/fuseki2/fuseki-main-security.html</guid>
+      <description>This page covers security for Fuseki Main.
+See other documentation for the webapp packaging of Fuseki.
+Serving RDF For any use of users-password information, and especially HTTP basic authentication, information is visible in the HTTP headers. When serving RDF and SPARQL requests, using HTTPS is necessary to avoid snooping. Digest authentication is also stronger over HTTPS because it protects against man-in-the-middle attacks.</description>
+    </item>
+    
+    <item>
       <title>SOH - SPARQL over HTTP</title>
       <link>https://jena.apache.org/documentation/fuseki2/soh.html</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
@@ -2068,7 +2091,7 @@ The file access mechanism can be set explicitly, but this is not a good idea for
       <guid>https://jena.apache.org/documentation/tdb/tdb-xloader.html</guid>
       <description>TDB xloader (&amp;ldquo;x&amp;rdquo; for external) is a bulkloader for very large datasets. The goal is stability and reliability for long running loading, running on modest and
 xloader is not a replacement for regular TDB1 and TDB2 loaders.
-Theer are two scripts to load data using the xlaoder subsystem.
+There are two scripts to load data using the xlaoder subsystem.
 &amp;ldquo;tdb1.xloader&amp;rdquo;, which was called &amp;ldquo;tdbloader2&amp;rdquo; and has some improvements.
 It is not as fast as other TDB loaders on dataset where the general loaders work on without encountering progressive slowdown.</description>
     </item>
diff --git a/content/sitemap.xml b/content/sitemap.xml
index 2c3326c..2c1d0a0 100644
--- a/content/sitemap.xml
+++ b/content/sitemap.xml
@@ -38,33 +38,33 @@
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/hadoop/</loc>
-    <lastmod>2021-02-20T13:42:28+00:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/hadoop/</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/hadoop/elephas_index.html</loc>
-    <lastmod>2021-02-20T13:42:28+00:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/hadoop/elephas_index.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/hadoop/common.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/hadoop/common.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/hadoop/io.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/hadoop/io.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/hadoop/mapred.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/hadoop/mapred.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/hadoop/demo.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/hadoop/demo.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
@@ -74,7 +74,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/geosparql/</loc>
-    <lastmod>2021-03-02T12:43:16+13:00</lastmod>
+    <lastmod>2021-11-05T16:04:36+00:00</lastmod>
   </url>
   
   <url>
@@ -93,8 +93,8 @@
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/sdb/</loc>
-    <lastmod>2021-02-20T13:42:28+00:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/sdb/</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
@@ -109,12 +109,12 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/sparql-apis/</loc>
-    <lastmod>2021-11-15T12:00:22+00:00</lastmod>
+    <lastmod>2021-11-15T17:04:25+00:00</lastmod>
   </url>
   
   <url>
     <loc>https://jena.apache.org/documentation/query/</loc>
-    <lastmod>2021-06-22T11:19:55+01:00</lastmod>
+    <lastmod>2021-11-05T16:04:36+00:00</lastmod>
   </url>
   
   <url>
@@ -154,7 +154,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/query/construct-quad.html</loc>
-    <lastmod>2020-05-01T11:11:56+12:00</lastmod>
+    <lastmod>2021-11-05T16:04:36+00:00</lastmod>
   </url>
   
   <url>
@@ -164,7 +164,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/query/arq-query-eval.html</loc>
-    <lastmod>2021-11-15T12:00:22+00:00</lastmod>
+    <lastmod>2021-11-15T17:04:25+00:00</lastmod>
   </url>
   
   <url>
@@ -184,7 +184,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/query/architecture.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <lastmod>2021-11-05T08:11:46+00:00</lastmod>
   </url>
   
   <url>
@@ -194,7 +194,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/query/logging.html</loc>
-    <lastmod>2020-05-11T15:00:20+01:00</lastmod>
+    <lastmod>2021-11-05T16:04:36+00:00</lastmod>
   </url>
   
   <url>
@@ -204,7 +204,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/query/sparql-remote.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <lastmod>2021-11-05T16:04:36+00:00</lastmod>
   </url>
   
   <url>
@@ -284,32 +284,32 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/notes/model-factory.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <lastmod>2021-11-05T08:11:46+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/csv/</loc>
-    <lastmod>2021-02-21T10:53:52+13:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/csv/</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/csv/csv_index.html</loc>
-    <lastmod>2021-02-19T15:39:55+13:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/csv/csv_index.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/csv/design.html</loc>
-    <lastmod>2021-02-19T15:39:55+13:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/csv/design.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/csv/get_started.html</loc>
-    <lastmod>2021-02-19T15:39:55+13:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/csv/get_started.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/csv/implementation.html</loc>
-    <lastmod>2021-02-19T15:39:55+13:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/csv/implementation.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
@@ -324,7 +324,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation.html</loc>
-    <lastmod>2021-11-15T12:00:36+00:00</lastmod>
+    <lastmod>2021-11-15T17:04:25+00:00</lastmod>
   </url>
   
   <url>
@@ -339,7 +339,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/query/explain.html</loc>
-    <lastmod>2020-05-11T15:00:20+01:00</lastmod>
+    <lastmod>2021-11-05T16:04:36+00:00</lastmod>
   </url>
   
   <url>
@@ -369,7 +369,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/fuseki2/fuseki-embedded.html</loc>
-    <lastmod>2021-02-18T09:21:56+00:00</lastmod>
+    <lastmod>2021-11-05T16:04:36+00:00</lastmod>
   </url>
   
   <url>
@@ -439,7 +439,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/geosparql/geosparql-fuseki.html</loc>
-    <lastmod>2021-07-16T18:35:45+01:00</lastmod>
+    <lastmod>2021-11-05T16:04:36+00:00</lastmod>
   </url>
   
   <url>
@@ -454,7 +454,7 @@
   
   <url>
     <loc>https://jena.apache.org/getting_started/</loc>
-    <lastmod>2021-09-04T18:49:14+01:00</lastmod>
+    <lastmod>2021-11-05T08:11:46+00:00</lastmod>
   </url>
   
   <url>
@@ -464,7 +464,7 @@
   
   <url>
     <loc>https://jena.apache.org/getting_started.html</loc>
-    <lastmod>2021-09-04T18:49:14+01:00</lastmod>
+    <lastmod>2021-11-05T08:11:46+00:00</lastmod>
   </url>
   
   <url>
@@ -473,8 +473,13 @@
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/query/http-auth.html</loc>
-    <lastmod>2020-05-01T11:11:56+12:00</lastmod>
+    <loc>https://jena.apache.org/documentation/sparql-apis/http-auth.html</loc>
+    <lastmod>2021-11-05T16:04:36+00:00</lastmod>
+  </url>
+  
+  <url>
+    <loc>https://jena.apache.org/documentation/archive/versions/http-auth-old.html</loc>
+    <lastmod>2021-11-05T16:04:36+00:00</lastmod>
   </url>
   
   <url>
@@ -534,7 +539,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/ontology/</loc>
-    <lastmod>2021-09-04T18:49:14+01:00</lastmod>
+    <lastmod>2021-11-05T08:11:46+00:00</lastmod>
   </url>
   
   <url>
@@ -589,7 +594,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/txn/transactions_api.html</loc>
-    <lastmod>2020-05-04T10:26:41+01:00</lastmod>
+    <lastmod>2021-11-05T16:04:36+00:00</lastmod>
   </url>
   
   <url>
@@ -608,8 +613,8 @@
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/hadoop/artifacts.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/hadoop/artifacts.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
@@ -659,7 +664,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/rdfconnection/</loc>
-    <lastmod>2021-02-19T15:39:55+13:00</lastmod>
+    <lastmod>2021-11-05T16:04:36+00:00</lastmod>
   </url>
   
   <url>
@@ -723,83 +728,83 @@
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/sdb/sdb_index.html</loc>
-    <lastmod>2021-02-20T13:42:28+00:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/sdb/sdb_index.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/sdb/configuration.html</loc>
-    <lastmod>2020-05-01T11:11:56+12:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/sdb/configuration.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/sdb/database_layouts.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/sdb/database_layouts.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/sdb/db_notes.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/sdb/db_notes.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/sdb/databases_supported.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/sdb/databases_supported.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/sdb/dataset_description.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/sdb/dataset_description.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/sdb/faq.html</loc>
-    <lastmod>2020-05-01T11:11:56+12:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/sdb/faq.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/sdb/fuseki_integration.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/sdb/fuseki_integration.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/sdb/installation.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/sdb/installation.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/sdb/javaapi.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/sdb/javaapi.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/sdb/loading_data.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/sdb/loading_data.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/sdb/loading_performance.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/sdb/loading_performance.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/sdb/query_performance.html</loc>
-    <lastmod>2020-05-01T11:11:56+12:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/sdb/query_performance.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/sdb/quickstart.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/sdb/quickstart.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/sdb/store_description.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/sdb/store_description.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
-    <loc>https://jena.apache.org/documentation/sdb/commands.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <loc>https://jena.apache.org/documentation/archive/sdb/commands.html</loc>
+    <lastmod>2021-11-05T11:40:17+00:00</lastmod>
   </url>
   
   <url>
@@ -808,6 +813,11 @@
   </url>
   
   <url>
+    <loc>https://jena.apache.org/documentation/fuseki2/fuseki-main-security.html</loc>
+    <lastmod>2021-11-05T16:04:36+00:00</lastmod>
+  </url>
+  
+  <url>
     <loc>https://jena.apache.org/documentation/fuseki2/soh.html</loc>
     <lastmod>2020-02-28T13:09:12+01:00</lastmod>
   </url>
@@ -919,17 +929,17 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/tdb/commands.html</loc>
-    <lastmod>2021-11-15T12:00:36+00:00</lastmod>
+    <lastmod>2021-11-15T17:03:29+00:00</lastmod>
   </url>
   
   <url>
     <loc>https://jena.apache.org/documentation/tdb/configuration.html</loc>
-    <lastmod>2020-05-11T15:00:20+01:00</lastmod>
+    <lastmod>2021-11-05T16:04:36+00:00</lastmod>
   </url>
   
   <url>
     <loc>https://jena.apache.org/documentation/tdb/datasets.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <lastmod>2021-11-05T16:04:36+00:00</lastmod>
   </url>
   
   <url>
@@ -939,7 +949,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/tdb/faqs.html</loc>
-    <lastmod>2021-11-15T12:00:36+00:00</lastmod>
+    <lastmod>2021-11-15T17:03:29+00:00</lastmod>
   </url>
   
   <url>
@@ -949,12 +959,12 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/tdb/optimizer.html</loc>
-    <lastmod>2020-05-11T15:00:20+01:00</lastmod>
+    <lastmod>2021-11-05T16:04:36+00:00</lastmod>
   </url>
   
   <url>
     <loc>https://jena.apache.org/documentation/tdb/quadfilter.html</loc>
-    <lastmod>2020-05-01T11:11:56+12:00</lastmod>
+    <lastmod>2021-11-05T16:04:36+00:00</lastmod>
   </url>
   
   <url>
@@ -964,7 +974,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/tdb/tdb_transactions.html</loc>
-    <lastmod>2020-02-28T13:09:12+01:00</lastmod>
+    <lastmod>2021-11-05T16:04:36+00:00</lastmod>
   </url>
   
   <url>
@@ -984,7 +994,7 @@
   
   <url>
     <loc>https://jena.apache.org/documentation/tdb/tdb-xloader.html</loc>
-    <lastmod>2021-11-12T12:33:33+00:00</lastmod>
+    <lastmod>2021-11-15T17:03:29+00:00</lastmod>
   </url>
   
   <url>