Merge branch 'develop' of github.com:mitre-attack/attack-website into develop

Author: adpare

modules/resources/templates/attack-data-and-tools.html

@@ -215,18 +215,18 @@ <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 
                             exchanging CTI over HTTPS. The ATT&amp;CK TAXII server provides API access to the ATT&amp;CK
                             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/docs/USAGE.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>
@@ -243,7 +243,36 @@ <h3>TAXII</h3>
                         </div>
                     </div>
                 </div>
-                <div class="col-sm"></div>
+                <div class="col-sm panel d-flex flex-column">
+                    <div class="panel-body p-4">
+                        <!-- taxii -->
+                        <h3>ATT&amp;CK Data Model</h3>
+                        <p>
+                            The ATT&amp;CK Data Model provides a standardized way to represent ATT&amp;CK data using Zod
+                            schemas. It enables developers to parse, validate, and utilize the ATT&amp;CK knowledge base
+                            efficiently in various formats.
+                        </p>
+                        <div class="d-flex flex-row mb-4 mt-3">
+                            <a href="https://github.com/mitre-attack/attack-data-model">
+                                <button type="button" class="slide-button">
+                                    <span class="slide-button-text">
+                                        Visit Repository
+                                    </span>
+                                    <span class="slide-button-icon">
+                                        <i class="fa-brands fa-github"></i>
+                                    </span>
+                                </button>
+                            </a>
+                        </div>
+                        <div>
+                            <a class="partial-underline" href="https://mitre-attack.github.io/attack-data-model/">
+                                <span class="hover-line">Learn more about the ATT&amp;CK Data Model</span>
+                                &nbsp;&nbsp;
+                                <i class="fa-solid fa-up-right-from-square"></i>
+                            </a>
+                        </div>
+                    </div>
+                </div>
             </div>
 
             <!-- excel -->

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.
+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.