From 60b4250e10e4ea4fc012be8319c8c71dc64cfe91 Mon Sep 17 00:00:00 2001 From: Anna Stuchlik Date: Fri, 25 Oct 2024 13:16:49 +0200 Subject: [PATCH] doc: fix redundant references to version 6.2 This commit removes mentions of version 6.2 that were introduced with https://github.com/scylladb/scylladb/pull/17969. Now that the documentation is versioned, there should be no reference to specific versions. Fixes https://github.com/scylladb/scylladb/issues/21276 (cherry picked from commit a5fed924e9c93dff319ebe0fd018399e9cabf20f) # Conflicts: # docs/getting-started/install-scylla/install-on-linux.rst # docs/getting-started/installation-common/unified-installer.rst --- docs/getting-started/install-scylla/install-jmx.rst | 4 ++-- docs/getting-started/install-scylla/install-on-linux.rst | 5 +++++ .../installation-common/unified-installer.rst | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/getting-started/install-scylla/install-jmx.rst b/docs/getting-started/install-scylla/install-jmx.rst index 1d0290afdf..489fa9f331 100644 --- a/docs/getting-started/install-scylla/install-jmx.rst +++ b/docs/getting-started/install-scylla/install-jmx.rst @@ -3,8 +3,8 @@ Install scylla-jmx Package ====================================== -scylla-jmx becomes optional package from ScyllaDB 6.2, not installed by default. -If you need JMX server you can still install it from scylla-jmx GitHub page. +scylla-jmx is an optional package and is not installed by default. +If you need JMX server, you can still install it from scylla-jmx GitHub page. .. tabs:: diff --git a/docs/getting-started/install-scylla/install-on-linux.rst b/docs/getting-started/install-scylla/install-on-linux.rst index db15160ea2..2d412681c6 100644 --- a/docs/getting-started/install-scylla/install-on-linux.rst +++ b/docs/getting-started/install-scylla/install-on-linux.rst @@ -156,8 +156,13 @@ Install ScyllaDB (Optional) Install scylla-jmx ------------------------------- +<<<<<<< HEAD scylla-jmx becomes optional package from ScyllaDB 6.2, not installed by default. If you need JMX server, see :doc:`Install scylla-jmx Package ` +======= + scylla-jmx is an optional package and is not installed by default. + If you need JMX server, see :doc:`Install scylla-jmx Package `. +>>>>>>> a5fed924e9 (doc: fix redundant references to version 6.2) diff --git a/docs/getting-started/installation-common/unified-installer.rst b/docs/getting-started/installation-common/unified-installer.rst index 04335fed8a..c6f6ac2a67 100644 --- a/docs/getting-started/installation-common/unified-installer.rst +++ b/docs/getting-started/installation-common/unified-installer.rst @@ -50,8 +50,13 @@ Download and Install #. (Optional) Install scylla-jmx +<<<<<<< HEAD scylla-jmx becomes optional package from ScyllaDB 6.2, not installed by default. If you need JMX server, see :doc:`Install scylla-jmx Package ` +======= + scylla-jmx is an optional package and is not installed by default. + If you need JMX server, see :doc:`Install scylla-jmx Package `. +>>>>>>> a5fed924e9 (doc: fix redundant references to version 6.2) Configure and Run ScyllaDB ----------------------------