[freemarker] branch 2.3-gae updated: Disabled Google Analytics, as per ASF Privacy Policy. Updated footer link section to be similar to what we have in freemarker-site.

[dd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ddekany pushed a commit to branch 2.3-gae
in repository https://gitbox.apache.org/repos/asf/freemarker.git


The following commit(s) were added to refs/heads/2.3-gae by this push:
     new 77cc7ed7 Disabled Google Analytics, as per ASF Privacy Policy. Updated footer link section to be similar to what we have in freemarker-site.
77cc7ed7 is described below

commit 77cc7ed79e39a002f1c92009900944a05eef3b07
Author: ddekany <dd...@apache.org>
AuthorDate: Tue Dec 13 10:57:45 2022 +0100

    Disabled Google Analytics, as per ASF Privacy Policy. Updated footer link section to be similar to what we have in freemarker-site.
---
 src/manual/en_US/book.xml     |  7 +++----
 src/manual/en_US/docgen.cjson | 33 ++++++++++++++++++++-------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index b1caabc1..d47f66b9 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -8275,10 +8275,9 @@ cfg.setSharedVariable("company", "Foo Inc.");</programlisting>
         <literal>locale</literal>, <literal>number_format</literal>,
         <literal>default_encoding</literal>,
         <literal>template_exception_handler</literal>. The full list of
-        settings can be found in the <link
-        xlink:href="https://freemarker.apache.org/docs/api/freemarker/template/Configuration.html#setSetting-java.lang.String-java.lang.String-">Java
-        API documentation of
-        <literal>Configuration.setSetting(...)</literal></link>.</para>
+        settings can be found in the <olink
+        targetdoc="apiConfigurationSettings">Java API documentation of
+        <literal>Configuration.setSetting(...)</literal></olink>.</para>
 
         <para>The settings coming from the <literal>Configuration</literal>
         can be overridden in a <literal>Template</literal> instance. For
diff --git a/src/manual/en_US/docgen.cjson b/src/manual/en_US/docgen.cjson
index e124f3ee..21adabcf 100644
--- a/src/manual/en_US/docgen.cjson
+++ b/src/manual/en_US/docgen.cjson
@@ -18,7 +18,9 @@
 // under the License.
 
 deployUrl: "https://freemarker.apache.org/docs/"
-onlineTrackerHTML: "docgen-misc/googleAnalytics.html"
+// ASF policy doesn't allow using Google Analytics anymore:
+// onlineTrackerHTML: "docgen-misc/googleAnalytics.html"
+// Search still uses cookies:
 cookieConsentScriptURL: "https://cdn.jsdelivr.net/npm/cookie-bar/cookiebar-latest.min.js"
 searchKey: "003127866208504630097:arjqbv_znfw"
 validation: {
@@ -58,6 +60,7 @@ logo: {
 olinks: {
   homepage: "https://freemarker.apache.org/"
   api: "api/index.html"
+  apiConfigurationSettings: "api/freemarker/core/Configurable.html#setSetting-java.lang.String-java.lang.String-"
   
   // Homepage links:
   freemarkerdownload: "https://freemarker.apache.org/freemarkerdownload.html"
@@ -71,9 +74,10 @@ olinks: {
   twitter: "https://twitter.com/freemarker"
   sourceforgeProject: "https://sourceforge.net/projects/freemarker/"
   githubProject: "https://github.com/freemarker/freemarker"
-  newBugReport: "https://issues.apache.org/jira/browse/FREEMARKER/"
-  newStackOverflowQuestion: "https://stackoverflow.com/questions/ask?tags=freemarker"
-  asfIncubator: "http://incubator.apache.org/"
+  reportBug: "https://issues.apache.org/jira/browse/FREEMARKER/"
+  reportSecurityVulnerability: "https://freemarker.apache.org/report-security-vulnerabilities.html"
+  askHelpOnStackOverflow: "https://stackoverflow.com/questions/ask?tags=freemarker"
+  asfPrivacyPolicy: "https://privacy.apache.org/policies/privacy-policy-public.html"
 }
 
 internalBookmarks: {
@@ -99,7 +103,7 @@ tabs: {
 // .icon-star
 secondaryTabs: {
   "Contribute": { class: "icon-heart", href: "olink:contribute" }
-  "Report a Bug": { class: "icon-bug", href: "olink:newBugReport" }
+  "Report a Bug": { class: "icon-bug", href: "olink:reportBug" }
   "Download": { class: "icon-download", href: "olink:freemarkerdownload" }
 }
 
@@ -108,27 +112,30 @@ footerSiteMap: {
     "What is FreeMarker?": "olink:what-is-freemarker"
     "Download": "olink:freemarkerdownload"
     "Version history": "id:app_versions"
-    "About us": "olink:history"
+    "FAQ": "id:app_faq"
     "License": "id:app_license"
+    "Privacy policy": "olink:asfPrivacyPolicy"
   }
-  "Handy stuff": {
+  "Often used / Reference": {
     "Try template online": "olink:onlineTemplateTester"
     "Expressions cheatsheet": "id:exp_cheatsheet"
     "#directives": "id:ref_directive_alphaidx"
     "?built_ins": "id:ref_builtins_alphaidx"
     ".special_vars": "id:ref_specvar"
+    "Configuration settings": "olink:apiConfigurationSettings"
   }
   "Community": {
-    "FreeMarker on Github": "olink:githubProject"
-    "Follow us on Twitter": "olink:twitter"
-    "Report a bug": "olink:newBugReport"
-    "Ask a question": "olink:newStackOverflowQuestion"
-    "Mailing lists": "olink:mailing-lists"
+    "Github project page": "olink:githubProject"
+    "Report a bug": "olink:reportBug"
+    "Report security vulnerability": "olink:reportSecurityVulnerability"
+    "Get help on StackOverflow": "olink:askHelpOnStackOverflow"
+    "Announcements on Twitter": "olink:twitter"
+    "Discuss on mailing lists": "olink:mailing-lists"
   }
 }
 
 socialLinks: {
   "Github": { class: "github", href: "olink:githubProject" }
   "Twitter": { class: "twitter", href: "olink:twitter" }
-  "Stack Overflow": { class: "stack-overflow", href: "olink:newStackOverflowQuestion" }
+  "Stack Overflow": { class: "stack-overflow", href: "olink:askHelpOnStackOverflow" }
 }