DOC-5456: Update references to deprecated DataStax properties

src/js/vendor/highlight.bundle.js

@@ -4,6 +4,7 @@
   var hljs = require('highlight.js/lib/highlight')
   var hljsCurl = require('highlightjs-curl')
   var sql = require('highlight.js/lib/languages/sql')
+  var ini = require('highlight.js/lib/languages/ini')
 
   hljs.registerLanguage('asciidoc', require('highlight.js/lib/languages/asciidoc'))
   hljs.registerLanguage('bash', require('highlight.js/lib/languages/bash'))
@@ -18,6 +19,7 @@
   hljs.registerLanguage('go', require('highlight.js/lib/languages/go'))
   hljs.registerLanguage('groovy', require('highlight.js/lib/languages/groovy'))
   hljs.registerLanguage('haskell', require('highlight.js/lib/languages/haskell'))
+  hljs.registerLanguage('ini', ini)
   hljs.registerLanguage('java', require('highlight.js/lib/languages/java'))
   hljs.registerLanguage('javascript', require('highlight.js/lib/languages/javascript'))
   hljs.registerLanguage('json', require('highlight.js/lib/languages/json'))
@@ -40,6 +42,7 @@
   // Use SQL highlighter for CQL
   hljs.registerLanguage('cql', sql)
   hljs.registerLanguage('swift', require('highlight.js/lib/languages/swift'))
+  hljs.registerLanguage('toml', ini)
   hljs.registerLanguage('typescript', require('highlight.js/lib/languages/typescript'))
   hljs.registerLanguage('xml', require('highlight.js/lib/languages/xml'))
   hljs.registerLanguage('yaml', require('highlight.js/lib/languages/yaml'))

src/partials/footer.hbs

@@ -1,32 +1,32 @@
 <footer class="footer [&_a]:text-link flex flex-col gap-6 border-t mt-auto pt-6 text-sm md:flex-row row-start-2 xl:peer-[.toc]:col-span-2">
   <div class="flex flex-col gap-6">
     <a
-      href="https://www.datastax.com"
+      href="https://www.ibm.com/products/datastax"
       target="_blank"
-      title="Go to the DataStax Website"
-      data-track="Footer datastax.com Link Clicked"
+      title="Go to the DataStax home page"
+      data-track="Footer Home Page Link Clicked"
       class="w-min !text-primary"
     >
     {{> logo}}
     </a>
     <p class="!m-0">
-      <span>©</span>
+      <span>© Copyright IBM Corporation</span>
       <span id="copyrightdate">{{year}}</span>
-      <span>DataStax, an IBM Company |
+      <span> |
         <a
-          href="https://www.datastax.com/legal/datastax-website-privacy-policy"
+          href="https://www.ibm.com/privacy"
           target="_blank"
           data-track="Footer Privacy Policy Link Clicked"
         >Privacy policy</a>
         |
         <a
