Update URL references to jetty.org

jetty · Jun 20, 2024 · 6bebb2d · 6bebb2d
1 parent 73f28b4
commit 6bebb2d
Show file tree

Hide file tree

Showing 265 changed files with 351 additions and 351 deletions.
diff --git a/.github/ISSUE_TEMPLATE/release-template.md b/.github/ISSUE_TEMPLATE/release-template.md
@@ -53,8 +53,8 @@ This release process will produce releases:
 - [ ] Promote staged 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 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://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/SECURITY.md b/SECURITY.md
@@ -2,7 +2,7 @@
 
 ## Supported Versions
 
-All [stable versions](https://eclipse.dev/jetty/download.php) of jetty are actively supported for security issues. [Deprecated versions](https://eclipse.dev/jetty/download.php) may be supported for serious security issues or on a commercial support basis.
+All [stable versions](https://jetty.org/download.html) of jetty are actively supported for security issues. [Deprecated versions](https://jetty.org/download.html) may be supported for serious security issues or on a commercial support basis.
 
 ## Reporting a Vulnerability
 

diff --git a/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-async-rest/demo-async-rest-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://www.eclipse.org/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/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html b/demos/demo-async-rest/demo-async-rest-webapp/src/main/webapp/index.html
@@ -55,7 +55,7 @@ <h1>Blocking vs Asynchronous REST</h1>
     </p>
 
     <div class="footer">
-      <center><a href="https://www.eclipse.org/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/demos/demo-jaas-webapp/src/main/config/modules/demo.d/demo-jaas.xml b/demos/demo-jaas-webapp/src/main/config/modules/demo.d/demo-jaas.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/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/demos/demo-jaas-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-jaas-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://www.eclipse.org/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Get name="servletContext">

diff --git a/demos/demo-jaas-webapp/src/main/webapp/index.html b/demos/demo-jaas-webapp/src/main/webapp/index.html
@@ -45,7 +45,7 @@ <h2>Using the Demo</h2>
    </div>
 
   <div class="footer">
-    <center><a href="https://www.eclipse.org/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/demos/demo-jaas-webapp/src/main/webapp/login.html b/demos/demo-jaas-webapp/src/main/webapp/login.html
@@ -28,7 +28,7 @@ <h1> Enter your username and password to login </h1>
    </div>
 
    <div class="footer">
-      <center><a href="https://www.eclipse.org/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/demos/demo-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml b/demos/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://www.eclipse.org/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/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-jetty.xml b/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-jetty.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/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/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-moved-context.xml b/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-moved-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- Simple handler to redirect from old path to new -->
 <Configure class="org.eclipse.jetty.server.handler.MovedContextHandler">

diff --git a/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-rewrite-rules.xml b/demos/demo-jetty-webapp/src/main/config/modules/demo.d/demo-rewrite-rules.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <!-- =============================================================== -->
 <!-- Configure the demos                                             -->

diff --git a/demos/demo-jetty-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-jetty-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://www.eclipse.org/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/demos/demo-jetty-webapp/src/main/webapp/auth.html b/demos/demo-jetty-webapp/src/main/webapp/auth.html
@@ -41,7 +41,7 @@ <h1>Jetty Authentication Links</h1>
    </div>
 
    <div class="footer">
-      <center><a href="https://www.eclipse.org/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/demos/demo-jetty-webapp/src/main/webapp/index.html b/demos/demo-jetty-webapp/src/main/webapp/index.html
@@ -66,7 +66,7 @@ <h2>Jetty Tests:</h2>
     </div>
 
     <div class="footer">
-      <center><a href="https://www.eclipse.org/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/demos/demo-jetty-webapp/src/main/webapp/remote.html b/demos/demo-jetty-webapp/src/main/webapp/remote.html
@@ -28,7 +28,7 @@ <h1>Welcome to Jetty 10 - REMOTE ACCESS!!</h1>
     </div>
 
     <div class="footer">
-      <center><a href="https://www.eclipse.org/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/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html b/demos/demo-jetty-webapp/src/main/webapp/rewrite/info.html
@@ -51,7 +51,7 @@ <h2>Response Code</h2>
   </div>
 
   <div class="footer">
-    <center><a href="https://www.eclipse.org/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/demos/demo-jndi-webapp/src/main/config/modules/demo.d/demo-jndi.xml b/demos/demo-jndi-webapp/src/main/config/modules/demo.d/demo-jndi.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/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/demos/demo-jndi-webapp/src/main/templates/jetty-test-jndi-header.xml b/demos/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://www.eclipse.org/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/demos/demo-jndi-webapp/src/main/templates/plugin-context-header.xml b/demos/demo-jndi-webapp/src/main/templates/plugin-context-header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/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/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/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.webapp.WebAppContext">
 

diff --git a/demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-jndi-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://www.eclipse.org/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Get name="servletContext">

diff --git a/demos/demo-jndi-webapp/src/main/webapp/index.html b/demos/demo-jndi-webapp/src/main/webapp/index.html
@@ -48,7 +48,7 @@ <h2>Execution</h2>
     </div>
 
     <div class="footer">
-      <center><a href="https://www.eclipse.org/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/demos/demo-jsp-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-jsp-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://www.eclipse.org/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Get name="servletContext">

diff --git a/demos/demo-jsp-webapp/src/main/webapp/index.jsp b/demos/demo-jsp-webapp/src/main/webapp/index.jsp
@@ -39,7 +39,7 @@
     </div>
 
     <div class="footer">
-      <center><a href="https://www.eclipse.org/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/demos/demo-proxy-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/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://www.eclipse.org/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Get name="servletContext">

diff --git a/demos/demo-spec/demo-spec-webapp/src/main/config/modules/demo.d/demo-spec.xml b/demos/demo-spec/demo-spec-webapp/src/main/config/modules/demo.d/demo-spec.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/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.webapp.WebAppContext">
   <Set name="contextPath">/test-spec</Set>

diff --git a/demos/demo-spec/demo-spec-webapp/src/main/templates/annotations-context-header.xml b/demos/demo-spec/demo-spec-webapp/src/main/templates/annotations-context-header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 
 <!-- =============================================================== -->

diff --git a/demos/demo-spec/demo-spec-webapp/src/main/templates/plugin-context-header.xml b/demos/demo-spec/demo-spec-webapp/src/main/templates/plugin-context-header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 
 <!-- =============================================================== -->

diff --git a/demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-env.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/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.webapp.WebAppContext">
 

diff --git a/demos/demo-spec/demo-spec-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/demos/demo-spec/demo-spec-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://www.eclipse.org/jetty/configure_10_0.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Get name="servletContext">

diff --git a/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html b/demos/demo-spec/demo-spec-webapp/src/main/webapp/index.html
@@ -80,7 +80,7 @@ <h3>Test ClassPath Isolation </h3>
   </div>
 
   <div class="footer">
-    <center><a href="https://www.eclipse.org/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/demos/demo-spec/demo-spec-webapp/src/test/jetty-plugin-env.xml b/demos/demo-spec/demo-spec-webapp/src/test/jetty-plugin-env.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/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.webapp.WebAppContext">
 

diff --git a/demos/demo-template/src/main/resources/index.html b/demos/demo-template/src/main/resources/index.html
@@ -29,7 +29,7 @@ <h1>Jetty XXX Demo Webapp</h1>
     </div>
 
     <div class="footer">
-      <center><a href="https://www.eclipse.org/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/demos/embedded/src/main/resources/exampleserver.xml b/demos/embedded/src/main/resources/exampleserver.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/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/demos/embedded/src/main/resources/fileserver.xml b/demos/embedded/src/main/resources/fileserver.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/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">
 

diff --git a/documentation/jetty-documentation/src/main/asciidoc/old_docs/ant/jetty-ant.adoc b/documentation/jetty-documentation/src/main/asciidoc/old_docs/ant/jetty-ant.adoc
@@ -32,7 +32,7 @@ Its purpose is to provide almost the same functionality as the Jetty plugin for
 
 To set up your project for Ant to run Jetty, you need a Jetty distribution and the jetty-ant Jar:
 
-1.  https://eclipse.dev/jetty/download.php[Download] a Jetty distribution and unpack it in the local filesystem.
+1.  https://jetty.org/download.html[Download] a Jetty distribution and unpack it in the local filesystem.
 2.  https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-ant/[Get] the jetty-ant Jar.
 3.  Make a directory in your project called `jetty-lib/`.
 4.  Copy all of the Jars in your Jetty distribution's `lib` directory, and all its subdirectories, into your new `jetty-lib` dir.

diff --git a/...jetty-documentation/src/main/asciidoc/old_docs/contexts/custom-error-pages.adoc b/...jetty-documentation/src/main/asciidoc/old_docs/contexts/custom-error-pages.adoc
@@ -72,7 +72,7 @@ Context files are normally located in `${jetty.base}/webapps/` (see `DeployerMan
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Set name="contextPath">/test</Set>

diff --git a/...etty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc b/...etty-documentation/src/main/asciidoc/old_docs/contributing/releasing-jetty.adoc
@@ -230,7 +230,7 @@ There are two git repositories you need to be aware of for releasing jetty-docum
 jetty-documentation::
 https://github.com/jetty-project/jetty-documentation
 jetty-website::
-http://git.eclipse.org/c/www.eclipse.org/jetty.git
+http://github.com/jetty/jetty.website
 
 Do the following steps to publish documentation for the release:
 

diff --git a/...rc/main/asciidoc/old_docs/deploying/configuring-specific-webapp-deployment.adoc b/...rc/main/asciidoc/old_docs/deploying/configuring-specific-webapp-deployment.adoc
@@ -41,7 +41,7 @@ For example, here is a descriptor file that deploys the file `/opt/myapp/myapp.w
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Set name="contextPath">/wiki</Set>
@@ -55,7 +55,7 @@ For example, if the system property is set to `myapp.home=/opt/myapp`, the previ
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Set name="contextPath">/wiki</Set>
@@ -83,7 +83,7 @@ This can help make it clear that users should not make changes to the temporary
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Set name="contextPath">/wiki</Set>
@@ -99,7 +99,7 @@ However, since the `web.xml` for the web application is processed after the depl
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Set name="contextPath">/wiki</Set>
@@ -120,7 +120,7 @@ This feature is useful when adding parameters or additional Servlet mappings wit
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Set name="contextPath">/wiki</Set>
@@ -135,7 +135,7 @@ If the `web.xml` does not include a reference to this data source, an override d
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_9_3.dtd">
 
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Set name="contextPath">/wiki</Set>

diff --git a/...documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc b/...documentation/src/main/asciidoc/old_docs/deploying/deployment-architecture.adoc
@@ -99,7 +99,7 @@ In the standard Jetty Distribution, this is configured in the `${jetty.home}/etc
 [source, xml, subs="{sub-order}"]
 ----
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/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">
 
   <Call name="addBean">