From eb18b8d6bef161682e7ac8c77f7bc74d71769f39 Mon Sep 17 00:00:00 2001 From: Bob Walker Date: Thu, 8 Jan 2026 15:06:15 -0600 Subject: [PATCH 1/2] Fixing the markdown fixes because the markdown linter contradicts our standards --- .markdownlint.json | 1 + src/pages/docs/administration/upgrading/index.mdx | 2 -- .../self-hosted-octopus/installation-guidelines.mdx | 2 -- src/pages/docs/installation/index.mdx | 2 -- src/pages/docs/installation/requirements.mdx | 2 -- .../installation/octopus-releases.include.md | 11 ++--------- 6 files changed, 3 insertions(+), 17 deletions(-) diff --git a/.markdownlint.json b/.markdownlint.json index 4234e49580..b3961bca0d 100644 --- a/.markdownlint.json +++ b/.markdownlint.json @@ -1,5 +1,6 @@ { "MD013": false, + "MD041": false, "emphasis": { "style": "asterisk" }, "no-inline-html": false, "ul-style": { "style": "dash" } diff --git a/src/pages/docs/administration/upgrading/index.mdx b/src/pages/docs/administration/upgrading/index.mdx index dc9eec2311..db822e4b14 100644 --- a/src/pages/docs/administration/upgrading/index.mdx +++ b/src/pages/docs/administration/upgrading/index.mdx @@ -63,8 +63,6 @@ The Windows Service is split across multiple folders to make upgrading easy and - **Tentacles**: Octopus Deploy connects to deployment targets via the Tentacle service. Each version of Octopus Deploy includes a specific Tentacle version. Tentacle upgrades do not occur until *after* the Octopus Deploy server is upgraded. Tentacle upgrades are optional; any Tentacle greater than 4.x will work [with any modern version of Octopus Deploy](/docs/support/compatibility). We recommend you upgrade them to get the latest bug fixes and security patches when convenient. - **Calamari**: The Tentacles facilitate communication between Octopus Deploy and the deployment targets. Calamari is the software that does the actual deployments. Calamari and Octopus Deploy are coupled together. Calamari is upgraded automatically during the first deployment to a target. -## Supported Octopus Deploy Server Versions - ## How we version Octopus Deploy diff --git a/src/pages/docs/best-practices/self-hosted-octopus/installation-guidelines.mdx b/src/pages/docs/best-practices/self-hosted-octopus/installation-guidelines.mdx index 81bdbe8ca1..3da0374be3 100644 --- a/src/pages/docs/best-practices/self-hosted-octopus/installation-guidelines.mdx +++ b/src/pages/docs/best-practices/self-hosted-octopus/installation-guidelines.mdx @@ -23,8 +23,6 @@ There are three components to an Octopus Deploy instance: This document will provide you with guidelines and recommendations for self-hosting Octopus Deploy. -## Supported Octopus Deploy Server Versions - ## Host Octopus on Windows Server or as a Linux Container diff --git a/src/pages/docs/installation/index.mdx b/src/pages/docs/installation/index.mdx index deced4cdfa..a1ae0e5474 100644 --- a/src/pages/docs/installation/index.mdx +++ b/src/pages/docs/installation/index.mdx @@ -45,8 +45,6 @@ When installed, the self-hosted Octopus Server: Before you install Octopus Deploy, review the software and hardware [requirements](/docs/installation/requirements/), and make sure you have access to an instance of [SQL Server Database](/docs/installation/sql-server-database) that you can use with Octopus Deploy. -## Supported Octopus Deploy Server Versions - ## Install Octopus as a Windows Service \{#install-octopus} diff --git a/src/pages/docs/installation/requirements.mdx b/src/pages/docs/installation/requirements.mdx index 49a909d03a..1b0fc552bb 100644 --- a/src/pages/docs/installation/requirements.mdx +++ b/src/pages/docs/installation/requirements.mdx @@ -21,8 +21,6 @@ Octopus Server can be hosted on either: However, once your Octopus Server is up and running, you can deploy to Windows servers, Linux servers, Microsoft Azure, AWS, GCP, Cloud Regions, or even an offline package drop. -## Supported Octopus Deploy Server Versions - ### Windows Server diff --git a/src/shared-content/installation/octopus-releases.include.md b/src/shared-content/installation/octopus-releases.include.md index bebd69916d..6093d84f81 100644 --- a/src/shared-content/installation/octopus-releases.include.md +++ b/src/shared-content/installation/octopus-releases.include.md @@ -1,13 +1,6 @@ ---- -layout: src/layouts/Default.astro -pubDate: 2023-01-01 -modDate: 2023-01-01 -title: octopus release and supported versions include -description: Include the octopus deploy release and supported versions -navOrder: 666 ---- +## Supported Octopus Deploy Server Versions -Each self-hosted major.minor release of Octopus Deploy will receive critical patches and support for a period of six months. For example, 2025.4 was released in December 2025 and will be supported for six months. +Each self-hosted major.minor release of Octopus Deploy will receive *critical patches and support* for a period of **six months.** For example, 2025.4 was released in December 2025 and will be supported for six months. All new releases of Octopus Deploy will run in Octopus Cloud first for at least one quarter. As a result, Octopus Cloud is always at least one version ahead of the self-hosted version. From 78cd6ff3853886c950b1d95ccb3b6551ca2bd3d5 Mon Sep 17 00:00:00 2001 From: Bob Walker Date: Thu, 8 Jan 2026 15:46:46 -0600 Subject: [PATCH 2/2] Being specific on when support ends --- src/shared-content/installation/octopus-releases.include.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared-content/installation/octopus-releases.include.md b/src/shared-content/installation/octopus-releases.include.md index 6093d84f81..6a13269b7f 100644 --- a/src/shared-content/installation/octopus-releases.include.md +++ b/src/shared-content/installation/octopus-releases.include.md @@ -1,6 +1,6 @@ ## Supported Octopus Deploy Server Versions -Each self-hosted major.minor release of Octopus Deploy will receive *critical patches and support* for a period of **six months.** For example, 2025.4 was released in December 2025 and will be supported for six months. +Each self-hosted major.minor release of Octopus Deploy will receive *critical patches and support* for a period of **six months.** For example, 2025.4 was released in December 2025 and will be supported through May 2026. All new releases of Octopus Deploy will run in Octopus Cloud first for at least one quarter. As a result, Octopus Cloud is always at least one version ahead of the self-hosted version.