Merge branch 'main' into 20260401-DOC-16558-update-pcr-placeholder

rmloveland · web-flow · commit 226c9afcfcbf · 2026-04-03T14:55:46.000-04:00
diff --git a/src/current/_data/redirects.yml b/src/current/_data/redirects.yml
@@ -1122,6 +1122,12 @@
   sources: ['query-data.md']
   versions: ['v26.1', 'v26.2']
 
+- destination: releases/index.md
+  sources: ['releases/staged-release-process.md']
+  
+- destination: releases/downloads-archive.md
+  sources: ['releases/unsupported-versions.md']
+
 - destination: delete.md
   sources: ['delete-data.md']
   versions: ['v26.1', 'v26.2']
@@ -1148,4 +1154,4 @@
 
 - destination: update.md
   sources: ['update-data.md']
-  versions: ['v26.1', 'v26.2']
+  versions: ['v26.1', 'v26.2']
diff --git a/src/current/_includes/releases/staged-release-policy.md b/src/current/_includes/releases/staged-release-policy.md
diff --git a/src/current/_includes/sidebar-all-releases.json b/src/current/_includes/sidebar-all-releases.json
@@ -22,28 +22,12 @@
     "/releases/{{ site.versions["dev"] }}.html"
   ]
 }{% endunless %},
-{
-  "title": "Staged Release Process",
-  "urls": [
-    "/releases/staged-release-process.html"
-  ]
-},
 {
   "title": "Release Support Policy",
   "urls": [
     "/releases/release-support-policy.html"
   ]
 },
-{% assign advisories = site.pages | where_exp: "advisories", "advisories.path contains 'advisories'" | where_exp: "advisories", "advisories.index != 'true'" %}
-{
- "title": "Technical Advisories",
- "urls": [
-    "/advisories/index.html"
-   {% for x in advisories %}
-    ,"{{ x.url }}"
-   {% endfor %}
- ]
-},
 {
   "title": "Cloud Releases",
   "urls": [
@@ -63,15 +47,8 @@
   ]
 },
 {
-  "title": "Unsupported Versions",
-  "urls": [
-    "/releases/unsupported-versions.html"
-  ]
-},
-{
-  "title": "Archived Documentation",
+  "title": "CockroachDB Downloads Archive",
   "urls": [
-   
-  "/releases/archived-documentation.html"
+    "/releases/downloads-archive.html"
   ]
 }
diff --git a/src/current/_includes/sidebar-releases.json b/src/current/_includes/sidebar-releases.json
@@ -64,20 +64,10 @@
     "/releases/kubernetes-operator.html"
   ]
 },
-{% assign advisories = site.pages | where_exp: "advisories", "advisories.path contains 'advisories'" | where_exp: "advisories", "advisories.index != 'true'" %}
 {
- "title": "Technical Advisories",
- "urls": [
-    "/advisories/index.html"
-   {% for x in advisories %}
-    ,"{{ x.url }}"
-   {% endfor %}
- ]
-},
-{
-  "title": "Unsupported Versions",
+  "title": "CockroachDB Downloads Archive",
   "urls": [
-    "/releases/unsupported-versions.html"
+    "/releases/downloads-archive.html"
   ]
 }
 
diff --git a/src/current/_includes/v23.1/sidebar-data/reference.json b/src/current/_includes/v23.1/sidebar-data/reference.json
@@ -419,6 +419,23 @@
             ]
           }
         ]
+      },
+      {% assign advisories = site.pages | where_exp: "advisories", "advisories.path contains 'advisories'" | where_exp: "advisories", "advisories.index != 'true'" %}
+      {
+      "title": "Technical Advisories",
+      "urls": [
+          "/advisories/index.html"
+        {% for x in advisories %}
+          ,"{{ x.url }}"
+        {% endfor %}
+      ]
+      },
+      {
+        "title": "Archived Documentation",
+        "urls": [
+        
+        "/releases/archived-documentation.html"
+        ]
       }
     ]
   }
diff --git a/src/current/_includes/v23.2/sidebar-data/reference.json b/src/current/_includes/v23.2/sidebar-data/reference.json
@@ -425,6 +425,23 @@
             ]
           }
         ]
+      },
+      {% assign advisories = site.pages | where_exp: "advisories", "advisories.path contains 'advisories'" | where_exp: "advisories", "advisories.index != 'true'" %}
+      {
+      "title": "Technical Advisories",
+      "urls": [
+          "/advisories/index.html"
+        {% for x in advisories %}
+          ,"{{ x.url }}"
+        {% endfor %}
+      ]
+      },
+      {
+        "title": "Archived Documentation",
+        "urls": [
+        
+        "/releases/archived-documentation.html"
+        ]
       }
     ]
   }
