Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-aadroles-roles-limits-scope-link

Author: rolyon

.openpublishing.redirection.json

@@ -27970,6 +27970,11 @@
           "redirect_url": "/azure/azure-cache-for-redis/cache-insights-overview",
           "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/aks/uptime-sla.md",
+            "redirect_url": "/azure/aks/free-standard-pricing-tiers",
+            "redirect_document_id": "false"
+        },
         {
           "source_path": "articles/dotnet-develop-multitenant-applications.md",
           "redirect_URL": "/azure/architecture/guide/multitenant/overview",

articles/active-directory/cloud-sync/index.yml

@@ -12,7 +12,7 @@ metadata:
   ms.collection: na
   ms.date: 09/05/2019
   ms.service: active-directory
-  ms.subservice: na
+  ms.subservice: hybrid
   ms.topic: landing-page
   services: active-directory
 

articles/active-directory/fundamentals/index.yml

@@ -11,7 +11,7 @@ metadata:
   ms.collection: na
   ms.date: 08/27/2019
   ms.service: active-directory
-  ms.subservice: na
+  ms.subservice: fundamentals
   ms.topic: landing-page
   services: active-directory
 

articles/active-directory/hybrid/index.yml

@@ -13,7 +13,7 @@ metadata:
   ms.collection: na
   ms.date: 08/15/2019
   ms.service: active-directory
-  ms.subservice: na
+  ms.subservice: hybrid
   ms.topic: landing-page
   services: active-directory
 

articles/active-directory/identity-protection/howto-export-risk-data.md

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: identity-protection
 ms.topic: how-to
-ms.date: 02/18/2022
+ms.date: 01/24/2023
 
 ms.author: joflore
 author: MicrosoftGuyJFlo
@@ -17,7 +17,7 @@ ms.collection: M365-identity-device-management
 ---
 # How To: Export risk data
 
-Azure AD stores reports and security signals for a defined period of time. When it comes to risk information, that may not be long enough.
+Azure AD stores reports and security signals for a defined period of time. When it comes to risk information that period may not be long enough.
 
 | Report / Signal | Azure AD Free | Azure AD Premium P1 | Azure AD Premium P2 |
 | --- | --- | --- | --- |
@@ -43,7 +43,7 @@ Once enabled you'll find access to Log Analytics in the **Azure portal** > **Azu
 
 [ ![Log Analytics view showing a query against the AADUserRiskEvents table showing the top 5 events](./media/howto-export-risk-data/log-analytics-view-query-user-risk-events.png) ](./media/howto-export-risk-data/log-analytics-view-query-user-risk-events.png#lightbox)
 
-In the image above, the following query was run to show the most recent five risk detections triggered. 
+In the previous image, the following query was run to show the most recent five risk detections triggered. 
 
 ```kusto
 AADUserRiskEvents

articles/active-directory/standards/index.yml

@@ -11,7 +11,7 @@ metadata:
   ms.collection: na
   ms.date: 04/29/2022
   ms.service: active-directory
-  ms.subservice: na
+  ms.subservice: standards
   ms.topic: landing-page
   ms.custom: kr2b-contr-experiment
   services: active-directory

articles/active-directory/verifiable-credentials/index.yml

@@ -10,8 +10,8 @@ metadata:
   ms.author: barclayn
   ms.collection: na
   ms.date: 07/28/2022
-  ms.service: decentralized-identity
-  ms.subservice: na
+  ms.service: active-directory
+  ms.subservice: verifiable-credentials
   ms.topic: landing-page
   services: active-directory
 

articles/advisor/advisor-reference-operational-excellence-recommendations.md

@@ -194,11 +194,11 @@ This cluster is not using ephemeral OS disks which can provide lower read/write
 
 Learn more about [Kubernetes service - UseEphemeralOSdisk (Use Ephemeral OS disk)](../aks/cluster-configuration.md#ephemeral-os).
 
-### Use Uptime SLA
+### Free and Standard pricing tiers for AKS control plane management
 
-This cluster has not enabled Uptime SLA, and it limited to an SLO of 99.5%
+This cluster has not enabled the Standard pricing tier with the Uptime SLA feature, and is limited to an SLO of 99.5%.
 
-Learn more about [Kubernetes service - UseUptimeSLA (Use Uptime SLA)](../aks/uptime-sla.md).
+Learn more about [Kubernetes service - UseUptimeSLA (Use Uptime SLA)](../aks/free-standard-pricing-tiers.md).
 
 ### Deprecated Kubernetes API in 1.22 has been found
 

articles/aks/TOC.yml

@@ -208,8 +208,8 @@
           href: out-of-tree.md
         - name: Upgrade an AKS cluster
           href: upgrade-cluster.md
-        - name: Use Uptime SLA
-          href: uptime-sla.md
+        - name: Free and Standard pricing tiers for AKS
+          href: free-standard-pricing-tiers.md
         - name: Use Draft (preview)
           href: draft.md
         - name: Use proximity placement groups