Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into aditya

Author: markingmyname

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
+ms.custom: build-2023, references_regions
 ms.topic: conceptual
 ms.date: 03/15/2024
 ms.author: pafarley
@@ -73,6 +73,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
+
 ### TPS limitations
 
 | Pricing Tier | Requests per 10 seconds |

articles/ai-services/openai/how-to/use-your-data-securely.md

@@ -168,6 +168,9 @@ To allow your Azure AI Search to call your Azure OpenAI `preprocessing-jobs` as
 
 Set `networkAcls.bypass` as `AzureServices` from the management API. For more information, see [Virtual networks article](/azure/ai-services/cognitive-services-virtual-networks?tabs=portal#grant-access-to-trusted-azure-services-for-azure-openai).
 
+> [!NOTE]
+> The trusted service feature is only available using the command described above, and cannot be done using the Azure portal.
+
 This step can be skipped only if you have a [shared private link](#create-shared-private-link) for your Azure AI Search resource.
 
 ### Disable public network access
@@ -249,9 +252,6 @@ To allow access to your Storage Account from Azure OpenAI and Azure AI Search, w
 
 In the Azure portal, navigate to your storage account networking tab, choose "Selected networks", and then select **Allow Azure services on the trusted services list to access this storage account** and click Save.
 
-> [!NOTE]
-> The trusted service feature is only available using the command line described above, and cannot be done using the Azure portal.
-
 ### Disable public network access
 
 You can disable public network access of your Storage Account in the Azure portal. 
@@ -378,3 +378,4 @@ curl -i -X GET https://my-resource.openai.azure.com/openai/extensions/on-your-da
 ### Inference API
 
 See the [inference API reference article](../references/on-your-data.md) for details on the request and response objects used by the inference API.   
+    

articles/ai-studio/how-to/data-add.md

@@ -346,6 +346,14 @@ Data support tagging, which is extra metadata applied to the data in the form of
 
 You can add tags to existing data.
 
+### Data preview
+
+You can browse the folder structure and preview the file in the Data details page.
+We support data preview for the following types:
+- Data file types will be supported via preview API: ".tsv", ".csv", ".parquet", ".jsonl".
+- Other file types, Studio UI will attempt to preview the file in the browser natively. So the supported file types may depend on the browser itself.
+Normally for images, these are supported: ".png", ".jpg", ".gif". And normally, these are support ".ipynb", ".py", ".yml", ".html".
+
 ## Next steps
 
 - Learn how to [create a project in Azure AI Studio](./create-projects.md).

articles/aks/auto-upgrade-node-os-image.md

@@ -140,7 +140,7 @@ az provider register --namespace Microsoft.ContainerService
 - The `SecurityPatch` channel isn't supported on Windows OS node pools. 
 
  > [!NOTE]
- > By default, any new cluster created with an API version of `06-01-2022` or later will set the node OS auto-upgrade channel value to `NodeImage`. Any existing clusters created with an API version earlier than `06-01-2022` will have the node OS auto-upgrade channel value set to `None` by default.
+ > By default, any new cluster created with an API version of `06-01-2023` or later (including 06-02-preview)  will set the node OS auto-upgrade channel value to `NodeImage`. Any existing clusters created with an API version earlier than `06-01-2023` will have the node OS auto-upgrade channel value set to `None` by default.
 
 
 ## Node OS planned maintenance windows

articles/aks/learn/quick-kubernetes-deploy-cli.md

@@ -31,7 +31,7 @@ This quickstart assumes a basic understanding of Kubernetes concepts. For more i
 
 - This article requires version 2.0.64 or later of the Azure CLI. If you're using Azure Cloud Shell, the latest version is already installed there.
 - Make sure that the identity you're using to create your cluster has the appropriate minimum permissions. For more details on access and identity for AKS, see [Access and identity options for Azure Kubernetes Service (AKS)](../concepts-identity.md).
-- If you have multiple Azure subscriptions, select the appropriate subscription ID in which the resources should be billed using the [az account set](/cli/azure/account#az-account-set) command.
+- If you have multiple Azure subscriptions, select the appropriate subscription ID in which the resources should be billed using the [az account set](/cli/azure/account#az-account-set) command. For more information, see [How to manage Azure subscriptions – Azure CLI](/cli/azure/manage-azure-subscriptions-azure-cli?tabs=bash#change-the-active-subscription).
 
 ## Define environment variables
 

articles/aks/learn/quick-kubernetes-deploy-powershell.md

@@ -30,7 +30,7 @@ This article assumes a basic understanding of Kubernetes concepts. For more info
     If you want to use PowerShell locally, then install the [Az PowerShell](/powershell/azure/new-azureps-module-az) module and connect to your Azure account using the [Connect-AzAccount](/powershell/module/az.accounts/Connect-AzAccount) cmdlet. Make sure that you run the commands with administrative privileges. For more information, see [Install Azure PowerShell][install-azure-powershell].
 
 - Make sure that the identity you're using to create your cluster has the appropriate minimum permissions. For more details on access and identity for AKS, see [Access and identity options for Azure Kubernetes Service (AKS)](../concepts-identity.md).
-- If you have more than one Azure subscription, set the subscription that you wish to use for the quickstart by calling the [Set-AzContext](/powershell/module/az.accounts/set-azcontext) cmdlet.
+- If you have more than one Azure subscription, set the subscription that you wish to use for the quickstart by calling the [Set-AzContext](/powershell/module/az.accounts/set-azcontext) cmdlet. For more information, see [Manage Azure subscriptions with Azure PowerShell](/powershell/azure/manage-subscriptions-azureps#change-the-active-subscription).
 
 ## Create a resource group
 

articles/aks/learn/quick-windows-container-deploy-cli.md

@@ -27,7 +27,7 @@ This quickstart assumes a basic understanding of Kubernetes concepts. For more i
 
 - This article requires version 2.0.64 or later of the Azure CLI. If you're using Azure Cloud Shell, the latest version is already installed there.
 - Make sure that the identity you're using to create your cluster has the appropriate minimum permissions. For more details on access and identity for AKS, see [Access and identity options for Azure Kubernetes Service (AKS)](../concepts-identity.md).
-- If you have multiple Azure subscriptions, select the appropriate subscription ID in which the resources should be billed using the [az account set](/cli/azure/account#az-account-set) command.
+- If you have multiple Azure subscriptions, select the appropriate subscription ID in which the resources should be billed using the [az account set](/cli/azure/account#az-account-set) command. For more information, see [How to manage Azure subscriptions – Azure CLI](/cli/azure/manage-azure-subscriptions-azure-cli?tabs=bash#change-the-active-subscription).
 
 ## Create a resource group
 

articles/aks/learn/quick-windows-container-deploy-powershell.md

@@ -27,7 +27,7 @@ This quickstart assumes a basic understanding of Kubernetes concepts. For more i
     If you want to use PowerShell locally, then install the [Az PowerShell](/powershell/azure/new-azureps-module-az) module and connect to your Azure account using the [Connect-AzAccount](/powershell/module/az.accounts/Connect-AzAccount) cmdlet. Make sure that you run the commands with administrative privileges. For more information, see [Install Azure PowerShell][install-azure-powershell].
 
 - Make sure that the identity you're using to create your cluster has the appropriate minimum permissions. For more details on access and identity for AKS, see [Access and identity options for Azure Kubernetes Service (AKS)](../concepts-identity.md).
-- If you have more than one Azure subscription, set the subscription that you wish to use for the quickstart by calling the [Set-AzContext](/powershell/module/az.accounts/set-azcontext) cmdlet.
+- If you have more than one Azure subscription, set the subscription that you wish to use for the quickstart by calling the [Set-AzContext](/powershell/module/az.accounts/set-azcontext) cmdlet. For more information, see [Manage Azure subscriptions with Azure PowerShell](/powershell/azure/manage-subscriptions-azureps#change-the-active-subscription).
 
 ## Create a resource group
 

articles/azure-arc/kubernetes/conceptual-workload-management.md

@@ -319,4 +319,6 @@ A key point is that application configuration snapshots are versioned independen
 ## Next steps
 
 * Walk through a sample implementation to explore [workload management in a multi-cluster environment with GitOps](workload-management.md).
-* Explore a [multi-cluster workload management sample repository](https://github.com/microsoft/kalypso).
+* Explore a [multi-cluster workload management sample repository](https://github.com/microsoft/kalypso).
+* [Concept: CD process with GitOps](https://github.com/microsoft/kalypso/blob/main/docs/cd-concept.md).
+* [Sample implementation: Explore CI/CD flow with GitOps](https://github.com/microsoft/kalypso/blob/main/cicd/tutorial/cicd-tutorial.md).

articles/azure-arc/kubernetes/tutorial-gitops-flux2-ci-cd.md

@@ -627,4 +627,5 @@ In this tutorial, you have set up a full CI/CD workflow that implements DevOps f
 Advance to our conceptual article to learn more about GitOps and configurations with Azure Arc-enabled Kubernetes.
 
 > [!div class="nextstepaction"]
-> [Conceptual CI/CD Workflow using GitOps](./conceptual-gitops-flux2-ci-cd.md)
+> [Concept: CD process with GitOps](https://github.com/microsoft/kalypso/blob/main/docs/cd-concept.md)
+> [Sample implementation: Explore CI/CD flow with GitOps](https://github.com/microsoft/kalypso/blob/main/cicd/tutorial/cicd-tutorial.md)