diff --git a/src/current/_includes/v24.1/sidebar-data/reference.json b/src/current/_includes/v24.1/sidebar-data/reference.json
@@ -419,6 +419,23 @@
             ]
           }
         ]
+      },
+      {% assign advisories = site.pages | where_exp: "advisories", "advisories.path contains 'advisories'" | where_exp: "advisories", "advisories.index != 'true'" %}
+      {
+      "title": "Technical Advisories",
+      "urls": [
+          "/advisories/index.html"
+        {% for x in advisories %}
+          ,"{{ x.url }}"
+        {% endfor %}
+      ]
+      },
+      {
+        "title": "Archived Documentation",
+        "urls": [
+        
+        "/releases/archived-documentation.html"
+        ]
       }
     ]
   }
diff --git a/src/current/_includes/v24.2/sidebar-data/reference.json b/src/current/_includes/v24.2/sidebar-data/reference.json
@@ -430,6 +430,23 @@
             ]
           }
         ]
+      },
+      {% assign advisories = site.pages | where_exp: "advisories", "advisories.path contains 'advisories'" | where_exp: "advisories", "advisories.index != 'true'" %}
+      {
+      "title": "Technical Advisories",
+      "urls": [
+          "/advisories/index.html"
+        {% for x in advisories %}
+          ,"{{ x.url }}"
+        {% endfor %}
+      ]
+      },
+      {
+        "title": "Archived Documentation",
+        "urls": [
+        
+        "/releases/archived-documentation.html"
+        ]
       }
     ]
   }
diff --git a/src/current/_includes/v24.3/sidebar-data/reference.json b/src/current/_includes/v24.3/sidebar-data/reference.json
@@ -430,6 +430,23 @@
             ]
           }
         ]
+      },
+      {% assign advisories = site.pages | where_exp: "advisories", "advisories.path contains 'advisories'" | where_exp: "advisories", "advisories.index != 'true'" %}
+      {
+      "title": "Technical Advisories",
+      "urls": [
+          "/advisories/index.html"
+        {% for x in advisories %}
+          ,"{{ x.url }}"
+        {% endfor %}
+      ]
+      },
+      {
+        "title": "Archived Documentation",
+        "urls": [
+        
+        "/releases/archived-documentation.html"
+        ]
       }
     ]
   }
diff --git a/src/current/_includes/v25.1/sidebar-data/reference.json b/src/current/_includes/v25.1/sidebar-data/reference.json
@@ -430,6 +430,23 @@
             ]
           }
         ]
+      },
+      {% assign advisories = site.pages | where_exp: "advisories", "advisories.path contains 'advisories'" | where_exp: "advisories", "advisories.index != 'true'" %}
+      {
+      "title": "Technical Advisories",
+      "urls": [
+          "/advisories/index.html"
+        {% for x in advisories %}
+          ,"{{ x.url }}"
+        {% endfor %}
+      ]
+      },
+      {
+        "title": "Archived Documentation",
+        "urls": [
+        
+        "/releases/archived-documentation.html"
+        ]
       }
     ]
   }
diff --git a/src/current/_includes/v25.2/sidebar-data/reference.json b/src/current/_includes/v25.2/sidebar-data/reference.json
@@ -436,6 +436,23 @@
             ]
           }
         ]
+      },
+      {% assign advisories = site.pages | where_exp: "advisories", "advisories.path contains 'advisories'" | where_exp: "advisories", "advisories.index != 'true'" %}
+      {
+      "title": "Technical Advisories",
+      "urls": [
+          "/advisories/index.html"
+        {% for x in advisories %}
+          ,"{{ x.url }}"
+        {% endfor %}
+      ]
+      },
+      {
+        "title": "Archived Documentation",
+        "urls": [
+        
+        "/releases/archived-documentation.html"
+        ]
       }
     ]
   }
diff --git a/src/current/_includes/v25.3/sidebar-data/reference.json b/src/current/_includes/v25.3/sidebar-data/reference.json
@@ -436,6 +436,23 @@
             ]
           }
         ]
