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

Author: PatAltimore

articles/active-directory-b2c/custom-policies-series-store-user.md

@@ -10,7 +10,7 @@ ms.service: active-directory
 
 ms.topic: how-to
 ms.custom: b2c-docs-improvements
-ms.date: 01/11/2024
+ms.date: 05/11/2024
 ms.author: kengaderdus
 ms.reviewer: yoelh
 ms.subservice: B2C
@@ -206,7 +206,7 @@ We use the `ClaimGenerator` technical profile to execute three claims transforma
                         </Precondition>
                     </Preconditions>
                 </ValidationTechnicalProfile>                        
-                <ValidationTechnicalProfile ReferenceId="DisplayNameClaimGenerator"/>
+                <ValidationTechnicalProfile ReferenceId="UserInputDisplayNameGenerator"/>
                 <ValidationTechnicalProfile ReferenceId="AAD-UserWrite"/>
             </ValidationTechnicalProfiles>
         <!--</TechnicalProfile>-->
@@ -407,15 +407,14 @@ To configure a display control, use the following steps:
 
 1. Use the procedure in [step 6](#step-6---upload-policy) and [step 7](#step-7---test-policy) to upload your policy file, and test it. This time, you must verify your email address before a user account is created.  
 
-<a name='update-user-account-by-using-azure-ad-technical-profile'></a>
 
 ## Update user account by using Microsoft Entra ID technical profile
 
-You can configure a Microsoft Entra ID technical profile to update a user account instead of attempting to create a new one. To do so, set the Microsoft Entra ID technical profile to throw an error if the specified user account doesn't already exist in the `Metadata` collection by using the following code. The *Operation* needs to be set to *Write*:
+You can configure a Microsoft Entra ID technical profile to update a user account instead of attempting to create a new one. To do so, set the Microsoft Entra ID technical profile to throw an error if the specified user account doesn't already exist in the metadata collection by using the following code. Also, remove the `Key="UserMessageIfClaimsPrincipalAlreadyExists` metadata entry. The *Operation* needs to be set to *Write*:
 
 ```xml
     <Item Key="Operation">Write</Item>
-    <Item Key="RaiseErrorIfClaimsPrincipalDoesNotExist">true</Item>
+    <Item Key="RaiseErrorIfClaimsPrincipalDoesNotExist">false</Item>
 ``` 
 
 ## Use custom attributes 

articles/active-directory-b2c/index.yml

@@ -228,7 +228,7 @@ conceptualContent:
           - text: Deploy with GitHub actions
             url: deploy-custom-policies-github-action.md
             itemType: how-to-guide
-          - text: Manage resources using Microsoft Powershell
+          - text: Manage resources using Microsoft PowerShell
             url: manage-custom-policies-powershell.md
             itemType: how-to-guide
 

articles/aks/enable-fips-nodes.md

@@ -33,6 +33,23 @@ The Federal Information Processing Standard (FIPS) 140-2 is a US government stan
 >
 > FIPS-enabled node images may have different version numbers, such as kernel version, than images that aren't FIPS-enabled. The update cycle for FIPS-enabled node pools and node images may differ from node pools and images that aren't FIPS-enabled.
 
+## Supported OS Versions
+You can create FIPS-enabled node pools on all supported OS types, Linux and Windows. However, not all OS versions support FIPS-enabled nodepools. After a new OS version is released, there is typically a waiting period before it is FIPS compliant.
+
+The below table includes the supported OS versions:
+
+|OS Type|OS SKU|FIPS Compliance|
+|--|--|--|
+|Linux|Ubuntu|Supported|
+|Linux|Azure Linux| Supported|
+|Windows|Windows Server 2019| Supported|
+|Windows| Windows Server 2022| Supported|
+
+When requesting FIPS enabled Ubuntu, if the default Ubuntu version does not support FIPS, AKS will default to the most recent FIPS-supported version of Ubuntu. For example, Ubuntu 22.04 is default for Linux node pools. Since 22.04 does not currently support FIPS, AKS will default to Ubuntu 20.04 for Linux FIPS-enabled nodepools.
+
+> [!NOTE]
+ > Previously, you could use the GetOSOptions API to determine whether a given OS supported FIPS. The GetOSOptions API is now deprecated and it will no longer be included in new AKS API versions starting with 2024-05-01. 
+
 ## Create a FIPS-enabled Linux node pool
 
 1. Create a FIPS-enabled Linux node pool using the [`az aks nodepool add`][az-aks-nodepool-add] command with the `--enable-fips-image` parameter.

articles/app-service/deploy-intelligent-apps.md

@@ -0,0 +1,23 @@
+---
+title: 'Deploy an application that uses OpenAI on Azure App Service'
+description: Get started with OpenAI on Azure App Service
+author: jefmarti
+ms.author: jefmarti
+ms.date: 04/10/2024
+ms.topic: article
+zone_pivot_groups: app-service-openai
+---
+
+# Deploy an application that uses OpenAI on Azure App Service
+
+::: zone pivot="openai-dotnet"
+[!INCLUDE [deploy-intelligent-apps-linux-dotnet-pivot.md](includes/deploy-intelligent-apps/deploy-intelligent-apps-linux-dotnet-pivot.md)]
+::: zone-end  
+
+::: zone pivot="openai-python"
+[!INCLUDE [deploy-intelligent-apps-linux-python-pivot.md](includes/deploy-intelligent-apps/deploy-intelligent-apps-linux-python-pivot.md)]
+::: zone-end
+
+:::zone pivot="openai-java"
+[!INCLUDE [deploy-intelligent-apps-linux-java-pivot.md](includes/deploy-intelligent-apps/deploy-intelligent-apps-linux-java-pivot.md)]
+::: zone-end