diff --git a/.asf.yaml b/.asf.yaml
index d674ea0d26..1a86da9ed9 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -44,4 +44,3 @@ notifications:
 
 publish:
   whoami: asf-site
-
diff --git a/content/broken-links.xml b/content/broken-links.xml
index f95aa9be01..14fcb6a518 100644
--- a/content/broken-links.xml
+++ b/content/broken-links.xml
@@ -1,2 +1,7 @@
 <broken-links>
+  <link message="No pipeline matched request: components/spreadsheet/error:site:subversion">components/spreadsheet/error:site:subversion</link>
+  <link message="No pipeline matched request: error:site:subversion">error:site:subversion</link>
+  <link message="No pipeline matched request: components/hpsf/error:site:subversion">components/hpsf/error:site:subversion</link>
+  <link message="No pipeline matched request: help/error:site:subversion">help/error:site:subversion</link>
+  <link message="No pipeline matched request: devel/error:site:subversion">devel/error:site:subversion</link>
 </broken-links>
diff --git a/content/components/hpsf/how-to.html b/content/components/hpsf/how-to.html
index 5bb908282d..a3fd624780 100644
--- a/content/components/hpsf/how-to.html
+++ b/content/components/hpsf/how-to.html
@@ -346,7 +346,7 @@ document.write("Last Published: " + document.lastModified);
 <strong>Please note:</strong> HPSF's writing functionality is
     <strong>not</strong> present in POI releases up to and including 2.5. In
     order to write properties you have to download a 3.0.x POI release,
-    or retrieve the POI development version from the <a href="../../devel/subversion.html">Subversion repository</a>.</div>
+    or retrieve the POI development version from the <a href="error:site:subversion">Subversion repository</a>.</div>
 </div>
 <a name="sec1" id="sec1"></a><a name="Reading+Standard+Properties"></a>
 <h3 class="boxed">Reading Standard Properties</h3>
diff --git a/content/components/poi-jvm-languages.html b/content/components/poi-jvm-languages.html
index 67025fc141..c00ee4f9a8 100644
--- a/content/components/poi-jvm-languages.html
+++ b/content/components/poi-jvm-languages.html
@@ -345,7 +345,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="../devel/nightly.html">Nightly Builds</a>
 </div>
 <div class="menuitem">
-<a href="../devel/subversion.html">Subversion Repository</a>
+<a href="../devel/git.html">Git Repository</a>
 </div>
 <div class="menuitem">
 <a href="../devel/guidelines.html">Contribution Guidelines</a>
diff --git a/content/components/poi-ruby.html b/content/components/poi-ruby.html
index 2496589fda..fbbf4c67c4 100644
--- a/content/components/poi-ruby.html
+++ b/content/components/poi-ruby.html
@@ -345,7 +345,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="../devel/nightly.html">Nightly Builds</a>
 </div>
 <div class="menuitem">
-<a href="../devel/subversion.html">Subversion Repository</a>
+<a href="../devel/git.html">Git Repository</a>
 </div>
 <div class="menuitem">
 <a href="../devel/guidelines.html">Contribution Guidelines</a>
diff --git a/content/components/spreadsheet/diagram1.html b/content/components/spreadsheet/diagram1.html
index f35fef791f..3bc2a9dd8c 100644
--- a/content/components/spreadsheet/diagram1.html
+++ b/content/components/spreadsheet/diagram1.html
@@ -345,7 +345,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="../../devel/nightly.html">Nightly Builds</a>
 </div>
 <div class="menuitem">
-<a href="../../devel/subversion.html">Subversion Repository</a>
+<a href="../../devel/git.html">Git Repository</a>
 </div>
 <div class="menuitem">
 <a href="../../devel/guidelines.html">Contribution Guidelines</a>
diff --git a/content/components/spreadsheet/how-to.html b/content/components/spreadsheet/how-to.html
index 0349e8dcdf..254e60864a 100644
--- a/content/components/spreadsheet/how-to.html
+++ b/content/components/spreadsheet/how-to.html
@@ -1225,7 +1225,7 @@ The latest version is always available from
 <em>In POI versions before 3.0.3, this code lived in the scratchpad section.
  If you're using one of these older versions of POI, you will either
  need to include the scratchpad jar on your classpath, or build from a</em>
