diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index d61a2c061cc..1fc19f4958e 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
   - name: Jetty Security Reports
-    url: https://eclipse.dev/jetty/security_reports.php
+    url: https://jetty.org/security.html
     about: Please raise security issues here.
diff --git a/.github/ISSUE_TEMPLATE/issue-template.md b/.github/ISSUE_TEMPLATE/issue-template.md
index 2f9f5649d03..1e97c1e3c0f 100644
--- a/.github/ISSUE_TEMPLATE/issue-template.md
+++ b/.github/ISSUE_TEMPLATE/issue-template.md
@@ -18,7 +18,7 @@ labels: Bug
 **OS type/version**
 
 **Description**
-<!-- Do not report security issues here! See [Jetty Security Reports](https://eclipse.dev/jetty/security_reports.php) -->
+<!-- Do not report security issues here! See [Jetty Security Reports](https://jetty.org/security.html) -->
 
 **How to reproduce?**
 
diff --git a/.github/ISSUE_TEMPLATE/release-template.md b/.github/ISSUE_TEMPLATE/release-template.md
index a6751fecdbd..b0aace9b047 100644
--- a/.github/ISSUE_TEMPLATE/release-template.md
+++ b/.github/ISSUE_TEMPLATE/release-template.md
@@ -56,7 +56,7 @@ This release process will produce releases:
 - [ ] Merge release branches back to main branches and delete release branches.
 - [ ] Verify release existence in Maven Central by triggering the Jenkins builds of CometD.
 - [ ] Update Jetty versions on the website ( follow instructions in [jetty-website](https://github.com/eclipse/jetty-website/blob/master/README.md) ).
-  + [ ] Update (or check) [Download](https://eclipse.dev/jetty/download.php) page is updated.
+  + [ ] Update (or check) [Download](https://jetty.org/download.html) page is updated.
   + [ ] Update (or check) documentation page(s) are updated.
 - [ ] Publish GitHub Releases.
 - [ ] Prepare release announcement for mailing lists.
diff --git a/documentation/jetty/modules/code/examples/src/main/java/org/eclipse/jetty/docs/programming/ArchitectureDocs.java b/documentation/jetty/modules/code/examples/src/main/java/org/eclipse/jetty/docs/programming/ArchitectureDocs.java
index 721372f5c24..5edfd89fbf5 100644
--- a/documentation/jetty/modules/code/examples/src/main/java/org/eclipse/jetty/docs/programming/ArchitectureDocs.java
+++ b/documentation/jetty/modules/code/examples/src/main/java/org/eclipse/jetty/docs/programming/ArchitectureDocs.java
@@ -17,17 +17,29 @@ import java.util.concurrent.Executors;
 
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
+import org.eclipse.jetty.util.thread.VirtualThreadPool;
 
 @SuppressWarnings("unused")
 public class ArchitectureDocs
 {
-    public void configureVirtualThreads()
+    public void queuedVirtualThreads()
     {
-        // tag::virtual[]
+        // tag::queuedVirtual[]
         QueuedThreadPool threadPool = new QueuedThreadPool();
         threadPool.setVirtualThreadsExecutor(Executors.newVirtualThreadPerTaskExecutor());
 
         Server server = new Server(threadPool);
-        // end::virtual[]
+        // end::queuedVirtual[]
+    }
+
+    public void virtualVirtualThreads()
+    {
+        // tag::virtualVirtual[]
+        VirtualThreadPool threadPool = new VirtualThreadPool();
+        // Limit the max number of current virtual threads.
+        threadPool.setMaxThreads(200);
+
+        Server server = new Server(threadPool);
+        // end::virtualVirtual[]
     }
 }
diff --git a/documentation/jetty/modules/operations-guide/pages/modules/standard.adoc b/documentation/jetty/modules/operations-guide/pages/modules/standard.adoc
index 41b475fd1e4..d3992234c71 100644
--- a/documentation/jetty/modules/operations-guide/pages/modules/standard.adoc
+++ b/documentation/jetty/modules/operations-guide/pages/modules/standard.adoc
@@ -708,6 +708,34 @@ If you want to use virtual threads, introduced as a preview feature in Java 19 a
 
 See also the xref:server/index.adoc#threadpool[section about configuring the thread pool].
 
+[[threadpool-all-virtual]]
+== Module `threadpool-all-virtual`
+
+The `threadpool-all-virtual` module allows you to configure the server-wide thread pool, similarly to what you can do with the <<threadpool,`threadpool`>> Jetty module, so that all threads are virtual threads, introduced as an official feature since Java 21.
+
+CAUTION: Only use this module if you are using Java 21 or later.
+If you are using Java 19 or Java 20, use the <<threadpool-virtual-preview,`threadpool-virtual-preview`>> Jetty module instead.
+
+The module properties to configure the thread pool are:
+
+----
+include::{jetty-home}/modules/threadpool-all-virtual.mod[tags=documentation]
+----
+
+The property `jetty.threadpool.maxThreads` limits, using a `Semaphore`, the number of current virtual threads in use.
+
+Limiting the number of current virtual threads helps to limit resource usage in applications, especially in case of load spikes.
+When an unlimited number of virtual threads is allowed, the server might be brought down due to resource (typically memory) exhaustion.
+
+[CAUTION]
+====
+Even when using virtual threads, Jetty uses non-blocking I/O, and dedicates a thread to each `java.nio.channels.Selector` to perform the `Selector.select()` operation.
+
+Currently (up to Java 22), calling `Selector.select()` from a virtual thread pins the carrier thread.
+
+When using the `threadpool-all-virtual` Jetty module, if you have `N` selectors, then `N` carrier threads will be pinned by the virtual threads calling `Selector.select()`, possibly making your system less efficient, and at worst locking up the entire system if there are no carrier threads available to run virtual threads.
+====
+
 [[threadpool-virtual]]
 == Module `threadpool-virtual`
 
diff --git a/documentation/jetty/modules/operations-guide/pages/server/index.adoc b/documentation/jetty/modules/operations-guide/pages/server/index.adoc
index f147d11d401..00c66b05489 100644
--- a/documentation/jetty/modules/operations-guide/pages/server/index.adoc
+++ b/documentation/jetty/modules/operations-guide/pages/server/index.adoc
@@ -328,32 +328,30 @@ Virtual threads have been introduced as a preview feature in Java 19 and Java 20
 
 The xref:modules/standard.adoc#threadpool-virtual-preview[`threadpool-virtual-preview`] Jetty module provides support for virtual threads in Java 19 and Java 20, and it is mutually exclusive with the `threadpool` Jetty module.
 
-The xref:modules/standard.adoc#threadpool-virtual[`threadpool-virtual`] Jetty module provides support for virtual threads in Java 21 or later, and it is mutually exclusive with the `threadpool` Jetty module.
+When using Java 21, there are two Jetty modules available:
+
+* xref:modules/standard.adoc#threadpool-virtual[`threadpool-virtual`]
+* xref:modules/standard.adoc#threadpool-all-virtual[`threadpool-all-virtual`]
+
+Both are mutually exclusive with the `threadpool` Jetty module.
 
 If you have already enabled the `threadpool` Jetty module, it is sufficient to remove it by removing the `$JETTY_BASE/start.d/threadpool.ini` file.
 
-When using Java 21 or later, you can enable the xref:modules/standard.adoc#threadpool-virtual[`threadpool-virtual`] module:
+The xref:modules/standard.adoc#threadpool-virtual[`threadpool-virtual`] Jetty module provides a mixed thread mode, where platform threads are used to run internal Jetty tasks, but application code is invoked using virtual threads.
+
+The xref:modules/standard.adoc#threadpool-all-virtual[`threadpool-all-virtual`] Jetty module provides a thread mode where all threads are virtual threads, including those used internally by Jetty.
+
+You can enable either module using:
 
 ----
 $ java -jar $JETTY_HOME/start.jar --add-modules=threadpool-virtual,http
 ----
 
-After the command above, the `$JETTY_BASE` directory looks like this:
+or
 
-[source]
 ----
-$JETTY_BASE
-├── resources
-│   └── jetty-logging.properties
-└── start.d
-    ├── http.ini
-    └── threadpool-virtual.ini
+$ java -jar $JETTY_HOME/start.jar --add-modules=threadpool-all-virtual,http
 ----
 
-Now you can customize the `threadpool-virtual.ini` file to explicitly configure the thread pool and the virtual threads and then start Jetty:
-
-[jetty%nowrap]
-....
-[jetty]
-setupArgs=--add-modules=threadpool-virtual,http
-....
+After the command above, the `$JETTY_BASE/start.d/` directory will contain the corresponding `threadpool-virtual.ini` or `threadpool-all-virtual.ini` file.
+You can now explicitly configure the thread pool module properties inside the `+*.ini+` file and then start Jetty.
diff --git a/documentation/jetty/modules/programming-guide/pages/arch/threads.adoc b/documentation/jetty/modules/programming-guide/pages/arch/threads.adoc
index e8b7016643e..1fb7dff1d2b 100644
--- a/documentation/jetty/modules/programming-guide/pages/arch/threads.adoc
+++ b/documentation/jetty/modules/programming-guide/pages/arch/threads.adoc
@@ -235,11 +235,14 @@ Virtual threads have been introduced in Java 19 and Java 20 as a preview feature
 
 NOTE: In Java versions where virtual threads are a preview feature, remember to add `+--enable-preview+` to the JVM command line options to use virtual threads.
 
+[[thread-pool-virtual-threads-queued]]
+==== Virtual Threads Support with `QueuedThreadPool`
+
 `QueuedThreadPool` can be configured to use virtual threads by specifying the virtual threads `Executor`:
 
 [,java,indent=0]
 ----
-include::code:example$src/main/java/org/eclipse/jetty/docs/programming/ArchitectureDocs.java[tags=virtual]
+include::code:example$src/main/java/org/eclipse/jetty/docs/programming/ArchitectureDocs.java[tags=queuedVirtual]
 ----
 
 [CAUTION]
@@ -255,3 +258,17 @@ Enabling virtual threads in `QueuedThreadPool` will default the number of reserv
 
 Defaulting the number of reserved threads to zero ensures that the <<execution-strategy-pec,Produce-Execute-Consume mode>> is always used, which means that virtual threads will always be used for blocking tasks.
 ====
+
+[[thread-pool-virtual-threads-virtual]]
+==== Virtual Threads Support with `VirtualThreadPool`
+
+`VirtualThreadPool`  is an alternative to `QueuedThreadPool` that creates only virtual threads (no platform threads).
+
+[,java,indent=0]
+----
+include::code:example$src/main/java/org/eclipse/jetty/docs/programming/ArchitectureDocs.java[tags=virtualVirtual]
+----
+
+Despite the name, `VirtualThreadPool` does not pool virtual threads, but allows you to impose a limit on the maximum number of current virtual threads, in order to limit resource consumption.
+
+Furthermore, you can configure it to track virtual threads so that a xref:troubleshooting/component-dump.adoc[Jetty component dump] will show all virtual threads, including those that are unmounted.
diff --git a/jetty-core/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml b/jetty-core/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml
index b1cb065aff6..a5a49056c59 100644
--- a/jetty-core/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml
+++ b/jetty-core/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
 
diff --git a/jetty-core/jetty-client/src/main/config/modules/client.mod b/jetty-core/jetty-client/src/main/config/modules/client.mod
index 1287200826d..fa8da61d182 100644
--- a/jetty-core/jetty-client/src/main/config/modules/client.mod
+++ b/jetty-core/jetty-client/src/main/config/modules/client.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds the Jetty HTTP client to the server classpath.
diff --git a/jetty-core/jetty-deploy/src/main/config/etc/jetty-core-deploy.xml b/jetty-core/jetty-deploy/src/main/config/etc/jetty-core-deploy.xml
index 551fcc99b9a..e4d6b0c4aca 100644
--- a/jetty-core/jetty-deploy/src/main/config/etc/jetty-core-deploy.xml
+++ b/jetty-core/jetty-deploy/src/main/config/etc/jetty-core-deploy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Attach the "core" environment app deployment provider           -->
diff --git a/jetty-core/jetty-deploy/src/main/config/etc/jetty-deploy.xml b/jetty-core/jetty-deploy/src/main/config/etc/jetty-deploy.xml
index 2ed9f8182d6..02d9dc90209 100644
--- a/jetty-core/jetty-deploy/src/main/config/etc/jetty-deploy.xml
+++ b/jetty-core/jetty-deploy/src/main/config/etc/jetty-deploy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Create the deployment manager                                   -->
diff --git a/jetty-core/jetty-deploy/src/test/resources/etc/core-context.xml b/jetty-core/jetty-deploy/src/test/resources/etc/core-context.xml
index 1eb453c7599..cccca5c2950 100644
--- a/jetty-core/jetty-deploy/src/test/resources/etc/core-context.xml
+++ b/jetty-core/jetty-deploy/src/test/resources/etc/core-context.xml
@@ -12,7 +12,7 @@
 <!-- // ======================================================================== -->
 <!-- // -->
 
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure class="org.eclipse.jetty.server.handler.ContextHandler">
   <Set name="contextPath">/global</Set>
   <Call name="setAttribute">
diff --git a/jetty-core/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml b/jetty-core/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml
index 7d4899bd907..0b3431bd222 100644
--- a/jetty-core/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml
+++ b/jetty-core/jetty-deploy/src/test/resources/jetty-deploymgr-contexts.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Call name="addBean">
diff --git a/jetty-core/jetty-deploy/src/test/resources/jetty-http.xml b/jetty-core/jetty-deploy/src/test/resources/jetty-http.xml
index aec2b1b9891..8ee14df91ae 100644
--- a/jetty-core/jetty-deploy/src/test/resources/jetty-http.xml
+++ b/jetty-core/jetty-deploy/src/test/resources/jetty-http.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure the Jetty Server instance with an ID "Server"       -->
diff --git a/jetty-core/jetty-deploy/src/test/resources/jetty.xml b/jetty-core/jetty-deploy/src/test/resources/jetty.xml
index e477b2820c7..849410ab404 100644
--- a/jetty-core/jetty-deploy/src/test/resources/jetty.xml
+++ b/jetty-core/jetty-deploy/src/test/resources/jetty.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 
 <!-- =============================================================== -->
 <!-- Documentation of this file format can be found at:              -->
-<!-- https://eclipse.dev/jetty/documentation/                        -->
+<!-- https://jetty.org/docs/                        -->
 <!--                                                                 -->
 <!-- Additional configuration files are available in $JETTY_HOME/etc -->
 <!-- and can be mixed in. See start.ini file for the default         -->
diff --git a/jetty-core/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml b/jetty-core/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml
index 16e071f40ab..a3ce9058a67 100644
--- a/jetty-core/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml
+++ b/jetty-core/jetty-deploy/src/test/resources/webapps/badapp/badapp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
   <Set name="contextPath">/badapp</Set>
diff --git a/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context-alt.xml b/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context-alt.xml
index 41787f99ed0..4aad41739be 100644
--- a/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context-alt.xml
+++ b/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context-alt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure class="org.eclipse.jetty.server.handler.ContextHandler">
   <Set name="contextPath">/bar</Set>
   <Set name="baseResourceAsString"><Property name="test.bar.resourceBase.alt" /></Set>
diff --git a/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context.xml b/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context.xml
index 8af6129f3b4..72731f08c4d 100644
--- a/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context.xml
+++ b/jetty-core/jetty-deploy/src/test/resources/webapps/bar-core-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure class="org.eclipse.jetty.server.handler.ContextHandler">
   <Set name="contextPath">/bar</Set>
   <Set name="baseResourceAsString"><Property name="test.bar.resourceBase" /></Set>
diff --git a/jetty-core/jetty-deploy/src/test/resources/webapps/foo.xml b/jetty-core/jetty-deploy/src/test/resources/webapps/foo.xml
index dfadf9a005a..e8c94f70b64 100644
--- a/jetty-core/jetty-deploy/src/test/resources/webapps/foo.xml
+++ b/jetty-core/jetty-deploy/src/test/resources/webapps/foo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
     <Set name="contextPath">/foo</Set>
     <Set name="war">
diff --git a/jetty-core/jetty-deploy/src/test/resources/webapps/simple.xml b/jetty-core/jetty-deploy/src/test/resources/webapps/simple.xml
index a83ffeafa26..3aac3b00214 100644
--- a/jetty-core/jetty-deploy/src/test/resources/webapps/simple.xml
+++ b/jetty-core/jetty-deploy/src/test/resources/webapps/simple.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure class="org.eclipse.jetty.server.handler.ContextHandler">
   <Set name="contextPath">/simple</Set>
   <Set name="tempDirectory"><Property name="test.tmpBase" /></Set>
diff --git a/jetty-core/jetty-ee/src/main/config/modules/ee-webapp.mod b/jetty-core/jetty-ee/src/main/config/modules/ee-webapp.mod
index db2420cf4f2..4dea06e0eab 100644
--- a/jetty-core/jetty-ee/src/main/config/modules/ee-webapp.mod
+++ b/jetty-core/jetty-ee/src/main/config/modules/ee-webapp.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 # tag::description[]
diff --git a/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2.xml b/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2.xml
index 0b9fdc6c7b1..a185f7fadca 100644
--- a/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2.xml
+++ b/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
   <Call name="addConnectionFactory">
diff --git a/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2c.xml b/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2c.xml
index 6d0ed5bd00f..71020ac9c88 100644
--- a/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2c.xml
+++ b/jetty-core/jetty-http2/jetty-http2-server/src/main/config/etc/jetty-http2c.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="httpConnector" class="org.eclipse.jetty.server.ServerConnector">
   <Call name="addConnectionFactory">
diff --git a/jetty-core/jetty-http3/jetty-http3-server/src/main/config/etc/jetty-http3.xml b/jetty-core/jetty-http3/jetty-http3-server/src/main/config/etc/jetty-http3.xml
index 044b86ad909..82e2ab4eea9 100644
--- a/jetty-core/jetty-http3/jetty-http3-server/src/main/config/etc/jetty-http3.xml
+++ b/jetty-core/jetty-http3/jetty-http3-server/src/main/config/etc/jetty-http3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Call name="addConnector">
diff --git a/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml b/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml
index aef61105a32..2f517dcfd37 100644
--- a/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml
+++ b/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Call name="addBean">
diff --git a/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx.xml b/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx.xml
index 2dfe691de24..008ad50b3ab 100644
--- a/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx.xml
+++ b/jetty-core/jetty-jmx/src/main/config/etc/jetty-jmx.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
diff --git a/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml b/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml
index 6f1b65ef6fa..adb2adaf276 100644
--- a/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml
+++ b/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-auth.xml
@@ -19,7 +19,7 @@
   ~
   -->
 
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure>
   <Ref refid="JMXConnectorServer">
diff --git a/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml b/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml
index 98c0dfc9eba..78a79d82da2 100644
--- a/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml
+++ b/jetty-core/jetty-jmx/src/main/config/modules/jmx.d/jmx-remote-ssl.xml
@@ -19,7 +19,7 @@
   ~
   -->
 
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure>
   <Ref refid="JMXConnectorServer">
diff --git a/jetty-core/jetty-jndi/src/main/config/modules/jndi.mod b/jetty-core/jetty-jndi/src/main/config/modules/jndi.mod
index 117a02ca0c1..d4cf07a71a5 100644
--- a/jetty-core/jetty-jndi/src/main/config/modules/jndi.mod
+++ b/jetty-core/jetty-jndi/src/main/config/modules/jndi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds the Jetty JNDI implementation to the classpath.
diff --git a/jetty-core/jetty-openid/src/main/config/modules/openid.mod b/jetty-core/jetty-openid/src/main/config/modules/openid.mod
index ddd36c8ec90..1f75f0478a2 100644
--- a/jetty-core/jetty-openid/src/main/config/modules/openid.mod
+++ b/jetty-core/jetty-openid/src/main/config/modules/openid.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds OpenId Connect authentication to the server.
diff --git a/jetty-core/jetty-plus/src/main/config/modules/plus.mod b/jetty-core/jetty-plus/src/main/config/modules/plus.mod
index 4813575eba3..fe87a55f5bc 100644
--- a/jetty-core/jetty-plus/src/main/config/modules/plus.mod
+++ b/jetty-core/jetty-plus/src/main/config/modules/plus.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds the Jetty Plus JNDI support to the classpath.
diff --git a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-compactpath.xml b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-compactpath.xml
index 2eab21ff751..68fedfc96cb 100644
--- a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-compactpath.xml
+++ b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-compactpath.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure id="Rewrite" class="org.eclipse.jetty.rewrite.handler.RuleContainer">
   <Call name="addRule">
     <Arg>
diff --git a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-customizer.xml b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-customizer.xml
index 2dfb8c9c76a..84294a1f051 100644
--- a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-customizer.xml
+++ b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite-customizer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
   <Call name="addCustomizer">
     <Arg>
diff --git a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml
index 9b0d0e3118d..991a7597d23 100644
--- a/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml
+++ b/jetty-core/jetty-rewrite/src/main/config/etc/jetty-rewrite.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Call name="insertHandler">
diff --git a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-compactpath.mod b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-compactpath.mod
index d0b64c295cb..7a6c1d84ecf 100644
--- a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-compactpath.mod
+++ b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-compactpath.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Add a rule to the rewrite module to compact paths.
diff --git a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod
index fced4946ee9..374867e4568 100644
--- a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod
+++ b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite-customizer.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables a rewrite Rules container as a request customizer.
diff --git a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite.mod b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite.mod
index ba7e9815457..8db323b256f 100644
--- a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite.mod
+++ b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds the RewriteHandler to the Handler chain.
diff --git a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite/jetty-rewrite-rules.xml b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite/jetty-rewrite-rules.xml
index 1bccfe945b1..67d871a0def 100644
--- a/jetty-core/jetty-rewrite/src/main/config/modules/rewrite/jetty-rewrite-rules.xml
+++ b/jetty-core/jetty-rewrite/src/main/config/modules/rewrite/jetty-rewrite-rules.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure id="Rewrite" class="org.eclipse.jetty.rewrite.handler.RuleContainer">
 
   <!-- Protects favicon handling by not processing other rules.
diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-all-virtual.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-all-virtual.xml
index 2719a4011a3..6333073b0c2 100644
--- a/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-all-virtual.xml
+++ b/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-all-virtual.xml
@@ -3,7 +3,10 @@
 
 <Configure>
   <New id="threadPool" class="org.eclipse.jetty.util.thread.VirtualThreadPool">
+    <Arg type="int"><Property name="jetty.threadPool.maxThreads" default="200" /></Arg>
     <Set name="name" property="jetty.threadPool.namePrefix" />
+    <Set name="tracking" property="jetty.threadPool.tracking" />
+    <Set name="detailedDump" property="jetty.threadPool.detailedDump" />
   </New>
 
   <Call class="org.slf4j.LoggerFactory" name="getLogger">
diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml b/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml
index 2995dfa0084..150c03a1cb3 100644
--- a/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml
+++ b/jetty-core/jetty-server/src/main/config/etc/jetty-threadpool-virtual.xml
@@ -11,25 +11,18 @@
     <Set name="maxEvictCount" type="int"><Property name="jetty.threadPool.maxEvictCount" default="1"/></Set>
     <Set name="detailedDump" type="boolean"><Property name="jetty.threadPool.detailedDump" default="false"/></Set>
     <Get id="namePrefix" name="name" />
-    <Call class="java.lang.Thread" name="ofVirtual">
-      <Call class="java.lang.Thread$Builder" name="name">
-        <Arg>
-          <Property name="jetty.threadPool.virtual.namePrefix">
-            <Default><Ref refid="namePrefix" />-virtual-</Default>
-          </Property>
-        </Arg>
-        <Arg type="long">0</Arg>
-        <Call class="java.lang.Thread$Builder" name="inheritInheritableThreadLocals">
-          <Arg type="boolean"><Property name="jetty.threadPool.virtual.inheritInheritableThreadLocals" default="false" /></Arg>
-          <Call id="virtualThreadFactory" class="java.lang.Thread$Builder" name="factory" />
-        </Call>
-      </Call>
-    </Call>
     <Call name="setVirtualThreadsExecutor">
       <Arg>
-        <Call class="java.util.concurrent.Executors" name="newThreadPerTaskExecutor">
-          <Arg><Ref refid="virtualThreadFactory" /></Arg>
-        </Call>
+        <New class="org.eclipse.jetty.util.thread.VirtualThreadPool">
+          <Set name="name">
+            <Property name="jetty.threadPool.virtual.namePrefix">
+              <Default><Ref refid="namePrefix" />-virtual-</Default>
+            </Property>
+          </Set>
+          <Set name="maxThreads" property="jetty.threadPool.virtual.maxThreads" />
+          <Set name="tracking" property="jetty.threadPool.virtual.tracking" />
+          <Set name="detailedDump" property="jetty.threadPool.detailedDump" />
+        </New>
       </Arg>
     </Call>
   </New>
diff --git a/jetty-core/jetty-server/src/main/config/etc/jetty.xml b/jetty-core/jetty-server/src/main/config/etc/jetty.xml
index 952d6232790..3796c3c29af 100644
--- a/jetty-core/jetty-server/src/main/config/etc/jetty.xml
+++ b/jetty-core/jetty-server/src/main/config/etc/jetty.xml
@@ -3,7 +3,7 @@
 
 <!-- =============================================================== -->
 <!-- Documentation of this file format can be found at:              -->
-<!-- https://eclipse.dev/jetty/documentation/                        -->
+<!-- https://jetty.org/docs/                        -->
 <!--                                                                 -->
 <!-- Additional configuration files are available in $JETTY_HOME/etc -->
 <!-- and can be mixed in. See start.ini file for the default         -->
diff --git a/jetty-core/jetty-server/src/main/config/modules/acceptratelimit.mod b/jetty-core/jetty-server/src/main/config/modules/acceptratelimit.mod
index 1e2435f4f9c..cf16c6c5a93 100644
--- a/jetty-core/jetty-server/src/main/config/modules/acceptratelimit.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/acceptratelimit.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables a server-wide accept rate limit.
diff --git a/jetty-core/jetty-server/src/main/config/modules/bytebufferpool-quadratic.mod b/jetty-core/jetty-server/src/main/config/modules/bytebufferpool-quadratic.mod
index 962130af6c4..58b93be6de7 100644
--- a/jetty-core/jetty-server/src/main/config/modules/bytebufferpool-quadratic.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/bytebufferpool-quadratic.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Configures the ByteBufferPool used by ServerConnectors.
diff --git a/jetty-core/jetty-server/src/main/config/modules/connectionlimit.mod b/jetty-core/jetty-server/src/main/config/modules/connectionlimit.mod
index 3c7b32d2041..a6d489c0f80 100644
--- a/jetty-core/jetty-server/src/main/config/modules/connectionlimit.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/connectionlimit.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables a server-wide connection limit.
diff --git a/jetty-core/jetty-server/src/main/config/modules/cross-origin.mod b/jetty-core/jetty-server/src/main/config/modules/cross-origin.mod
index c9bf176b41f..d9d4c4a8ce8 100644
--- a/jetty-core/jetty-server/src/main/config/modules/cross-origin.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/cross-origin.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables CrossOriginHandler to support the CORS protocol and protect from cross-site request forgery (CSRF) attacks.
diff --git a/jetty-core/jetty-server/src/main/config/modules/customrequestlog.mod b/jetty-core/jetty-server/src/main/config/modules/customrequestlog.mod
index 710343ee54e..e2b0178d50d 100644
--- a/jetty-core/jetty-server/src/main/config/modules/customrequestlog.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/customrequestlog.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Deprecated name for requestlog using custom request logger.
diff --git a/jetty-core/jetty-server/src/main/config/modules/debug.mod b/jetty-core/jetty-server/src/main/config/modules/debug.mod
index 897dbaa2a4c..b30cc8dde4c 100644
--- a/jetty-core/jetty-server/src/main/config/modules/debug.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/debug.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables the DebugListener.
diff --git a/jetty-core/jetty-server/src/main/config/modules/debuglog.mod b/jetty-core/jetty-server/src/main/config/modules/debuglog.mod
index 1a0a3bb36fd..de8ec60b785 100644
--- a/jetty-core/jetty-server/src/main/config/modules/debuglog.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/debuglog.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Deprecated Debug Log using DebugHandle.
diff --git a/jetty-core/jetty-server/src/main/config/modules/ext.mod b/jetty-core/jetty-server/src/main/config/modules/ext.mod
index 6fc42b27cb8..6e99b69621e 100644
--- a/jetty-core/jetty-server/src/main/config/modules/ext.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/ext.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds the jar file from $JETTY_HOME/lib/ext and $JETTY_BASE/lib/ext to the server classpath.
diff --git a/jetty-core/jetty-server/src/main/config/modules/graceful.mod b/jetty-core/jetty-server/src/main/config/modules/graceful.mod
index 03a6d91b8e7..3dccd3c3896 100644
--- a/jetty-core/jetty-server/src/main/config/modules/graceful.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/graceful.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables Graceful processing of requests
diff --git a/jetty-core/jetty-server/src/main/config/modules/gzip.mod b/jetty-core/jetty-server/src/main/config/modules/gzip.mod
index fc3a14a14de..1fe563b62e7 100644
--- a/jetty-core/jetty-server/src/main/config/modules/gzip.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/gzip.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables GzipHandler for dynamic gzip compression for the entire server.
diff --git a/jetty-core/jetty-server/src/main/config/modules/home-base-warning.mod b/jetty-core/jetty-server/src/main/config/modules/home-base-warning.mod
index e4ed15823bb..828b6440995 100644
--- a/jetty-core/jetty-server/src/main/config/modules/home-base-warning.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/home-base-warning.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Generates a warning that server has been run from $JETTY_HOME rather than from a $JETTY_BASE.
diff --git a/jetty-core/jetty-server/src/main/config/modules/https.mod b/jetty-core/jetty-server/src/main/config/modules/https.mod
index 59ae07ca018..aa8ecfe6464 100644
--- a/jetty-core/jetty-server/src/main/config/modules/https.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/https.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds HTTPS protocol support to the TLS(SSL) Connector.
diff --git a/jetty-core/jetty-server/src/main/config/modules/inetaccess.mod b/jetty-core/jetty-server/src/main/config/modules/inetaccess.mod
index acd2ceacfe7..7f2f2cebea8 100644
--- a/jetty-core/jetty-server/src/main/config/modules/inetaccess.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/inetaccess.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables the InetAccessHandler.
diff --git a/jetty-core/jetty-server/src/main/config/modules/jaas.mod b/jetty-core/jetty-server/src/main/config/modules/jaas.mod
index 1f969842cd8..4bbc9b79512 100644
--- a/jetty-core/jetty-server/src/main/config/modules/jaas.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/jaas.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables JAAS for deployed web applications.
diff --git a/jetty-core/jetty-server/src/main/config/modules/jdbc.mod b/jetty-core/jetty-server/src/main/config/modules/jdbc.mod
index 2177507f381..9b1b1e56cd2 100644
--- a/jetty-core/jetty-server/src/main/config/modules/jdbc.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/jdbc.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables the java.sql JPMS module.
diff --git a/jetty-core/jetty-server/src/main/config/modules/jvm.mod b/jetty-core/jetty-server/src/main/config/modules/jvm.mod
index 578f163b578..7fe320304d4 100644
--- a/jetty-core/jetty-server/src/main/config/modules/jvm.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/jvm.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Creates an ini template for setting JVM arguments (eg -Xmx ).
diff --git a/jetty-core/jetty-server/src/main/config/modules/lowresources.mod b/jetty-core/jetty-server/src/main/config/modules/lowresources.mod
index 6acebbfdcc5..63794baffd9 100644
--- a/jetty-core/jetty-server/src/main/config/modules/lowresources.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/lowresources.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables a low resource monitor on the server.
diff --git a/jetty-core/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod b/jetty-core/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod
index 8c0611c68c6..7b2d478720a 100644
--- a/jetty-core/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables the Proxy Protocol on the TLS(SSL) Connector.
diff --git a/jetty-core/jetty-server/src/main/config/modules/requestlog.mod b/jetty-core/jetty-server/src/main/config/modules/requestlog.mod
index bb5cb3ce95e..959b83f4411 100644
--- a/jetty-core/jetty-server/src/main/config/modules/requestlog.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/requestlog.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Logs requests using CustomRequestLog and AsyncRequestLogWriter.
diff --git a/jetty-core/jetty-server/src/main/config/modules/resources.mod b/jetty-core/jetty-server/src/main/config/modules/resources.mod
index 9c503c55480..e5c6e6bce22 100644
--- a/jetty-core/jetty-server/src/main/config/modules/resources.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/resources.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 # tag::description[]
diff --git a/jetty-core/jetty-server/src/main/config/modules/secure-redirect.mod b/jetty-core/jetty-server/src/main/config/modules/secure-redirect.mod
index 80e47924cf3..6704508255d 100644
--- a/jetty-core/jetty-server/src/main/config/modules/secure-redirect.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/secure-redirect.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enable SecuredRedirectHandler to redirect all http requests to https on the secure port configured in the server.ini file.
diff --git a/jetty-core/jetty-server/src/main/config/modules/security.mod b/jetty-core/jetty-server/src/main/config/modules/security.mod
index f6bad5e4933..78d2e1d56e1 100644
--- a/jetty-core/jetty-server/src/main/config/modules/security.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/security.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds core security handling to the classpath.
diff --git a/jetty-core/jetty-server/src/main/config/modules/session-cache-hash.mod b/jetty-core/jetty-server/src/main/config/modules/session-cache-hash.mod
index 79c4e753ec2..aaedd0585ed 100644
--- a/jetty-core/jetty-server/src/main/config/modules/session-cache-hash.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/session-cache-hash.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enable first level session cache. 
diff --git a/jetty-core/jetty-server/src/main/config/modules/session-cache-null.mod b/jetty-core/jetty-server/src/main/config/modules/session-cache-null.mod
index 4e7af393f3b..e7da2bbb42c 100644
--- a/jetty-core/jetty-server/src/main/config/modules/session-cache-null.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/session-cache-null.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 A SessionCache that does not actually cache sessions.
diff --git a/jetty-core/jetty-server/src/main/config/modules/session-store-cache.mod b/jetty-core/jetty-server/src/main/config/modules/session-store-cache.mod
index 7485b70aa54..67bc582ab97 100644
--- a/jetty-core/jetty-server/src/main/config/modules/session-store-cache.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/session-store-cache.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables caching of SessionData in front of a SessionDataStore.
diff --git a/jetty-core/jetty-server/src/main/config/modules/session-store-file.mod b/jetty-core/jetty-server/src/main/config/modules/session-store-file.mod
index e00163a4883..42f799fbdac 100644
--- a/jetty-core/jetty-server/src/main/config/modules/session-store-file.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/session-store-file.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables session persistent storage in files.
diff --git a/jetty-core/jetty-server/src/main/config/modules/session-store-jdbc.mod b/jetty-core/jetty-server/src/main/config/modules/session-store-jdbc.mod
index 1ed5ef999d3..ab4ea998fd9 100644
--- a/jetty-core/jetty-server/src/main/config/modules/session-store-jdbc.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/session-store-jdbc.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables JDBC persistent/distributed session storage.
diff --git a/jetty-core/jetty-server/src/main/config/modules/sessions.mod b/jetty-core/jetty-server/src/main/config/modules/sessions.mod
index ade7f539642..19adfb8a518 100644
--- a/jetty-core/jetty-server/src/main/config/modules/sessions.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/sessions.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables session management.
diff --git a/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod b/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod
index e60eb16c4ed..ace61f3a77f 100644
--- a/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 JDBC Datasource connections for session storage.
diff --git a/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod b/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod
index 4d4af55f330..880ca335561 100644
--- a/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/sessions/jdbc/driver.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 JDBC Driver connections for session storage.
diff --git a/jetty-core/jetty-server/src/main/config/modules/state.mod b/jetty-core/jetty-server/src/main/config/modules/state.mod
index aceeb233c1b..405a2859001 100644
--- a/jetty-core/jetty-server/src/main/config/modules/state.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/state.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Creates and updates state file used by jetty.sh
diff --git a/jetty-core/jetty-server/src/main/config/modules/statistics.mod b/jetty-core/jetty-server/src/main/config/modules/statistics.mod
index 7eb8c22caf2..3009e97c076 100644
--- a/jetty-core/jetty-server/src/main/config/modules/statistics.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/statistics.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables statistics collection for the server.
diff --git a/jetty-core/jetty-server/src/main/config/modules/threadpool-all-virtual.mod b/jetty-core/jetty-server/src/main/config/modules/threadpool-all-virtual.mod
index 1f9526b4f30..388871b6b3e 100644
--- a/jetty-core/jetty-server/src/main/config/modules/threadpool-all-virtual.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/threadpool-all-virtual.mod
@@ -13,7 +13,16 @@ etc/jetty-threadpool-all-virtual.xml
 
 [ini-template]
 # tag::documentation[]
-## Platform threads name prefix.
+## Virtual threads name prefix.
 #jetty.threadPool.namePrefix=vtp<hashCode>
 
+## Maximum number of current virtual threads.
+#jetty.threadPool.maxThreads=200
+
+## Whether to track virtual threads so they appear
+## in the dump even if they are unmounted.
+#jetty.threadPool.tracking=false
+
+## Whether to output virtual thread's stack traces in the dump.
+#jetty.threadPool.detailedDump=false
 # end::documentation[]
diff --git a/jetty-core/jetty-server/src/main/config/modules/threadpool-virtual.mod b/jetty-core/jetty-server/src/main/config/modules/threadpool-virtual.mod
index 88ab2a0c274..ebc55200a6e 100644
--- a/jetty-core/jetty-server/src/main/config/modules/threadpool-virtual.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/threadpool-virtual.mod
@@ -37,6 +37,10 @@ etc/jetty-threadpool-virtual.xml
 ## Virtual threads name prefix.
 #jetty.threadPool.virtual.namePrefix=qtp<hashCode>-virtual-
 
-## Whether virtual threads inherits the values of inheritable thread locals.
-#jetty.threadPool.virtual.inheritInheritableThreadLocals=true
+## Max number of current virtual threads.
+#jetty.threadPool.virtual.maxThreads=200
+
+## Whether to track virtual threads so they appear
+## in the dump even if they are unmounted.
+#jetty.threadPool.virtual.tracking=false
 # end::documentation[]
diff --git a/jetty-core/jetty-server/src/main/config/modules/well-known.mod b/jetty-core/jetty-server/src/main/config/modules/well-known.mod
index 370cc7fbdc6..ab1aabb3e1c 100644
--- a/jetty-core/jetty-server/src/main/config/modules/well-known.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/well-known.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Serve static files from a directory for the "/.well-known" context path.
diff --git a/jetty-core/jetty-server/src/main/config/modules/work.mod b/jetty-core/jetty-server/src/main/config/modules/work.mod
index 0299b7f92f5..c2076a0aec5 100644
--- a/jetty-core/jetty-server/src/main/config/modules/work.mod
+++ b/jetty-core/jetty-server/src/main/config/modules/work.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Creates the $JETTY_BASE/work directory as a persistent temp directory.
diff --git a/jetty-core/jetty-start/src/test/resources/dist-home/modules/main.mod b/jetty-core/jetty-start/src/test/resources/dist-home/modules/main.mod
index 8e398221e85..3d06d4efc22 100644
--- a/jetty-core/jetty-start/src/test/resources/dist-home/modules/main.mod
+++ b/jetty-core/jetty-start/src/test/resources/dist-home/modules/main.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Example of a module
diff --git a/jetty-core/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml b/jetty-core/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml
index 7e7d8beda77..236563eecef 100644
--- a/jetty-core/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml
+++ b/jetty-core/jetty-unixdomain-server/src/main/config/etc/jetty-unixdomain-http.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Call name="addConnector">
     <Arg>
diff --git a/jetty-core/jetty-util/src/main/config/modules/console-capture.mod b/jetty-core/jetty-util/src/main/config/modules/console-capture.mod
index 24bb34984c0..0ad212be13c 100644
--- a/jetty-core/jetty-util/src/main/config/modules/console-capture.mod
+++ b/jetty-core/jetty-util/src/main/config/modules/console-capture.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Redirects the JVM console stderr and stdout to a rolling log file.
diff --git a/jetty-core/jetty-util/src/main/config/modules/pid.mod b/jetty-core/jetty-util/src/main/config/modules/pid.mod
index 3e08fc545a9..4b316327d08 100644
--- a/jetty-core/jetty-util/src/main/config/modules/pid.mod
+++ b/jetty-core/jetty-util/src/main/config/modules/pid.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Creates the PID file for the Jetty process
diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/VirtualThreadPool.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/VirtualThreadPool.java
index bd90805b98d..09e4d2577c6 100644
--- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/VirtualThreadPool.java
+++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/VirtualThreadPool.java
@@ -16,6 +16,7 @@ package org.eclipse.jetty.util.thread;
 import java.util.Objects;
 import java.util.concurrent.Executor;
 import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.Semaphore;
 
 import org.eclipse.jetty.util.StringUtil;
 import org.eclipse.jetty.util.VirtualThreads;
@@ -27,7 +28,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * An implementation of {@link ThreadPool} interface that does not pool, but instead uses {@link VirtualThreads}.
+ * <p>An implementation of {@link ThreadPool} interface that does not pool, but instead uses {@link VirtualThreads}.</p>
+ * <p>It is possible to specify the max number of concurrent virtual threads that can be spawned, to help limiting
+ * resource usage in applications, especially in case of load spikes, where an unlimited number of virtual threads
+ * may be spawned, compete for resources, and eventually bring the system down due to memory exhaustion.</p>
  */
 @ManagedObject("A thread non-pool for virtual threads")
 public class VirtualThreadPool extends ContainerLifeCycle implements ThreadPool, Dumpable, TryExecutor, VirtualThreads.Configurable
@@ -35,12 +39,14 @@ public class VirtualThreadPool extends ContainerLifeCycle implements ThreadPool,
     private static final Logger LOG = LoggerFactory.getLogger(VirtualThreadPool.class);
 
     private final AutoLock.WithCondition _joinLock = new AutoLock.WithCondition();
-    private String _name = null;
-    private Executor _virtualExecutor;
-    private Thread _main;
-    private boolean _externalExecutor;
+    private String _name;
+    private int _maxThreads = 200;
     private boolean _tracking;
     private boolean _detailedDump;
+    private Thread _keepAlive;
+    private Executor _virtualExecutor;
+    private boolean _externalExecutor;
+    private Semaphore _semaphore;
 
     public VirtualThreadPool()
     {
@@ -71,12 +77,32 @@ public class VirtualThreadPool extends ContainerLifeCycle implements ThreadPool,
         _name = name;
     }
 
+    /**
+     * @return the maximum number of concurrent virtual threads
+     */
+    @ManagedAttribute("The max number of concurrent virtual threads")
+    public int getMaxThreads()
+    {
+        return _maxThreads;
+    }
+
+    /**
+     * @param maxThreads the maximum number of concurrent virtual threads
+     */
+    public void setMaxThreads(int maxThreads)
+    {
+        if (isRunning())
+            throw new IllegalStateException(getState());
+        _maxThreads = maxThreads;
+    }
+
     /**
      * Get if this pool is tracking virtual threads.
+     *
      * @return {@code true} if the virtual threads will be tracked.
      * @see TrackingExecutor
      */
-    @ManagedAttribute("virtual threads are tracked")
+    @ManagedAttribute("Whether virtual threads are tracked")
     public boolean isTracking()
     {
         return _tracking;
@@ -89,7 +115,7 @@ public class VirtualThreadPool extends ContainerLifeCycle implements ThreadPool,
         _tracking = tracking;
     }
 
-    @ManagedAttribute("reports additional details in the dump")
+    @ManagedAttribute("Whether to report additional details in the dump")
     public boolean isDetailedDump()
     {
         return _detailedDump;
@@ -101,11 +127,11 @@ public class VirtualThreadPool extends ContainerLifeCycle implements ThreadPool,
         if (_virtualExecutor instanceof TrackingExecutor trackingExecutor)
             trackingExecutor.setDetailedDump(detailedDump);
     }
-    
+
     @Override
     protected void doStart() throws Exception
     {
-        _main = new Thread("jetty-virtual-thread-pool-keepalive")
+        _keepAlive = new Thread("jetty-virtual-thread-pool-keepalive")
         {
             @Override
             public void run()
@@ -123,18 +149,24 @@ public class VirtualThreadPool extends ContainerLifeCycle implements ThreadPool,
                 }
             }
         };
-        _main.start();
+        _keepAlive.start();
 
         if (_virtualExecutor == null)
         {
-            _externalExecutor = false;
             _virtualExecutor = Objects.requireNonNull(StringUtil.isBlank(_name)
                 ? VirtualThreads.getDefaultVirtualThreadsExecutor()
                 : VirtualThreads.getNamedVirtualThreadsExecutor(_name));
         }
         if (_tracking && !(_virtualExecutor instanceof TrackingExecutor))
-            _virtualExecutor = new TrackingExecutor(_virtualExecutor, _detailedDump);
+            _virtualExecutor = new TrackingExecutor(_virtualExecutor, isDetailedDump());
         addBean(_virtualExecutor);
+
+        if (_maxThreads > 0)
+        {
+            _semaphore = new Semaphore(_maxThreads);
+            addBean(_semaphore);
+        }
+
         super.doStart();
     }
 
@@ -142,11 +174,12 @@ public class VirtualThreadPool extends ContainerLifeCycle implements ThreadPool,
     protected void doStop() throws Exception
     {
         super.doStop();
+        removeBean(_semaphore);
+        _semaphore = null;
         removeBean(_virtualExecutor);
         if (!_externalExecutor)
             _virtualExecutor = null;
-        _main = null;
-
+        _keepAlive = null;
         try (AutoLock.WithCondition l = _joinLock.lock())
         {
             l.signalAll();
@@ -208,7 +241,7 @@ public class VirtualThreadPool extends ContainerLifeCycle implements ThreadPool,
     {
         try
         {
-            _virtualExecutor.execute(task);
+            execute(task);
             return true;
         }
         catch (RejectedExecutionException e)
@@ -221,6 +254,32 @@ public class VirtualThreadPool extends ContainerLifeCycle implements ThreadPool,
     @Override
     public void execute(Runnable task)
     {
-        _virtualExecutor.execute(task);
+        Runnable job = task;
+        if (_semaphore != null)
+        {
+            job = () ->
+            {
+                try
+                {
+                    // The caller of execute(Runnable) cannot be blocked,
+                    // as it is unknown whether it is a virtual thread.
+                    // But this is a virtual thread, so acquiring a permit here
+                    // blocks the virtual thread, but does not pin the carrier.
+                    _semaphore.acquire();
+                    task.run();
+                }
+                catch (InterruptedException x)
+                {
+                    // Likely stopping this component, exit.
+                    if (LOG.isDebugEnabled())
+                        LOG.debug("interrupted while waiting for permit {}", task, x);
+                }
+                finally
+                {
+                    _semaphore.release();
+                }
+            };
+        }
+        _virtualExecutor.execute(job);
     }
 }
diff --git a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/thread/VirtualThreadPoolTest.java b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/thread/VirtualThreadPoolTest.java
index 1f9ef396a77..80683b7a8dc 100644
--- a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/thread/VirtualThreadPoolTest.java
+++ b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/thread/VirtualThreadPoolTest.java
@@ -16,16 +16,19 @@ package org.eclipse.jetty.util.thread;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.eclipse.jetty.util.StringUtil;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledForJreRange;
 import org.junit.jupiter.api.condition.JRE;
 
+import static org.awaitility.Awaitility.await;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.startsWith;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @DisabledForJreRange(max = JRE.JAVA_20)
@@ -146,6 +149,46 @@ public class VirtualThreadPoolTest
         }
     }
 
+    @Test
+    public void testMaxThreads() throws Exception
+    {
+        VirtualThreadPool vtp = new VirtualThreadPool();
+        vtp.setMaxThreads(1);
+        vtp.start();
+
+        AtomicBoolean run1 = new AtomicBoolean();
+        CountDownLatch latch1 = new CountDownLatch(1);
+        vtp.execute(() ->
+        {
+            try
+            {
+                // Simulate a blocking call.
+                run1.set(true);
+                latch1.await();
+            }
+            catch (InterruptedException x)
+            {
+                throw new RuntimeException(x);
+            }
+        });
+
+        // Wait for the first task to acquire the only permit.
+        await().atMost(1, TimeUnit.SECONDS).until(run1::get);
+
+        // Try to submit another task, it should not
+        // be executed, and the caller must not block.
+        CountDownLatch latch2 = new CountDownLatch(1);
+        vtp.execute(latch2::countDown);
+        assertFalse(latch2.await(1, TimeUnit.SECONDS));
+
+        // Unblocking the first task allows the execution of the second task.
+        latch1.countDown();
+
+        assertTrue(latch2.await(5, TimeUnit.SECONDS));
+
+        vtp.stop();
+    }
+
     public static int count(String str, String subStr)
     {
         if (StringUtil.isEmpty(str))
diff --git a/jetty-demos/jetty-core-demos/jetty-core-demo-handler/src/main/config/modules/demo-handler.mod b/jetty-demos/jetty-core-demos/jetty-core-demo-handler/src/main/config/modules/demo-handler.mod
index ffefbc1df82..a963f0f232c 100644
--- a/jetty-demos/jetty-core-demos/jetty-core-demo-handler/src/main/config/modules/demo-handler.mod
+++ b/jetty-demos/jetty-core-demos/jetty-core-demo-handler/src/main/config/modules/demo-handler.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo Handler
diff --git a/jetty-demos/jetty-core-demos/jetty-core-demo-handler/src/main/config/modules/demo.d/demo-handler.xml b/jetty-demos/jetty-core-demos/jetty-core-demo-handler/src/main/config/modules/demo.d/demo-handler.xml
index f3cef898b6d..0f0f7c07521 100644
--- a/jetty-demos/jetty-core-demos/jetty-core-demo-handler/src/main/config/modules/demo.d/demo-handler.xml
+++ b/jetty-demos/jetty-core-demos/jetty-core-demo-handler/src/main/config/modules/demo.d/demo-handler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection">
   <Call name="addHandler">
diff --git a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-async-rest/jetty-servlet4-demo-async-rest-webapp/src/main/config/modules/ee8-demo-async-rest.mod b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-async-rest/jetty-servlet4-demo-async-rest-webapp/src/main/config/modules/ee8-demo-async-rest.mod
index 4054f07dddc..15bd729f465 100644
--- a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-async-rest/jetty-servlet4-demo-async-rest-webapp/src/main/config/modules/ee8-demo-async-rest.mod
+++ b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-async-rest/jetty-servlet4-demo-async-rest-webapp/src/main/config/modules/ee8-demo-async-rest.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo Async Rest webapp
diff --git a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jaas-webapp/src/main/config/modules/ee8-demo-jaas.mod b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jaas-webapp/src/main/config/modules/ee8-demo-jaas.mod
index e6ee6a0bfb0..c7e719cb09e 100644
--- a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jaas-webapp/src/main/config/modules/ee8-demo-jaas.mod
+++ b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jaas-webapp/src/main/config/modules/ee8-demo-jaas.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo EE8 JAAS webapp
diff --git a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jetty-webapp/src/main/config/modules/ee8-demo-jetty.mod b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jetty-webapp/src/main/config/modules/ee8-demo-jetty.mod
index 8c949230e03..fb61d60e0ab 100644
--- a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jetty-webapp/src/main/config/modules/ee8-demo-jetty.mod
+++ b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jetty-webapp/src/main/config/modules/ee8-demo-jetty.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo Jetty Webapp
diff --git a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jetty-webapp/src/main/config/modules/ee8-demo-moved-context.mod b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jetty-webapp/src/main/config/modules/ee8-demo-moved-context.mod
index 18a631c2da3..aa0923701b2 100644
--- a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jetty-webapp/src/main/config/modules/ee8-demo-moved-context.mod
+++ b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jetty-webapp/src/main/config/modules/ee8-demo-moved-context.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demonstrate a Moved Context Handler.
diff --git a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jetty-webapp/src/main/config/modules/ee8-demo-rewrite.mod b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jetty-webapp/src/main/config/modules/ee8-demo-rewrite.mod
index d5c75002682..1128f08b3e0 100644
--- a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jetty-webapp/src/main/config/modules/ee8-demo-rewrite.mod
+++ b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jetty-webapp/src/main/config/modules/ee8-demo-rewrite.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demonstrate the rewrite module.
diff --git a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jndi-webapp/src/main/config/modules/demo.d/ee8-demo-jndi.xml b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jndi-webapp/src/main/config/modules/demo.d/ee8-demo-jndi.xml
index 212fe13c2cf..02101e01bf1 100644
--- a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jndi-webapp/src/main/config/modules/demo.d/ee8-demo-jndi.xml
+++ b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jndi-webapp/src/main/config/modules/demo.d/ee8-demo-jndi.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Configure the test-jndi webapp                                  -->
diff --git a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jndi-webapp/src/main/config/modules/ee8-demo-jndi.mod b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jndi-webapp/src/main/config/modules/ee8-demo-jndi.mod
index f71bf6cbce0..c3a5162a6c2 100644
--- a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jndi-webapp/src/main/config/modules/ee8-demo-jndi.mod
+++ b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jndi-webapp/src/main/config/modules/ee8-demo-jndi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo JNDI Resources Webapp
diff --git a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml
index a7291d722ff..75d7c71757a 100644
--- a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml
+++ b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.ee8.webapp.WebAppContext">
   <Get name="servletContext">
diff --git a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-mock-resources/src/main/config/modules/ee8-demo-mock-resources.mod b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-mock-resources/src/main/config/modules/ee8-demo-mock-resources.mod
index 0b789e0f75f..ead6a48c092 100644
--- a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-mock-resources/src/main/config/modules/ee8-demo-mock-resources.mod
+++ b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-mock-resources/src/main/config/modules/ee8-demo-mock-resources.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Download and install some Demo Mock Resources
diff --git a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-spec/jetty-servlet4-demo-spec-webapp/src/main/config/modules/demo.d/ee8-demo-spec.xml b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-spec/jetty-servlet4-demo-spec-webapp/src/main/config/modules/demo.d/ee8-demo-spec.xml
index eacab533cb4..bb573d65f85 100644
--- a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-spec/jetty-servlet4-demo-spec-webapp/src/main/config/modules/demo.d/ee8-demo-spec.xml
+++ b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-spec/jetty-servlet4-demo-spec-webapp/src/main/config/modules/demo.d/ee8-demo-spec.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="wac" class="org.eclipse.jetty.ee8.webapp.WebAppContext">
   <Set name="contextPath">/ee8-test-spec</Set>
diff --git a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-spec/jetty-servlet4-demo-spec-webapp/src/main/config/modules/ee8-demo-spec.mod b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-spec/jetty-servlet4-demo-spec-webapp/src/main/config/modules/ee8-demo-spec.mod
index defcf9b6315..158af5877cf 100644
--- a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-spec/jetty-servlet4-demo-spec-webapp/src/main/config/modules/ee8-demo-spec.mod
+++ b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-spec/jetty-servlet4-demo-spec-webapp/src/main/config/modules/ee8-demo-spec.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Download and deploy the Test Spec webapp demo.
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/config/modules/ee9-demo-async-rest.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/config/modules/ee9-demo-async-rest.mod
index 50d948fef90..116cd745250 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/config/modules/ee9-demo-async-rest.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/config/modules/ee9-demo-async-rest.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo Async Rest webapp
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml
index 052dc02ad7e..09a57fe77c7 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!--
 This is the jetty specific web application configuration file.  When starting
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-ee9-web.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-ee9-web.xml
index d6abf37f497..1cd200461f8 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-ee9-web.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-ee9-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!--
 This is the jetty specific web application configuration file.  When starting
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/webapp/index.html b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/webapp/index.html
index d11e813e865..000f14d508e 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/webapp/index.html
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/webapp/index.html
@@ -56,7 +56,7 @@
     </div>
 
     <div class="footer">
-      <center><a href="https://eclipse.dev/jetty"><img style="border:0" src="small_powered_by.gif"/></a></center>
+      <center><a href="https://jetty.org"><img style="border:0" src="small_powered_by.gif"/></a></center>
     </div>
 
 </body>
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/demo.d/ee10-demo-jaas.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/demo.d/ee10-demo-jaas.xml
index 1167c1494f6..145fee70d56 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/demo.d/ee10-demo-jaas.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/demo.d/ee10-demo-jaas.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Configure the demo-jaas webapp                                  -->
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee10-demo-jaas.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee10-demo-jaas.mod
index e90d12e0ccf..1a73a71b1c0 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee10-demo-jaas.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee10-demo-jaas.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo EE10 JAAS webapp
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee9-demo-jaas.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee9-demo-jaas.mod
index cb13c029c8f..5762247bd2d 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee9-demo-jaas.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee9-demo-jaas.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo EE9 JAAS webapp
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml
index c0b25a70728..fbaa8e464dc 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.ee10.webapp.WebAppContext">
   <Get name="servletContext">
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-ee9-web.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-ee9-web.xml
index c979828b30b..968d3551284 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-ee9-web.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-ee9-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
   <Get name="servletContext">
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/index.html b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/index.html
index e8fef4864e5..6a575e23dd8 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/index.html
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/index.html
@@ -36,7 +36,7 @@
    </div>
 
   <div class="footer">
-    <center><a href="https://eclipse.dev/jetty"><img style="border:0" src="small_powered_by.gif"/></a></center>
+    <center><a href="https://jetty.org"><img style="border:0" src="small_powered_by.gif"/></a></center>
   </div>
 
 </body>
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/login.html b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/login.html
index 45f4b9e9d31..ea9df7f01ad 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/login.html
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/login.html
@@ -28,7 +28,7 @@
    </div>
 
    <div class="footer">
-      <center><a href="https://eclipse.dev/jetty"><img style="border:0" src="small_powered_by.gif"/></a></center>
+      <center><a href="https://jetty.org"><img style="border:0" src="small_powered_by.gif"/></a></center>
    </div>
 
 </body>
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml
index ba842025ad2..64c70694ec8 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ==================================================================
 Configure and deploy the test web application in $(jetty.home)/webapps/test
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee10-demo-jetty.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee10-demo-jetty.xml
index 7f389abfa77..eebc4a530f6 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee10-demo-jetty.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee10-demo-jetty.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ==================================================================
 Configure and deploy the test web application
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee10-demo-rewrite-rules.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee10-demo-rewrite-rules.xml
index fa1d8f8a364..19235468ed5 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee10-demo-rewrite-rules.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee10-demo-rewrite-rules.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Configure the demos                                             -->
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee9-demo-jetty.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee9-demo-jetty.xml
index 9373aab21d5..106a6956ef1 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee9-demo-jetty.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee9-demo-jetty.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ==================================================================
 Configure and deploy the test web application
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee9-demo-rewrite-rules.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee9-demo-rewrite-rules.xml
index 32e3b2d893f..7c139560f3a 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee9-demo-rewrite-rules.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee9-demo-rewrite-rules.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Configure the demos                                             -->
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee10-demo-jetty.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee10-demo-jetty.mod
index 5fea95bc90f..e20a3b4eb97 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee10-demo-jetty.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee10-demo-jetty.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo Jetty Webapp
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee10-demo-rewrite.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee10-demo-rewrite.mod
index ef3f514ebce..860c1f5f76f 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee10-demo-rewrite.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee10-demo-rewrite.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demonstrate the rewrite module.
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee9-demo-jetty.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee9-demo-jetty.mod
index 209b3c44b11..6e5e6c81227 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee9-demo-jetty.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee9-demo-jetty.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo Jetty Webapp
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee9-demo-rewrite.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee9-demo-rewrite.mod
index 433ed68d12e..db8116096ba 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee9-demo-rewrite.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee9-demo-rewrite.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demonstrate the rewrite module.
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml
index e64f0a48b1f..bedadc831f9 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!--
 This is the jetty specific web application configuration file.  When starting
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-ee9-web.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-ee9-web.xml
index 1552bca1e72..2d7904d2d73 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-ee9-web.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-ee9-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!--
 This is the jetty specific web application configuration file.  When starting
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/auth.html b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/auth.html
index 8d6db99474e..aa7b0ba6f72 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/auth.html
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/auth.html
@@ -41,7 +41,7 @@
    </div>
 
    <div class="footer">
-      <center><a href="https://eclipse.dev/jetty"><img style="border:0" src="small_powered_by.gif"/></a></center>
+      <center><a href="https://jetty.org"><img style="border:0" src="small_powered_by.gif"/></a></center>
    </div>
 </body>
 </html>
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/index.html b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/index.html
index 73103a9183a..ad1b57ca300 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/index.html
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/index.html
@@ -64,7 +64,7 @@
     </div>
 
     <div class="footer">
-      <center><a href="https://eclipse.dev/jetty"><img style="border:0" src="small_powered_by.gif"/></a></center>
+      <center><a href="https://jetty.org"><img style="border:0" src="small_powered_by.gif"/></a></center>
     </div>
 </body>
 </html>
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/remote.html b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/remote.html
index 3ede5c0602d..c5be4a415ad 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/remote.html
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/remote.html
@@ -28,7 +28,7 @@
     </div>
 
     <div class="footer">
-      <center><a href="https://eclipse.dev/jetty"><img style="border:0" src="small_powered_by.gif"/></a></center>
+      <center><a href="https://jetty.org"><img style="border:0" src="small_powered_by.gif"/></a></center>
     </div>
 
 </body>
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/rewrite/info.html b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/rewrite/info.html
index 7ea8ab5d7ec..8e653f54e00 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/rewrite/info.html
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/rewrite/info.html
@@ -51,7 +51,7 @@
   </div>
 
   <div class="footer">
-    <center><a href="https://eclipse.dev/jetty"><img style="border:0" src="../small_powered_by.gif"/></a></center>
+    <center><a href="https://jetty.org"><img style="border:0" src="../small_powered_by.gif"/></a></center>
   </div>
 
    
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/demo.d/ee10-demo-jndi.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/demo.d/ee10-demo-jndi.xml
index aa478a2759d..8e21c590156 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/demo.d/ee10-demo-jndi.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/demo.d/ee10-demo-jndi.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Configure the test-jndi webapp                                  -->
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/demo.d/ee11-demo-jndi.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/demo.d/ee11-demo-jndi.xml
index 562fb161826..d0aefa046b0 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/demo.d/ee11-demo-jndi.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/demo.d/ee11-demo-jndi.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Configure the test-jndi webapp                                  -->
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/demo.d/ee9-demo-jndi.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/demo.d/ee9-demo-jndi.xml
index 8008fbf45d8..d0ef27dbcf1 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/demo.d/ee9-demo-jndi.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/demo.d/ee9-demo-jndi.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Configure the test-jndi webapp                                  -->
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml
index b8cc80a3fb9..aae9dce1925 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Configure the test-jndi webapp                                  -->
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/templates/plugin-context.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/templates/plugin-context.xml
index 736fcd5769b..452ea765bae 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/templates/plugin-context.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/templates/plugin-context.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Configure the test-jndi webapp                                  -->
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/webapp/index.html b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/webapp/index.html
index eb43e413003..7c6ed3aaf79 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/webapp/index.html
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/webapp/index.html
@@ -48,7 +48,7 @@
     </div>
 
     <div class="footer">
-      <center><a href="https://eclipse.dev/jetty"><img style="border:0" src="small_powered_by.gif"/></a></center>
+      <center><a href="https://jetty.org"><img style="border:0" src="small_powered_by.gif"/></a></center>
     </div>
 
 
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml
index c4ff612a34f..a5496db976e 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.ee10.webapp.WebAppContext">
   <Get name="servletContext">
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-ee9-web.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-ee9-web.xml
index de6fa8e5426..ae27ece3b01 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-ee9-web.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-ee9-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
   <Get name="servletContext">
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jsp-webapp/src/main/webapp/index.jsp b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jsp-webapp/src/main/webapp/index.jsp
index 2d6c868bf79..7067c84e31a 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jsp-webapp/src/main/webapp/index.jsp
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jsp-webapp/src/main/webapp/index.jsp
@@ -39,7 +39,7 @@
     </div>
 
     <div class="footer">
-      <center><a href="https://eclipse.dev/jetty"><img style="border:0" src="small_powered_by.gif"/></a></center>
+      <center><a href="https://jetty.org"><img style="border:0" src="small_powered_by.gif"/></a></center>
     </div>
 </body>
 </html>
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/demo.d/ee10-demo-spec.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/demo.d/ee10-demo-spec.xml
index 8dcba6328a8..fd0034b06ef 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/demo.d/ee10-demo-spec.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/demo.d/ee10-demo-spec.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="wac" class="org.eclipse.jetty.ee10.webapp.WebAppContext">
   <Set name="contextPath">/ee10-test-spec</Set>
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee10-demo-spec.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee10-demo-spec.mod
index eb46bd605ff..68afb02fbcc 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee10-demo-spec.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee10-demo-spec.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Download and deploy the Test Spec webapp demo.
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee9-demo-spec.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee9-demo-spec.mod
index 4e94b8aac04..4c937d8e0ee 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee9-demo-spec.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee9-demo-spec.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Download and deploy the Test Spec webapp demo.
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-ee10-env.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-ee10-env.xml
index 00beed6f071..24def7b180a 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-ee10-env.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-ee10-env.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id='wac' class="org.eclipse.jetty.ee10.webapp.WebAppContext">
 
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml
index 170908cfed3..369ff962ca1 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-ee10-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.ee10.webapp.WebAppContext">
   <Get name="servletContext">
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/index.html b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/index.html
index 3b5fecdbc6b..aebaeabf7a3 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/index.html
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/index.html
@@ -80,7 +80,7 @@
   </div>
 
   <div class="footer">
-    <center><a href="https://eclipse.dev/jetty"><img style="border:0" src="small_powered_by.gif"/></a></center>
+    <center><a href="https://jetty.org"><img style="border:0" src="small_powered_by.gif"/></a></center>
   </div>
 </body>
 </html>
diff --git a/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod b/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod
index c3b24d3716f..dbd7bdf8660 100644
--- a/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod
+++ b/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables Annotation scanning for deployed web applications.
diff --git a/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod b/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod
index e06a1bddb29..1c92cdcb3cc 100644
--- a/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod
+++ b/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables use of the apache implementation of JSP.
diff --git a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-decorate.mod b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-decorate.mod
index a5d664bbf6e..b27bce53cca 100644
--- a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-decorate.mod
+++ b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-decorate.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Configures Jetty to use the "CdiDecoratingListener" as the default CDI mode.
diff --git a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-spi.mod b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-spi.mod
index 981e689feba..f9d4cdb0e01 100644
--- a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-spi.mod
+++ b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi-spi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Configures Jetty to use the "CdiSpiDecorator" as the default CDI mode.
diff --git a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi.mod b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi.mod
index 94d490847a8..800e2043186 100644
--- a/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi.mod
+++ b/jetty-ee10/jetty-ee10-cdi/src/main/config/modules/ee10-cdi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Provides integration of CDI within webapp to Jetty container object lifecycles.
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/demo/webdefault-ee10.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/demo/webdefault-ee10.xml
index 4db5a4de386..51724418fb8 100644
--- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/demo/webdefault-ee10.xml
+++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/demo/webdefault-ee10.xml
@@ -185,7 +185,7 @@
   <!-- The JSP page compiler and execution servlet, which is the mechanism  -->
   <!-- used by the jsp container to support JSP pages.  Traditionally,      -->
   <!-- this servlet is mapped to URL pattern "*.jsp".                       -->
-  <!-- See https://eclipse.dev/jetty/documentation/              -->
+  <!-- See https://jetty.org/docs/              -->
   <!-- for applicable configuration params.                                 -->
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
   <servlet id="jsp">
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/exampleserver.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/exampleserver.xml
index b8056cdbecb..10f6287cd79 100644
--- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/exampleserver.xml
+++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/exampleserver.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="ExampleServer" class="org.eclipse.jetty.server.Server">
 
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/fileserver.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/fileserver.xml
index 2fcadfe77b0..613c4136aa1 100644
--- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/fileserver.xml
+++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-embedded/src/main/resources/fileserver.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="FileServer" class="org.eclipse.jetty.server.Server">
     <Call name="addConnector">
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/config/modules/ee10-demo-proxy.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/config/modules/ee10-demo-proxy.mod
index 061f39a0271..f4298cde9f3 100644
--- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/config/modules/ee10-demo-proxy.mod
+++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/config/modules/ee10-demo-proxy.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo Proxy Webapp
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml
index 631a65bbd7d..9ee5860728e 100644
--- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.ee10.webapp.WebAppContext">
   <Get name="servletContext">
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml
index e224e2019e4..545b0a5fa6c 100644
--- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml
@@ -13,11 +13,11 @@
     <servlet-class>org.eclipse.jetty.ee10.proxy.ProxyServlet$Transparent</servlet-class>
     <init-param>
       <param-name>proxyTo</param-name>
-      <param-value>https://eclipse.dev/jetty/javadoc/jetty-12/index.html?overview-summary.html</param-value>
+      <param-value>https://javadoc.jetty.org/</param-value>
     </init-param>
     <init-param>
       <param-name>hostHeader</param-name>
-      <param-value>www.eclipse.org</param-value>
+      <param-value>javadoc.jetty.org</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>
     <async-supported>true</async-supported>
@@ -25,7 +25,7 @@
 
   <servlet-mapping>
     <servlet-name>JavadocTransparentProxy</servlet-name>
-    <url-pattern>/current/*</url-pattern>
+    <url-pattern>/jetty-12/*</url-pattern>
   </servlet-mapping>
 
 </web-app>
diff --git a/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod b/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod
index 18405bc1b14..00bac885f4e 100644
--- a/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod
+++ b/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables the glassfish version of JSTL for all webapps.
diff --git a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-default-auth-config-factory.mod b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-default-auth-config-factory.mod
index 6a3841ac8f1..ed16406138e 100644
--- a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-default-auth-config-factory.mod
+++ b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-default-auth-config-factory.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Provides a DefaultAuthConfigFactory for jaspi
diff --git a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-demo.mod b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-demo.mod
index b9342914a66..1c3620204e0 100644
--- a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-demo.mod
+++ b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi-demo.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables JASPI basic authentication the /test context path.
diff --git a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod
index 9b65c07c0b9..15849f2a458 100644
--- a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod
+++ b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables JASPI authentication for deployed web applications.
diff --git a/jetty-ee10/jetty-ee10-jndi/src/main/config/modules/ee10-jndi.mod b/jetty-ee10/jetty-ee10-jndi/src/main/config/modules/ee10-jndi.mod
index 093f4a0fc3f..094f706dd4a 100644
--- a/jetty-ee10/jetty-ee10-jndi/src/main/config/modules/ee10-jndi.mod
+++ b/jetty-ee10/jetty-ee10-jndi/src/main/config/modules/ee10-jndi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds the Jetty EE10 JNDI reference factories
diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod
index 6278dc43d66..3eb1a0ff4e0 100644
--- a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod
+++ b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables test setup
diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty-env.xml b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty-env.xml
index 8d0ddabb112..997664a7734 100644
--- a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty-env.xml
+++ b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty-env.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure id='wac' class="org.eclipse.jetty.ee10.webapp.WebAppContext">
 
   <!-- Add an EnvEntry only valid for this webapp               -->
diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod
index 78134aace9c..5a1c1eb3ec1 100644
--- a/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod
+++ b/jetty-ee10/jetty-ee10-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee10-testmod.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables test setup
diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/main/resources/ee10-maven.mod b/jetty-ee10/jetty-ee10-maven-plugin/src/main/resources/ee10-maven.mod
index ab4ed52419b..05b837a7c51 100644
--- a/jetty-ee10/jetty-ee10-maven-plugin/src/main/resources/ee10-maven.mod
+++ b/jetty-ee10/jetty-ee10-maven-plugin/src/main/resources/ee10-maven.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables an un-assembled Maven webapp to run in a Jetty distribution.
diff --git a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty.xml b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty.xml
index 322cd7db263..845d7fdb232 100644
--- a/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty.xml
+++ b/jetty-ee10/jetty-ee10-osgi/jetty-ee10-osgi-boot/jettyhome/etc/jetty.xml
@@ -6,7 +6,7 @@
 <!-- Configure the Jetty Server                                      -->
 <!--                                                                 -->
 <!-- Documentation of this file format can be found at:              -->
-<!-- https://eclipse.dev/jetty/documentation/                        -->
+<!-- https://jetty.org/docs/                        -->
 <!-- =============================================================== -->
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty.xml
index ed1e4f3433e..7699aab3efe 100644
--- a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty.xml
+++ b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/config/etc/jetty.xml
@@ -6,7 +6,7 @@
 <!-- Configure the Jetty Server                                      -->
 <!--                                                                 -->
 <!-- Documentation of this file format can be found at:              -->
-<!-- https://eclipse.dev/jetty/documentation/                        -->
+<!-- https://jetty.org/docs/                        -->
 <!-- =============================================================== -->
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
diff --git a/jetty-ee10/jetty-ee10-proxy/src/main/config/modules/ee10-proxy.mod b/jetty-ee10/jetty-ee10-proxy/src/main/config/modules/ee10-proxy.mod
index e62d7f38b5b..bad7dbb33f2 100644
--- a/jetty-ee10/jetty-ee10-proxy/src/main/config/modules/ee10-proxy.mod
+++ b/jetty-ee10/jetty-ee10-proxy/src/main/config/modules/ee10-proxy.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables the Jetty Proxy service.
diff --git a/jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/ee10-quickstart.mod b/jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/ee10-quickstart.mod
index daacb58fad4..6d388413ac8 100644
--- a/jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/ee10-quickstart.mod
+++ b/jetty-ee10/jetty-ee10-quickstart/src/main/config/modules/ee10-quickstart.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables the Jetty Quickstart module for rapid deployment of preconfigured web applications.
diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-security.mod b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-security.mod
index 19657b869f3..023b86f2255 100644
--- a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-security.mod
+++ b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-security.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds servlet standard security handling to the classpath.
diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod
index e679f195524..bcffc1cd74f 100644
--- a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod
+++ b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables standard Servlet handling.
diff --git a/jetty-ee10/jetty-ee10-servlets/src/main/config/modules/ee10-servlets.mod b/jetty-ee10/jetty-ee10-servlets/src/main/config/modules/ee10-servlets.mod
index 7e94e2e48be..d1cb854f543 100644
--- a/jetty-ee10/jetty-ee10-servlets/src/main/config/modules/ee10-servlets.mod
+++ b/jetty-ee10/jetty-ee10-servlets/src/main/config/modules/ee10-servlets.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds Jetty EE10 utility servlets and filters available to a webapp.
diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/config/etc/webdefault-ee10.xml b/jetty-ee10/jetty-ee10-webapp/src/main/config/etc/webdefault-ee10.xml
index ab19d557272..c0bd143f32e 100644
--- a/jetty-ee10/jetty-ee10-webapp/src/main/config/etc/webdefault-ee10.xml
+++ b/jetty-ee10/jetty-ee10-webapp/src/main/config/etc/webdefault-ee10.xml
@@ -185,7 +185,7 @@
   <!-- The JSP page compiler and execution servlet, which is the mechanism  -->
   <!-- used by the jsp container to support JSP pages.  Traditionally,      -->
   <!-- this servlet is mapped to URL pattern "*.jsp".                       -->
-  <!-- See https://eclipse.dev/jetty/documentation/              -->
+  <!-- See https://jetty.org/docs/              -->
   <!-- for applicable configuration params.                                 -->
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
   <servlet id="jsp">
diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-webapp.mod b/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-webapp.mod
index 229c107f3f3..be1ebbaab73 100644
--- a/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-webapp.mod
+++ b/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-webapp.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 # tag::description[]
diff --git a/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-ee10-web-xml/WEB-INF/jetty-ee10-web.xml b/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-ee10-web-xml/WEB-INF/jetty-ee10-web.xml
index beba698c2c9..868909820b7 100644
--- a/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-ee10-web-xml/WEB-INF/jetty-ee10-web.xml
+++ b/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-ee10-web-xml/WEB-INF/jetty-ee10-web.xml
@@ -12,7 +12,7 @@
 <!-- // ======================================================================== -->
 <!-- // -->
 
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure class="org.eclipse.jetty.ee10.webapp.WebAppContext">
   <Set name="contextPath">/raspberry</Set>
 </Configure>
diff --git a/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-ee10-web-xml/WEB-INF/jetty-web.xml b/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-ee10-web-xml/WEB-INF/jetty-web.xml
index bc6363a9b73..941dd6fc247 100644
--- a/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-ee10-web-xml/WEB-INF/jetty-web.xml
+++ b/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-ee10-web-xml/WEB-INF/jetty-web.xml
@@ -12,7 +12,7 @@
 <!-- // ======================================================================== -->
 <!-- // -->
 
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure class="org.eclipse.jetty.ee10.webapp.WebAppContext">
   <Set name="contextPath">/apple</Set>
 </Configure>
diff --git a/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml b/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml
index c1fd44b483b..9ba91a2ff38 100644
--- a/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml
+++ b/jetty-ee10/jetty-ee10-webapp/src/test/resources/webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml
@@ -12,7 +12,7 @@
 <!-- // ======================================================================== -->
 <!-- // -->
 
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure class="org.eclipse.jetty.ee10.webapp.WebAppContext">
   <Set name="contextPath">/orange</Set>
 </Configure>
diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/config/modules/ee10-websocket-jetty-client-webapp.mod b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/config/modules/ee10-websocket-jetty-client-webapp.mod
index adad3a7fd3d..0ab6236ed35 100644
--- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/config/modules/ee10-websocket-jetty-client-webapp.mod
+++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-client-webapp/src/main/config/modules/ee10-websocket-jetty-client-webapp.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Expose the Jetty WebSocket Client classes to deployed web applications.
diff --git a/jetty-ee8/jetty-ee8-annotations/src/main/config/modules/ee8-annotations.mod b/jetty-ee8/jetty-ee8-annotations/src/main/config/modules/ee8-annotations.mod
index 539543afec0..c04356eddb7 100644
--- a/jetty-ee8/jetty-ee8-annotations/src/main/config/modules/ee8-annotations.mod
+++ b/jetty-ee8/jetty-ee8-annotations/src/main/config/modules/ee8-annotations.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables Annotation scanning for deployed web applications.
diff --git a/jetty-ee8/jetty-ee8-apache-jsp/src/main/config/modules/ee8-apache-jsp.mod b/jetty-ee8/jetty-ee8-apache-jsp/src/main/config/modules/ee8-apache-jsp.mod
index 1680801a899..b754bfb3c6d 100644
--- a/jetty-ee8/jetty-ee8-apache-jsp/src/main/config/modules/ee8-apache-jsp.mod
+++ b/jetty-ee8/jetty-ee8-apache-jsp/src/main/config/modules/ee8-apache-jsp.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables use of the apache implementation of JSP.
diff --git a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/src/main/config/modules/ee8-demo-proxy.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/src/main/config/modules/ee8-demo-proxy.mod
index f7ad5f95122..c65f65d41f1 100644
--- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/src/main/config/modules/ee8-demo-proxy.mod
+++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-proxy-webapp/src/main/config/modules/ee8-demo-proxy.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo Proxy Webapp
diff --git a/jetty-ee8/jetty-ee8-glassfish-jstl/src/main/config/modules/ee8-glassfish-jstl.mod b/jetty-ee8/jetty-ee8-glassfish-jstl/src/main/config/modules/ee8-glassfish-jstl.mod
index 7c2ac4e540c..72c7a59f4cd 100644
--- a/jetty-ee8/jetty-ee8-glassfish-jstl/src/main/config/modules/ee8-glassfish-jstl.mod
+++ b/jetty-ee8/jetty-ee8-glassfish-jstl/src/main/config/modules/ee8-glassfish-jstl.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables the glassfish version of JSTL for all webapps.
diff --git a/jetty-ee8/jetty-ee8-jndi/src/main/config/modules/ee8-jndi.mod b/jetty-ee8/jetty-ee8-jndi/src/main/config/modules/ee8-jndi.mod
index 05f2e868dc0..87dab7aba2d 100644
--- a/jetty-ee8/jetty-ee8-jndi/src/main/config/modules/ee8-jndi.mod
+++ b/jetty-ee8/jetty-ee8-jndi/src/main/config/modules/ee8-jndi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds the Jetty EE8 JNDI reference factories
diff --git a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod
index a2fc225ca68..d44f9142ab5 100644
--- a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod
+++ b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables test setup
diff --git a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod
index 604ee1f920f..ad72ff8faa2 100644
--- a/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod
+++ b/jetty-ee8/jetty-ee8-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee8-testmod.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables test setup
diff --git a/jetty-ee8/jetty-ee8-maven-plugin/src/main/resources/ee8-maven.mod b/jetty-ee8/jetty-ee8-maven-plugin/src/main/resources/ee8-maven.mod
index e16db22ed87..45572442786 100644
--- a/jetty-ee8/jetty-ee8-maven-plugin/src/main/resources/ee8-maven.mod
+++ b/jetty-ee8/jetty-ee8-maven-plugin/src/main/resources/ee8-maven.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables an un-assembled Maven webapp to run in a Jetty distribution.
diff --git a/jetty-ee8/jetty-ee8-openid/src/main/config/modules/ee8-openid.mod b/jetty-ee8/jetty-ee8-openid/src/main/config/modules/ee8-openid.mod
index b68eb35ac3d..dc9d5fd3e1e 100644
--- a/jetty-ee8/jetty-ee8-openid/src/main/config/modules/ee8-openid.mod
+++ b/jetty-ee8/jetty-ee8-openid/src/main/config/modules/ee8-openid.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds OpenId Connect authentication to the server.
diff --git a/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty-deploy.xml b/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty-deploy.xml
index 88fc1a79e59..1396a86176a 100644
--- a/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty-deploy.xml
+++ b/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty-deploy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
diff --git a/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty-http.xml b/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty-http.xml
index bbd9ab19ed5..3387ed855d3 100644
--- a/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty-http.xml
+++ b/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty-http.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure the Jetty Server instance with an ID "Server"       -->
diff --git a/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty.xml b/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty.xml
index a2e40523909..f7fa7e0ac8b 100644
--- a/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty.xml
+++ b/jetty-ee8/jetty-ee8-osgi/jetty-ee8-osgi-boot/jettyhome/etc/jetty.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 
 <!-- =============================================================== -->
 <!-- Configure the Jetty Server                                      -->
 <!--                                                                 -->
 <!-- Documentation of this file format can be found at:              -->
-<!-- https://eclipse.dev/jetty/documentation/                    -->
+<!-- https://jetty.org/docs/                    -->
 <!-- =============================================================== -->
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-alpn.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-alpn.xml
index f07dfa10807..bc73c4d1ffe 100644
--- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-alpn.xml
+++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-alpn.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
 
diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-deploy.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-deploy.xml
index 21d724916da..5b21201dd8e 100644
--- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-deploy.xml
+++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-deploy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml
index 368b7b13f04..167bdfa2cc8 100644
--- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml
+++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure the Jetty Server instance with an ID "Server"       -->
diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml
index 0f8a95f6ba2..817c79209b8 100644
--- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml
+++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure the Jetty Server instance with an ID "Server"       -->
diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml
index 2f192b9ad76..71b58edf4f0 100644
--- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml
+++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure the Jetty Server instance with an ID "Server"       -->
diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml
index 55833c5cdd6..d558f458706 100644
--- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml
+++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure the Jetty Server instance with an ID "Server"       -->
diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml
index 48e9f5b3189..8d129694a35 100644
--- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml
+++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-javax-websocket.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure the Jetty Server instance with an ID "Server"       -->
diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml
index 250f55485ff..163764abea1 100644
--- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml
+++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure the Jetty Server instance with an ID "Server"       -->
diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml
index c5a60d87957..1b8421df4f3 100644
--- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml
+++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure the Jetty Server instance with an ID "Server"       -->
diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http.xml
index a98af21f658..b2e21f7755b 100644
--- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http.xml
+++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure the Jetty Server instance with an ID "Server"       -->
diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http2-jdk9.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http2-jdk9.xml
index 8bcf77c3992..a5eca60f996 100644
--- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http2-jdk9.xml
+++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http2-jdk9.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure an HTTP2 on the ssl connector.                       -->
diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http2.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http2.xml
index 750062e2bfd..f3cbd267a76 100644
--- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http2.xml
+++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-http2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure an HTTP2 on the ssl connector.                       -->
diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-https.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-https.xml
index 58901463ac2..c8d9cefffb5 100644
--- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-https.xml
+++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-https.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure an HTTPS connector.                                  -->
diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-ssl.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-ssl.xml
index e76e7cfda34..801de9e53a5 100644
--- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-ssl.xml
+++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-ssl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Base SSL configuration                                        -->
diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-testrealm.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-testrealm.xml
index aa5a5b7d6d8..43fd283c9cc 100644
--- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-testrealm.xml
+++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-testrealm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
     <!-- =========================================================== -->
     <!-- Configure Authentication Login Service                      -->
diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-with-custom-class.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-with-custom-class.xml
index 5ee75015be6..89796c75e19 100644
--- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-with-custom-class.xml
+++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty-with-custom-class.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 
 <!-- =============================================================== -->
diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty.xml
index 3042e2e31d5..e23cd91bf37 100644
--- a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty.xml
+++ b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/src/test/config/etc/jetty.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 
 <!-- =============================================================== -->
 <!-- Configure the Jetty Server                                      -->
 <!--                                                                 -->
 <!-- Documentation of this file format can be found at:              -->
-<!-- https://eclipse.dev/jetty/documentation/                    -->
+<!-- https://jetty.org/docs/                    -->
 <!-- =============================================================== -->
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
diff --git a/jetty-ee8/jetty-ee8-proxy/src/main/config/modules/ee8-proxy.mod b/jetty-ee8/jetty-ee8-proxy/src/main/config/modules/ee8-proxy.mod
index 372c4e5f1bd..0514972615e 100644
--- a/jetty-ee8/jetty-ee8-proxy/src/main/config/modules/ee8-proxy.mod
+++ b/jetty-ee8/jetty-ee8-proxy/src/main/config/modules/ee8-proxy.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables the Jetty Proxy service.
diff --git a/jetty-ee8/jetty-ee8-quickstart/src/main/config/modules/ee8-quickstart.mod b/jetty-ee8/jetty-ee8-quickstart/src/main/config/modules/ee8-quickstart.mod
index c4f50ab8f39..a079864d9b7 100644
--- a/jetty-ee8/jetty-ee8-quickstart/src/main/config/modules/ee8-quickstart.mod
+++ b/jetty-ee8/jetty-ee8-quickstart/src/main/config/modules/ee8-quickstart.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables the Jetty Quickstart module for rapid deployment of preconfigured web applications.
diff --git a/jetty-ee8/jetty-ee8-security/src/main/config/modules/ee8-security.mod b/jetty-ee8/jetty-ee8-security/src/main/config/modules/ee8-security.mod
index 5e786362647..c82b51df319 100644
--- a/jetty-ee8/jetty-ee8-security/src/main/config/modules/ee8-security.mod
+++ b/jetty-ee8/jetty-ee8-security/src/main/config/modules/ee8-security.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds servlet standard security handling to the classpath.
diff --git a/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod b/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod
index ef6c975365f..b49ef65940b 100644
--- a/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod
+++ b/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables standard Servlet handling.
diff --git a/jetty-ee8/jetty-ee8-servlets/src/main/config/modules/ee8-servlets.mod b/jetty-ee8/jetty-ee8-servlets/src/main/config/modules/ee8-servlets.mod
index dd6fd652a85..c14366cb8ba 100644
--- a/jetty-ee8/jetty-ee8-servlets/src/main/config/modules/ee8-servlets.mod
+++ b/jetty-ee8/jetty-ee8-servlets/src/main/config/modules/ee8-servlets.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds Jetty EE8 utility servlets and filters available to a webapp.
diff --git a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-deploy.xml b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-deploy.xml
index 52fb1adae48..ef89f770e7b 100644
--- a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-deploy.xml
+++ b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-deploy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Attach the "ee8" environment app deployment provider            -->
diff --git a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-webapp.xml b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-webapp.xml
index d041fcdb3f8..f77acad54e5 100644
--- a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-webapp.xml
+++ b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/jetty-ee8-webapp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Call class="org.eclipse.jetty.ee.WebAppClassLoading" name="addProtectedClasses">
diff --git a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/webdefault-ee8.xml b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/webdefault-ee8.xml
index aadae3cbb13..33dbbfc802e 100644
--- a/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/webdefault-ee8.xml
+++ b/jetty-ee8/jetty-ee8-webapp/src/main/config/etc/webdefault-ee8.xml
@@ -187,7 +187,7 @@
   <!-- The JSP page compiler and execution servlet, which is the mechanism  -->
   <!-- used by the jsp container to support JSP pages.  Traditionally,      -->
   <!-- this servlet is mapped to URL pattern "*.jsp".                       -->
-  <!-- See https://eclipse.dev/jetty/documentation/                         -->
+  <!-- See https://jetty.org/docs/                         -->
   <!-- for applicable configuration params.                                 -->
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
   <servlet id="jsp">
diff --git a/jetty-ee8/jetty-ee8-webapp/src/main/config/modules/ee8-webapp.mod b/jetty-ee8/jetty-ee8-webapp/src/main/config/modules/ee8-webapp.mod
index f1bd99183c8..6f5843f9575 100644
--- a/jetty-ee8/jetty-ee8-webapp/src/main/config/modules/ee8-webapp.mod
+++ b/jetty-ee8/jetty-ee8-webapp/src/main/config/modules/ee8-webapp.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds support for servlet specification web applications to the server classpath.
diff --git a/jetty-ee8/jetty-ee8-webapp/src/test/resources/webapp-with-jetty-ee8-web-xml/WEB-INF/jetty-ee8-web.xml b/jetty-ee8/jetty-ee8-webapp/src/test/resources/webapp-with-jetty-ee8-web-xml/WEB-INF/jetty-ee8-web.xml
index 75eb7ab66d9..04339583062 100644
--- a/jetty-ee8/jetty-ee8-webapp/src/test/resources/webapp-with-jetty-ee8-web-xml/WEB-INF/jetty-ee8-web.xml
+++ b/jetty-ee8/jetty-ee8-webapp/src/test/resources/webapp-with-jetty-ee8-web-xml/WEB-INF/jetty-ee8-web.xml
@@ -12,7 +12,7 @@
 <!-- // ======================================================================== -->
 <!-- // -->
 
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure class="org.eclipse.jetty.ee8.webapp.WebAppContext">
   <Set name="contextPath">/raspberry</Set>
 </Configure>
diff --git a/jetty-ee8/jetty-ee8-webapp/src/test/resources/webapp-with-jetty-ee8-web-xml/WEB-INF/jetty-web.xml b/jetty-ee8/jetty-ee8-webapp/src/test/resources/webapp-with-jetty-ee8-web-xml/WEB-INF/jetty-web.xml
index 4cebf8aca2f..33546a81d30 100644
--- a/jetty-ee8/jetty-ee8-webapp/src/test/resources/webapp-with-jetty-ee8-web-xml/WEB-INF/jetty-web.xml
+++ b/jetty-ee8/jetty-ee8-webapp/src/test/resources/webapp-with-jetty-ee8-web-xml/WEB-INF/jetty-web.xml
@@ -12,7 +12,7 @@
 <!-- // ======================================================================== -->
 <!-- // -->
 
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure class="org.eclipse.jetty.ee8.webapp.WebAppContext">
   <Set name="contextPath">/apple</Set>
 </Configure>
diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/ee8-websocket-jetty-client-webapp.mod b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/ee8-websocket-jetty-client-webapp.mod
index 2daec2f617b..803d0b8eba9 100644
--- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/ee8-websocket-jetty-client-webapp.mod
+++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/src/main/config/modules/ee8-websocket-jetty-client-webapp.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Expose the Jetty WebSocket Client classes to deployed web applications.
diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/ee8-websocket-jetty-client.mod b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/ee8-websocket-jetty-client.mod
index 6a5e53290fd..630874a96ac 100644
--- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/ee8-websocket-jetty-client.mod
+++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/src/main/config/modules/ee8-websocket-jetty-client.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Expose the Jetty WebSocket Client classes to deployed web applications.
diff --git a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/ee8-websocket-jetty.mod b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/ee8-websocket-jetty.mod
index 56a17d48d74..7d19b4c8806 100644
--- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/ee8-websocket-jetty.mod
+++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/src/main/config/modules/ee8-websocket-jetty.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enable the Jetty WebSocket API support for deployed web applications.
diff --git a/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/ee9-annotations.mod b/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/ee9-annotations.mod
index 28e42669814..4f40d35b257 100644
--- a/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/ee9-annotations.mod
+++ b/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/ee9-annotations.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables Annotation scanning for deployed web applications.
diff --git a/jetty-ee9/jetty-ee9-apache-jsp/src/main/config/modules/ee9-apache-jsp.mod b/jetty-ee9/jetty-ee9-apache-jsp/src/main/config/modules/ee9-apache-jsp.mod
index b942a5d7982..ffad9a7f068 100644
--- a/jetty-ee9/jetty-ee9-apache-jsp/src/main/config/modules/ee9-apache-jsp.mod
+++ b/jetty-ee9/jetty-ee9-apache-jsp/src/main/config/modules/ee9-apache-jsp.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables use of the apache implementation of JSP.
diff --git a/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi-decorate.mod b/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi-decorate.mod
index d2855107fdb..263b4aa87ce 100644
--- a/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi-decorate.mod
+++ b/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi-decorate.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Configures Jetty to use the "CdiDecoratingListener" as the default CDI mode.
diff --git a/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi-spi.mod b/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi-spi.mod
index a46b9f8461c..dc581e8c9d9 100644
--- a/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi-spi.mod
+++ b/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi-spi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Configures Jetty to use the "CdiSpiDecorator" as the default CDI mode.
diff --git a/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi.mod b/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi.mod
index 45a8d13752c..a94e3986c7a 100644
--- a/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi.mod
+++ b/jetty-ee9/jetty-ee9-cdi/src/main/config/modules/ee9-cdi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Provides integration of CDI within webapp to Jetty container object lifecycles.
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/src/main/resources/demo/webdefault-ee9.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/src/main/resources/demo/webdefault-ee9.xml
index 2e88aef7b76..bd463684374 100644
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/src/main/resources/demo/webdefault-ee9.xml
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/src/main/resources/demo/webdefault-ee9.xml
@@ -195,7 +195,7 @@
   <!-- The JSP page compiler and execution servlet, which is the mechanism  -->
   <!-- used by the jsp container to support JSP pages.  Traditionally,      -->
   <!-- this servlet is mapped to URL pattern "*.jsp".                       -->
-  <!-- See https://eclipse.dev/jetty/documentation/                         -->
+  <!-- See https://jetty.org/docs/                         -->
   <!-- for applicable configuration params.                                 -->
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
   <servlet id="jsp">
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/config/modules/ee9-demo-proxy.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/config/modules/ee9-demo-proxy.mod
index 519c5cfb5d6..f0ecb0dadfc 100644
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/config/modules/ee9-demo-proxy.mod
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/config/modules/ee9-demo-proxy.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo Proxy Webapp
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml
index 3f52695fefe..308c423dda0 100644
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
   <Get name="servletContext">
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml
index 8d832bd8372..75f2d4904de 100644
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml
@@ -13,11 +13,11 @@
     <servlet-class>org.eclipse.jetty.ee9.proxy.ProxyServlet$Transparent</servlet-class>
     <init-param>
       <param-name>proxyTo</param-name>
-      <param-value>https://eclipse.dev/jetty/javadoc/jetty-12/index.html?overview-summary.html</param-value>
+      <param-value>https://javadoc.jetty.org/</param-value>
     </init-param>
     <init-param>
       <param-name>hostHeader</param-name>
-      <param-value>www.eclipse.org</param-value>
+      <param-value>javadoc.jetty.org</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>
     <async-supported>true</async-supported>
@@ -25,7 +25,7 @@
 
   <servlet-mapping>
     <servlet-name>JavadocTransparentProxy</servlet-name>
-    <url-pattern>/current/*</url-pattern>
+    <url-pattern>/jetty-12/*</url-pattern>
   </servlet-mapping>
 
 </web-app>
diff --git a/jetty-ee9/jetty-ee9-glassfish-jstl/src/main/config/modules/ee9-glassfish-jstl.mod b/jetty-ee9/jetty-ee9-glassfish-jstl/src/main/config/modules/ee9-glassfish-jstl.mod
index 82bbb833ea0..490cc60a09d 100644
--- a/jetty-ee9/jetty-ee9-glassfish-jstl/src/main/config/modules/ee9-glassfish-jstl.mod
+++ b/jetty-ee9/jetty-ee9-glassfish-jstl/src/main/config/modules/ee9-glassfish-jstl.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables the glassfish version of JSTL for all webapps.
diff --git a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-default-auth-config-factory.mod b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-default-auth-config-factory.mod
index 39762bc79f9..ce713d57ba4 100644
--- a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-default-auth-config-factory.mod
+++ b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-default-auth-config-factory.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Provides a DefaultAuthConfigFactory for jaspi
diff --git a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-demo.mod b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-demo.mod
index 4ba345f9752..74ac84779df 100644
--- a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-demo.mod
+++ b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi-demo.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables JASPI basic authentication the /test context path.
diff --git a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi.mod b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi.mod
index 071f79a1a9e..5232d7f06f7 100644
--- a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi.mod
+++ b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables JASPI authentication for deployed web applications.
diff --git a/jetty-ee9/jetty-ee9-jndi/src/main/config/modules/ee9-jndi.mod b/jetty-ee9/jetty-ee9-jndi/src/main/config/modules/ee9-jndi.mod
index 1c2e7d6e653..938ffe936ec 100644
--- a/jetty-ee9/jetty-ee9-jndi/src/main/config/modules/ee9-jndi.mod
+++ b/jetty-ee9/jetty-ee9-jndi/src/main/config/modules/ee9-jndi.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds the Jetty EE9 JNDI reference factories
diff --git a/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod b/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod
index 5e40e47dbbf..082129567a1 100644
--- a/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod
+++ b/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables test setup
diff --git a/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod b/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod
index efc4adfa0c9..294a7062af3 100644
--- a/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod
+++ b/jetty-ee9/jetty-ee9-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee9-testmod.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables test setup
diff --git a/jetty-ee9/jetty-ee9-maven-plugin/src/main/resources/ee9-maven.mod b/jetty-ee9/jetty-ee9-maven-plugin/src/main/resources/ee9-maven.mod
index 4eee3f1211f..5ad679e3a67 100644
--- a/jetty-ee9/jetty-ee9-maven-plugin/src/main/resources/ee9-maven.mod
+++ b/jetty-ee9/jetty-ee9-maven-plugin/src/main/resources/ee9-maven.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables an un-assembled Maven webapp to run in a Jetty distribution.
diff --git a/jetty-ee9/jetty-ee9-openid/src/main/config/modules/ee9-openid.mod b/jetty-ee9/jetty-ee9-openid/src/main/config/modules/ee9-openid.mod
index d86a075bc8b..099b4769feb 100644
--- a/jetty-ee9/jetty-ee9-openid/src/main/config/modules/ee9-openid.mod
+++ b/jetty-ee9/jetty-ee9-openid/src/main/config/modules/ee9-openid.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds OpenId Connect authentication to the server.
diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-deploy.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-deploy.xml
index 88fc1a79e59..1396a86176a 100644
--- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-deploy.xml
+++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-deploy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-http.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-http.xml
index bbd9ab19ed5..3387ed855d3 100644
--- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-http.xml
+++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty-http.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure the Jetty Server instance with an ID "Server"       -->
diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty.xml b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty.xml
index a2e40523909..f7fa7e0ac8b 100644
--- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty.xml
+++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/jettyhome/etc/jetty.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 
 <!-- =============================================================== -->
 <!-- Configure the Jetty Server                                      -->
 <!--                                                                 -->
 <!-- Documentation of this file format can be found at:              -->
-<!-- https://eclipse.dev/jetty/documentation/                    -->
+<!-- https://jetty.org/docs/                    -->
 <!-- =============================================================== -->
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-alpn.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-alpn.xml
index f07dfa10807..bc73c4d1ffe 100644
--- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-alpn.xml
+++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-alpn.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
 
diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-deploy.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-deploy.xml
index 21d724916da..5b21201dd8e 100644
--- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-deploy.xml
+++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-deploy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml
index 368b7b13f04..167bdfa2cc8 100644
--- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml
+++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-context-as-service.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure the Jetty Server instance with an ID "Server"       -->
diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml
index 0f8a95f6ba2..817c79209b8 100644
--- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml
+++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-webapp-as-service.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure the Jetty Server instance with an ID "Server"       -->
diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml
index 2f192b9ad76..71b58edf4f0 100644
--- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml
+++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-annotations.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure the Jetty Server instance with an ID "Server"       -->
diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml
index 55833c5cdd6..d558f458706 100644
--- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml
+++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-bundle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure the Jetty Server instance with an ID "Server"       -->
diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jakarta-websocket.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jakarta-websocket.xml
index 7ed60324940..0f85ffc426a 100644
--- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jakarta-websocket.xml
+++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jakarta-websocket.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure the Jetty Server instance with an ID "Server"       -->
diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml
index 250f55485ff..163764abea1 100644
--- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml
+++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-jsp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure the Jetty Server instance with an ID "Server"       -->
diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml
index c5a60d87957..1b8421df4f3 100644
--- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml
+++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http-boot-with-websocket.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure the Jetty Server instance with an ID "Server"       -->
diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http.xml
index 03817aee22a..ac9daa6b5d7 100644
--- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http.xml
+++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure the Jetty Server instance with an ID "Server"       -->
diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2-jdk9.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2-jdk9.xml
index fe6ec6306b2..4bf134cec4b 100644
--- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2-jdk9.xml
+++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2-jdk9.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure an HTTP2 on the ssl connector.                       -->
diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2.xml
index 750062e2bfd..f3cbd267a76 100644
--- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2.xml
+++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-http2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure an HTTP2 on the ssl connector.                       -->
diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-https.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-https.xml
index 4ea09074388..0131aa42bbe 100644
--- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-https.xml
+++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-https.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Configure an HTTPS connector.                                  -->
diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-ssl.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-ssl.xml
index e76e7cfda34..801de9e53a5 100644
--- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-ssl.xml
+++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-ssl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- ============================================================= -->
 <!-- Base SSL configuration                                        -->
diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-testrealm.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-testrealm.xml
index b7af3243b8e..0d90ab0259b 100644
--- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-testrealm.xml
+++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-testrealm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
     <!-- =========================================================== -->
     <!-- Configure Authentication Login Service                      -->
diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-with-custom-class.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-with-custom-class.xml
index b9539aa864e..d730f60aa54 100644
--- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-with-custom-class.xml
+++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty-with-custom-class.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 
 <!-- =============================================================== -->
diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty.xml
index 3042e2e31d5..e23cd91bf37 100644
--- a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty.xml
+++ b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/config/etc/jetty.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 
 <!-- =============================================================== -->
 <!-- Configure the Jetty Server                                      -->
 <!--                                                                 -->
 <!-- Documentation of this file format can be found at:              -->
-<!-- https://eclipse.dev/jetty/documentation/                    -->
+<!-- https://jetty.org/docs/                    -->
 <!-- =============================================================== -->
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
diff --git a/jetty-ee9/jetty-ee9-proxy/src/main/config/etc/jetty-ee9-proxy.xml b/jetty-ee9/jetty-ee9-proxy/src/main/config/etc/jetty-ee9-proxy.xml
index 746d13edf87..f919ef7fc88 100644
--- a/jetty-ee9/jetty-ee9-proxy/src/main/config/etc/jetty-ee9-proxy.xml
+++ b/jetty-ee9/jetty-ee9-proxy/src/main/config/etc/jetty-ee9-proxy.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
diff --git a/jetty-ee9/jetty-ee9-proxy/src/main/config/modules/ee9-proxy.mod b/jetty-ee9/jetty-ee9-proxy/src/main/config/modules/ee9-proxy.mod
index 9e8dd912cae..494520be45b 100644
--- a/jetty-ee9/jetty-ee9-proxy/src/main/config/modules/ee9-proxy.mod
+++ b/jetty-ee9/jetty-ee9-proxy/src/main/config/modules/ee9-proxy.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables the Jetty Proxy service.
diff --git a/jetty-ee9/jetty-ee9-quickstart/src/main/config/modules/ee9-quickstart.mod b/jetty-ee9/jetty-ee9-quickstart/src/main/config/modules/ee9-quickstart.mod
index 76931992e2d..4b383ec2ff7 100644
--- a/jetty-ee9/jetty-ee9-quickstart/src/main/config/modules/ee9-quickstart.mod
+++ b/jetty-ee9/jetty-ee9-quickstart/src/main/config/modules/ee9-quickstart.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables the Jetty Quickstart module for rapid deployment of preconfigured web applications.
diff --git a/jetty-ee9/jetty-ee9-security/src/main/config/modules/ee9-security.mod b/jetty-ee9/jetty-ee9-security/src/main/config/modules/ee9-security.mod
index a16d6791250..92ecf5d5ba9 100644
--- a/jetty-ee9/jetty-ee9-security/src/main/config/modules/ee9-security.mod
+++ b/jetty-ee9/jetty-ee9-security/src/main/config/modules/ee9-security.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds servlet standard security handling to the classpath.
diff --git a/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod b/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod
index 4066aee5d99..1993eb6216d 100644
--- a/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod
+++ b/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables standard Servlet handling.
diff --git a/jetty-ee9/jetty-ee9-servlets/src/main/config/modules/ee9-servlets.mod b/jetty-ee9/jetty-ee9-servlets/src/main/config/modules/ee9-servlets.mod
index cb5fd4b40b3..d54df1af88e 100644
--- a/jetty-ee9/jetty-ee9-servlets/src/main/config/modules/ee9-servlets.mod
+++ b/jetty-ee9/jetty-ee9-servlets/src/main/config/modules/ee9-servlets.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds Jetty EE9 utility servlets and filters available to a webapp.
diff --git a/jetty-ee9/jetty-ee9-webapp/src/main/config/etc/webdefault-ee9.xml b/jetty-ee9/jetty-ee9-webapp/src/main/config/etc/webdefault-ee9.xml
index d1364eb7851..d84351180c1 100644
--- a/jetty-ee9/jetty-ee9-webapp/src/main/config/etc/webdefault-ee9.xml
+++ b/jetty-ee9/jetty-ee9-webapp/src/main/config/etc/webdefault-ee9.xml
@@ -187,7 +187,7 @@
   <!-- The JSP page compiler and execution servlet, which is the mechanism  -->
   <!-- used by the jsp container to support JSP pages.  Traditionally,      -->
   <!-- this servlet is mapped to URL pattern "*.jsp".                       -->
-  <!-- See https://eclipse.dev/jetty/documentation/              -->
+  <!-- See https://jetty.org/docs/              -->
   <!-- for applicable configuration params.                                 -->
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
   <servlet id="jsp">
diff --git a/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-webapp.mod b/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-webapp.mod
index 56301513d11..f72bd381ebc 100644
--- a/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-webapp.mod
+++ b/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-webapp.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Adds support for servlet specification web applications to the server classpath.
diff --git a/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-ee9-web-xml/WEB-INF/jetty-ee9-web.xml b/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-ee9-web-xml/WEB-INF/jetty-ee9-web.xml
index 68227056378..cc95fdb2260 100644
--- a/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-ee9-web-xml/WEB-INF/jetty-ee9-web.xml
+++ b/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-ee9-web-xml/WEB-INF/jetty-ee9-web.xml
@@ -12,7 +12,7 @@
 <!-- // ======================================================================== -->
 <!-- // -->
 
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
   <Set name="contextPath">/raspberry</Set>
 </Configure>
diff --git a/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-ee9-web-xml/WEB-INF/jetty-web.xml b/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-ee9-web-xml/WEB-INF/jetty-web.xml
index 517bef72c45..641fc93e913 100644
--- a/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-ee9-web-xml/WEB-INF/jetty-web.xml
+++ b/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-ee9-web-xml/WEB-INF/jetty-web.xml
@@ -12,7 +12,7 @@
 <!-- // ======================================================================== -->
 <!-- // -->
 
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
   <Set name="contextPath">/apple</Set>
 </Configure>
diff --git a/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml b/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml
index 90d5ac4e64a..d2f6885ba0b 100644
--- a/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml
+++ b/jetty-ee9/jetty-ee9-webapp/src/test/resources/webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml
@@ -12,7 +12,7 @@
 <!-- // ======================================================================== -->
 <!-- // -->
 
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 <Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
   <Set name="contextPath">/orange</Set>
 </Configure>
diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/ee9-websocket-jetty-client-webapp.mod b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/ee9-websocket-jetty-client-webapp.mod
index 128a6ae3a6f..d4087de6a0f 100644
--- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/ee9-websocket-jetty-client-webapp.mod
+++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client-webapp/src/main/config/modules/ee9-websocket-jetty-client-webapp.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Expose the Jetty WebSocket Client classes to deployed web applications.
diff --git a/jetty-home/src/main/resources/modules/core-demos.mod b/jetty-home/src/main/resources/modules/core-demos.mod
index 9928322ca0b..4af7fa251f7 100644
--- a/jetty-home/src/main/resources/modules/core-demos.mod
+++ b/jetty-home/src/main/resources/modules/core-demos.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 A meta module to enable all core demo modules.
diff --git a/jetty-home/src/main/resources/modules/demo-jaas.mod b/jetty-home/src/main/resources/modules/demo-jaas.mod
index ec8c8351b84..7119a7868a7 100644
--- a/jetty-home/src/main/resources/modules/demo-jaas.mod
+++ b/jetty-home/src/main/resources/modules/demo-jaas.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Setup for jaas demos.
diff --git a/jetty-home/src/main/resources/modules/demo-moved-context.mod b/jetty-home/src/main/resources/modules/demo-moved-context.mod
index e695fa659a9..1a734f5d6c1 100644
--- a/jetty-home/src/main/resources/modules/demo-moved-context.mod
+++ b/jetty-home/src/main/resources/modules/demo-moved-context.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demonstrate a Moved Context Handler setup in XML
diff --git a/jetty-home/src/main/resources/modules/demo-realm.mod b/jetty-home/src/main/resources/modules/demo-realm.mod
index 808d3fadfeb..c9dc8baefef 100644
--- a/jetty-home/src/main/resources/modules/demo-realm.mod
+++ b/jetty-home/src/main/resources/modules/demo-realm.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Configure a demo authentication realm.
diff --git a/jetty-home/src/main/resources/modules/demo-root.mod b/jetty-home/src/main/resources/modules/demo-root.mod
index c777c4f3060..b8d99a76186 100644
--- a/jetty-home/src/main/resources/modules/demo-root.mod
+++ b/jetty-home/src/main/resources/modules/demo-root.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Demo root context.
diff --git a/jetty-home/src/main/resources/modules/demo.d/moved/index.html b/jetty-home/src/main/resources/modules/demo.d/moved/index.html
index 9cdd2c4ea35..771a1427fd2 100644
--- a/jetty-home/src/main/resources/modules/demo.d/moved/index.html
+++ b/jetty-home/src/main/resources/modules/demo.d/moved/index.html
@@ -22,7 +22,7 @@
     </div>
 
     <div class="footer">
-      <center><a href="https://eclipse.dev/jetty"><img style="border:0" src="small_powered_by.gif"/></a></center>
+      <center><a href="https://jetty.org"><img style="border:0" src="small_powered_by.gif"/></a></center>
     </div>
 </body>
 </html>
diff --git a/jetty-home/src/main/resources/modules/demos.mod b/jetty-home/src/main/resources/modules/demos.mod
index 5ebb1e86b87..2c76b0449a8 100644
--- a/jetty-home/src/main/resources/modules/demos.mod
+++ b/jetty-home/src/main/resources/modules/demos.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 A meta module to enable all demo modules.
diff --git a/jetty-home/src/main/resources/modules/disable-urlcache.mod b/jetty-home/src/main/resources/modules/disable-urlcache.mod
index 92fb9be10f7..a86869ecba6 100644
--- a/jetty-home/src/main/resources/modules/disable-urlcache.mod
+++ b/jetty-home/src/main/resources/modules/disable-urlcache.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 A module that will disable java.net.URL internal cache of `jar` protocol URLs.
diff --git a/jetty-home/src/main/resources/modules/ee10-demos.mod b/jetty-home/src/main/resources/modules/ee10-demos.mod
index 7b977365d95..8e098e96657 100644
--- a/jetty-home/src/main/resources/modules/ee10-demos.mod
+++ b/jetty-home/src/main/resources/modules/ee10-demos.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 A meta module to enable all EE10 demo modules.
diff --git a/jetty-home/src/main/resources/modules/ee10-jsp.mod b/jetty-home/src/main/resources/modules/ee10-jsp.mod
index 5f6bcb2050b..b90105b32f4 100644
--- a/jetty-home/src/main/resources/modules/ee10-jsp.mod
+++ b/jetty-home/src/main/resources/modules/ee10-jsp.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables JSP for all web applications deployed on the server.
diff --git a/jetty-home/src/main/resources/modules/ee10-jstl.mod b/jetty-home/src/main/resources/modules/ee10-jstl.mod
index 4aa55bb4969..6ccfb7e7ec8 100644
--- a/jetty-home/src/main/resources/modules/ee10-jstl.mod
+++ b/jetty-home/src/main/resources/modules/ee10-jstl.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables JSTL for all web applications deployed on the server.
diff --git a/jetty-home/src/main/resources/modules/ee8-demos.mod b/jetty-home/src/main/resources/modules/ee8-demos.mod
index 71c00121aa8..8b099a4f5a0 100644
--- a/jetty-home/src/main/resources/modules/ee8-demos.mod
+++ b/jetty-home/src/main/resources/modules/ee8-demos.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 A meta module to enable all EE8 demo modules.
diff --git a/jetty-home/src/main/resources/modules/ee8-jsp.mod b/jetty-home/src/main/resources/modules/ee8-jsp.mod
index f98d636dd34..156cd1ba4bd 100644
--- a/jetty-home/src/main/resources/modules/ee8-jsp.mod
+++ b/jetty-home/src/main/resources/modules/ee8-jsp.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables JSP for all web applications deployed on the server.
diff --git a/jetty-home/src/main/resources/modules/ee8-jstl.mod b/jetty-home/src/main/resources/modules/ee8-jstl.mod
index a5458d41bd3..a57cf65e538 100644
--- a/jetty-home/src/main/resources/modules/ee8-jstl.mod
+++ b/jetty-home/src/main/resources/modules/ee8-jstl.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables JSTL for all web applications deployed on the server.
diff --git a/jetty-home/src/main/resources/modules/ee9-demos.mod b/jetty-home/src/main/resources/modules/ee9-demos.mod
index 06c023136c8..90aa0bd2208 100644
--- a/jetty-home/src/main/resources/modules/ee9-demos.mod
+++ b/jetty-home/src/main/resources/modules/ee9-demos.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 A meta module to enable all EE9 demo modules.
diff --git a/jetty-home/src/main/resources/modules/ee9-jsp.mod b/jetty-home/src/main/resources/modules/ee9-jsp.mod
index 2dbb8d8cac9..4c89a096b17 100644
--- a/jetty-home/src/main/resources/modules/ee9-jsp.mod
+++ b/jetty-home/src/main/resources/modules/ee9-jsp.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables JSP for all web applications deployed on the server.
diff --git a/jetty-home/src/main/resources/modules/ee9-jstl.mod b/jetty-home/src/main/resources/modules/ee9-jstl.mod
index abc388f6b61..885b3736b43 100644
--- a/jetty-home/src/main/resources/modules/ee9-jstl.mod
+++ b/jetty-home/src/main/resources/modules/ee9-jstl.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables JSTL for all web applications deployed on the server.
diff --git a/jetty-home/src/main/resources/modules/logging-jcl-capture.mod b/jetty-home/src/main/resources/modules/logging-jcl-capture.mod
index 5ef75a8d856..9f0adeeca03 100644
--- a/jetty-home/src/main/resources/modules/logging-jcl-capture.mod
+++ b/jetty-home/src/main/resources/modules/logging-jcl-capture.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Captures jakarta-commons-logging events and bridges them to SLF4J.
diff --git a/jetty-home/src/main/resources/modules/logging-jetty.mod b/jetty-home/src/main/resources/modules/logging-jetty.mod
index c068913f00f..7aaebb11812 100644
--- a/jetty-home/src/main/resources/modules/logging-jetty.mod
+++ b/jetty-home/src/main/resources/modules/logging-jetty.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Base configuration for the jetty logging mechanism.
diff --git a/jetty-home/src/main/resources/modules/logging-jul-capture.mod b/jetty-home/src/main/resources/modules/logging-jul-capture.mod
index efd6103d94f..adc89b97b12 100644
--- a/jetty-home/src/main/resources/modules/logging-jul-capture.mod
+++ b/jetty-home/src/main/resources/modules/logging-jul-capture.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Captures java.util.logging events and bridges them to slf4j.
diff --git a/jetty-home/src/main/resources/modules/logging-jul.mod b/jetty-home/src/main/resources/modules/logging-jul.mod
index 87e950b25ce..cb6ef021278 100644
--- a/jetty-home/src/main/resources/modules/logging-jul.mod
+++ b/jetty-home/src/main/resources/modules/logging-jul.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Configures jetty logging to use Java Util Logging (jul).
diff --git a/jetty-home/src/main/resources/modules/logging-log4j1-capture.mod b/jetty-home/src/main/resources/modules/logging-log4j1-capture.mod
index 9e1ca062248..f3d29c836a2 100644
--- a/jetty-home/src/main/resources/modules/logging-log4j1-capture.mod
+++ b/jetty-home/src/main/resources/modules/logging-log4j1-capture.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Captures Apache log4j events and bridges them to SLF4J.
diff --git a/jetty-home/src/main/resources/modules/logging-log4j1.mod b/jetty-home/src/main/resources/modules/logging-log4j1.mod
index 70b8a1e607a..27842b86552 100644
--- a/jetty-home/src/main/resources/modules/logging-log4j1.mod
+++ b/jetty-home/src/main/resources/modules/logging-log4j1.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Configures Jetty logging to use Log4j.
diff --git a/jetty-home/src/main/resources/modules/logging-log4j2.mod b/jetty-home/src/main/resources/modules/logging-log4j2.mod
index 42e93e4eca5..1c27fc33e8d 100644
--- a/jetty-home/src/main/resources/modules/logging-log4j2.mod
+++ b/jetty-home/src/main/resources/modules/logging-log4j2.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Configures Jetty logging to use log4j version 2.
diff --git a/jetty-home/src/main/resources/modules/logging-logback.mod b/jetty-home/src/main/resources/modules/logging-logback.mod
index aa70e7f9a2e..00ba5f78276 100644
--- a/jetty-home/src/main/resources/modules/logging-logback.mod
+++ b/jetty-home/src/main/resources/modules/logging-logback.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Configures Jetty logging to use Logback Logging.
diff --git a/jetty-home/src/main/resources/modules/logging-noop.mod b/jetty-home/src/main/resources/modules/logging-noop.mod
index ef1c7ff6f2c..58a5311d71d 100644
--- a/jetty-home/src/main/resources/modules/logging-noop.mod
+++ b/jetty-home/src/main/resources/modules/logging-noop.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Configures Jetty logging to use SLF4J No-Op Implementation.
diff --git a/jetty-home/src/main/resources/modules/logging/slf4j.mod b/jetty-home/src/main/resources/modules/logging/slf4j.mod
index 059e02da365..a352cb5bdce 100644
--- a/jetty-home/src/main/resources/modules/logging/slf4j.mod
+++ b/jetty-home/src/main/resources/modules/logging/slf4j.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Configures logging to use SLF4J.
diff --git a/jetty-home/src/main/resources/modules/stop.mod b/jetty-home/src/main/resources/modules/stop.mod
index 6b18509cd18..ad5d619ca12 100644
--- a/jetty-home/src/main/resources/modules/stop.mod
+++ b/jetty-home/src/main/resources/modules/stop.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 This module causes Jetty to stop immediately after starting.
diff --git a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml
index 291b56b5ad9..b0db7b5d224 100644
--- a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml
+++ b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/etc/sessions/gcloud/session-store.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
diff --git a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud-datastore.mod b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud-datastore.mod
index e14b772ff0d..48c418a019f 100644
--- a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud-datastore.mod
+++ b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud-datastore.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables GCloud Datastore API and implementation.
diff --git a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod
index 4d2a7e18f5f..5ef39b30272 100644
--- a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod
+++ b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/gcloud.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Controls GCloud API classpath.
diff --git a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod
index a975e1083ce..7806dd0f4f2 100644
--- a/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod
+++ b/jetty-integrations/jetty-gcloud/jetty-gcloud-session-manager/src/main/config-template/modules/session-store-gcloud.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables GCloudDatastore session management.
diff --git a/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml b/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml
index a53b2c52ac5..f0c6035fc71 100644
--- a/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml
+++ b/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/default.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
diff --git a/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml b/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml
index 8a931ec2611..ea09e1a172c 100644
--- a/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml
+++ b/jetty-integrations/jetty-hazelcast/src/main/config/etc/sessions/hazelcast/remote.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
diff --git a/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod b/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod
index 00e4a7eb56d..61d14871219 100644
--- a/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod
+++ b/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables session data store in an embedded Hazelcast Map.
diff --git a/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod b/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod
index a1e2cfe547c..4a2d51a3fd7 100644
--- a/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod
+++ b/jetty-integrations/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables session data store in a remote Hazelcast Map.
diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml
index d60a140879b..24645d4f8be 100644
--- a/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml
+++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-common/src/main/config/etc/sessions/infinispan/infinispan-common.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   
diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml
index 839575f394d..54a4832be2f 100644
--- a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml
+++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded-query/src/main/config-template/etc/sessions/infinispan/infinispan-embedded-query.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml
index c84714a4867..79a88aa3b08 100644
--- a/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml
+++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml
index 89a4a2af503..c539859bb78 100644
--- a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml
+++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/src/main/config-template/etc/sessions/infinispan/infinispan-remote-query.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
diff --git a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml
index aa0fb75f01f..26dcceabc7c 100644
--- a/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml
+++ b/jetty-integrations/jetty-infinispan/jetty-infinispan-remote/src/main/config-template/etc/sessions/infinispan/infinispan-remote.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
diff --git a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml
index 97785fb05ff..7cf7737769c 100644
--- a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml
+++ b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/etc/sessions/session-data-cache/xmemcached.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
     <New id="sessionDataMapFactory" class="org.eclipse.jetty.memcached.session.MemcachedSessionDataMapFactory">
diff --git a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod
index b503e6c46e9..7c8c5855ec7 100644
--- a/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod
+++ b/jetty-integrations/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Memcache cache for SessionData.
diff --git a/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml b/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml
index 3dde37177e4..645d9a1c3ab 100644
--- a/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml
+++ b/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-address.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
diff --git a/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml b/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml
index 1c0664c497a..daac2febb08 100644
--- a/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml
+++ b/jetty-integrations/jetty-nosql/src/main/config/etc/sessions/mongo/session-store-by-uri.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
 
diff --git a/jetty-integrations/jetty-nosql/src/main/config/modules/session-store-mongo.mod b/jetty-integrations/jetty-nosql/src/main/config/modules/session-store-mongo.mod
index cc896ed6280..ea6e8f7b1d9 100644
--- a/jetty-integrations/jetty-nosql/src/main/config/modules/session-store-mongo.mod
+++ b/jetty-integrations/jetty-nosql/src/main/config/modules/session-store-mongo.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Enables NoSql session management with a MongoDB driver.
diff --git a/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/address.mod b/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/address.mod
index 3467a0f55cb..9c23370aa31 100644
--- a/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/address.mod
+++ b/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/address.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 Server/port connections for Mongo session storage.
diff --git a/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/uri.mod b/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/uri.mod
index 2e8732c8401..ed87f8de706 100644
--- a/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/uri.mod
+++ b/jetty-integrations/jetty-nosql/src/main/config/modules/sessions/mongo/uri.mod
@@ -1,4 +1,4 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
+# DO NOT EDIT THIS FILE - See: https://jetty.org/docs/
 
 [description]
 MongoURI connections for Mongo session storage
diff --git a/pom.xml b/pom.xml
index e36b7c47e05..79fbcf407e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -315,7 +315,7 @@
     <jetty.test.version>6.2</jetty.test.version>
     <jetty.testtracker.log>true</jetty.testtracker.log>
     <jetty.unixdomain.dir>/tmp</jetty.unixdomain.dir>
-    <jetty.url>https://eclipse.dev/jetty/</jetty.url>
+    <jetty.url>https://jetty.org/</jetty.url>
     <jetty.xhtml.schemas-version>1.4</jetty.xhtml.schemas-version>
     <jettyHomeZip>${project.build.directory}/${jettyHomeZipFileName}</jettyHomeZip>
     <jettyHomeZipFileName>jetty-home.zip</jettyHomeZipFileName>
diff --git a/tests/test-cross-context-dispatch/ccd-tests/src/test/resources/install-ccd-handler.xml b/tests/test-cross-context-dispatch/ccd-tests/src/test/resources/install-ccd-handler.xml
index 7eefabf9bfc..ea7c1d39e4e 100644
--- a/tests/test-cross-context-dispatch/ccd-tests/src/test/resources/install-ccd-handler.xml
+++ b/tests/test-cross-context-dispatch/ccd-tests/src/test/resources/install-ccd-handler.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://eclipse.dev/jetty/configure_10_0.dtd">
+<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure id="Server" class="org.eclipse.jetty.server.Server">
   <Call name="insertHandler">
diff --git a/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java b/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java
index f86d70848e9..d7ec9f9e4b5 100644
--- a/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java
+++ b/tests/test-distribution/test-distribution-common/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java
@@ -620,7 +620,7 @@ public class DistributionTests extends AbstractJettyHomeTest
                 assertTrue(run2.awaitConsoleLogsFor("Started oejs.Server@", START_TIMEOUT, TimeUnit.SECONDS));
 
                 startHttpClient(() -> new HttpClient(new HttpClientTransportOverHTTP(1)));
-                ContentResponse response = client.GET("http://localhost:" + port + "/proxy/current/");
+                ContentResponse response = client.GET("http://localhost:" + port + "/proxy/jetty-12/index.html");
                 assertEquals(HttpStatus.OK_200, response.getStatus(), () ->
                 {
                     StringBuilder rawResponse = new StringBuilder();