diff --git a/docs/pages/pmd/projectdocs/committers/releasing.md b/docs/pages/pmd/projectdocs/committers/releasing.md
index 65faa84e1b..d41605db65 100644
--- a/docs/pages/pmd/projectdocs/committers/releasing.md
+++ b/docs/pages/pmd/projectdocs/committers/releasing.md
@@ -79,9 +79,6 @@ Add the new rules as comments to the quickstart rulesets:
 * `pmd-apex/src/main/resources/rulesets/apex/quickstart.xml`
 * `pmd-java/src/main/resources/rulesets/java/quickstart.xml`
 
-We maintain a documentation for the [next major release](pmd_next_major_development.html). Copy the API
-changes from the current release notes to this document: `docs/pages/next_major_development.md`.
-
 The designer lives at [pmd/pmd-designer](https://github.com/pmd/pmd-designer).
 Update property `pmd-designer.version` in **pom.xml** to reference the latest pmd-designer release.
 See <https://search.maven.org/search?q=g:net.sourceforge.pmd%20AND%20a:pmd-ui&core=gav> for the available releases.
diff --git a/docs/pages/pmd/userdocs/extending/defining_properties.md b/docs/pages/pmd/userdocs/extending/defining_properties.md
index 31360fbdad..0805a8486c 100644
--- a/docs/pages/pmd/userdocs/extending/defining_properties.md
+++ b/docs/pages/pmd/userdocs/extending/defining_properties.md
@@ -55,7 +55,7 @@ This is fairly more readable than a constructor call, but keep in mind the descr
 
 {%include note.html
 content='As of version 6.10.0, all property concrete classes are deprecated for
-removal in 7.0.0. See the <a href="pmd_next_major_development.html#properties-framework">detailed list of planned removals</a> for
+removal in 7.0.0. See the <a href="pmd_release_notes_pmd7.html#properties-framework">detailed list of planned removals</a> for
 information about how to migrate.' %}
 
 
diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 98d3aaa6ac..502baf97c0 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -15,7 +15,7 @@ keywords: changelog, release notes
 We're excited to bring you the next major version of PMD!
 
 Since this is a big release, we provide here only a concise version of the release notes. We prepared a separate
-page with the full [Detailed Release Notes for PMD 7.0.0]({{ baseurl }}/pmd_release_notes_pmd7.html).
+page with the full [Detailed Release Notes for PMD 7.0.0]({{ baseurl }}pmd_release_notes_pmd7.html).
 
 {% include note.html content="
 
diff --git a/pmd-doc/src/main/java/net/sourceforge/pmd/docs/DeadLinksChecker.java b/pmd-doc/src/main/java/net/sourceforge/pmd/docs/DeadLinksChecker.java
index 9188ebef0d..9f8fbe170f 100644
--- a/pmd-doc/src/main/java/net/sourceforge/pmd/docs/DeadLinksChecker.java
+++ b/pmd-doc/src/main/java/net/sourceforge/pmd/docs/DeadLinksChecker.java
@@ -51,7 +51,8 @@ public class DeadLinksChecker {
     private static final boolean CHECK_EXTERNAL_LINKS = Boolean.parseBoolean(System.getProperty(CHECK_EXTERNAL_LINKS_PROPERTY));
 
     // Markdown-Link: something in []'s followed by something in ()'s
-    private static final Pattern LOCAL_LINK_PATTERN = Pattern.compile("(!)?\\[.*?]\\((.*?)\\)");
+    // ignoring an optional prefix "{{ baseurl }}"
+    private static final Pattern LOCAL_LINK_PATTERN = Pattern.compile("(!)?\\[.*?]\\((?:\\{\\{\\s*baseurl\\s*\\}\\})?(.*?)\\)");
 
     // Markdown permalink-header and captions
     private static final Pattern MD_HEADER_PERMALINK = Pattern.compile("permalink:\\s*(.*)");