From eeca90502e867453820c3c5fc5587617ce4eb49b Mon Sep 17 00:00:00 2001
From: Charissa Miller <48832936+clemiller@users.noreply.github.com>
Date: Tue, 26 Nov 2024 15:30:14 -0500
Subject: [PATCH 1/6] update taxii card to 2.1

---
 modules/resources/templates/attack-data-and-tools.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/resources/templates/attack-data-and-tools.html b/modules/resources/templates/attack-data-and-tools.html
index dbeb56a591c..e06457fa78c 100644
--- a/modules/resources/templates/attack-data-and-tools.html
+++ b/modules/resources/templates/attack-data-and-tools.html
@@ -215,7 +215,7 @@ <h3>ATT&amp;CK in STIX 2.0</h3>
                 <div class="col-sm panel d-flex flex-column">
                     <div class="panel-body p-4">
                         <!-- taxii -->
-                        <h3>TAXII</h3>
+                        <h3>TAXII 2.1</h3>
                         <p>
                             The ATT&amp;CK STIX data can also be accessed via the official ATT&amp;CK TAXII&trade; server. 
                             Trusted Automated Exchange of Intelligence Information (TAXII) is an application protocol for 
@@ -223,7 +223,7 @@ <h3>TAXII</h3>
                             STIX knowledge base. 
                         </p>
                         <div class="d-flex flex-row mb-4 mt-3">
-                            <a href="https://github.com/mitre/cti/blob/master/USAGE.md#access-from-the-attck-taxii-server">
+                            <a href="https://github.com/mitre-attack/attack-workbench-taxii-server/blob/main/README.md">
                                 <button type="button" class="slide-button">
                                     <span class="slide-button-text">
                                         Access TAXII Server

From e04bf9687ed59c194a685be11059e3ddf18632d7 Mon Sep 17 00:00:00 2001
From: Charissa Miller <48832936+clemiller@users.noreply.github.com>
Date: Tue, 26 Nov 2024 15:30:37 -0500
Subject: [PATCH 2/6] update banner

---
 website-banner.production | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website-banner.production b/website-banner.production
index 09a00a02989..65f2450b254 100644
--- a/website-banner.production
+++ b/website-banner.production
@@ -1 +1 @@
-ATT&CK v16 has been released! Check out the <a href='https://medium.com/mitre-attack/attack-v16-561c76af94cf'>blog post</a> for more information.
\ No newline at end of file
+Reminder: the TAXII 2.0 server will be <a href='https://medium.com/mitre-attack/introducing-taxii-2-1-and-a-fond-farewell-to-taxii-2-0-d9fca6ce4c58'>retiring on December 18</a>. Please switch to the <a href='https://github.com/mitre-attack/attack-workbench-taxii-server/blob/main/README.md'>TAXII 2.1 server</a> to ensure uninterrupted service.
\ No newline at end of file

From c678f3281386d2cac4ec5f2fc9219409a747a1b1 Mon Sep 17 00:00:00 2001
From: Charissa Miller <48832936+clemiller@users.noreply.github.com>
Date: Tue, 26 Nov 2024 16:09:20 -0500
Subject: [PATCH 3/6] update button text

---
 modules/resources/templates/attack-data-and-tools.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/resources/templates/attack-data-and-tools.html b/modules/resources/templates/attack-data-and-tools.html
index 3193ddcb71c..b4147fba6cc 100644
--- a/modules/resources/templates/attack-data-and-tools.html
+++ b/modules/resources/templates/attack-data-and-tools.html
@@ -226,7 +226,7 @@ <h3>TAXII 2.1</h3>
                             <a href="https://github.com/mitre-attack/attack-workbench-taxii-server/blob/main/README.md">
                                 <button type="button" class="slide-button">
                                     <span class="slide-button-text">
-                                        Access TAXII Server
+                                        Visit Repository
                                     </span>
                                     <span class="slide-button-icon">
                                         <i class="fa-brands fa-github"></i>

From 9cbf29046e9d6ac3b20f3c8712d3ef1d1d268d35 Mon Sep 17 00:00:00 2001
From: Charissa Miller <48832936+clemiller@users.noreply.github.com>
Date: Tue, 26 Nov 2024 16:14:57 -0500
Subject: [PATCH 4/6] link to taxii usage docs

---
 modules/resources/templates/attack-data-and-tools.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/resources/templates/attack-data-and-tools.html b/modules/resources/templates/attack-data-and-tools.html
