From 8fb8af286eacbc86fa7b9f0b56f6b1f2dcbba403 Mon Sep 17 00:00:00 2001
From: Joe Mooring <joe.mooring@veriphor.com>
Date: Sat, 23 Mar 2024 13:07:00 -0700
Subject: [PATCH 1/4] tpl/tplimpl: Update Google Analytics template and config

Google Analytics 4 (GA4) replaced Google Universal Analytics (UA)
effective 1 July 2023.

See https://support.google.com/analytics/answer/11583528.

Changes:

- Update tpl/tplimpl/embedded/templates/google_analytics.html
- Remove tpl/tplimpl/embedded/templates/google_analytics_async.html
- Remove extraneous config settings

Closes #11802
Closes #10093
---
 data/docs.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/data/docs.yaml b/data/docs.yaml
index ad47ac54d..f9b5731f2 100644
--- a/data/docs.yaml
+++ b/data/docs.yaml
@@ -1557,10 +1557,8 @@ config:
     disqus:
       disable: false
     googleAnalytics:
-      anonymizeIP: false
       disable: false
       respectDoNotTrack: false
-      useSessionStorage: false
     instagram:
       disable: false
       simple: false

From 9d18e239f4182abc17016a9ad0947967b51909a2 Mon Sep 17 00:00:00 2001
From: Joe Mooring <joe.mooring@veriphor.com>
Date: Mon, 1 Apr 2024 15:30:03 -0700
Subject: [PATCH 2/4] tpl/tplimpl: Optionally exclude content from sitemap

Define global inclusion/exclusion in site configuration, and override
via front matter. For example, to exclude a page from the sitemap:

    [sitemap]
    disable = true # default is false

Closes #653
Closes #12282

Co-authored-by: kolappannathan <kolappannathan@users.noreply.github.com>
Co-authored-by: felicianotech <FelicianoTech@gmail.com>
---
 data/docs.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/docs.yaml b/data/docs.yaml
index f9b5731f2..b522ffbef 100644
--- a/data/docs.yaml
+++ b/data/docs.yaml
@@ -1649,6 +1649,7 @@ config:
       disableInlineCSS: false
   sitemap:
     changeFreq: ""
+    disable: false
     filename: sitemap.xml
     priority: -1
   social: null
@@ -2797,8 +2798,8 @@ tpl:
             {{ $m.Set "Hugo" "Rocks!" }}
             {{ $m.Values | debug.Dump | safeHTML }}
           - |-
-            map[string]interface {}{
-              "Hugo": "Rocks!",
+            {
+              "Hugo": "Rocks!"
             }
       TestDeprecationErr:
         Aliases: null

From ae663793b99af635a4fe572c26494170730e6616 Mon Sep 17 00:00:00 2001
From: Eitan Adler <eitan@eitanadler.com>
Date: Thu, 11 Apr 2024 00:31:33 -0700
Subject: [PATCH 3/4] all: Fix duplicate words in comments

---
 data/docs.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/docs.yaml b/data/docs.yaml
index b522ffbef..82862e042 100644
--- a/data/docs.yaml
+++ b/data/docs.yaml
@@ -4581,5 +4581,5 @@ tpl:
         - urlize
         Args:
         - s
-        Description: URLize returns the the strings s formatted as an URL.
+        Description: URLize returns the strings s formatted as an URL.
         Examples: []

From 7f26f69e897dd26b768084d9ab2db7278085f082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Tue, 16 Apr 2024 12:08:28 +0200
Subject: [PATCH 4/4] docs: Regen docshelper

---
 data/docs.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/data/docs.yaml b/data/docs.yaml
index 82862e042..dcc96c590 100644
--- a/data/docs.yaml
+++ b/data/docs.yaml
@@ -4017,6 +4017,11 @@ tpl:
         - s
         Description: CountWords returns the approximate word count in s.
         Examples: []
+      Diff:
+        Aliases: null
+        Args: null
+        Description: ""
+        Examples: null
       FindRE:
         Aliases:
         - findRE