+      },
+      {% assign advisories = site.pages | where_exp: "advisories", "advisories.path contains 'advisories'" | where_exp: "advisories", "advisories.index != 'true'" %}
+      {
+      "title": "Technical Advisories",
+      "urls": [
+          "/advisories/index.html"
+        {% for x in advisories %}
+          ,"{{ x.url }}"
+        {% endfor %}
+      ]
+      },
+      {
+        "title": "Archived Documentation",
+        "urls": [
+        
+        "/releases/archived-documentation.html"
+        ]
       }
     ]
   }
diff --git a/src/current/_includes/v25.4/sidebar-data/reference.json b/src/current/_includes/v25.4/sidebar-data/reference.json
@@ -436,6 +436,23 @@
             ]
           }
         ]
+      },
+      {% assign advisories = site.pages | where_exp: "advisories", "advisories.path contains 'advisories'" | where_exp: "advisories", "advisories.index != 'true'" %}
+      {
+      "title": "Technical Advisories",
+      "urls": [
+          "/advisories/index.html"
+        {% for x in advisories %}
+          ,"{{ x.url }}"
+        {% endfor %}
+      ]
+      },
+      {
+        "title": "Archived Documentation",
+        "urls": [
+        
+        "/releases/archived-documentation.html"
+        ]
       }
     ]
   }
diff --git a/src/current/_includes/v26.1/sidebar-data/reference.json b/src/current/_includes/v26.1/sidebar-data/reference.json
@@ -442,6 +442,23 @@
             ]
           }
         ]
+      },
+      {% assign advisories = site.pages | where_exp: "advisories", "advisories.path contains 'advisories'" | where_exp: "advisories", "advisories.index != 'true'" %}
+      {
+      "title": "Technical Advisories",
+      "urls": [
+          "/advisories/index.html"
+        {% for x in advisories %}
+          ,"{{ x.url }}"
+        {% endfor %}
+      ]
+      },
+      {
+        "title": "Archived Documentation",
+        "urls": [
+        
+        "/releases/archived-documentation.html"
+        ]
       }
     ]
   }
diff --git a/src/current/_includes/v26.2/sidebar-data/reference.json b/src/current/_includes/v26.2/sidebar-data/reference.json
@@ -442,6 +442,23 @@
             ]
           }
         ]
+      },
+      {% assign advisories = site.pages | where_exp: "advisories", "advisories.path contains 'advisories'" | where_exp: "advisories", "advisories.index != 'true'" %}
+      {
+      "title": "Technical Advisories",
+      "urls": [
+          "/advisories/index.html"
+        {% for x in advisories %}
+          ,"{{ x.url }}"
+        {% endfor %}
+      ]
+      },
+      {
+        "title": "Archived Documentation",
+        "urls": [
+        
+        "/releases/archived-documentation.html"
+        ]
       }
     ]
   }
diff --git a/src/current/releases/downloads-archive.md b/src/current/releases/downloads-archive.md
@@ -1,11 +1,11 @@
 ---
-title: Unsupported Versions
-summary: Versions of CockroachDB that are no longer supported
+title: CockroachDB Downloads Archive
+summary: Archive of downloads for versions of CockroachDB that are no longer supported
 toc: true
 docs_area: releases
 ---
 {{site.data.alerts.callout_danger}}
