From 2ef6a3473a0315d1063d054a597abb6352f02f98 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 22 Aug 2024 12:34:56 +1000
Subject: [PATCH] jetty 12.1.x 12184 urls fixes (#12187)

* fix proxy url in web.xml
* Issue #12184 Change urls https://eclipse.dev to https://jetty.org

Fix #12187

Signed-off-by: Olivier Lamy <olamy@apache.org>

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 .../src/main/webapp/WEB-INF/jetty-ee8-web.xml  |  2 +-
 .../src/main/webapp/WEB-INF/jetty-ee8-web.xml  |  2 +-
 .../demo.d/ee8-demo-javax-websocket.xml        |  2 +-
 .../modules/ee8-demo-javax-websocket.mod       |  2 +-
 .../src/main/webapp/WEB-INF/jetty-ee8-web.xml  |  2 +-
 .../config/modules/ee10-demo-async-rest.mod    |  2 +-
 .../config/modules/ee11-demo-async-rest.mod    |  2 +-
 .../src/main/webapp/WEB-INF/jetty-ee11-web.xml |  2 +-
 .../config/modules/demo.d/ee11-demo-jaas.xml   |  2 +-
 .../src/main/config/modules/ee11-demo-jaas.mod |  2 +-
 .../src/main/webapp/WEB-INF/jetty-ee11-web.xml |  2 +-
 .../demo.d/ee10-demo-jakarta-websocket.xml     |  2 +-
 .../demo.d/ee11-demo-jakarta-websocket.xml     |  2 +-
 .../demo.d/ee9-demo-jakarta-websocket.xml      |  2 +-
 .../modules/ee10-demo-jakarta-websocket.mod    |  2 +-
 .../modules/ee11-demo-jakarta-websocket.mod    |  2 +-
 .../modules/ee9-demo-jakarta-websocket.mod     |  2 +-
 .../src/main/webapp/index.html                 |  2 +-
 .../config/modules/demo.d/ee11-demo-jetty.xml  |  2 +-
 .../modules/demo.d/ee11-demo-rewrite-rules.xml |  2 +-
 .../main/config/modules/ee11-demo-jetty.mod    |  2 +-
 .../main/config/modules/ee11-demo-rewrite.mod  |  2 +-
 .../src/main/webapp/WEB-INF/jetty-ee11-web.xml |  2 +-
 .../src/main/config/modules/ee10-demo-jndi.mod |  2 +-
 .../src/main/config/modules/ee11-demo-jndi.mod |  2 +-
 .../src/main/config/modules/ee9-demo-jndi.mod  |  2 +-
 .../src/main/webapp/WEB-INF/jetty-ee11-web.xml |  2 +-
 .../modules/ee10-demo-mock-resources.mod       |  2 +-
 .../modules/ee11-demo-mock-resources.mod       |  2 +-
 .../config/modules/ee9-demo-mock-resources.mod |  2 +-
 .../config/modules/demo.d/ee11-demo-spec.xml   |  2 +-
 .../src/main/config/modules/ee11-demo-spec.mod |  2 +-
 .../src/main/webapp/WEB-INF/jetty-ee11-env.xml |  2 +-
 .../src/main/webapp/WEB-INF/jetty-ee11-web.xml |  2 +-
 .../demo.d/ee10-demo-jetty-websocket.xml       |  2 +-
 .../modules/ee10-demo-jetty-websocket.mod      |  2 +-
 .../main/config/modules/ee11-annotations.mod   |  2 +-
 .../main/config/modules/ee11-apache-jsp.mod    |  2 +-
 .../main/config/modules/ee11-cdi-decorate.mod  |  2 +-
 .../src/main/config/modules/ee11-cdi-spi.mod   |  2 +-
 .../src/main/config/modules/ee11-cdi.mod       |  2 +-
 .../main/resources/demo/webdefault-ee11.xml    |  2 +-
 .../src/main/resources/exampleserver.xml       |  2 +-
 .../src/main/resources/fileserver.xml          |  2 +-
 .../demo.d/ee11-demo-jetty-websocket.xml       |  2 +-
 .../modules/ee11-demo-jetty-websocket.mod      |  2 +-
 .../src/main/webapp/index.html                 |  2 +-
 .../main/config/modules/ee11-demo-proxy.mod    |  2 +-
 .../src/main/webapp/WEB-INF/jetty-web.xml      |  2 +-
 .../src/main/webapp/WEB-INF/web.xml            | 18 +++++++++---------
 .../src/main/resources/index.html              |  2 +-
 .../config/modules/ee11-glassfish-jstl.mod     |  2 +-
 .../ee11-jaspi-default-auth-config-factory.mod |  2 +-
 .../main/config/modules/ee11-jaspi-demo.mod    |  2 +-
 .../src/main/config/modules/ee11-jaspi.mod     |  2 +-
 .../src/main/config/modules/ee11-jndi.mod      |  2 +-
 .../src/base/modules/ee11-testmod.mod          |  2 +-
 .../src/config/jetty-env.xml                   |  2 +-
 .../src/base/modules/ee11-testmod.mod          |  2 +-
 .../src/main/resources/ee11-maven.mod          |  2 +-
 .../jettyhome/etc/jetty.xml                    |  2 +-
 .../src/test/config/etc/jetty.xml              |  2 +-
 .../src/main/config/modules/ee11-proxy.mod     |  2 +-
 .../main/config/modules/ee11-quickstart.mod    |  2 +-
 .../src/main/config/modules/ee11-security.mod  |  2 +-
 .../src/main/config/modules/ee11-servlet.mod   |  2 +-
 .../src/main/config/modules/ee11-servlets.mod  |  2 +-
 .../src/main/config/etc/webdefault-ee11.xml    |  2 +-
 .../src/main/config/modules/ee11-webapp.mod    |  2 +-
 .../WEB-INF/jetty-ee11-web.xml                 |  2 +-
 .../WEB-INF/jetty-web.xml                      |  2 +-
 .../WEB-INF/jetty-web.xml                      |  2 +-
 .../ee11-websocket-jetty-client-webapp.mod     |  2 +-
 .../demo.d/ee8-demo-jetty-websocket.xml        |  2 +-
 .../modules/ee8-demo-jetty-websocket.mod       |  2 +-
 .../demo.d/ee9-demo-jetty-websocket.xml        |  2 +-
 .../modules/ee9-demo-jetty-websocket.mod       |  2 +-
 .../src/main/resources/modules/ee11-demos.mod  |  2 +-
 .../src/main/resources/modules/ee11-jsp.mod    |  2 +-
 .../src/main/resources/modules/ee11-jstl.mod   |  2 +-
 80 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-async-rest/jetty-servlet4-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-async-rest/jetty-servlet4-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml
index cd347463152..d50dcdfd2dd 100644
--- a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-async-rest/jetty-servlet4-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml
+++ b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-async-rest/jetty-servlet4-demo-async-rest-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">
 
 <!--
 This is the jetty specific web application configuration file.  When starting
diff --git a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml
index eabcb1b6273..67c31c1c770 100644
--- a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml
+++ b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jaas-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-javax-websocket-webapp/src/main/config/modules/demo.d/ee8-demo-javax-websocket.xml b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-javax-websocket-webapp/src/main/config/modules/demo.d/ee8-demo-javax-websocket.xml
index 39ed1282fe3..56f2ddbc44f 100644
--- a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-javax-websocket-webapp/src/main/config/modules/demo.d/ee8-demo-javax-websocket.xml
+++ b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-javax-websocket-webapp/src/main/config/modules/demo.d/ee8-demo-javax-websocket.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-servlet4-demos/jetty-servlet4-demo-javax-websocket-webapp/src/main/config/modules/ee8-demo-javax-websocket.mod b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-javax-websocket-webapp/src/main/config/modules/ee8-demo-javax-websocket.mod
index 645f6a1fa3a..44205140014 100644
--- a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-javax-websocket-webapp/src/main/config/modules/ee8-demo-javax-websocket.mod
+++ b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-javax-websocket-webapp/src/main/config/modules/ee8-demo-javax-websocket.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 Javax WebSocket Webapp
diff --git a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml
index 0a845ca03d9..fa7265d36ee 100644
--- a/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-ee8-web.xml
+++ b/jetty-demos/jetty-servlet4-demos/jetty-servlet4-demo-jetty-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">
 
 <!--
 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/config/modules/ee10-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/ee10-demo-async-rest.mod
index f2393e14429..64960392f16 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/config/modules/ee10-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/ee10-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/config/modules/ee11-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/ee11-demo-async-rest.mod
index 292105309b7..3a2aac653e4 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/config/modules/ee11-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/ee11-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-ee11-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-ee11-web.xml
index 93c7e3d2005..d793c3e649d 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-async-rest/jetty-servlet5-demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-ee11-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-ee11-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-jaas-webapp/src/main/config/modules/demo.d/ee11-demo-jaas.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/demo.d/ee11-demo-jaas.xml
index fe153f8ba44..ded08f664a4 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/demo.d/ee11-demo-jaas.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/demo.d/ee11-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/ee11-demo-jaas.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee11-demo-jaas.mod
index 15dd85dc030..bc93bd2d91c 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee11-demo-jaas.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/config/modules/ee11-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 EE11 JAAS webapp
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml
index 4e73883c79a..f78e3c546a7 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-ee11-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.ee11.webapp.WebAppContext">
   <Get name="servletContext">
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee10-demo-jakarta-websocket.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee10-demo-jakarta-websocket.xml
index c63f2042b0c..9446f5bcbf4 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee10-demo-jakarta-websocket.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee10-demo-jakarta-websocket.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-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee11-demo-jakarta-websocket.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee11-demo-jakarta-websocket.xml
index 578ea3fbaa7..f4c821eee26 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee11-demo-jakarta-websocket.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee11-demo-jakarta-websocket.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-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee9-demo-jakarta-websocket.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee9-demo-jakarta-websocket.xml
index 4d2e215ae94..1fb5a2a4fdd 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee9-demo-jakarta-websocket.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/demo.d/ee9-demo-jakarta-websocket.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-jakarta-websocket-webapp/src/main/config/modules/ee10-demo-jakarta-websocket.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/ee10-demo-jakarta-websocket.mod
index 328757a3857..64aa5704b37 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/ee10-demo-jakarta-websocket.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/ee10-demo-jakarta-websocket.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 Jakarta WebSocket Webapp
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/ee11-demo-jakarta-websocket.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/ee11-demo-jakarta-websocket.mod
index fb044b59277..593d1d79821 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/ee11-demo-jakarta-websocket.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/ee11-demo-jakarta-websocket.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 Jakarta WebSocket Webapp
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/ee9-demo-jakarta-websocket.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/ee9-demo-jakarta-websocket.mod
index 0c56418e664..239fb87a68b 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/ee9-demo-jakarta-websocket.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/config/modules/ee9-demo-jakarta-websocket.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 Jakarta WebSocket Webapp
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/webapp/index.html b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/webapp/index.html
index d4f69bcdcf0..0181702cc06 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/webapp/index.html
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jakarta-websocket-webapp/src/main/webapp/index.html
@@ -26,7 +26,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/config/modules/demo.d/ee11-demo-jetty.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee11-demo-jetty.xml
index ea4f70b8a15..b9d200bd3f7 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee11-demo-jetty.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee11-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/ee11-demo-rewrite-rules.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee11-demo-rewrite-rules.xml
index 5589484aa0d..dffd960fa75 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee11-demo-rewrite-rules.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/demo.d/ee11-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/ee11-demo-jetty.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee11-demo-jetty.mod
index 7409d5b382e..49498967f8a 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee11-demo-jetty.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee11-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/ee11-demo-rewrite.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee11-demo-rewrite.mod
index 71421571905..bd315e99256 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee11-demo-rewrite.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/config/modules/ee11-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-ee11-web.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml
index 7f160447c71..b1b4da3e2fe 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-ee11-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-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod
index a4e3639292f..e878e27dbd5 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee10-demo-jndi.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee10-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-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee11-demo-jndi.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee11-demo-jndi.mod
index 11f380e63fd..e1bd05e20ed 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee11-demo-jndi.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee11-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-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod
index d07c26c0ee6..00ad49773e2 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee9-demo-jndi.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jndi-webapp/src/main/config/modules/ee9-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-servlet5-demos/jetty-servlet5-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml
index 0668473541a..78c3f54a075 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-ee11-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.ee11.webapp.WebAppContext">
   <Get name="servletContext">
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-mock-resources/src/main/config/modules/ee10-demo-mock-resources.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-mock-resources/src/main/config/modules/ee10-demo-mock-resources.mod
index 5adb09a5791..c18873a0264 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-mock-resources/src/main/config/modules/ee10-demo-mock-resources.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-mock-resources/src/main/config/modules/ee10-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-servlet5-demos/jetty-servlet5-demo-mock-resources/src/main/config/modules/ee11-demo-mock-resources.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-mock-resources/src/main/config/modules/ee11-demo-mock-resources.mod
index 8fed4c708e5..759414e7aa9 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-mock-resources/src/main/config/modules/ee11-demo-mock-resources.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-mock-resources/src/main/config/modules/ee11-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-servlet5-demos/jetty-servlet5-demo-mock-resources/src/main/config/modules/ee9-demo-mock-resources.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-mock-resources/src/main/config/modules/ee9-demo-mock-resources.mod
index 0f673023382..4deb1224f8a 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-mock-resources/src/main/config/modules/ee9-demo-mock-resources.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-mock-resources/src/main/config/modules/ee9-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-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/demo.d/ee11-demo-spec.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/demo.d/ee11-demo-spec.xml
index 4145cae3085..89d43f4655c 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/demo.d/ee11-demo-spec.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/demo.d/ee11-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.ee11.webapp.WebAppContext">
   <Set name="contextPath">/ee11-test-spec</Set>
diff --git a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee11-demo-spec.mod b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee11-demo-spec.mod
index 0674235b63c..1f35d237d93 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee11-demo-spec.mod
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/config/modules/ee11-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-ee11-env.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-ee11-env.xml
index 784328c8405..892dc983073 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-ee11-env.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-ee11-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.ee11.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-ee11-web.xml b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml
index 0f2a65bfbb1..22f7817d717 100644
--- a/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-ee11-web.xml
+++ b/jetty-demos/jetty-servlet5-demos/jetty-servlet5-demo-spec/jetty-servlet5-demo-spec-webapp/src/main/webapp/WEB-INF/jetty-ee11-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.ee11.webapp.WebAppContext">
   <Get name="servletContext">
diff --git a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee10-demo-jetty-websocket.xml b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee10-demo-jetty-websocket.xml
index 5bdbc4b4bc1..48ff9f9bad1 100644
--- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee10-demo-jetty-websocket.xml
+++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee10-demo-jetty-websocket.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-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-websocket-webapp/src/main/config/modules/ee10-demo-jetty-websocket.mod b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-websocket-webapp/src/main/config/modules/ee10-demo-jetty-websocket.mod
index 510168fe004..32f3add115e 100644
--- a/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-websocket-webapp/src/main/config/modules/ee10-demo-jetty-websocket.mod
+++ b/jetty-ee10/jetty-ee10-demos/jetty-ee10-demo-jetty-websocket-webapp/src/main/config/modules/ee10-demo-jetty-websocket.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 WebSocket Webapp
diff --git a/jetty-ee11/jetty-ee11-annotations/src/main/config/modules/ee11-annotations.mod b/jetty-ee11/jetty-ee11-annotations/src/main/config/modules/ee11-annotations.mod
index 4e16b175698..ed0a5da0469 100644
--- a/jetty-ee11/jetty-ee11-annotations/src/main/config/modules/ee11-annotations.mod
+++ b/jetty-ee11/jetty-ee11-annotations/src/main/config/modules/ee11-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-ee11/jetty-ee11-apache-jsp/src/main/config/modules/ee11-apache-jsp.mod b/jetty-ee11/jetty-ee11-apache-jsp/src/main/config/modules/ee11-apache-jsp.mod
index a475fe461d0..33d49a21f89 100644
--- a/jetty-ee11/jetty-ee11-apache-jsp/src/main/config/modules/ee11-apache-jsp.mod
+++ b/jetty-ee11/jetty-ee11-apache-jsp/src/main/config/modules/ee11-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-ee11/jetty-ee11-cdi/src/main/config/modules/ee11-cdi-decorate.mod b/jetty-ee11/jetty-ee11-cdi/src/main/config/modules/ee11-cdi-decorate.mod
index fbada7d3d9d..c0bef9e9a10 100644
--- a/jetty-ee11/jetty-ee11-cdi/src/main/config/modules/ee11-cdi-decorate.mod
+++ b/jetty-ee11/jetty-ee11-cdi/src/main/config/modules/ee11-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-ee11/jetty-ee11-cdi/src/main/config/modules/ee11-cdi-spi.mod b/jetty-ee11/jetty-ee11-cdi/src/main/config/modules/ee11-cdi-spi.mod
index 86b16715575..ee990e41e5b 100644
--- a/jetty-ee11/jetty-ee11-cdi/src/main/config/modules/ee11-cdi-spi.mod
+++ b/jetty-ee11/jetty-ee11-cdi/src/main/config/modules/ee11-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-ee11/jetty-ee11-cdi/src/main/config/modules/ee11-cdi.mod b/jetty-ee11/jetty-ee11-cdi/src/main/config/modules/ee11-cdi.mod
index 7e6d18c6148..8c9eac842e0 100644
--- a/jetty-ee11/jetty-ee11-cdi/src/main/config/modules/ee11-cdi.mod
+++ b/jetty-ee11/jetty-ee11-cdi/src/main/config/modules/ee11-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-ee11/jetty-ee11-demos/jetty-ee11-demo-embedded/src/main/resources/demo/webdefault-ee11.xml b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-embedded/src/main/resources/demo/webdefault-ee11.xml
index 4fcab5f3a8d..9c57d4e0028 100644
--- a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-embedded/src/main/resources/demo/webdefault-ee11.xml
+++ b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-embedded/src/main/resources/demo/webdefault-ee11.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-ee11/jetty-ee11-demos/jetty-ee11-demo-embedded/src/main/resources/exampleserver.xml b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-embedded/src/main/resources/exampleserver.xml
index c9ce4991c99..a5198708a1e 100644
--- a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-embedded/src/main/resources/exampleserver.xml
+++ b/jetty-ee11/jetty-ee11-demos/jetty-ee11-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-ee11/jetty-ee11-demos/jetty-ee11-demo-embedded/src/main/resources/fileserver.xml b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-embedded/src/main/resources/fileserver.xml
index 2fcadfe77b0..613c4136aa1 100644
--- a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-embedded/src/main/resources/fileserver.xml
+++ b/jetty-ee11/jetty-ee11-demos/jetty-ee11-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-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee11-demo-jetty-websocket.xml b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee11-demo-jetty-websocket.xml
index 548a8c14399..8e0c3456385 100644
--- a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee11-demo-jetty-websocket.xml
+++ b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee11-demo-jetty-websocket.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-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/config/modules/ee11-demo-jetty-websocket.mod b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/config/modules/ee11-demo-jetty-websocket.mod
index 5991edf20df..96521d01917 100644
--- a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/config/modules/ee11-demo-jetty-websocket.mod
+++ b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/config/modules/ee11-demo-jetty-websocket.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 WebSocket Webapp
diff --git a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/webapp/index.html b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/webapp/index.html
index fa9cf7a4d9d..354fab6b40d 100644
--- a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/webapp/index.html
+++ b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-jetty-websocket-webapp/src/main/webapp/index.html
@@ -26,7 +26,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-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/config/modules/ee11-demo-proxy.mod b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/config/modules/ee11-demo-proxy.mod
index ca4cc7c40c9..a574bb3c211 100644
--- a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/config/modules/ee11-demo-proxy.mod
+++ b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/config/modules/ee11-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-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml
index 61e9cfe2557..4da114809d6 100644
--- a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/jetty-ee11/jetty-ee11-demos/jetty-ee11-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.ee11.webapp.WebAppContext">
   <Get name="servletContext">
diff --git a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml
index bb2f1fe5a5a..61869c2730c 100644
--- a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-proxy-webapp/src/main/webapp/WEB-INF/web.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app
-  xmlns="http://java.sun.com/xml/ns/javaee"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-  metadata-complete="false"
-  version="3.0">
+    xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+    metadata-complete="false"
+    version="3.0">
 
-  <display-name>EE11 Demo Proxy WebApp</display-name>
+  <display-name>EE10 Demo Proxy WebApp</display-name>
 
   <servlet>
     <servlet-name>JavadocTransparentProxy</servlet-name>
     <servlet-class>org.eclipse.jetty.ee11.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-ee11/jetty-ee11-demos/jetty-ee11-demo-template/src/main/resources/index.html b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-template/src/main/resources/index.html
index 20ac6aa69ae..d8a7d18b8b5 100644
--- a/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-template/src/main/resources/index.html
+++ b/jetty-ee11/jetty-ee11-demos/jetty-ee11-demo-template/src/main/resources/index.html
@@ -29,7 +29,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-ee11/jetty-ee11-glassfish-jstl/src/main/config/modules/ee11-glassfish-jstl.mod b/jetty-ee11/jetty-ee11-glassfish-jstl/src/main/config/modules/ee11-glassfish-jstl.mod
index 9aa2b5871f9..6077f1908ca 100644
--- a/jetty-ee11/jetty-ee11-glassfish-jstl/src/main/config/modules/ee11-glassfish-jstl.mod
+++ b/jetty-ee11/jetty-ee11-glassfish-jstl/src/main/config/modules/ee11-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-ee11/jetty-ee11-jaspi/src/main/config/modules/ee11-jaspi-default-auth-config-factory.mod b/jetty-ee11/jetty-ee11-jaspi/src/main/config/modules/ee11-jaspi-default-auth-config-factory.mod
index 1fb25c739eb..b90468b8123 100644
--- a/jetty-ee11/jetty-ee11-jaspi/src/main/config/modules/ee11-jaspi-default-auth-config-factory.mod
+++ b/jetty-ee11/jetty-ee11-jaspi/src/main/config/modules/ee11-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-ee11/jetty-ee11-jaspi/src/main/config/modules/ee11-jaspi-demo.mod b/jetty-ee11/jetty-ee11-jaspi/src/main/config/modules/ee11-jaspi-demo.mod
index d32296a3190..ba4d16bf66a 100644
--- a/jetty-ee11/jetty-ee11-jaspi/src/main/config/modules/ee11-jaspi-demo.mod
+++ b/jetty-ee11/jetty-ee11-jaspi/src/main/config/modules/ee11-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-ee11/jetty-ee11-jaspi/src/main/config/modules/ee11-jaspi.mod b/jetty-ee11/jetty-ee11-jaspi/src/main/config/modules/ee11-jaspi.mod
index e18fcf6da8b..1fb3448e44b 100644
--- a/jetty-ee11/jetty-ee11-jaspi/src/main/config/modules/ee11-jaspi.mod
+++ b/jetty-ee11/jetty-ee11-jaspi/src/main/config/modules/ee11-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-ee11/jetty-ee11-jndi/src/main/config/modules/ee11-jndi.mod b/jetty-ee11/jetty-ee11-jndi/src/main/config/modules/ee11-jndi.mod
index 144db52c08a..45a4f31362c 100644
--- a/jetty-ee11/jetty-ee11-jndi/src/main/config/modules/ee11-jndi.mod
+++ b/jetty-ee11/jetty-ee11-jndi/src/main/config/modules/ee11-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 EE11 JNDI reference factories
diff --git a/jetty-ee11/jetty-ee11-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee11-testmod.mod b/jetty-ee11/jetty-ee11-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee11-testmod.mod
index 200733fb07e..bbac7df545f 100644
--- a/jetty-ee11/jetty-ee11-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee11-testmod.mod
+++ b/jetty-ee11/jetty-ee11-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee11-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-ee11/jetty-ee11-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty-env.xml b/jetty-ee11/jetty-ee11-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty-env.xml
index ac26e7a42f0..7038602924c 100644
--- a/jetty-ee11/jetty-ee11-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/config/jetty-env.xml
+++ b/jetty-ee11/jetty-ee11-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.ee11.webapp.WebAppContext">
 
   <!-- Add an EnvEntry only valid for this webapp               -->
diff --git a/jetty-ee11/jetty-ee11-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee11-testmod.mod b/jetty-ee11/jetty-ee11-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee11-testmod.mod
index 9270d5e3ad6..d0970766020 100644
--- a/jetty-ee11/jetty-ee11-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee11-testmod.mod
+++ b/jetty-ee11/jetty-ee11-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/modules/ee11-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-ee11/jetty-ee11-maven-plugin/src/main/resources/ee11-maven.mod b/jetty-ee11/jetty-ee11-maven-plugin/src/main/resources/ee11-maven.mod
index 9931f8669a6..83a795d4291 100644
--- a/jetty-ee11/jetty-ee11-maven-plugin/src/main/resources/ee11-maven.mod
+++ b/jetty-ee11/jetty-ee11-maven-plugin/src/main/resources/ee11-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-ee11/jetty-ee11-osgi/jetty-ee11-osgi-boot/jettyhome/etc/jetty.xml b/jetty-ee11/jetty-ee11-osgi/jetty-ee11-osgi-boot/jettyhome/etc/jetty.xml
index ed1e4f3433e..7699aab3efe 100644
--- a/jetty-ee11/jetty-ee11-osgi/jetty-ee11-osgi-boot/jettyhome/etc/jetty.xml
+++ b/jetty-ee11/jetty-ee11-osgi/jetty-ee11-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-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/src/test/config/etc/jetty.xml b/jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/src/test/config/etc/jetty.xml
index ed1e4f3433e..7699aab3efe 100644
--- a/jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/src/test/config/etc/jetty.xml
+++ b/jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-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-ee11/jetty-ee11-proxy/src/main/config/modules/ee11-proxy.mod b/jetty-ee11/jetty-ee11-proxy/src/main/config/modules/ee11-proxy.mod
index 4c6ea26e8bc..18cbfae2425 100644
--- a/jetty-ee11/jetty-ee11-proxy/src/main/config/modules/ee11-proxy.mod
+++ b/jetty-ee11/jetty-ee11-proxy/src/main/config/modules/ee11-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-ee11/jetty-ee11-quickstart/src/main/config/modules/ee11-quickstart.mod b/jetty-ee11/jetty-ee11-quickstart/src/main/config/modules/ee11-quickstart.mod
index 58b078bab26..5132c90ad9c 100644
--- a/jetty-ee11/jetty-ee11-quickstart/src/main/config/modules/ee11-quickstart.mod
+++ b/jetty-ee11/jetty-ee11-quickstart/src/main/config/modules/ee11-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-ee11/jetty-ee11-servlet/src/main/config/modules/ee11-security.mod b/jetty-ee11/jetty-ee11-servlet/src/main/config/modules/ee11-security.mod
index ca6eb62ddc9..9956db21567 100644
--- a/jetty-ee11/jetty-ee11-servlet/src/main/config/modules/ee11-security.mod
+++ b/jetty-ee11/jetty-ee11-servlet/src/main/config/modules/ee11-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-ee11/jetty-ee11-servlet/src/main/config/modules/ee11-servlet.mod b/jetty-ee11/jetty-ee11-servlet/src/main/config/modules/ee11-servlet.mod
index 2b2114a5dff..8a697b30f22 100644
--- a/jetty-ee11/jetty-ee11-servlet/src/main/config/modules/ee11-servlet.mod
+++ b/jetty-ee11/jetty-ee11-servlet/src/main/config/modules/ee11-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-ee11/jetty-ee11-servlets/src/main/config/modules/ee11-servlets.mod b/jetty-ee11/jetty-ee11-servlets/src/main/config/modules/ee11-servlets.mod
index a736318c438..164abf75539 100644
--- a/jetty-ee11/jetty-ee11-servlets/src/main/config/modules/ee11-servlets.mod
+++ b/jetty-ee11/jetty-ee11-servlets/src/main/config/modules/ee11-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 EE11 utility servlets and filters available to a webapp.
diff --git a/jetty-ee11/jetty-ee11-webapp/src/main/config/etc/webdefault-ee11.xml b/jetty-ee11/jetty-ee11-webapp/src/main/config/etc/webdefault-ee11.xml
index 1505c0f2dda..06b25152c8a 100644
--- a/jetty-ee11/jetty-ee11-webapp/src/main/config/etc/webdefault-ee11.xml
+++ b/jetty-ee11/jetty-ee11-webapp/src/main/config/etc/webdefault-ee11.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-ee11/jetty-ee11-webapp/src/main/config/modules/ee11-webapp.mod b/jetty-ee11/jetty-ee11-webapp/src/main/config/modules/ee11-webapp.mod
index d34e76cc4eb..affe74a8dc1 100644
--- a/jetty-ee11/jetty-ee11-webapp/src/main/config/modules/ee11-webapp.mod
+++ b/jetty-ee11/jetty-ee11-webapp/src/main/config/modules/ee11-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-ee11/jetty-ee11-webapp/src/test/resources/webapp-with-jetty-ee11-web-xml/WEB-INF/jetty-ee11-web.xml b/jetty-ee11/jetty-ee11-webapp/src/test/resources/webapp-with-jetty-ee11-web-xml/WEB-INF/jetty-ee11-web.xml
index ba20dc5a78c..61c6c64f26d 100644
--- a/jetty-ee11/jetty-ee11-webapp/src/test/resources/webapp-with-jetty-ee11-web-xml/WEB-INF/jetty-ee11-web.xml
+++ b/jetty-ee11/jetty-ee11-webapp/src/test/resources/webapp-with-jetty-ee11-web-xml/WEB-INF/jetty-ee11-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.ee11.webapp.WebAppContext">
   <Set name="contextPath">/raspberry</Set>
 </Configure>
diff --git a/jetty-ee11/jetty-ee11-webapp/src/test/resources/webapp-with-jetty-ee11-web-xml/WEB-INF/jetty-web.xml b/jetty-ee11/jetty-ee11-webapp/src/test/resources/webapp-with-jetty-ee11-web-xml/WEB-INF/jetty-web.xml
index ba00780a686..a2a08f9004a 100644
--- a/jetty-ee11/jetty-ee11-webapp/src/test/resources/webapp-with-jetty-ee11-web-xml/WEB-INF/jetty-web.xml
+++ b/jetty-ee11/jetty-ee11-webapp/src/test/resources/webapp-with-jetty-ee11-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.ee11.webapp.WebAppContext">
   <Set name="contextPath">/apple</Set>
 </Configure>
diff --git a/jetty-ee11/jetty-ee11-webapp/src/test/resources/webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml b/jetty-ee11/jetty-ee11-webapp/src/test/resources/webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml
index cc7494c391c..cf1bb5799cb 100644
--- a/jetty-ee11/jetty-ee11-webapp/src/test/resources/webapp-with-jetty-web-xml/WEB-INF/jetty-web.xml
+++ b/jetty-ee11/jetty-ee11-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.ee11.webapp.WebAppContext">
   <Set name="contextPath">/orange</Set>
 </Configure>
diff --git a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jetty-client-webapp/src/main/config/modules/ee11-websocket-jetty-client-webapp.mod b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jetty-client-webapp/src/main/config/modules/ee11-websocket-jetty-client-webapp.mod
index d1b60f3c04c..6638fef88f1 100644
--- a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jetty-client-webapp/src/main/config/modules/ee11-websocket-jetty-client-webapp.mod
+++ b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jetty-client-webapp/src/main/config/modules/ee11-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-demos/jetty-ee8-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee8-demo-jetty-websocket.xml b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee8-demo-jetty-websocket.xml
index 69ce7179639..12a79038501 100644
--- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee8-demo-jetty-websocket.xml
+++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee8-demo-jetty-websocket.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-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-websocket-webapp/src/main/config/modules/ee8-demo-jetty-websocket.mod b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-websocket-webapp/src/main/config/modules/ee8-demo-jetty-websocket.mod
index 3f3e66e18c8..beba367f375 100644
--- a/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-websocket-webapp/src/main/config/modules/ee8-demo-jetty-websocket.mod
+++ b/jetty-ee8/jetty-ee8-demos/jetty-ee8-demo-jetty-websocket-webapp/src/main/config/modules/ee8-demo-jetty-websocket.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 WebSocket Webapp
diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee9-demo-jetty-websocket.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee9-demo-jetty-websocket.xml
index fa6275b74c8..f527c4178b0 100644
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee9-demo-jetty-websocket.xml
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-websocket-webapp/src/main/config/modules/demo.d/ee9-demo-jetty-websocket.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-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-websocket-webapp/src/main/config/modules/ee9-demo-jetty-websocket.mod b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-websocket-webapp/src/main/config/modules/ee9-demo-jetty-websocket.mod
index 46a4d78e6f3..84ba7b574f2 100644
--- a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-websocket-webapp/src/main/config/modules/ee9-demo-jetty-websocket.mod
+++ b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-jetty-websocket-webapp/src/main/config/modules/ee9-demo-jetty-websocket.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 WebSocket Webapp
diff --git a/jetty-home/src/main/resources/modules/ee11-demos.mod b/jetty-home/src/main/resources/modules/ee11-demos.mod
index 4b069c3d7bc..78e4e2a136c 100644
--- a/jetty-home/src/main/resources/modules/ee11-demos.mod
+++ b/jetty-home/src/main/resources/modules/ee11-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 EE11 demo modules.
diff --git a/jetty-home/src/main/resources/modules/ee11-jsp.mod b/jetty-home/src/main/resources/modules/ee11-jsp.mod
index 22e2f88fb46..ce56d20fafc 100644
--- a/jetty-home/src/main/resources/modules/ee11-jsp.mod
+++ b/jetty-home/src/main/resources/modules/ee11-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/ee11-jstl.mod b/jetty-home/src/main/resources/modules/ee11-jstl.mod
index 82253a40615..80d27e47484 100644
--- a/jetty-home/src/main/resources/modules/ee11-jstl.mod
+++ b/jetty-home/src/main/resources/modules/ee11-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.