From a80e217551adeec83a393b7464ee3cb6c054a4bc Mon Sep 17 00:00:00 2001
From: Reto Lehmann <retocode@icloud.com>
Date: Thu, 25 Jan 2024 07:58:09 +0100
Subject: [PATCH 1/2] Add linux foundation trademark

---
 netlify.toml                   | 5 -----
 overrides/partials/footer.html | 5 +++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/netlify.toml b/netlify.toml
index 4a40f8cf183..57eb5067f5c 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -27,11 +27,6 @@
   to = "/docs/community/"
   status = 301
 
-[[redirects]]
-  from = "/about-analytics-cookies/"
-  to = "/development/about-analytics-cookies/"
-  status = 301
-
 [[redirects]]
   from = "/docs/help/contributor/*"
   to = "https://github.com/knative/docs/blob/main/contribute-to-docs/README.md"
diff --git a/overrides/partials/footer.html b/overrides/partials/footer.html
index 7ef8096e407..1ae378772ab 100644
--- a/overrides/partials/footer.html
+++ b/overrides/partials/footer.html
@@ -73,8 +73,9 @@
       </div>
 
       <div class="footer-links md-footer-copyright">
+        <a href="https://www.linuxfoundation.org/legal/trademark-usage">Trademarks</a> |
         <a href="https://policies.google.com/privacy">Privacy Policy</a> |
-        <a href="/development/about-analytics-cookies/">Cookie Usage</a> |
+        <a href="/docs/about-analytics-cookies/">Cookie Usage</a> |
         <a href="https://github.com/knative/docs/blob/main/LICENSE">Apache-2.0 LICENSE</a> |
         <a href="https://github.com/knative/docs/blob/main/LICENSE-docs">CC BY 4.0 LICENSE</a> |
         <a href="https://squidfunk.github.io/mkdocs-material/">Made by Material MkDocs</a>
@@ -98,7 +99,7 @@
   </div>
 </footer>
 
-<!-- Cookie Bannier -->
+<!-- Cookie Banner -->
 <div id="cookieModal" class="md-typeset modal custom fade" role="dialog" data-backdrop="false">
   <div class="modal-dialog modal-xl">
     <div class="modal-content">

From 3c70e9a18c0b111918ca2622713aa5a1a51a7df9 Mon Sep 17 00:00:00 2001
From: Reto Lehmann <retocode@icloud.com>
Date: Thu, 25 Jan 2024 14:03:46 +0100
Subject: [PATCH 2/2] Update cookie banner url

---
 overrides/partials/footer.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/overrides/partials/footer.html b/overrides/partials/footer.html
index 1ae378772ab..9161b063a33 100644
--- a/overrides/partials/footer.html
+++ b/overrides/partials/footer.html
@@ -110,7 +110,7 @@
           <button type="button" class="md-button md-button--primary" onclick="acceptcookie()">Accept</button>
           <div class="opt-out">
             <hr>
-            <p><a href="/development/about-analytics-cookies/">Learn about analytics cookies and how you can take steps to opt-out from sharing your usage data.</a></p>
+            <p><a href="/docs/about-analytics-cookies/">Learn about analytics cookies and how you can take steps to opt-out from sharing your usage data.</a></p>
             <button type="button" class="md-button" onclick="optout()">I understand how to opt-out, hide this notice.</button>
           </div>
         </div>
@@ -121,7 +121,7 @@
 <div class="cookienotice md-typeset">
   <div class="text">
     <p>We use analytics and cookies to understand site traffic. Information about your use of
-      our site is shared with Google for that purpose. <a href="/development/about-analytics-cookies/">Learn more.</a>
+      our site is shared with Google for that purpose. <a href="/docs/about-analytics-cookies/">Learn more.</a>
     </p>
   </div>
   <div class="buttons">