Merge pull request #282641 from MicrosoftDocs/main

7/31 11:00 AM IST Publish

Author: PhilKang0704

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

@@ -86,7 +86,7 @@ This shield aims to safeguard against attacks that use information not directly
 
 ### Language availability
 
-Currently, the Prompt Shields API supports the English language. While our API doesn't restrict the submission of non-English content, we can't guarantee the same level of quality and accuracy in the analysis of such content. We recommend users to primarily submit content in English to ensure the most reliable and accurate results from the API.
+Prompt Shields have been specifically trained and tested on the following languages: Chinese, English, French, German, Italian, Japanese, Portuguese. However, the feature can work in many other languages, but the quality might vary. In all cases, you should do your own testing to ensure that it works for your application.
 
 ### Text length limitations
 

articles/ai-services/openai/concepts/model-retirements.md

@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
 description: Learn about the model deprecations and retirements in Azure OpenAI.
 ms.service: azure-ai-openai
 ms.topic: conceptual
-ms.date: 07/18/2024
+ms.date: 07/30/2024
 ms.custom: 
 manager: nitinme
 author: mrbullwinkle
@@ -93,9 +93,9 @@ These models are currently available for use in Azure OpenAI Service.
 | `gpt-35-turbo` | 0125 | No earlier than Feb 22, 2025 |
 | `gpt-4`<br>`gpt-4-32k` | 0314 | **Deprecation:** October 1, 2024 <br> **Retirement:** June 6, 2025 |
 | `gpt-4`<br>`gpt-4-32k` | 0613 | **Deprecation:** October 1, 2024 <br> **Retirement:** June 6, 2025 |
-| `gpt-4` | 1106-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on August 15, 2024, or later **<sup>1</sup>** |
-| `gpt-4` | 0125-preview |To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on August 15, 2024, or later  **<sup>1</sup>**  |
-| `gpt-4` | vision-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on August 15, 2024, or later  **<sup>1</sup>** |
+| `gpt-4` | 1106-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on November 15, 2024, or later **<sup>1</sup>** |
+| `gpt-4` | 0125-preview |To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on November 15, 2024, or later  **<sup>1</sup>**  |
+| `gpt-4` | vision-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on November 15, 2024, or later  **<sup>1</sup>** |
 | `gpt-3.5-turbo-instruct` | 0914 | No earlier than Sep 14, 2025 |
 | `text-embedding-ada-002` | 2 | No earlier than April 3, 2025 |
 | `text-embedding-ada-002` | 1 | No earlier than April 3, 2025 |
@@ -143,11 +143,18 @@ If you're an existing customer looking for information about these models, see [
 
 ## Retirement and deprecation history
 
-## July 18, 2024
+### July 30, 2024
+
+* Updated `gpt-4` preview model upgrade date to November 15, 2024 or later for the following versions:
+  * 1106-preview
+  * 0125-preview
+  * vision-preview
+
+### July 18, 2024
 
 * Updated `gpt-4` 0613  deprecation date to October 1, 2024 and the retirement date to June 6, 2025.
 
-## June 19, 2024
+### June 19, 2024
 
 * Updated `gpt-35-turbo` 0301 retirement date to no earlier than October 1, 2024.
 * Updated `gpt-35-turbo` & `gpt-35-turbo-16k`0613 retirement date to October 1, 2024.

articles/api-management/api-management-howto-deploy-multi-region.md

@@ -5,7 +5,7 @@ description: Learn how to deploy a Premium tier Azure API Management instance to
 author: dlepow
 ms.service: api-management
 ms.topic: how-to
-ms.date: 05/15/2024
+ms.date: 07/29/2024
 ms.author: danlep
 ---
 
@@ -168,7 +168,7 @@ This section provides considerations for multi-region deployments when the API M
 
 ### IP addresses
 
-* A public virtual IP address is created in every region added with a virtual network. For virtual networks in either [external mode](api-management-using-with-vnet.md) or [internal mode](api-management-using-with-internal-vnet.md), this public IP address is required for management traffic on port `3443`.
+* A public virtual IP address is created in every region added with a virtual network. For virtual networks in either [external mode](api-management-using-with-vnet.md) or [internal mode](api-management-using-with-internal-vnet.md), this public IP address is used for management traffic on port `3443`.
 
     * **External VNet mode** - The public IP addresses are also required to route public HTTP traffic to the API gateways.
 
@@ -178,7 +178,7 @@ This section provides considerations for multi-region deployments when the API M
 
 * **External VNet mode** - Routing of public HTTP traffic to the regional gateways is handled automatically, in the same way it is for a non-networked API Management instance.
 
