From d5319362763a845afa682ac00c10fdcb999dc05b Mon Sep 17 00:00:00 2001
From: Sam Wu <sam.wu2@amd.com>
Date: Tue, 9 Jan 2024 09:21:24 -0700
Subject: [PATCH] Merge roc-6.0.x into docs/6.0.0 (#2784)

* Mi300 info update (#2780)

* docs(gpu-enabled-mpi.rst): Fix links to 3rd party support matrices (#2775)

* docs(gpu-enabled-mpi.rst): Fix links to 3rd party support matrices

* docs: Directly link for RST instead of using intersphinx

---------

Co-authored-by: Istvan Kiss <neon60@gmail.com>
---
 CHANGELOG.md                                  | 2 +-
 docs/conceptual/cmake-packages.rst            | 6 ++++--
 docs/how-to/gpu-enabled-mpi.rst               | 4 ++--
 tools/autotag/templates/rocm_changes/6.0.0.md | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed7e513c5..aaa0db901 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,7 +36,7 @@ systems.
 
 * Ubuntu 22.04.3 (MI300A and MI300X)
 * RHEL 8.9 (MI300A)
-* SLES 15 SP5(MI300A)
+* SLES 15 SP5 (MI300A)
 
 We've added support for the following operating systems:
 
diff --git a/docs/conceptual/cmake-packages.rst b/docs/conceptual/cmake-packages.rst
index 183984c64..f533b1035 100644
--- a/docs/conceptual/cmake-packages.rst
+++ b/docs/conceptual/cmake-packages.rst
@@ -56,8 +56,10 @@ the *config-file* packages are shipped with the upstream projects, such as
 rocPRIM and other ROCm libraries.
 
 For a complete guide on where and how ROCm may be installed on a system, refer
-to the installation guides for {doc}`Linux<rocm-install-on-linux:tutorial/quick-start>` and
-{doc}`Windows<rocm-install-on-windows:tutorial/install-quick>`.
+to the installation guides for
+`Linux <https://rocm.docs.amd.com/projects/install-on-linux/en/latest/tutorial/quick-start.html>`_
+and
+`Windows <https://rocm.docs.amd.com/projects/install-on-windows/en/latest/index.html>`_.
 
 Using HIP in CMake
 ==================
diff --git a/docs/how-to/gpu-enabled-mpi.rst b/docs/how-to/gpu-enabled-mpi.rst
index ff5089d91..df0b82f2d 100644
--- a/docs/how-to/gpu-enabled-mpi.rst
+++ b/docs/how-to/gpu-enabled-mpi.rst
@@ -44,7 +44,7 @@ home directory in our example, but you can specify a different location if you w
         mkdir -p $BUILD_DIR
 
 2. Install UCX. To view UCX and ROCm version compatibility, refer to the
-`communication libraries tables <https://rocm.docs.amd.com/en/latest/release/3rd_party_support_matrix.html>`_.
+`communication libraries tables <https://rocm.docs.amd.com/projects/install-on-linux/en/latest/reference/3rd-party-support-matrix.html>`_
 
     .. code-block:: shell
 
@@ -153,7 +153,7 @@ library with ROCm support.
 .. note::
 
     You can verify UCC and ROCm version compatibility using the
-    `communication libraries <https://rocm.docs.amd.com/en/latest/release/3rd_party_support_matrix.html>`_.
+    `communication libraries tables <https://rocm.docs.amd.com/projects/install-on-linux/en/latest/reference/3rd-party-support-matrix.html>`_
 
 .. code-block:: shell
 
diff --git a/tools/autotag/templates/rocm_changes/6.0.0.md b/tools/autotag/templates/rocm_changes/6.0.0.md
index 8f26615e5..8158e7b89 100644
--- a/tools/autotag/templates/rocm_changes/6.0.0.md
+++ b/tools/autotag/templates/rocm_changes/6.0.0.md
@@ -21,9 +21,9 @@ the [Changelog](https://rocm.docs.amd.com/en/develop/about/CHANGELOG.html).
 AMD Instinct™ MI300A and MI300X Accelerator support has been enabled for limited operating
 systems.
 
-* Ubuntu 22.04.5 (MI300A and MI300X)
+* Ubuntu 22.04.3 (MI300A and MI300X)
 * RHEL 8.9 (MI300A)
-* SLES 15 SP5
+* SLES 15 SP5 (MI300A)
 
 We've added support for the following operating systems: