Merge pull request #24496 from meeseeksmachine/auto-backport-of-pr-24495-on-v3.6.x

oscargus · web-flow · commit dda8717674de · 2022-11-18T10:25:54.000+01:00
Backport PR #24495 on branch v3.6.x (Update adding of google analytics key for docs)
diff --git a/doc/conf.py b/doc/conf.py
@@ -387,7 +387,7 @@ def js_tag_with_cache_busting(js):
 }
 include_analytics = is_release_build
 if include_analytics:
-    html_theme_options["google_analytics_id"] = "UA-55954603-1"
+    html_theme_options["analytics"] = {"google_analytics_id": "UA-55954603-1"}
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,

Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ def js_tag_with_cache_busting(js):`
`387`	`387`	`}`
`388`	`388`	`include_analytics = is_release_build`
`389`	`389`	`if include_analytics:`
`390`		`- html_theme_options["google_analytics_id"] = "UA-55954603-1"`
	`390`	`+ html_theme_options["analytics"] = {"google_analytics_id": "UA-55954603-1"}`
`391`	`391`
`392`	`392`	`# Add any paths that contain custom static files (such as style sheets) here,`
`393`	`393`	`# relative to this directory. They are copied after the builtin static files,`