- <a href="../../devel/subversion.html">subversion checkout</a>.
+ <a href="error:site:subversion">subversion checkout</a>.
 </p>
 <a name="xssf_sax_api" id="xssf_sax_api"></a><a name="XSSF+and+SAX+%28Event+API%29"></a>
 <h3 class="boxed">XSSF and SAX (Event API)</h3>
diff --git a/content/devel/subversion.html b/content/devel/git.html
similarity index 98%
rename from content/devel/subversion.html
rename to content/devel/git.html
index 491b008965..6f43899006 100644
--- a/content/devel/subversion.html
+++ b/content/devel/git.html
@@ -114,7 +114,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="../devel/nightly.html">Nightly Builds</a>
 </div>
 <div class="menupage">
-<div class="menupagetitle">Subversion Repository</div>
+<div class="menupagetitle">Git Repository</div>
 </div>
 <div class="menuitem">
 <a href="../devel/guidelines.html">Contribution Guidelines</a>
@@ -288,7 +288,7 @@ document.write("Last Published: " + document.lastModified);
     </div>
 <div id="feedback">
         Send feedback about the website to:
-    <a id="feedbackto" href="mailto:dev@poi.apache.org?subject=Feedback%C2%A0devel/subversion.html">dev@poi.apache.org</a>
+    <a id="feedbackto" href="mailto:dev@poi.apache.org?subject=Feedback%C2%A0devel/git.html">dev@poi.apache.org</a>
 </div>
 <!--+
     |end bottomstrip
diff --git a/content/devel/guidelines.html b/content/devel/guidelines.html
index 83cb12f9f6..9580c09097 100644
--- a/content/devel/guidelines.html
+++ b/content/devel/guidelines.html
@@ -114,7 +114,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="../devel/nightly.html">Nightly Builds</a>
 </div>
 <div class="menuitem">
-<a href="../devel/subversion.html">Subversion Repository</a>
+<a href="../devel/git.html">Git Repository</a>
 </div>
 <div class="menupage">
 <div class="menupagetitle">Contribution Guidelines</div>
@@ -280,7 +280,7 @@ document.write("Last Published: " + document.lastModified);
      
 <li>Join the <a href="../help/index.html">mailing lists</a> and share your knowledge with others.</li>
      
-<li>Get <a href="../devel/subversion.html">Subversion</a> and check out the POI source tree</li>
+<li>Get <a href="error:site:subversion">Subversion</a> and check out the POI source tree</li>
      
 <li>Documentation is always the best place to start contributing, maybe you found that if the documentation just told you how to do X then it would make more sense, modify the documentation.</li>
      
@@ -482,7 +482,7 @@ document.write("Last Published: " + document.lastModified);
 <h3 class="boxed">Approach 3 - the git way</h3>
 <p>
       If you are working on a Git clone of Apache POI (see the
-      <a href="../devel/subversion.html">Version Control page</a> for
+      <a href="error:site:subversion">Version Control page</a> for
       more on the read-only Git mirrors), it is possible to generate
       a patch of your changes (including new binary files) using Git.
     </p>
diff --git a/content/devel/history/changes-3x.html b/content/devel/history/changes-3x.html
index 3e6c04a7c1..e648509f9b 100644
--- a/content/devel/history/changes-3x.html
+++ b/content/devel/history/changes-3x.html
@@ -114,7 +114,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="../../devel/nightly.html">Nightly Builds</a>
 </div>
 <div class="menuitem">
-<a href="../../devel/subversion.html">Subversion Repository</a>
+<a href="../../devel/git.html">Git Repository</a>
 </div>
 <div class="menuitem">
 <a href="../../devel/guidelines.html">Contribution Guidelines</a>
diff --git a/content/devel/history/changes-pre3x.html b/content/devel/history/changes-pre3x.html
index 2af1ee8ed7..49edf4315d 100644
--- a/content/devel/history/changes-pre3x.html
+++ b/content/devel/history/changes-pre3x.html
@@ -114,7 +114,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="../../devel/nightly.html">Nightly Builds</a>
 </div>
 <div class="menuitem">
-<a href="../../devel/subversion.html">Subversion Repository</a>
+<a href="../../devel/git.html">Git Repository</a>
 </div>
 <div class="menuitem">
 <a href="../../devel/guidelines.html">Contribution Guidelines</a>
diff --git a/content/devel/history/index.html b/content/devel/history/index.html
index 3816aca6e6..0a9e9f41be 100644
--- a/content/devel/history/index.html
+++ b/content/devel/history/index.html
@@ -114,7 +114,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="../../devel/nightly.html">Nightly Builds</a>
 </div>
 <div class="menuitem">
