URL cleanup based on Whimsy Website Checks
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index 4f9fb8b..0706ef9 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -575,11 +575,6 @@
<literal>master</literal></para>
</listitem>
</itemizedlist>
-
- <para>There are some other FreeMarker-related repositories, such FMPP
- and Tutorials, which you can only find on the <olink
- targetdoc="githubProjectOld">old GitHub project</olink> page, as they
- aren't part of the project at Apache.</para>
</section>
<section>
@@ -2103,12 +2098,6 @@
</section>
<section>
- <title><olink targetdoc="asfThanks">Thanks</olink></title>
-
- <para/>
- </section>
-
- <section>
<title><olink targetdoc="asfLicense">License</olink></title>
<para/>
diff --git a/src/main/docgen/docgen.cjson b/src/main/docgen/docgen.cjson
index e5fbad7..8d7a111 100644
--- a/src/main/docgen/docgen.cjson
+++ b/src/main/docgen/docgen.cjson
@@ -80,7 +80,6 @@
gitOnlineTester: "https://gitbox.apache.org/repos/asf/freemarker-online-tester.git"
githubMirrorOnlineTester: "https://github.com/apache/freemarker-online-tester"
githubProject: "olink:githubMirrorFreemarker"
- githubProjectOld: "https://github.com/freemarker/"
securityMailingList: "mailto:security@apache.org"
privateMailingList: "mailto:private@freemarker.apache.org"
devMailingList: "mailto:dev@freemarker.apache.org"
@@ -89,15 +88,11 @@
devMailingListArchive: "https://lists.apache.org/list.html?dev@freemarker.apache.org"
notificationsMailingListSubscribe: "mailto:notifications-subscribe@freemarker.apache.org"
notificationsMailingListUnsubscribe: "mailto:notifications-unsubscribe@freemarker.apache.org"
- oldUserMailingListArchive: "http://news.gmane.org/gmane.comp.web.freemarker.user"
- oldDevelMailingListArchive: "http://news.gmane.org/gmane.comp.web.freemarker.devel"
- reportBug: "https://issues.apache.org/jira/browse/FREEMARKER/"
+ reportBug: "https://issues.apache.org/jira/projects/FREEMARKER"
askHelpOnStackOverflow: "https://stackoverflow.com/questions/ask?tags=freemarker"
- asfSponsorship: "http://www.apache.org/foundation/sponsorship.html"
- asfThanks: "http://www.apache.org/foundation/thanks.html"
- asfHome: "http://www.apache.org/"
- asfIncubator: "http://incubator.apache.org/"
- asfLicense: "http://www.apache.org/licenses/"
+ asfSponsorship: "https://www.apache.org/foundation/sponsors"
+ asfHome: "https://www.apache.org"
+ asfLicense: "https://www.apache.org/licenses/"
asfPrivacyPolicy: "https://privacy.apache.org/policies/privacy-policy-public.html"
templateUploadingSecurityFaq: "https://freemarker.apache.org/docs/app_faq.html#faq_template_uploading_security"
