Resolve merge conflict

Author: neon60

docs/how-to/debugging.rst

@@ -275,14 +275,6 @@ Here are some of the more commonly used environment variables:
 
 .. include:: ../how-to/debugging_env.rst
 
-    * - DEBUG_HIP_7_PREVIEW
-        |break| Enable preview of upcoming runtime changes that break backward compatibility.
-        These changes might require updating existing application code to support the new behavior.
-        The new behavior will become default in a future major release and this environment
-        variable will no longer be needed.
-      - 0
-      - 0x1: Match the behavior of hipGetLastError with its corresponding CUDA API
-
 General debugging tips
 ======================================================
 

docs/how-to/debugging_env.rst

@@ -92,4 +92,19 @@
         per device. If an application allocates more HIP streams than this number, then HIP runtime reuses
         the same hardware queues for the new streams in a round-robin manner. Note that this maximum
         number does not apply to hardware queues that are created for CU-masked HIP streams, or
-        cooperative queues for HIP Cooperative Groups (single queue per device).
+        cooperative queues for HIP Cooperative Groups (single queue per device).
+
+    * - | ``DEBUG_HIP_7_PREVIEW``
+        | Enable preview of upcoming
+        | runtime changes that break 
+        | backward compatibility.
+        | These changes might require
+        | updating existing application
+        | code to support the new
+        | behavior. The new behavior
+        | will become default in a
+        | future major release and this
+        | environment variable will
+        | no longer be needed.
+      - 0
+      - 0x1: Match the behavior of hipGetLastError with its corresponding CUDA API

docs/sphinx/_toc.yml.in

@@ -15,9 +15,9 @@ subtrees:
     title: Installing HIP
   - file: install/build
     title: Building HIP from source
-  - url: https://rocm.docs.amd.com/projects/install-on-linux/en/${branch}/reference/system-requirements.html#supported-gpus
+  - url: https://rocm.docs.amd.com/projects/install-on-linux/en/${branch}/reference/system-requirements.html
     title: Linux supported AMD GPUs
-  - url: https://rocm.docs.amd.com/projects/install-on-windows/en/${branch}/reference/system-requirements.html#windows-supported-gpus
+  - url: https://rocm.docs.amd.com/projects/install-on-windows/en/${branch}/reference/system-requirements.html
     title: Windows supported AMD GPUs
   - url: https://developer.nvidia.com/cuda-gpus
     title: NVIDIA supported GPUs