-<a href="../../devel/subversion.html">Subversion Repository</a>
+<a href="../../devel/git.html">Git Repository</a>
 </div>
 <div class="menuitem">
 <a href="../../devel/guidelines.html">Contribution Guidelines</a>
diff --git a/content/devel/index.html b/content/devel/index.html
index 32c44e91e4..5757266df2 100644
--- a/content/devel/index.html
+++ b/content/devel/index.html
@@ -114,7 +114,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="../devel/nightly.html">Nightly Builds</a>
 </div>
 <div class="menuitem">
-<a href="../devel/subversion.html">Subversion Repository</a>
+<a href="../devel/git.html">Git Repository</a>
 </div>
 <div class="menuitem">
 <a href="../devel/guidelines.html">Contribution Guidelines</a>
@@ -232,7 +232,7 @@ document.write("Last Published: " + document.lastModified);
 <p>
                 The main Apache POI build was traditionally done with <a href="https://ant.apache.org/">Apache Ant</a>.
                 In 2021, we moved to using <a href="https://gradle.org/">Gradle</a>.
-                After <a href="subversion.html">checking out</a> the POI code, you will find <strong>gradlew</strong> and
+                After <a href="git.html">checking out</a> the POI code, you will find <strong>gradlew</strong> and
                 <strong>gradlew.bat</strong>. These command files are used for running Gradle on Linux/Mac and Windows respectively.
                 Gradlew checks if you the right version of Gradle installed and will install it if you don't.
             </p>
diff --git a/content/devel/nightly.html b/content/devel/nightly.html
index 50e8f24a84..c679ac84e1 100644
--- a/content/devel/nightly.html
+++ b/content/devel/nightly.html
@@ -114,7 +114,7 @@ document.write("Last Published: " + document.lastModified);
 <div class="menupagetitle">Nightly Builds</div>
 </div>
 <div class="menuitem">
-<a href="../devel/subversion.html">Subversion Repository</a>
+<a href="../devel/git.html">Git Repository</a>
 </div>
 <div class="menuitem">
 <a href="../devel/guidelines.html">Contribution Guidelines</a>
diff --git a/content/devel/plan/index.html b/content/devel/plan/index.html
index d7506e0563..db01207ee8 100644
--- a/content/devel/plan/index.html
+++ b/content/devel/plan/index.html
@@ -114,7 +114,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="../../devel/nightly.html">Nightly Builds</a>
 </div>
 <div class="menuitem">
-<a href="../../devel/subversion.html">Subversion Repository</a>
+<a href="../../devel/git.html">Git Repository</a>
 </div>
 <div class="menuitem">
 <a href="../../devel/guidelines.html">Contribution Guidelines</a>
diff --git a/content/devel/plan/vision10.html b/content/devel/plan/vision10.html
index 7ef16fc308..6e68fac950 100644
--- a/content/devel/plan/vision10.html
+++ b/content/devel/plan/vision10.html
@@ -114,7 +114,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="../../devel/nightly.html">Nightly Builds</a>
 </div>
 <div class="menuitem">
-<a href="../../devel/subversion.html">Subversion Repository</a>
+<a href="../../devel/git.html">Git Repository</a>
 </div>
 <div class="menuitem">
 <a href="../../devel/guidelines.html">Contribution Guidelines</a>
diff --git a/content/devel/plan/vision20.html b/content/devel/plan/vision20.html
index 57e524e525..1982f9d51f 100644
--- a/content/devel/plan/vision20.html
+++ b/content/devel/plan/vision20.html
@@ -114,7 +114,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="../../devel/nightly.html">Nightly Builds</a>
 </div>
 <div class="menuitem">
-<a href="../../devel/subversion.html">Subversion Repository</a>
+<a href="../../devel/git.html">Git Repository</a>
 </div>
 <div class="menuitem">
 <a href="../../devel/guidelines.html">Contribution Guidelines</a>
diff --git a/content/devel/references/index.html b/content/devel/references/index.html
index 3a135e161b..7192311848 100644
--- a/content/devel/references/index.html
+++ b/content/devel/references/index.html
@@ -114,7 +114,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="../../devel/nightly.html">Nightly Builds</a>
 </div>
 <div class="menuitem">
-<a href="../../devel/subversion.html">Subversion Repository</a>
+<a href="../../devel/git.html">Git Repository</a>
 </div>
 <div class="menuitem">
 <a href="../../devel/guidelines.html">Contribution Guidelines</a>
diff --git a/content/devel/references/logocontest.html b/content/devel/references/logocontest.html
index a696cddf32..eb74ef742f 100644
--- a/content/devel/references/logocontest.html
+++ b/content/devel/references/logocontest.html
@@ -114,7 +114,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="../../devel/nightly.html">Nightly Builds</a>
 </div>
 <div class="menuitem">
-<a href="../../devel/subversion.html">Subversion Repository</a>
+<a href="../../devel/git.html">Git Repository</a>
 </div>
 <div class="menuitem">
 <a href="../../devel/guidelines.html">Contribution Guidelines</a>
diff --git a/content/devel/resolutions/index.html b/content/devel/resolutions/index.html
index 2f5ef5675f..bdd3d4dc6c 100644
--- a/content/devel/resolutions/index.html
+++ b/content/devel/resolutions/index.html
@@ -114,7 +114,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="../../devel/nightly.html">Nightly Builds</a>
 </div>
 <div class="menuitem">
-<a href="../../devel/subversion.html">Subversion Repository</a>
+<a href="../../devel/git.html">Git Repository</a>
 </div>
 <div class="menuitem">
 <a href="../../devel/guidelines.html">Contribution Guidelines</a>
diff --git a/content/devel/resolutions/res001.html b/content/devel/resolutions/res001.html
index c6fde453d6..62fe7bc5f7 100644
--- a/content/devel/resolutions/res001.html
+++ b/content/devel/resolutions/res001.html
@@ -114,7 +114,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="../../devel/nightly.html">Nightly Builds</a>
 </div>
 <div class="menuitem">
-<a href="../../devel/subversion.html">Subversion Repository</a>
+<a href="../../devel/git.html">Git Repository</a>
 </div>
 <div class="menuitem">
 <a href="../../devel/guidelines.html">Contribution Guidelines</a>
diff --git a/content/devel/who.html b/content/devel/who.html
index f64d4b1db6..85b949a7b7 100644
--- a/content/devel/who.html
+++ b/content/devel/who.html
@@ -114,7 +114,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="../devel/nightly.html">Nightly Builds</a>
 </div>
 <div class="menuitem">
-<a href="../devel/subversion.html">Subversion Repository</a>
+<a href="../devel/git.html">Git Repository</a>
 </div>
 <div class="menuitem">
 <a href="../devel/guidelines.html">Contribution Guidelines</a>
diff --git a/content/help/faq.html b/content/help/faq.html
index a3a6761ec3..66683b1026 100644
--- a/content/help/faq.html
+++ b/content/help/faq.html
@@ -207,7 +207,7 @@ System.out.println("POI Scratchpad came from " + path);</pre>
        <a href="../components/">the components overview section</a>
        for the artifact details to have maven download it for you.
        If you download the source release of POI, and/or checkout the
