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

Author: Learn Build Service GitHub App

articles/active-directory-b2c/media/partner-bindid/partner-TransmitSecurity-architecture-diagram.png renamed to articles/active-directory-b2c/media/partner-bindid/partner-transmit-security-architecture-diagram.png

@@ -23,7 +23,7 @@ In this tutorial, learn to integrate Azure Active Directory B2C (Azure AD B2C) a
 
 The following architecture diagram illustrates the implementation:
 
-![Diagram of the Transmit and Azure AD B2C architecture.](media/partner-bindid/partner-TransmitSecurity-architecture-diagram.png) 
+![Diagram of the Transmit and Azure AD B2C architecture.](media/partner-bindid/partner-transmit-security-architecture-diagram.png) 
 
 1. User opens the Azure AD B2C sign-in page, and signs in or signs up.
 2. Azure AD B2C redirects the user to Transmit Security using an OpenID Connect (OIDC) request.

articles/active-directory-b2c/partner-bindid.md

@@ -22,7 +22,7 @@ The PII preview feature includes the ability to detect personal (`PII`) informat
 
 The following entity categories are returned when you're sending API requests PII feature.
 
-## Category: Name
+## Category: Person
 
 This category contains the following entity:
 
@@ -38,7 +38,9 @@ This category contains the following entity:
 
         All first, middle, last or full name is considered PII regardless of whether it is the speaker’s name, the agent’s name, someone else’s name or a different version of the speaker’s full name (Chris vs. Christopher). 
 
-        To get this entity category, add `Name` to the `pii-categories` parameter. `Name` will be returned in the API response if detected.
+        To get this entity category, add `Person` to the `pii-categories` parameter. `Person` will be returned in the API response if detected. 
+        > [!NOTE]
+        > As of the 2023-04-15-preview API onwards, this category is 'Person' instead of 'Name'.
       
     :::column-end:::
 

articles/ai-services/language-service/personally-identifiable-information/concepts/conversations-entity-categories.md

@@ -84,7 +84,7 @@ GPT-4 version 0314 is the first version of the model released.  Version 0613 is
 See [model versions](../concepts/model-versions.md) to learn about how Azure OpenAI Service handles model version upgrades, and [working with models](../how-to/working-with-models.md) to learn how to view and configure the model version settings of your GPT-4 deployments.
 
 > [!NOTE]
