merge conflcit

Author: markingmyname

.openpublishing.redirection.json

@@ -59474,6 +59474,21 @@
       "source_path": "docs/linux/sql-server-linux-setup-2022.md",
       "redirect_url": "/sql/linux/sql-server-linux-setup",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/linux/sql-server-linux-availability-group-cluster-rhel.md",
+      "redirect_url": "/sql/linux/sql-server-linux-availability-group-cluster-pacemaker",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/linux/sql-server-linux-availability-group-cluster-sles.md",
+      "redirect_url": "/sql/linux/sql-server-linux-availability-group-cluster-pacemaker",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/linux/sql-server-linux-availability-group-cluster-ubuntu.md",
+      "redirect_url": "/sql/linux/sql-server-linux-availability-group-cluster-pacemaker",
+      "redirect_document_id": false
     }
   ]
 }

azure-sql/virtual-machines/linux/rhel-high-availability-listener-tutorial.md

@@ -14,7 +14,7 @@ ms.topic: tutorial
 > [!NOTE]
 > The tutorial presented is in **public preview**. 
 >
-> We use SQL Server 2017 with RHEL 7.6 in this tutorial, but it is possible to use SQL Server 2019 in RHEL 7 or RHEL 8 to configure high availability. The commands to configure availability group resources has changed in RHEL 8, and you'll want to look at the article [Create availability group resource](/sql/linux/sql-server-linux-availability-group-cluster-rhel#create-availability-group-resource) and RHEL 8 resources for more information on the correct commands.
+> We use SQL Server 2017 with RHEL 7.6 in this tutorial, but it is possible to use SQL Server 2019 in RHEL 7 or RHEL 8 to configure high availability. The commands to configure availability group resources has changed in RHEL 8, and you'll want to look at the article [Create availability group resource](/sql/linux/sql-server-linux-availability-group-cluster-pacemaker?tabs=rhel#create-availability-group-resource) and RHEL 8 resources for more information on the correct commands.
 
 This tutorial will go over steps on how to create an availability group listener for your SQL Servers on RHEL virtual machines (VMs) in Azure. You will learn how to:
 

azure-sql/virtual-machines/linux/rhel-high-availability-stonith-tutorial.md

@@ -11,7 +11,7 @@ ms.topic: tutorial
 [!INCLUDE[appliesto-sqlvm](../../includes/appliesto-sqlvm.md)]
 
 > [!NOTE]
-> We use SQL Server 2017 with RHEL 7.6 in this tutorial, but it is possible to use SQL Server 2019 in RHEL 7 or RHEL 8 to configure high availability. The commands to configure the pacemake cluster and availability group resources has changed in RHEL 8, and you'll want to look at the article [Create availability group resource](/sql/linux/sql-server-linux-availability-group-cluster-rhel#create-availability-group-resource) and RHEL 8 resources for more information on the correct commands.
+> We use SQL Server 2017 with RHEL 7.6 in this tutorial, but it is possible to use SQL Server 2019 in RHEL 7 or RHEL 8 to configure high availability. The commands to configure the pacemake cluster and availability group resources has changed in RHEL 8, and you'll want to look at the article [Create availability group resource](/sql/linux/sql-server-linux-availability-group-cluster-pacemaker?tabs=rhel#create-availability-group-resource) and RHEL 8 resources for more information on the correct commands.
 
 In this tutorial, you learn how to:
 
@@ -278,7 +278,7 @@ Type `exit` to leave the SSH session.
 > [!IMPORTANT]
 > In order to complete this portion of the tutorial, you must have a subscription for RHEL and the High Availability Add-on. If you are using an image recommended in the previous section, you do not have to register another subscription.
  