-       source code from <a href="../devel/subversion.html">subversion</a>,
+       source code from <a href="error:site:subversion">subversion</a>,
        then you can run the ant task "compile-ooxml-xsds" to have the
        OOXML schemas downloaded and compiled for you (This will also
        give you the XMLBeans generated source code, in case you wish to
diff --git a/content/index.html b/content/index.html
index 6ba9676df7..03852180fa 100644
--- a/content/index.html
+++ b/content/index.html
@@ -392,7 +392,7 @@ document.write("Last Published: " + document.lastModified);
         hard-working, talented folks to help us on the project, no matter your
         background. So if you're motivated, ready, and have the time: Download the
         source from the
-        <a href="devel/subversion.html">Subversion Repository</a>,
+        <a href="error:site:subversion">Subversion Repository</a>,
         <a href="devel/index.html">build the code</a>, join the
         <a href="help/index.html">mailing lists</a>, and we'll be happy to
         help you get started on the project!
diff --git a/content/linkmap.html b/content/linkmap.html
index cbb5b14c88..eb7f4e4431 100644
--- a/content/linkmap.html
+++ b/content/linkmap.html
@@ -345,7 +345,7 @@ document.write("Last Published: " + document.lastModified);
 <a href="devel/nightly.html">Nightly Builds</a>
 </div>
 <div class="menuitem">
-<a href="devel/subversion.html">Subversion Repository</a>
+<a href="devel/git.html">Git Repository</a>
 </div>
 <div class="menuitem">
 <a href="devel/guidelines.html">Contribution Guidelines</a>
@@ -943,7 +943,7 @@ document.write("Last Published: " + document.lastModified);
         
 <ul>
 <li>
-<a href="devel/subversion.html">Subversion Repository</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>subversion</em>
+<a href="devel/git.html">Git Repository</a>&nbsp;&nbsp;___________________&nbsp;&nbsp;<em>git</em>
 </li>
 </ul>
         
diff --git a/src/documentation/content/xdocs/devel/subversion.xml b/src/documentation/content/xdocs/devel/git.xml
similarity index 100%
rename from src/documentation/content/xdocs/devel/subversion.xml
rename to src/documentation/content/xdocs/devel/git.xml
diff --git a/src/documentation/content/xdocs/devel/index.xml b/src/documentation/content/xdocs/devel/index.xml
index 819e7a4c44..4b3acd2783 100644
--- a/src/documentation/content/xdocs/devel/index.xml
+++ b/src/documentation/content/xdocs/devel/index.xml
@@ -62,7 +62,7 @@
             <p>
                 The main Apache POI build was traditionally done with <a href="https://ant.apache.org/">Apache Ant</a>.
                 In 2021, we moved to using <a href="https://gradle.org/">Gradle</a>.
-                After <a href="subversion.html">checking out</a> the POI code, you will find <strong>gradlew</strong> and
+                After <a href="git.html">checking out</a> the POI code, you will find <strong>gradlew</strong> and
                 <strong>gradlew.bat</strong>. These command files are used for running Gradle on Linux/Mac and Windows respectively.
                 Gradlew checks if you the right version of Gradle installed and will install it if you don't.
             </p>
diff --git a/src/documentation/content/xdocs/site.xml b/src/documentation/content/xdocs/site.xml
index e7f10e9379..3bfb5efbe7 100644
--- a/src/documentation/content/xdocs/site.xml
+++ b/src/documentation/content/xdocs/site.xml
@@ -124,7 +124,7 @@ See https://xml.apache.org/forrest/linking.html for more info
     <community label="Getting Involved" href="devel/" tab="community">
         <howtobuild label="How To Build" href="index.html"/>
         <nightly label="Nightly Builds" href="nightly.html"/>
-        <subversion label="Subversion Repository" href="subversion.html"/>
+        <git label="Git Repository" href="git.html"/>
         <guidelines label="Contribution Guidelines" href="guidelines.html"/>
         <whoweare label="Who We Are" href="who.html"/>
         <plan label="Planning Documents" href="plan/">
diff --git a/src/documentation/publish-poi-site.txt b/src/documentation/publish-poi-site.txt
index c60cd7918b..c0456e77d9 100644
--- a/src/documentation/publish-poi-site.txt
+++ b/src/documentation/publish-poi-site.txt
@@ -47,15 +47,28 @@ Building and Deploying the Site
 It is recommended that you open a command prompt and set up Java 8 as your default. The web site build will fail
 if you use a very recent Java version.
 
-In your local copy of the POI svn (https://github.com/apache/poi/tree/trunk), run:
+In your local copy of the POI git (https://github.com/apache/poi/tree/trunk), run using Java 8:
 
 ant site
 
-After this completes, you can copy the files in `build/site` to the `publish` directory in your poi-site checkout
-(https://github.com/apache/poi/tree/asf-site).
+If you use a newer version, you will get warnings and the output will have issues.
+
+After this completes, you can switch to the `asf-site` branch.
+
+The `ant site` command will have created a directory called `build/site` in your local POI git checkout.
+You can copy the files in `build/site` to the `content` directory.
+This `content` directory is where the files for the web site are stored
+and only appears in the `asf-site` branch.
 
 A command like this might work.
 
-cp -r ~/poi/build/site/* ~/poi-site/publish/
+cp -R build/site/* content/
 
-I would recommend that you use `git status` and `git diff` before committing the changes to poi-site.
+I would recommend that you use `git status` and `git diff` before committing the changes to asf-site.
+
+It is probably a good idea to check the site locally before committing the changes by opening the
+content/index.html file in a browser.
+
+Once you are happy with the changes, you can commit them to the `asf-site` branch.
+
+It is probably a good idea to merge the changes to the `trunk` branch as well but that won't affect the web site.