Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: Learn Build Service GitHub App

.openpublishing.redirection.azure-kubernetes-service.json

@@ -80,6 +80,11 @@
             "redirect_url": "/azure/aks/azure-csi-files-storage-provision",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/aks/learn/tutorial-kubernetes-workload-identity.md",
+            "redirect_url": "/azure/aks/workload-identity-deploy-cluster",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/aks/workload-identity-migration-sidecar.md",
             "redirect_url": "/azure/aks/workload-identity-migrate-from-pod-identity",

.openpublishing.redirection.container-registry.json

@@ -2,32 +2,42 @@
     "redirections": [
         {
             "source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache-auth.md",
-            "redirect_url": "/azure/container-registry/tutorial-enable-artifact-cache-auth",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache-auth-cli.md",
-            "redirect_url": "/azure/container-registry/tutorial-enable-artifact-cache-auth-cli",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache.md",
-            "redirect_url": "/azure/container-registry/tutorial-enable-artifact-cache",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache-cli.md",
-            "redirect_url": "/azure/container-registry/tutorial-enable-artifact-cache-cli",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/container-registry/tutorial-artifact-cache.md",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/container-registry/tutorial-registry-cache.md",
-            "redirect_url": "/azure/container-registry/tutorial-artifact-cache",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/container-registry/tutorial-troubleshoot-registry-cache.md",
-            "redirect_url": "/azure/container-registry/tutorial-troubleshoot-artifact-cache",
+            "redirect_url": "/azure/container-registry/troubleshoot-artifact-cache",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/container-registry/tutorial-troubleshoot-artifact-cache.md",
+            "redirect_url": "/azure/container-registry/troubleshoot-artifact-cache",
             "redirect_document_id": false
         },
         {
@@ -60,6 +70,31 @@
             "redirect_url": "/azure/container-registry/troubleshoot-artifact-streaming",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/container-registry/tutorial-enable-artifact-cache.md",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/container-registry/tutorial-enable-artifact-cache-cli.md",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/container-registry/tutorial-enable-artifact-cache-auth.md",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/container-registry/tutorial-enable-artifact-cache-auth-cli.md",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/container-registry/tutorial-artifact-cache-troubleshoot.md",
+            "redirect_url": "/azure/container-registry/troubleshoot-artifact-cache",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/container-registry/container-registry-diagnostics-audit-logs.md",
             "redirect_url": "/azure/container-registry/monitor-service"

.openpublishing.redirection.operator-5g-core.json

@@ -15,11 +15,6 @@
             "redirect_url": "/azure/operator-5g-core/how-to-deploy-observability",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/operator-5g-core/quickstart-complete-prerequisites-deploy-azure-kubernetes-service.md",
-            "redirect_url": "/azure/operator-5g-core/quickstart-complete-prerequisites-deploy-nexus-azure-kubernetes-service",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/operator-5g-core/how-to-complete-prerequisites-deploy-nexus-azure-kubernetes-service.md",
             "redirect_url": "/azure/operator-5g-core/quickstart-complete-prerequisites-deploy-nexus-azure-kubernetes-service",

articles/ai-services/content-safety/concepts/custom-categories-rapid.md

@@ -50,9 +50,7 @@ See the following table for the input limitations of the custom categories (rapi
 
 ### Region availability
 
-To use this API, you must create your Azure AI Content Safety resource in one of the supported regions:
-- East US
-- Sweden Central
+To use this API, you must create your Azure AI Content Safety resource in one of the supported regions. See [Region availability](/azure/ai-services/content-safety/overview#region-availability).
 
 ## Next steps
 

articles/ai-services/content-safety/concepts/groundedness.md

@@ -55,18 +55,11 @@ The maximum character limit for the grounding sources is 55,000 characters per A
 
 ### Regions
 
-To use this API, you must create your Azure AI Content Safety resource in the supported regions. Currently, it's available in the following Azure regions:
-- East US 2
-- East US 
-- West US
-- Sweden Central
+To use this API, you must create your Azure AI Content Safety resource in the supported regions. See [Region availability](/azure/ai-services/content-safety/overview#region-availability).
 
 ### TPS limitations
 
-| Pricing Tier | Requests per 10 seconds |
-| :----------- | :--------------------------- |
-| F0           | 50                           |
-| S0           | 50                           |
+See [Query rates](/azure/ai-services/content-safety/overview#query-rates).
 
 If you need a higher rate, [contact us](mailto:[email protected]) to request it.
 

articles/ai-services/content-safety/concepts/jailbreak-detection.md

@@ -6,7 +6,7 @@ description: Learn about User Prompt injection attacks and the Prompt Shields fe
 author: PatrickFarley
 manager: nitinme
 ms.service: azure-ai-content-safety
-ms.custom: build-2023, references_regions
+ms.custom: build-2023
 ms.topic: conceptual
 ms.date: 03/15/2024
 ms.author: pafarley
@@ -74,17 +74,12 @@ Currently, the Prompt Shields API supports the English language. While our API d
 The maximum character limit for Prompt Shields allows for a user prompt of up to 10,000 characters, while the document array is restricted to a maximum of 5 documents with a combined total not exceeding 10,000 characters.
 
 ### Regions
-To use this API, you must create your Azure AI Content Safety resource in the supported regions. Currently, it's available in the following Azure regions:
 
-- East US
-- West Europe
+To use this API, you must create your Azure AI Content Safety resource in the supported regions. See [Region availability](/azure/ai-services/content-safety/overview#region-availability).
 
 ### TPS limitations
 
-| Pricing Tier | Requests per 10 seconds |
-| :----------- | :---------------------------- |
-| F0           | 1000         |
-| S0           | 1000         |
+See [Query rates](/azure/ai-services/content-safety/overview#query-rates).
 
 If you need a higher rate, please [contact us](mailto:[email protected]) to request it.
 

articles/ai-services/content-safety/how-to/custom-categories-rapid.md

@@ -20,15 +20,15 @@ The custom categories (rapid) API lets you quickly respond to emerging harmful c
 Follow these steps to define an incident with a few examples of text content and then analyze new text content to see if it matches the incident.
 
 > [!IMPORTANT]
-> This new feature is only available in the **East US** and **Sweden Central** Azure regions. 
+> This new feature is only available in select Azure regions. See [Region availability](/azure/ai-services/content-safety/overview#region-availability).
 
 > [!CAUTION]
 > The sample data in this guide might contain offensive content. User discretion is advised.
 
 ## Prerequisites
 
 * An Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services/) 
-* Once you have your Azure subscription, <a href="https://aka.ms/acs-create"  title="Create a Content Safety resource"  target="_blank">create a Content Safety resource </a> in the Azure portal to get your key and endpoint. Enter a unique name for your resource, select your subscription, and select a resource group, supported region (East US or Sweden Central), and supported pricing tier. Then select **Create**.
+* Once you have your Azure subscription, <a href="https://aka.ms/acs-create"  title="Create a Content Safety resource"  target="_blank">create a Content Safety resource </a> in the Azure portal to get your key and endpoint. Enter a unique name for your resource, select your subscription, and select a resource group, supported region (see [Region availability](/azure/ai-services/content-safety/overview#region-availability)), and supported pricing tier. Then select **Create**.
   * The resource takes a few minutes to deploy. After it finishes, Select **go to resource**. In the left pane, under **Resource Management**, select **Subscription Key and Endpoint**. The endpoint and either of the keys are used to call APIs.
 * Also [create a blob storage container](https://ms.portal.azure.com/#create/Microsoft.StorageAccount-ARM) if you want to upload your images there. You can alternatively encode your images as Base64 strings and use them directly in the API calls.
 * One of the following installed:

articles/ai-services/content-safety/how-to/use-blocklist.md

@@ -23,7 +23,7 @@ The default AI classifiers are sufficient for most content moderation needs. How
 ## Prerequisites
 
 * An Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services/) 
-* Once you have your Azure subscription, <a href="https://aka.ms/acs-create"  title="Create a Content Safety resource"  target="_blank">create a Content Safety resource </a> in the Azure portal to get your key and endpoint. Enter a unique name for your resource, select your subscription, and select a resource group, supported region (East US or West Europe), and supported pricing tier. Then select **Create**.
+* Once you have your Azure subscription, <a href="https://aka.ms/acs-create"  title="Create a Content Safety resource"  target="_blank">create a Content Safety resource </a> in the Azure portal to get your key and endpoint. Enter a unique name for your resource, select your subscription, and select a resource group, supported region (see [Region availability](/azure/ai-services/content-safety/overview#region-availability)), and supported pricing tier. Then select **Create**.
   * The resource takes a few minutes to deploy. After it finishes, Select **go to resource**. In the left pane, under **Resource Management**, select **Subscription Key and Endpoint**. The endpoint and either of the keys are used to call APIs.
 * One of the following installed:
   * [cURL](https://curl.haxx.se/) for REST API calls.

articles/ai-services/content-safety/includes/quickstarts/csharp-quickstart-image.md

@@ -18,7 +18,7 @@ ms.author: pafarley
 * An Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services/) 
 * The [Visual Studio IDE](https://visualstudio.microsoft.com/vs/) with workload .NET desktop development enabled. Or if you don't plan on using Visual Studio IDE, you need the current version of [.NET Core](https://dotnet.microsoft.com/download/dotnet-core).
 * [.NET Runtime](https://dotnet.microsoft.com/download/dotnet/) installed.
-* Once you have your Azure subscription, <a href="https://aka.ms/acs-create"  title="Create a Content Safety resource"  target="_blank">create a Content Safety resource </a> in the Azure portal to get your key and endpoint. Enter a unique name for your resource, select your subscription, and select a resource group, supported region (East US or West Europe), and supported pricing tier. Then select **Create**.
+* Once you have your Azure subscription, <a href="https://aka.ms/acs-create"  title="Create a Content Safety resource"  target="_blank">create a Content Safety resource </a> in the Azure portal to get your key and endpoint. Enter a unique name for your resource, select your subscription, and select a resource group, supported region (see [Region availability](/azure/ai-services/content-safety/overview#region-availability)), and supported pricing tier. Then select **Create**.
   * The resource takes a few minutes to deploy. After it finishes, Select **go to resource**. In the left pane, under **Resource Management**, select **Subscription Key and Endpoint**. The endpoint and either of the keys are used to call APIs.
 
 ## Set up application

articles/ai-services/content-safety/includes/quickstarts/csharp-quickstart-text.md

@@ -17,7 +17,7 @@ ms.author: pafarley
 
 * An Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services/) 
 * The [Visual Studio IDE](https://visualstudio.microsoft.com/vs/) with workload .NET desktop development enabled. Or if you don't plan on using Visual Studio IDE, you need the current version of [.NET Core](https://dotnet.microsoft.com/download/dotnet-core).
-* Once you have your Azure subscription, <a href="https://aka.ms/acs-create"  title="Create a Content Safety resource"  target="_blank">create a Content Safety resource </a> in the Azure portal to get your key and endpoint. Enter a unique name for your resource, select your subscription, and select a resource group, supported region (East US or West Europe), and supported pricing tier. Then select **Create**.
+* Once you have your Azure subscription, <a href="https://aka.ms/acs-create"  title="Create a Content Safety resource"  target="_blank">create a Content Safety resource </a> in the Azure portal to get your key and endpoint. Enter a unique name for your resource, select your subscription, and select a resource group, supported region (see [Region availability](/azure/ai-services/content-safety/overview#region-availability)), and supported pricing tier. Then select **Create**.
   * The resource takes a few minutes to deploy. After it finishes, Select **go to resource**. In the left pane, under **Resource Management**, select **Subscription Key and Endpoint**. The endpoint and either of the keys are used to call APIs.
 
 ## Set up application