index b4147fba6cc..b9347fc3d96 100644
--- a/modules/resources/templates/attack-data-and-tools.html
+++ b/modules/resources/templates/attack-data-and-tools.html
@@ -223,7 +223,7 @@ <h3>TAXII 2.1</h3>
                             STIX knowledge base. 
                         </p>
                         <div class="d-flex flex-row mb-4 mt-3">
-                            <a href="https://github.com/mitre-attack/attack-workbench-taxii-server/blob/main/README.md">
+                            <a href="https://github.com/mitre-attack/attack-workbench-taxii-server/blob/main/USAGE.md">
                                 <button type="button" class="slide-button">
                                     <span class="slide-button-text">
                                         Visit Repository

From bdcf531db887833716efd79486c69b99effb253f Mon Sep 17 00:00:00 2001
From: Charissa Miller <48832936+clemiller@users.noreply.github.com>
Date: Tue, 26 Nov 2024 16:17:33 -0500
Subject: [PATCH 5/6] update banner

---
 website-banner.production | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website-banner.production b/website-banner.production
index 65f2450b254..255171d9602 100644
--- a/website-banner.production
+++ b/website-banner.production
@@ -1 +1 @@
-Reminder: the TAXII 2.0 server will be <a href='https://medium.com/mitre-attack/introducing-taxii-2-1-and-a-fond-farewell-to-taxii-2-0-d9fca6ce4c58'>retiring on December 18</a>. Please switch to the <a href='https://github.com/mitre-attack/attack-workbench-taxii-server/blob/main/README.md'>TAXII 2.1 server</a> to ensure uninterrupted service.
\ No newline at end of file
+Reminder: the TAXII 2.0 server will be <a href='https://medium.com/mitre-attack/introducing-taxii-2-1-and-a-fond-farewell-to-taxii-2-0-d9fca6ce4c58'>retiring on December 18</a>. Please switch to the <a href='https://github.com/mitre-attack/attack-workbench-taxii-server/blob/main/USAGE.md'>TAXII 2.1 server</a> to ensure uninterrupted service.
\ No newline at end of file

From f48d95ac294f08748fcdba79f0ebea8a10525225 Mon Sep 17 00:00:00 2001
From: Charissa Miller <48832936+clemiller@users.noreply.github.com>
Date: Tue, 26 Nov 2024 16:19:54 -0500
Subject: [PATCH 6/6] update links to taxii usage

---
 modules/resources/templates/attack-data-and-tools.html | 2 +-
 website-banner.production                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/resources/templates/attack-data-and-tools.html b/modules/resources/templates/attack-data-and-tools.html
index b9347fc3d96..d6c099fa99b 100644
--- a/modules/resources/templates/attack-data-and-tools.html
+++ b/modules/resources/templates/attack-data-and-tools.html
@@ -223,7 +223,7 @@ <h3>TAXII 2.1</h3>
                             STIX knowledge base. 
                         </p>
                         <div class="d-flex flex-row mb-4 mt-3">
-                            <a href="https://github.com/mitre-attack/attack-workbench-taxii-server/blob/main/USAGE.md">
+                            <a href="https://github.com/mitre-attack/attack-workbench-taxii-server/blob/main/docs/USAGE.md">
                                 <button type="button" class="slide-button">
                                     <span class="slide-button-text">
                                         Visit Repository
diff --git a/website-banner.production b/website-banner.production
index 255171d9602..7eef68aaccb 100644
--- a/website-banner.production
+++ b/website-banner.production
@@ -1 +1 @@
-Reminder: the TAXII 2.0 server will be <a href='https://medium.com/mitre-attack/introducing-taxii-2-1-and-a-fond-farewell-to-taxii-2-0-d9fca6ce4c58'>retiring on December 18</a>. Please switch to the <a href='https://github.com/mitre-attack/attack-workbench-taxii-server/blob/main/USAGE.md'>TAXII 2.1 server</a> to ensure uninterrupted service.
\ No newline at end of file
+Reminder: the TAXII 2.0 server will be <a href='https://medium.com/mitre-attack/introducing-taxii-2-1-and-a-fond-farewell-to-taxii-2-0-d9fca6ce4c58'>retiring on December 18</a>. Please switch to the <a href='https://github.com/mitre-attack/attack-workbench-taxii-server/blob/main/docs/USAGE.md'>TAXII 2.1 server</a> to ensure uninterrupted service.
\ No newline at end of file