-* **Internal VNet mode** - Private HTTP traffic isn't routed or load-balanced to the regional gateways by default. Users own the routing and are responsible for bringing their own solution to manage routing and private load balancing across multiple regions. Example solutions include Azure Application Gateway and Azure Traffic Manager.
+* **Internal VNet mode** - Private HTTP traffic isn't routed or load-balanced to the regional gateways by default. Users own the routing and are responsible for bringing their own solution to manage routing and private load balancing across multiple regions. 
 
 ## Next steps
 

articles/app-service/language-support-policy.md

@@ -41,13 +41,24 @@ To learn more about specific timelines for the language support policy, see the
 - [PHP](https://aka.ms/phprelease)
 - [Go](https://aka.ms/gorelease)
 
+## Support status
+
+App Service supports languages on both Linux and Windows operating systems. See the following resources for the list of OS support for each language:
+
+- [.NET](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/dot_net_core.md#support-timeline)
+- [Java](#jdk-versions-and-maintenance)
+- [Node](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/node_support.md#support-timeline)
+- [Python](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/python_support.md#support-timeline)
+- [PHP](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/php_support.md#support-timeline)
+
+
 ## Configure language versions
 
 To learn more about how to update language versions for your App Service applications, see the following resources:
 
 - [.NET](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/dot_net_core.md#how-to-update-your-app-to-target-a-different-version-of-net-or-net-core)
-- [Node](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/node_support.md#node-on-linux-app-service)
 - [Java](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/java_support.md#java-on-app-service)
+- [Node](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/node_support.md#node-on-linux-app-service)
 - [Python](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/python_support.md#how-to-update-your-app-to-target-a-different-version-of-python)
 - [PHP](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/php_support.md#how-to-update-your-app-to-target-a-different-version-of-php)
 

articles/backup/blob-backup-support-matrix.md

@@ -2,7 +2,7 @@
 title: Support matrix for Azure Blobs backup
 description: Provides a summary of support settings and limitations when backing up Azure Blobs.
 ms.topic: conceptual
-ms.date: 07/24/2024
+ms.date: 07/31/2024
 ms.custom: references_regions, engagement-fy24
 ms.service: backup
 author: AbhishekMallick-MS
@@ -23,7 +23,7 @@ Operational backup for blobs is available in all public cloud regions, except Fr
 
 # [Vaulted backup](#tab/vaulted-backup)
 
-Vaulted backup for blobs is currently available in all public regions **except** South Africa West, Sweden Central, Sweden South, Israel Central, Poland Central, India Central, Italy North and Malaysia South.
+Vaulted backup for blobs is available in all public regions.
 
 
 ---

articles/confidential-computing/confidential-computing-enclaves.md

@@ -2,7 +2,7 @@
 title: Build with SGX enclaves - Azure Virtual Machines
 description: Learn about Intel SGX hardware to enable your confidential computing workloads.
 author: ju-shim
-ms.service: virtual-machines
+ms.service: azure-virtual-machines
 ms.subservice: workloads
 ms.topic: conceptual
 ms.date: 11/01/2021

articles/confidential-computing/quick-create-portal.md

@@ -2,7 +2,7 @@
 title: Quickstart - Create Intel SGX VM in the Azure Portal
 description: Get started with your deployments by learning how to quickly create an Intel SGX VM in the Azure Portal
 author: ju-shim
-ms.service: virtual-machines
+ms.service: azure-virtual-machines
 ms.subservice: workloads
 ms.topic: quickstart
 ms.date: 11/1/2021

articles/cosmos-db/table/includes/quickstart-dotnet/azure-cli-create-resource-group-and-resource.md

@@ -1,6 +1,6 @@
 ---
 author: alexwolfmsft
-ms.service: cosmos-db
+ms.service: azure-cosmos-db
 ms.subservice: table
 ms.custom: devx-track-azurecli
 ms.topic: include

articles/cosmos-db/table/includes/quickstart-dotnet/azure-cli-get-connection-string.md

@@ -1,6 +1,6 @@
 ---
 author: alexwolfmsft
-ms.service: cosmos-db
+ms.service: azure-cosmos-db
 ms.subservice: table
 ms.topic: include
 ms.date: 08/22/2022

articles/cosmos-db/table/includes/quickstart-dotnet/environment-variables-connection-string.md

@@ -1,6 +1,6 @@
 ---
 author: alexwolfmsft
-ms.service: cosmos-db
+ms.service: azure-cosmos-db
 ms.subservice: table
 ms.topic: include
 ms.date: 07/08/2022