From 54e2727d183860a7eb336aa4501b2356451bca20 Mon Sep 17 00:00:00 2001 From: William Morgan Date: Sat, 6 Apr 2024 16:46:19 -0500 Subject: [PATCH] wordsmithing --- linkerd.io/content/releases/_index.md | 43 +++++++++++---------- linkerd.io/layouts/shortcodes/releases.html | 4 +- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/linkerd.io/content/releases/_index.md b/linkerd.io/content/releases/_index.md index 36e08e9290..510363e6bc 100644 --- a/linkerd.io/content/releases/_index.md +++ b/linkerd.io/content/releases/_index.md @@ -4,33 +4,36 @@ aliases = [ "edge" ] weight = 18 +++ -Linkerd is developed in the [Linkerd GitHub -repository](https://github.com/linkerd/linkerd2). Releases and packages of -Linkerd are available in several different forms. +Releases and packages of Linkerd are available in several different forms. -## Edge (latest version: {{% latestedge %}}) +## Edge releases (latest version: {{% latestedge %}}) -All Linkerd development happens "on main": all changes, whether in support of -upcoming new features, refactors, bug fixes, or something else, land on the main -branch where they are merged together. +All Linkerd development happens "on main": all changes, whether security +patches, new features, refactors, bug fixes, or something else, land on the main +branch. -Edge releases contain the latest code in from the main branch at the point in -time when they were cut. This means they have the latest features and fixes, but -it also means they don't have stability guarantees. Upgrading between edge -releases may involve breaking changes, and may involve partial features that are -later modified or backed out. +Edge release artifacts contain the latest code in from the main branch, at the +point in time when they were cut. This means they have the latest features and +fixes, but it also means may involve partial features that are later modified or +backed out. They may involve breaking changes—of course, we do our best to avoid +this. -The full list of edge releases can be found on -[GitHub](https://github.com/linkerd/linkerd2/releases). +Using edge release artifacts and reporting bugs is a great way to help Linkerd. -## Stable +The full list of edge release artifacts can be found on +[the Linkerd GitHub releases page](https://github.com/linkerd/linkerd2/releases). -As of Linkerd 2.15.0, the open source project no longer publishes stable -releases. Instead, the vendor community around Linkerd is responsible for -supported, stable releases. +Latest version: **{{% latestedge %}}** [[release +notes](https://github.com/linkerd/linkerd2/releases/tag/{{% latestedge %}})]. -Known stable distributions of Linkerd include: +## Stable releases + +As of February 2024, the vendor community around Linkerd is responsible for +supported, stable release artifacts. Known distributions of Linkerd with stable +release artifacts are: * [Buoyant Enterprise for Linkerd](https://docs.buoyant.io/buoyant-enterprise-linkerd) from Buoyant, - creators of Linkerd. + creators of Linkerd. Latest version: + **enterprise-2.15.2** [[release + notes](https://docs.buoyant.io/release-notes/buoyant-enterprise-linkerd/enterprise-2.15.2/)]. diff --git a/linkerd.io/layouts/shortcodes/releases.html b/linkerd.io/layouts/shortcodes/releases.html index a0c7756bf4..2fc4ff420c 100644 --- a/linkerd.io/layouts/shortcodes/releases.html +++ b/linkerd.io/layouts/shortcodes/releases.html @@ -1,2 +1,2 @@ -{{ $content := "This page contains instructions using the latest edge release of Linkerd. To use a stable distribution, see [Linkerd Releases](/releases/)." | markdownify -}} -{{ partial "admonition.html" (dict "type" "info" "icon" "info-circle" "id" (.Get "id") "title" "Linkerd Releases" "content" $content) }} +{{ $content := "This page contains instructions using the latest edge release of Linkerd. For other types of releases, including stable releases, please see [Linkerd Releases](/releases/)." | markdownify -}} +{{ partial "admonition.html" (dict "type" "info" "icon" "info-circle" "id" (.Get "id") "title" "Edge release content" "content" $content) }}