-The CockroachDB versions on this page are no longer supported. For more information, refer to [Release Support Policy]({% link releases/release-support-policy.md %}#unsupported-versions). To download and learn about currently supported CockroachDB versions, refer to [CockroachDB Releases]({% link releases/index.md %}).
+This page hosts download links to CockroachDB versions that are no longer supported. For more information about CockroachDB version support, refer to [Release Support Policy]({% link releases/release-support-policy.md %}#unsupported-versions). To download and learn about currently supported CockroachDB versions, refer to [CockroachDB Releases]({% link releases/index.md %}).
 {{site.data.alerts.end}}
 ## Downloads
 
diff --git a/src/current/releases/index.md b/src/current/releases/index.md
@@ -82,9 +82,9 @@ The following releases and their descriptions represent proposed plans that are
 | :---: | :---: | :---: |
 | v26.2 | Regular    | 2026 Q2    |
 
-## Unsupported versions 
+## Archived releases 
 
-A full archive of CockroachDB major versions that are no longer supported is available on the [Unsupported Versions]({% link releases/unsupported-versions.md %}) page.
+To access CockroachDB versions that are no longer supported, refer to [CockroachDB Downloads Archive]({% link releases/downloads-archive.md %}).
 
 ## Licenses
 
diff --git a/src/current/releases/staged-release-process.md b/src/current/releases/staged-release-process.md

Original file line number	Diff line number	Diff line change
`@@ -64,20 +64,10 @@`
`64`	`64`	`"/releases/kubernetes-operator.html"`
`65`	`65`	`]`
`66`	`66`	`},`
`67`		`-{% assign advisories = site.pages \| where_exp: "advisories", "advisories.path contains 'advisories'" \| where_exp: "advisories", "advisories.index != 'true'" %}`
`68`	`67`	`{`
`69`		`- "title": "Technical Advisories",`
`70`		`- "urls": [`
`71`		`- "/advisories/index.html"`
`72`		`- {% for x in advisories %}`
`73`		`- ,"{{ x.url }}"`
`74`		`- {% endfor %}`
`75`		`- ]`
`76`		`-},`
`77`		`-{`
`78`		`- "title": "Unsupported Versions",`
	`68`	`+ "title": "CockroachDB Downloads Archive",`
`79`	`69`	`"urls": [`
`80`		`- "/releases/unsupported-versions.html"`
	`70`	`+ "/releases/downloads-archive.html"`
`81`	`71`	`]`
`82`	`72`	`}`
`83`	`73`
Original file line number	Diff line number	Diff line change
`@@ -419,6 +419,23 @@`
`419`	`419`	`]`
`420`	`420`	`}`
`421`	`421`	`]`
	`422`	`+ },`
	`423`	`+ {% assign advisories = site.pages \| where_exp: "advisories", "advisories.path contains 'advisories'" \| where_exp: "advisories", "advisories.index != 'true'" %}`
	`424`	`+ {`
	`425`	`+ "title": "Technical Advisories",`
	`426`	`+ "urls": [`
	`427`	`+ "/advisories/index.html"`
	`428`	`+ {% for x in advisories %}`
	`429`	`+ ,"{{ x.url }}"`
	`430`	`+ {% endfor %}`
	`431`	`+ ]`
	`432`	`+ },`
	`433`	`+ {`
	`434`	`+ "title": "Archived Documentation",`
	`435`	`+ "urls": [`
	`436`	`+`
	`437`	`+ "/releases/archived-documentation.html"`
	`438`	`+ ]`
`422`	`439`	`}`
`423`	`440`	`]`
`424`	`441`	`}`
Original file line number	Diff line number	Diff line change
`@@ -425,6 +425,23 @@`
`425`	`425`	`]`
`426`	`426`	`}`
`427`	`427`	`]`
	`428`	`+ },`
	`429`	`+ {% assign advisories = site.pages \| where_exp: "advisories", "advisories.path contains 'advisories'" \| where_exp: "advisories", "advisories.index != 'true'" %}`
	`430`	`+ {`
	`431`	`+ "title": "Technical Advisories",`
	`432`	`+ "urls": [`
	`433`	`+ "/advisories/index.html"`
	`434`	`+ {% for x in advisories %}`
	`435`	`+ ,"{{ x.url }}"`
	`436`	`+ {% endfor %}`
	`437`	`+ ]`
	`438`	`+ },`
	`439`	`+ {`
	`440`	`+ "title": "Archived Documentation",`
	`441`	`+ "urls": [`
	`442`	`+`
	`443`	`+ "/releases/archived-documentation.html"`
	`444`	`+ ]`
`428`	`445`	`}`
`429`	`446`	`]`
`430`	`447`	`}`
Original file line number	Diff line number	Diff line change
`@@ -430,6 +430,23 @@`
`430`	`430`	`]`
`431`	`431`	`}`
`432`	`432`	`]`
	`433`	`+ },`
	`434`	`+ {% assign advisories = site.pages \| where_exp: "advisories", "advisories.path contains 'advisories'" \| where_exp: "advisories", "advisories.index != 'true'" %}`
	`435`	`+ {`
	`436`	`+ "title": "Technical Advisories",`
	`437`	`+ "urls": [`
	`438`	`+ "/advisories/index.html"`
	`439`	`+ {% for x in advisories %}`
	`440`	`+ ,"{{ x.url }}"`
	`441`	`+ {% endfor %}`
	`442`	`+ ]`
	`443`	`+ },`
	`444`	`+ {`
	`445`	`+ "title": "Archived Documentation",`
	`446`	`+ "urls": [`
	`447`	`+`
	`448`	`+ "/releases/archived-documentation.html"`
	`449`	`+ ]`
`433`	`450`	`}`
`434`	`451`	`]`
`435`	`452`	`}`