-> Version `0314` of `gpt-4` and `gpt-4-32k` will be retired no earlier than July 5, 2024.  See [model updates](../how-to/working-with-models.md#model-updates) for model upgrade behavior.
+> Version `0613` of `gpt-4` and `gpt-4-32k` will be retired on June 13, 2024.  Version `0314` of `gpt-4` and `gpt-4-32k` will be retired on July 5, 2024.  See [model updates](../how-to/working-with-models.md#model-updates) for model upgrade behavior.
 
 |  Model ID  | Max Request (tokens) | Training Data (up to)  |
 |  --- |  :--- | :---: |
@@ -121,7 +121,7 @@ GPT-3.5 Turbo version 0301 is the first version of the model released.  Version
 See [model versions](../concepts/model-versions.md) to learn about how Azure OpenAI Service handles model version upgrades, and [working with models](../how-to/working-with-models.md) to learn how to view and configure the model version settings of your GPT-3.5 Turbo deployments.
 
 > [!NOTE]
-> Version `0301` of `gpt-35-turbo` will be retired no earlier than July 5, 2024.  See [model updates](../how-to/working-with-models.md#model-updates) for model upgrade behavior.
+> Version `0613` of `gpt-35-turbo` and `gpt-35-turbo-16k` will be retired on June 13, 2024. Version `0301` of `gpt-35-turbo` will be retired on July 5, 2024.  See [model updates](../how-to/working-with-models.md#model-updates) for model upgrade behavior.
 
 ### GPT-3.5-Turbo model availability
 

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

@@ -2,9 +2,9 @@
 title: Troubleshoot the Azure Monitor agent on Windows virtual machines and scale sets
 description: Guidance for troubleshooting issues on Windows virtual machines, scale sets with Azure Monitor agent and Data Collection Rules.
 ms.topic: conceptual
-ms.date: 01/09/2024
+ms.date: 01/23/2024
 ms.custom: references_region
-ms.reviewer: shseth
+ms.reviewer: jeffwo
 ---
 
 # Troubleshooting guidance for the Azure Monitor agent on Windows virtual machines and scale sets

articles/azure-monitor/agents/azure-monitor-agent-troubleshoot-windows-vm.md

@@ -1,8 +1,8 @@
 ---
 title: Collect IIS logs with Azure Monitor Agent
 description: Configure collection of Internet Information Services (IIS) logs on virtual machines with Azure Monitor Agent.
-ms.topic: how-to
-ms.date: 01/19/2024
+ms.topic: Conceptual
+ms.date: 01/23/2024
 author: guywi-ms
 ms.author: guywild
 ms.reviewer: jeffwo

articles/azure-monitor/agents/data-collection-iis.md

@@ -27,8 +27,6 @@ All [Azure NetApp Files features](whats-new.md) available on Azure public cloud
 |:--- |:--- |:--- |
 | Azure NetApp Files backup | Public preview | No |
 | Azure NetApp Files large volumes | Public preview | No |
-| Edit network features for existing volumes | Public preview | No |
-| Standard storage with cool access in Azure NetApp Files | Public preview | Public preview |
 
 ## Portal access
 

articles/azure-netapp-files/azure-government.md

@@ -112,6 +112,9 @@ Azure NetApp Files volumes are designed to be contained in a special purpose sub
 * UAE North 
 * UK South
 * UK West
+* US Gov Arizona
+* US Gov Texas 
+* US Gov Virginia
 * West Europe 
 * West US 
 * West US 2*  

articles/azure-netapp-files/azure-netapp-files-network-topologies.md

@@ -37,7 +37,7 @@ The following diagram demonstrates how customer-managed keys work with Azure Net
     * To renew, you need to call the NetApp account operation `renewCredentials` if eligible for renewal. If it's not eligible, an error message communicates the date of eligibility.
     * Version 2.42 or later of the Azure CLI supports running the `renewCredentials` operation with the [az netappfiles account command](/cli/azure/netappfiles/account#az-netappfiles-account-renew-credentials). For example:
 
-    `az netappfiles account renew-credentials –-account-name myaccount –resource-group myresourcegroup`
+    `az netappfiles account renew-credentials –-account-name myaccount -–resource-group myresourcegroup`
 
     * If the account isn't eligible for MSI certificate renewal, an error message communicates the date and time when the account is eligible. It's recommended you run this operation periodically (for example, daily) to prevent the certificate from expiring and from the customer-managed key volume going offline.
 * Applying Azure network security groups on the private link subnet to Azure Key Vault isn't supported for Azure NetApp Files customer-managed keys. Network security groups don't affect connectivity to Private Link unless `Private endpoint network policy` is enabled on the subnet. It's recommended to keep this option disabled.

articles/azure-netapp-files/configure-customer-managed-keys.md

@@ -17,6 +17,10 @@ Azure NetApp Files is updated regularly. This article provides a summary about t
 
 ## January 2024
 
+* [Standard network features - Edit volumes available in US Gov regions](azure-netapp-files-network-topologies.md#regions-edit-network-features) (Preview)
+
+    Azure NetApp Files now supports the capability to edit network features of existing volumes in US Gov Arizona, US Gov Texas, and US Gov Texas. This capability provides an enhanced, more standard, Microsoft Azure Virtual Network experience through various security and connectivity features that are available on Virtual Networks to Azure services. This feature is in preview in commercial and US Gov regions. 
+    
 * [Customer-managed keys](configure-customer-managed-keys.md) is now generally available (GA).
 
     You still must register the feature before using it for the first time.