Merge pull request #196987 from MicrosoftDocs/main

5/03 PM Publish

Author: huypub

.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

@@ -23828,6 +23828,36 @@
       "redirect_url": "/rest/api/securityinsights/watchlists",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/sentinel/sap-deploy-solution.md",
+      "redirect_url": "/azure/sentinel/sap/deployment-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/sentinel/sap-solution-detailed-requirements.md",
+      "redirect_url": "/azure/sentinel/sap/prerequisites-for-deploying-sap-continuous-threat-monitoring",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/sentinel/sap-solution-security-content.md",
+      "redirect_url": "/azure/sentinel/sap/sap-solution-security-content",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/sentinel/sap-solution-deploy-alternate.md",
+      "redirect_url": "/azure/sentinel/sap/sap-solution-deploy-alternate",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/sentinel/sap-solution-deploy-snc.md",
+      "redirect_url": "/azure/sentinel/sap/configure-snc",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/sentinel/sap-solution-log-reference.md",
+      "redirect_url": "/azure/sentinel/sap/sap-solution-log-reference",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/service-bus/index.md",
       "redirect_url": "/azure/service-bus-messaging/index",
@@ -24213,26 +24243,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

@@ -4,7 +4,7 @@ description: Learn how to use number matching in MFA notifications
 ms.service: active-directory
 ms.subservice: authentication
 ms.topic: conceptual
-ms.date: 03/18/2022
+ms.date: 05/03/2022
 ms.author: justinha
 author: mjsantani
 ms.collection: M365-identity-device-management
@@ -242,6 +242,7 @@ To enable number matching in the Azure AD portal, complete the following steps:
 >[!NOTE]
 >[Least privilege role in Azure Active Directory - Multi-factor Authentication](https://docs.microsoft.com/azure/active-directory/roles/delegate-by-task#multi-factor-authentication)
 
+Number matching is not supported for Apple Watch notifications. Apple Watch need to use their phone to approve notifications when number matching is enabled.
 
 ## Next steps
 

articles/active-directory/authentication/how-to-mfa-number-match.md

@@ -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

@@ -10,6 +10,7 @@ ms.author: mbaldwin
 
 
 ---
+
 # How to author an attestation policy
 
 Attestation policy is a file uploaded to Microsoft Azure Attestation. Azure Attestation offers the flexibility to upload a policy in an attestation-specific policy format. Alternatively, an encoded version of the policy, in JSON Web Signature, can also be uploaded. The policy administrator is responsible for writing the attestation policy. In most attestation scenarios, the relying party acts as the policy administrator. The client making the attestation call sends attestation evidence, which the service parses and converts into incoming claims (set of properties, value). The service then processes the claims, based on what is defined in the policy, and returns the computed result.
@@ -134,3 +135,4 @@ After creating a policy file, to upload a policy in JWS format, follow the below
 ## Next steps
 - [Set up Azure Attestation using PowerShell](quickstart-powershell.md)
 - [Attest an SGX enclave using code samples](/samples/browse/?expanded=azure&terms=attestation)
+- [Learn more about policy versions](policy-version-1-0.md)