From 02cd84adbfa74aedacbcfc9c6358caf6bd8cb548 Mon Sep 17 00:00:00 2001 From: Anna Stuchlik Date: Mon, 12 Feb 2024 17:43:54 +0100 Subject: [PATCH] doc: remove OSS-vs-Ent Matrix from OSS docs This commit removes the Open Source vs. Enterprise matrix from the Open Source documentation. In addition, a redirection is added to prevent 404 in the OSS docs, and to the removed page is replaced with a link to the same page in the Enterprise docs. This commit must be reverted enterprise.git, because we want to keep the Matrix in the Enterprise docs. Fixes https://github.com/scylladb/scylladb/issues/17289 Closes scylladb/scylladb#17295 --- docs/_utils/redirects.yaml | 5 +++ .../versions-matrix-enterprise-oss.rst | 31 ------------------- docs/upgrade/scylladb-versioning.rst | 2 +- 3 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 docs/reference/versions-matrix-enterprise-oss.rst diff --git a/docs/_utils/redirects.yaml b/docs/_utils/redirects.yaml index 4676644c6c..25259cc792 100644 --- a/docs/_utils/redirects.yaml +++ b/docs/_utils/redirects.yaml @@ -1,6 +1,11 @@ ### a dictionary of redirections #old path: new path + +# remove the Open Source vs. Enterprise Matrix from the Open Source docs + +/stable/reference/versions-matrix-enterprise-oss.html: https://enterprise.docs.scylladb.com/stable/reference/versions-matrix-enterprise-oss.html + # Remove the Learn page (replaced with a link to a page in a different repo) /stable/using-scylla/learn: https://docs.scylladb.com/stable/get-started/learn-resources/index.html diff --git a/docs/reference/versions-matrix-enterprise-oss.rst b/docs/reference/versions-matrix-enterprise-oss.rst deleted file mode 100644 index e2d2d8d4e2..0000000000 --- a/docs/reference/versions-matrix-enterprise-oss.rst +++ /dev/null @@ -1,31 +0,0 @@ -============================================= -ScyllaDB Enterprise vs. Open Source Matrix -============================================= - -ScyllaDB Enterprise is based on ScyllaDB Open Source - it provides the functionality of ScyllaDB Open Source, -with the addition of Enterprise-only features and 24/7 support. - -The following table shows ScyllaDB Enterprise versions and their corresponding ScyllaDB Open Source releases. - - -.. list-table:: - :widths: 50 50 - :header-rows: 1 - - * - ScyllaDB Enterprise - - ScyllaDB Open Source - * - 2024.1 - - 5.4 - * - 2023.1 - - 5.2 - * - 2022.2 - - 5.1 - * - 2022.1 - - 5.0 - * - 2021.1 - - 4.3 - * - 2020.1 - - 4.0 - * - 2019.1 - - 3.0 - diff --git a/docs/upgrade/scylladb-versioning.rst b/docs/upgrade/scylladb-versioning.rst index 4cb75d52d5..f8f812d4a6 100644 --- a/docs/upgrade/scylladb-versioning.rst +++ b/docs/upgrade/scylladb-versioning.rst @@ -57,5 +57,5 @@ ScyllaDB Enterprise: Feature Releases - Minor Versions: * 3-4 releases per year - * Closely follow ScyllaDB Open Source releases (see :doc:`ScyllaDB Enterprise vs. Open Source Matrix `) + * Closely follow ScyllaDB Open Source releases (see `ScyllaDB Enterprise vs. Open Source Matrix `_) * Introduce features added in ScyllaDB Open Source, as well as Enterprise-only premium features \ No newline at end of file