Merge branch 'MicrosoftDocs:main' into master

Author: gmndrg

.openpublishing.publish.config.json

@@ -897,6 +897,7 @@
     ".openpublishing.redirection.healthcare-apis.json",
     ".openpublishing.redirection.iot-hub.json",
     ".openpublishing.redirection.key-vault.json",
+    ".openpublishing.redirection.sql-database.json",
     ".openpublishing.redirection.security-benchmark.json",
     "articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
     ".openpublishing.redirection.azure-web-pubsub.json",

.openpublishing.redirection.json

@@ -24213,26 +24213,6 @@
       "redirect_url": "/azure/azure-sql/virtual-machines/windows/sql-server-on-azure-vm-iaas-what-is-overview",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/sql-database/index.md",
-      "redirect_url": "/azure/azure-sql/database/index",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/sql-database/sql-database-managed-instance-create-manage.md",
-      "redirect_url": "/azure/azure-sql/managed-instance/instance-create-quickstart",
-      "redirect_document_id": false
-    },          
-    {
-      "source_path_from_root": "/articles/sql-database/sql-database-single-database.md",
-      "redirect_url": "/azure/azure-sql/database/sql-database-paas-overview",
-      "redirect_document_id": false
-    },  
-    {
-      "source_path_from_root": "/articles/sql-database/sql-database-managed-instance.md",
-      "redirect_url": "/azure/azure-sql/managed-instance/sql-managed-instance-paas-overview",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/sql-data-warehouse/sql-data-warehouse-backups.md",
       "redirect_url": "/azure/sql-data-warehouse/backup-and-restore",

.openpublishing.redirection.sql-database.json

@@ -146,8 +146,14 @@ Next, create a public IP address with the *static* allocation method using the [
 
 ---
 
-> [!NOTE]
-> The above commands create an IP address that will be deleted if you delete your AKS cluster. Alternatively, you can create an IP address in a different resource group which can be managed separately from your AKS cluster. If you create an IP address in a different resource group, ensure the cluster identity used by the AKS cluster has delegated permissions to the other resource group, such as *Network Contributor*. For more information, see [Use a static public IP address and DNS label with the AKS load balancer][aks-static-ip].
+The above commands create an IP address that will be deleted if you delete your AKS cluster. 
+
+Alternatively, you can create an IP address in a different resource group which can be managed separately from your AKS cluster. If you create an IP address in a different resource group, ensure the following:
+
+* The cluster identity used by the AKS cluster has delegated permissions to the resource group, such as *Network Contributor*. 
+* Add the `--set controller.service.annotations."service\.beta\.kubernetes\.io/azure-load-balancer-resource-group"="<RESOURCE_GROUP>"` parameter. Replace `<RESOURCE_GROUP>` with the name of the resource group where the IP address resides. 
+
+For more information, see [Use a static public IP address and DNS label with the AKS load balancer][aks-static-ip].
 
 Now deploy the *nginx-ingress* chart with Helm. For added redundancy, two replicas of the NGINX ingress controllers are deployed with the `--set controller.replicaCount` parameter. To fully benefit from running replicas of the ingress controller, make sure there's more than one node in your AKS cluster.
 
@@ -167,8 +173,7 @@ The ingress controller also needs to be scheduled on a Linux node. Windows Serve
 
 Update the following script with the **IP address** of your ingress controller and a **unique name** that you would like to use for the FQDN prefix.
 
-> [!IMPORTANT]
-> You must update replace `<STATIC_IP>` and `<DNS_LABEL>` with your own IP address and unique name when running the command.  The DNS_LABEL must be unique within the Azure region.
+Replace `<STATIC_IP>` and `<DNS_LABEL>` with your own IP address and unique name when running the command. The DNS_LABEL must be unique within the Azure region.
 
 ### [Azure CLI](#tab/azure-cli)
 

articles/aks/ingress-static-ip.md

@@ -4,7 +4,7 @@ services: azure-arc
 ms.service: azure-arc
 author: shashankbarsin
 ms.author: shasb
-ms.date: 04/13/2022
+ms.date: 05/03/2022
 ms.topic: overview
 description: "This article provides an overview of Azure Arc-enabled Kubernetes."
 keywords: "Kubernetes, Arc, Azure, containers"
@@ -15,13 +15,14 @@ keywords: "Kubernetes, Arc, Azure, containers"
 Azure Arc-enabled Kubernetes allows you to attach and configure Kubernetes clusters running anywhere. You can connect your clusters running on other public cloud providers (such as GCP or AWS) or clusters running on your on-premise data center (such as VMware vSphere or Azure Stack HCI) to Azure Arc.
 
 When you connect a Kubernetes cluster to Azure Arc, it will:
+
 * Be represented in Azure Resource Manager by a unique ID
 * Be placed in an Azure subscription and resource group
 * Receive tags just like any other Azure resource
 
-Azure Arc-enabled Kubernetes supports industry-standard SSL to secure data in transit. For the connected clusters, data at rest is stored encrypted in an Azure Cosmos DB database to ensure confidentiality.
+Azure Arc-enabled Kubernetes supports industry-standard SSL to secure data in transit. For the connected clusters, cluster extensions, and custom locations, data at rest is stored encrypted in an Azure Cosmos DB database to ensure confidentiality.
 
-Azure Arc-enabled Kubernetes supports the following scenarios for connected clusters: 
+Azure Arc-enabled Kubernetes supports the following scenarios for connected clusters:
 
 * [Connect Kubernetes](quickstart-connect-cluster.md) running outside of Azure for inventory, grouping, and tagging.