-Connect to each VM node and follow the guide below to enable HA. For more information, see [enable high availability subscription for RHEL](/sql/linux/sql-server-linux-availability-group-cluster-rhel#enable-the-high-availability-subscription-for-rhel).
+Connect to each VM node and follow the guide below to enable HA. For more information, see [enable high availability subscription for RHEL](/sql/linux/sql-server-linux-availability-group-cluster-pacemaker?tabs=rhel#enable-the-high-availability-subscription-for-rhel).
 
 > [!TIP]
 > It will be easier if you open an SSH session to each of the VMs simultaneously as the same commands will need to be run on each VM throughout the article.

docs/azure-data-studio/extensions/mysql-extension.md

@@ -38,6 +38,9 @@ If you don't already have Azure Data Studio installed, see its [install instruct
 
 3. Select **Install**. Once installed, select **Reload** to activate the extension in Azure Data Studio.
 
+> [!NOTE]
+> The extension is currently available in Azure Data Studio (ADS) insider build only. It will be available in the next ADS stable build soon.
+
 ## Next steps
 
 Learn how to [connect and query MySQL using Azure Data Studio](../quickstart-mysql.md).

docs/azure-data-studio/quickstart-mysql.md

@@ -22,6 +22,9 @@ To complete this quickstart, you need Azure Data Studio, the MySQL extension for
 - [Install the MySQL extension for Azure Data Studio](./extensions/mysql-extension.md).
 - A MySQL server. You can either create a managed MySQL server on Azure using [Azure Database for MySQL - Flexible Server](/azure/mysql/flexible-server/quickstart-create-server-portal.md) or [install MySQL locally](https://dev.mysql.com/downloads/mysql/).
 
+> [!NOTE]
+> The extension is currently available in Azure Data Studio (ADS) insider build only. It will be available in the next ADS stable build soon.
+
 ## Connect to MySQL
 
 1. Start **Azure Data Studio**.

docs/docfx.json

@@ -307,7 +307,7 @@
       },
       "sensitive-language-sl": {
         "exclude": [
-          "linux/sql-server-linux-availability-group-cluster-sles.md",
+          "linux/sql-server-linux-availability-group-cluster-pacemaker.md",
           "linux/sql-server-linux-create-availability-group.md",
           "linux/sql-server-linux-ha-basics.md"
         ]

docs/includes/sscurrent-md.md

@@ -9,7 +9,7 @@ ms.topic: include
 ---
 | Platform | File System | Installation Guide |
 |-----|-----|-----|
-| Red Hat Enterprise Linux 7.7 - 7.9, or 8.0 - 8.5 Server | XFS or EXT4 | [Installation guide](../quickstart-install-connect-red-hat.md) |
+| Red Hat Enterprise Linux 7.7 - 7.9, or 8.0 - 8.6 Server | XFS or EXT4 | [Installation guide](../quickstart-install-connect-red-hat.md) |
 | SUSE Enterprise Linux Server v12 SP3 - SP5 | XFS or EXT4 | [Installation guide](../quickstart-install-connect-suse.md) |
 | Ubuntu 16.04 LTS <sup>1</sup>, 18.04 LTS | XFS or EXT4 | [Installation guide](../quickstart-install-connect-ubuntu.md) |
 | Docker Engine 1.8+ on Linux | N/A | [Installation guide](../quickstart-install-connect-docker.md) |

docs/linux/includes/linux-supported-platforms-2017.md

@@ -2,15 +2,15 @@
 author: rwestMSFT
 ms.author: randolphwest
 ms.reviewer: vanto
-ms.date: 07/29/2022
+ms.date: 10/13/2022
 ms.prod: sql
 ms.technology: linux
 ms.topic: include
 ---
 | Platform | File System | Installation Guide | Get |
 | --- | --- | --- | --- |
-| Red Hat Enterprise Linux 7.7 - 7.9, or 8.0 - 8.5 Server | XFS or EXT4 | [Installation guide](../quickstart-install-connect-red-hat.md) | [Get RHEL 8.0](https://access.redhat.com/products/red-hat-enterprise-linux/evaluation) |
-| SUSE Enterprise Linux Server v12 (SP3 - SP5) or v15 | XFS or EXT4 | [Installation guide](../quickstart-install-connect-suse.md) | [Get SLES v15](https://www.suse.com/products/server) |
+| Red Hat Enterprise Linux 7.7 - 7.9, or 8.0 - 8.6 Server | XFS or EXT4 | [Installation guide](../quickstart-install-connect-red-hat.md) | [Get RHEL 8.0](https://access.redhat.com/products/red-hat-enterprise-linux/evaluation) |
+| SUSE Enterprise Linux Server v12 (SP3 - SP5), or v15 (SP1 - SP3) | XFS or EXT4 | [Installation guide](../quickstart-install-connect-suse.md) | [Get SLES v15](https://www.suse.com/products/server) |
 | Ubuntu 16.04 LTS <sup>1</sup>, 18.04 LTS, 20.04 LTS | XFS or EXT4 | [Installation guide](../quickstart-install-connect-ubuntu.md) | [Get Ubuntu 20.04](https://releases.ubuntu.com/20.04/) |
 | Docker Engine 1.8+ on Windows, Mac, or Linux | N/A | [Installation guide](../quickstart-install-connect-docker.md) | [Get Docker](https://www.docker.com/get-started) |
 

docs/linux/includes/linux-supported-platforms-2019.md

@@ -2,14 +2,14 @@
 author: rwestMSFT
 ms.author: randolphwest
 ms.reviewer: vanto
-ms.date: 07/29/2022
+ms.date: 10/13/2022
 ms.prod: sql
 ms.technology: linux
 ms.topic: include
 ---
 | Platform | File System | Installation Guide | Get |
 | --- | --- | --- | --- |
-| Red Hat Enterprise Linux 8.0 - 8.5 Server | XFS or EXT4 | [Installation guide](../quickstart-install-connect-red-hat.md) | [Get RHEL 8.0](https://access.redhat.com/products/red-hat-enterprise-linux/evaluation) |
+| Red Hat Enterprise Linux 8.0 - 8.6 Server | XFS or EXT4 | [Installation guide](../quickstart-install-connect-red-hat.md) | [Get RHEL 8.0](https://access.redhat.com/products/red-hat-enterprise-linux/evaluation) |
 | SUSE Enterprise Linux Server v15 (SP1 - SP3) | XFS or EXT4 | [Installation guide](../quickstart-install-connect-suse.md) | [Get SLES v15](https://www.suse.com/products/server) |
 | Ubuntu 20.04 LTS | XFS or EXT4 | [Installation guide](../quickstart-install-connect-ubuntu.md) | [Get Ubuntu 20.04](https://releases.ubuntu.com/20.04/) |
 | Docker Engine 1.8+ on Linux | N/A | [Installation guide](../quickstart-install-connect-docker.md) | [Get Docker](https://www.docker.com/get-started) |