Merge branch 'main' into release-blob-backup

Author: v-alje

.openpublishing.redirection.azure-app-configuration.json

@@ -24,6 +24,11 @@
             "source_path_from_root": "/articles/azure-app-configuration/quickstart-azure-function-csharp.md",
             "redirect_url": "/azure/azure-app-configuration/quickstart-azure-functions-csharp",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-app-configuration/concept-github-action.md",
+            "redirect_url": "/azure/azure-app-configuration/push-kv-github-action.md",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.baremetal-infrastructure.json

@@ -139,6 +139,36 @@
             "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/solution-design.md",
             "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
             "redirect_document_id": false
-        }       
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/nc2-baremetal-overview.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/skus.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/nc2-on-azure-responsibility-matrix.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/requirements.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/use-cases-and-supported-scenarios.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/supported-instances-and-regions.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
+            "redirect_document_id": false
+        }
     ]
 }

.openpublishing.redirection.defender-for-cloud.json

@@ -1,10 +1,15 @@
 {
     "redirections": [
         {
-            "source_path_from_root": "/articles/defender-for-cloud/recommendations-reference.md",
+            "source_path_from_root": "/articles/defender-for-cloud/multicloud.yml",
             "redirect_url": "/azure/defender-for-cloud/security-policy-concept",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/recommendations-reference.md",
+            "redirect_url": "/azure/defender-for-cloud/plan-multicloud-security-get-started",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/recommendations-reference-gcp.md",
             "redirect_url": "/azure/defender-for-cloud/security-policy-concept",

articles/ai-services/document-intelligence/how-to-guides/includes/v4-0/csharp-sdk.md

@@ -5,7 +5,7 @@ author: laujan
 manager: nitinme
 ms.service: azure-ai-document-intelligence
 ms.topic: include
-ms.date: 05/23/2024
+ms.date: 07/18/2024
 ms.author: lajanuar
 ms.custom: devx-track-csharp, ignite-2023, linux-related-content
 monikerRange: 'doc-intel-4.0.0'
@@ -16,7 +16,7 @@ monikerRange: 'doc-intel-4.0.0'
 <!-- markdownlint-disable MD033 -->
 <!-- markdownlint-disable MD034 -->
 
-[Client library](/dotnet/api/overview/azure/ai.documentintelligence-readme?view=azure-dotnet-preview&preserve-view=true) | [SDK reference](https://azuresdkdocs.blob.core.windows.net/$web/dotnet/Azure.AI.DocumentIntelligence/1.0.0-beta.2/index.html) | [REST API reference](/rest/api/aiservices/operation-groups?view=rest-aiservices-2024-02-29-preview&preserve-view=true) | [Package](https://www.nuget.org/packages/Azure.AI.DocumentIntelligence/1.0.0-beta.2)| [Samples]( https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/README.md)|[Supported REST API versions](../../sdk-overview-v4-0.md)
+[Client library](/dotnet/api/overview/azure/ai.documentintelligence-readme?view=azure-dotnet-preview&preserve-view=true) | [SDK reference](https://azuresdkdocs.blob.core.windows.net/$web/dotnet/Azure.AI.DocumentIntelligence/1.0.0-beta.2/index.html) | [REST API reference](/rest/api/aiservices/operation-groups?view=rest-aiservices-2024-02-29-preview&preserve-view=true) | [Package](https://www.nuget.org/packages/Azure.AI.DocumentIntelligence/1.0.0-beta.2)| [Samples]( https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/documentintelligence/Azure.AI.DocumentIntelligence/samples/README.md)|[Supported REST API versions](../../../sdk-overview-v4-0.md)
 
 ## Prerequisites
 
@@ -786,4 +786,4 @@ if (identityDocument.Fields.TryGetValue("Sex", out DocumentField sexfield))
 
 ```
 
-Visit the Azure samples repository on GitHub and view the [id-document model output](https://github.com/Azure-Samples/cognitive-services-quickstart-code/blob/master/dotnet/FormRecognizer/how-to-guide/id-document-model-output.md).
+Visit the Azure samples repository on GitHub and view the [ID document model output](https://github.com/Azure-Samples/cognitive-services-quickstart-code/blob/master/dotnet/FormRecognizer/how-to-guide/id-document-model-output.md).

articles/ai-services/document-intelligence/how-to-guides/use-sdk-rest-api.md

@@ -7,7 +7,7 @@ manager: nitinme
 ms.service: azure-ai-document-intelligence
 ms.custom: devx-track-dotnet, devx-track-extended-java, devx-track-js, devx-track-python, ignite-2023, linux-related-content
 ms.topic: how-to
-ms.date: 06/11/2024
+ms.date: 07/18/2024
 ms.author: lajanuar
 zone_pivot_groups: programming-languages-set-formre
 ---
@@ -68,7 +68,7 @@ Choose from the following Document Intelligence models and analyze and extract d
 ::: zone pivot="programming-language-csharp"
 
 ::: moniker range="doc-intel-4.0.0"
-[!INCLUDE [C# SDK quickstart](includes/v3-0/csharp-sdk.md)]
+[!INCLUDE [C# SDK quickstart](includes/v4-0/csharp-sdk.md)]
 ::: moniker-end
 
 ::: moniker range="doc-intel-3.1.0 || doc-intel-3.0.0"

articles/ai-services/language-service/tutorials/prompt-flow.md

@@ -21,10 +21,6 @@ This tutorial teaches you how to use Language in prompt flow utilizing [Azure AI
 
 - An Azure subscription - <a href="https://azure.microsoft.com/free/cognitive-services" target="_blank">Create one for free</a>.
 
-- Access granted to Azure OpenAI in the desired Azure subscription.
-
-     Currently, access to this service is granted only by application. You can apply for access to Azure OpenAI by completing the form at <a href="https://aka.ms/oai/access" target="_blank">https://aka.ms/oai/access</a>. Open an issue on this repo to contact us if you have an issue.
-
 - You need an Azure AI Studio hub or permissions to create one. Your user role must be **Azure AI Developer**, **Contributor**, or **Owner** on the hub. For more information, see [hubs](../../../ai-studio/concepts/ai-resources.md) and [Azure AI roles](../../../ai-studio/concepts/rbac-ai-studio.md).
      - If your role is **Contributor** or **Owner**, you can [create a hub in this tutorial](#create-a-project-in-azure-ai-studio). 
      - If your role is **Azure AI Developer**, the hub must already be created. 

articles/ai-services/openai/assistants-quickstart.md

@@ -8,7 +8,7 @@ ms.custom: devx-track-python, devx-track-dotnet, devx-track-extended-java, devx-
 ms.topic: quickstart
 author: mrbullwinkle
 ms.author: mbullwin
-ms.date: 05/20/2024
+ms.date: 07/18/2024
 zone_pivot_groups: openai-quickstart-assistants
 recommendations: false
 ---

articles/ai-services/openai/concepts/models.md

@@ -14,7 +14,7 @@ recommendations: false
 
 # Azure OpenAI Service models
 
-Azure OpenAI Service is powered by a diverse set of models with different capabilities and price points. Model availability varies by region.
+Azure OpenAI Service is powered by a diverse set of models with different capabilities and price points. Model availability varies by region and cloud. For Azure Government model availability, please refer to [Azure Government OpenAI Service](../../../azure-government/compare-azure-government-global-azure.md#azure-ai-services-openai-service).
 
 | Models | Description |
 |--|--|
@@ -225,14 +225,6 @@ In addition to the regions above which are available to all Azure OpenAI custome
 | `gpt-4` (0314) <br> `gpt-4-32k` (0314) | East US <br> France Central <br> South Central US <br> UK South |  
 | `gpt-4` (0613) <br> `gpt-4-32k` (0613) | East US <br> East US 2 <br> Japan East <br> UK South |  
 
-#### Azure Government regions
-
-The following GPT-4 models are available with [Azure Government](/azure/azure-government/documentation-government-welcome):
-
-|Model ID | Model Availability |
-|--|--|
-| `gpt-4` (1106-Preview) | US Gov Virginia<br>US Gov Arizona |
-
 ### GPT-3.5 models
 
 > [!IMPORTANT]
@@ -250,14 +242,6 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
 
 [!INCLUDE [GPT-35-Turbo](../includes/model-matrix/standard-gpt-35-turbo.md)]
 
-#### Azure Government regions
-
-The following GPT-3.5 turbo models are available with [Azure Government](/azure/azure-government/documentation-government-welcome):
-
-|Model ID | Model Availability |
-|--|--|
-| `gpt-35-turbo` (1106-Preview) | US Gov Virginia |
-
 ### Embeddings models
 
 These models can only be used with Embedding API requests.
@@ -279,14 +263,6 @@ These models can only be used with Embedding API requests.
 
 [!INCLUDE [Embeddings](../includes/model-matrix/standard-embeddings.md)]
 
-#### Azure Government regions
-
-The following Embeddings models are available with [Azure Government](/azure/azure-government/documentation-government-welcome):
-
-|Model ID | Model Availability |
-|--|--|
-|`text-embedding-ada-002` (version 2) |US Gov Virginia<br>US Gov Arizona |
-
 ### DALL-E models
 
 |  Model ID  | Feature Availability | Max Request (characters) |

articles/ai-services/openai/how-to/reproducible-output.md

@@ -6,7 +6,7 @@ services: cognitive-services
 manager: nitinme
 ms.service: azure-ai-openai
 ms.topic: how-to
-ms.date: 04/09/2024
+ms.date: 07/19/2024
 author: mrbullwinkle
 ms.author: mbullwin
 recommendations: false
@@ -23,10 +23,14 @@ Reproducible output is only currently supported with the following:
 
 ### Supported models
 
-* `gpt-35-turbo` (1106) - [region availability](../concepts/models.md#gpt-35-turbo-model-availability)
-* `gpt-35-turbo` (0125) - [region availability](../concepts/models.md#gpt-35-turbo-model-availability)
-* `gpt-4` (1106-Preview) - [region availability](../concepts/models.md#gpt-4-and-gpt-4-turbo-model-availability)
-* `gpt-4` (0125-Preview) - [region availability](../concepts/models.md#gpt-4-and-gpt-4-turbo-model-availability)
+* `gpt-35-turbo` (1106)
+* `gpt-35-turbo` (0125)
+* `gpt-4` (1106-Preview)
+* `gpt-4` (0125-Preview)
+* `gpt-4` (turbo-2024-04-09)
+* `gpt-4o` (2024-05-13)
+
+Consult the [models page](../concepts/models.md) for the latest information on model regional availability.
 
 ### API Version
 

articles/ai-services/openai/includes/assistants-ai-studio.md

@@ -40,7 +40,7 @@ author: mrbullwinkle
     | **Deployment** | This is where you set which model deployment to use with your assistant. |
     | **Functions**| Create custom function definitions for the models to formulate API calls and structure data outputs based on your specifications. Not used in this quickstart. |
     | **Code interpreter** | Code interpreter provides access to a sandboxed Python environment that can be used to allow the model to test and execute code. |
-    | **Files** | You can upload up to 20 files, with a max file size of 512 MB to use with tools. Not used in this quickstart. |
+    | **Files** | You can upload up to 10,000 files, with a max file size of 512 MB to use with tools. Not used in this quickstart. |
 
     :::image type="content" source="../media/quickstarts/assistants-ai-studio-playground.png" alt-text="Screenshot of the Assistant configuration screen without all the values filled in." lightbox="../media/quickstarts/assistants-ai-studio-playground.png":::