-          href="https://www.datastax.com/legal/datastax-website-terms-use"
+          href="https://www.ibm.com/legal/terms"
           target="_blank"
           data-track="Footer Terms of Use Link Clicked"
         >Terms of use</a>
         {{#with site.keys.ibmSegment}}
         <span id="preferenceCenterContainer">
-          ·&nbsp;
+          |&nbsp;
           <a
             id="preferenceCenterLink"
             href="#"
@@ -48,34 +48,13 @@
   </div>
   <div class="flex flex-col gap-6 md:ml-auto md:items-end">
     <div class="flex items-center gap-4">
-      <a
-        href="https://discord.gg/datastax"
-        target="_blank"
-        title="Go to DataStax Developers Discord"
-        data-track="Footer Discord Link Clicked"
-        class="h-6 w-6 bg-[url('../img/social-discord.svg')] bg-no-repeat dark:invert"
-      ></a>
       <a
         href="https://github.com/datastax"
         target="_blank"
         title="Go to DataStax GitHub"
         data-track="Footer Github Link Clicked"
         class="h-6 w-6 bg-[url('../img/social-github.svg')] bg-no-repeat dark:invert"
       ></a>
-      <a
-        href="https://www.linkedin.com/showcase/datastaxdevs/"
-        target="_blank"
-        title="Go to DataStax Developers LinkedIn"
-        data-track="LinkedIn Link Clicked"
-        class="h-6 w-6 bg-[url('../img/social-linkedin.svg')] bg-no-repeat dark:invert"
-      ></a>
-      <a
-        href="https://twitter.com/datastaxdevs"
-        target="_blank"
-        title="Go to DataStax Developers X (Twitter)"
-        data-track="Footer Twitter Link Clicked"
-        class="h-6 w-6 bg-[url('../img/social-x.svg')] bg-no-repeat dark:invert"
-      ></a>
       <a
         href="https://www.youtube.com/@DataStaxDevs"
         target="_blank"
@@ -86,13 +65,9 @@
     </div>
     <p class="!m-0 md:text-right">General Inquiries:
       <a
-        href="tel:+1-650-389-6000"
-        data-track="Footer Telephone Link Clicked"
-      >+1 (650) 389-6000</a>,
-      <a
-        href="mailto:[email protected]"
-        data-track="Footer Email Link Clicked"
-      >[email protected]</a>
+        href="https://www.ibm.com/contact/global"
+        data-track="Footer Contact Link Clicked"
+      >Contact IBM</a>
     </p>
   </div>
 </footer>

src/partials/head-meta.hbs

@@ -1,110 +1,100 @@
-    {{!-- Add additional meta tags here --}}
+{{!-- Favicon / social --}}
+<link rel="icon" href="https://www.ibm.com/favicon.ico">
 
-    {{!-- apple touch icon --}}
-    {{!-- <link rel="apple-touch-icon" sizes="180x180" href="https://www.datastax.com/en/astra/_/img/apple-touch-icon-180x180.png"> --}}
-    <link rel="icon" href="https://www.datastax.com/favicon.ico">
-    <meta property="article:published_time" content="{{page.localdate}}">
-    <meta property="article:modified_time" content="{{page.docdate}}">
-    <meta property="article:author" content="DataStax">
-    {{!-- og --}}
-    <meta property="og:site_name" content="DataStax Documentation">
-    <meta property="og:type" content="article">
-    <meta property="og:url" content="{{page.canonicalUrl}}">
-    <meta property="og:title" content="{{> head-title}}">
-    <meta property="og:description" content="{{page.description}}">
-    <meta property="og:image" content="{{{site.url}}}{{{site.ui.url}}}/img/datastax-docs-banner.png">
-    <meta property="og:image:type" content="image/png">
-    <meta property="og:image:width" content="1200">
-    <meta property="og:image:height" content="628">
-    <meta property="og:image:alt" content="DataStax Documentation">
-    {{!-- twitter --}}
-    <meta name="twitter:card" content="summary_large_image">
-    <meta name="twitter:site" content="@datastax">
-    <meta name="twitter:creator" content="@datastax">
-    <meta name="twitter:url" content="{{page.canonicalUrl}}">
-    <meta name="twitter:title" content="{{> head-title}}">
-    <meta name="twitter:description" content="{{page.description}}">
-    <meta name="twitter:image" content="{{{site.url}}}{{{site.ui.url}}}/img/datastax-docs-banner.png">
-    <script type="application/ld+json">
-    [
-    {{!-- {{commented expressions}} --}}
-    {{#if (eq  "{{{site.url}}}{{{site.homeUrl}}}" page.canonicalUrl)}}
+{{!-- Article meta --}}
+<meta property="article:published_time" content="{{page.localdate}}">
+<meta property="article:modified_time" content="{{page.docdate}}">
+<meta property="article:author" content="DataStax">
+
+{{!-- Open Graph --}}
+{{#if (eq "{{{site.url}}}{{{site.homeUrl}}}" page.canonicalUrl)}}
+<meta property="og:type" content="website">
+{{else}}
+<meta property="og:type" content="article">
+{{/if}}
+<meta property="og:site_name" content="DataStax Documentation">
+<meta property="og:url" content="{{page.canonicalUrl}}">
+<meta property="og:title" content="{{> head-title}}">
+<meta property="og:description" content="{{page.description}}">
+<meta property="og:image" content="{{{site.url}}}{{{site.ui.url}}}/img/datastax-docs-banner.png">
+<meta property="og:image:type" content="image/png">
+<meta property="og:image:width" content="1200">
+<meta property="og:image:height" content="628">
+<meta property="og:image:alt" content="DataStax Documentation">
+
+{{!-- Twitter / X --}}
+<meta name="twitter:card" content="summary_large_image">
+<meta name="twitter:url" content="{{page.canonicalUrl}}">
+<meta name="twitter:title" content="{{> head-title}}">
+<meta name="twitter:description" content="{{page.description}}">
+<meta name="twitter:image" content="{{{site.url}}}{{{site.ui.url}}}/img/datastax-docs-banner.png">
+
+<script type="application/ld+json">
     {
-        "@context": "https://schema.org",
-        "@type": "WebSite",
-        "@id": "https://docs.datastax.com",
-        "name": "DataStax Documentation",
-        "url": "{{page.canonicalUrl}}",
-        "image": "{{{site.url}}}{{{site.ui.url}}}/img/datastax-docs-banner.png",
+    "@context": "https://schema.org",
+    "@graph": [
+        {
+        "@type": "Organization",
+        "@id": "https://docs.datastax.com#organization",
+        "name": "DataStax",
+        "url": "https://docs.datastax.com",
+        "logo": "{{{site.url}}}{{{site.ui.url}}}/img/datastax-docs-banner.png",
         "sameAs": [
-             "https://github.com/datastaxdevs/",
-             "https://twitter.com/datastaxdevs",
-             "https://datastax.medium.com/"
-         ],
-        "potentialAction": {
-            "@type": "SearchAction",
-            "target": "https://www.datastax.com/search?dataset=docs&query={search_term}",
-            "query-input": "required name=search_term"
+            "https://www.ibm.com/products/datastax",
+            "https://github.com/datastax/",
+            "https://github.com/datastaxdevs/",
+            "https://www.youtube.com/@DataStax",
+            "https://www.youtube.com/@DataStaxDevs",
+            "https://en.wikipedia.org/wiki/DataStax"
+        ],
+        "parentOrganization": {
+            "@type": "Organization",
+            "@id": "https://www.ibm.com#organization",
+            "name": "IBM",
+            "url": "https://www.ibm.com"
+        }
         },
-        "Publisher":{
-            "@type": "Corporation",
-            "@id": "https://datastax.com#organization",
-            "name": "DataStax",
-            "url": "https://datastax.com"
+        {
+        "@type": "WebSite",
+        "@id": "https://docs.datastax.com#website",
+        "name": "DataStax Documentation",
+        "url": "https://docs.datastax.com",
+        "publisher": { "@id": "https://docs.datastax.com#organization" }
         },
-        "Author":{
-            "@type": "Corporation",
-            "@id": "https://datastax.com#organization",
-            "name": "DataStax"
-        }
-    },
-    {{else}}
-    {
-        "@context": "https://schema.org",
+        {{#if (eq  "{{{site.url}}}{{{site.homeUrl}}}" page.canonicalUrl)}}
+        {
         "@type": "WebPage",
         "@id": "{{page.canonicalUrl}}",
-        "name":"{{page.title}}",
-        "inLanguage":"en-US",
-        "reviewedBy":{
-            "@type": "Corporation",
-            "@id": "https://datastax.com#organization",
-            "name": "DataStax"
-        },
-        "author":{
-            "@type": "Corporation",
-            "@id": "https://datastax.com#organization",
-            "name": "DataStax"
-        },
-        "isPartOf": {
-            "@type": "WebSite",
-            "@id": "https://docs.datastax.com",
-            "name": "DataStax Documentation"
-        },
-        "mainEntity":
+        "name": "{{page.title}}",
+        "inLanguage": "en-US",
+        "isPartOf": { "@id": "https://docs.datastax.com#website" },
+        "publisher": { "@id": "https://docs.datastax.com#organization" },
+        "primaryImageOfPage": "{{{site.url}}}{{{site.ui.url}}}/img/datastax-docs-banner.png"
+        }
+        {{else}}
         {
-            "@type":"TechArticle",
+        "@type": "WebPage",
+        "@id": "{{page.canonicalUrl}}",
+        "name": "{{page.title}}",
+        "inLanguage": "en-US",
+        "isPartOf": { "@id": "https://docs.datastax.com#website" },
+        "reviewedBy": { "@id": "https://docs.datastax.com#organization" },
+        "author": { "@id": "https://docs.datastax.com#organization" },
+        "mainEntity": {
+            "@type": "TechArticle",
             "@id": "{{page.canonicalUrl}}#main_content",
-            "mainEntityOfPage": "true",
-            "datePublished":"{{page.localdate}}",
-            "dateModified":"{{page.docdate}}",
+            "mainEntityOfPage": true,
+            "datePublished": "{{page.localdate}}",
+            "dateModified": "{{page.docdate}}",
             "headline": "{{page.title}}",
-            "description":"{{page.description}}",
-            "keywords":"{{page.keywords}}",
+            "description": "{{page.description}}",
+            "keywords": "{{page.keywords}}",
             "image": "{{{site.url}}}{{{site.ui.url}}}/img/datastax-docs-banner.png",
-            "publisher":{
-                "@type": "Corporation",
-                "@id": "https://datastax.com#organization",
-                "name": "DataStax",
-                "url": "https://datastax.com"
-            },
-            "author":{
-                "@type": "Corporation",
-                "@id": "https://datastax.com#organization",
-                "name": "DataStax",
-                "url": "https://datastax.com"
-            }
+            "publisher": { "@id": "https://docs.datastax.com#organization" },
+            "author": { "@id": "https://docs.datastax.com#organization" }
+        }
         }
-     }
-    {{/if}}
+        {{/if}}
     ]
+    }
     </script>

src/partials/nav-secondary.hbs

@@ -2,7 +2,7 @@
   <li>
     <a
       class="text-body-small text-primary hover:bg-[var(--ds-neutral-plain-hover-bg)] flex rounded p-1 !no-underline transition-colors"
-      href="https://www.datastax.com/"
+      href="https://www.ibm.com/products/datastax"
       target="_self"
     >
       <span class="material-icons text-tertiary mr-2">home</span>