Merge branch 'main' into patch-21

Author: enricohuang

.openpublishing.redirection.json

@@ -1065,6 +1065,11 @@
             "redirect_url": "/azure/container-instances/container-instances-resource-and-quota-limits",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/container-instances/container-instances-region-availability.md",
+            "redirect_url": "/azure/container-instances/container-instances-resource-and-quota-limits",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/cassandra-managed-instance/compare-cosmosdb-managed-instance.md",
             "redirect_url": "/azure/managed-instance-apache-cassandra/compare-cosmosdb-managed-instance",

articles/active-directory-b2c/custom-policy-developer-notes.md

@@ -31,17 +31,18 @@ Azure Active Directory B2C [user flows and custom policies](user-flow-overview.m
 - Support requests for public preview features can be submitted through regular support channels.
 
 ## User flows
-
 |Feature  |User flow  |Custom policy  |Notes  |
 |---------|:---------:|:---------:|---------|
 | [Sign-up and sign-in](add-sign-up-and-sign-in-policy.md) with email and password. | GA | GA| |
 | [Sign-up and sign-in](add-sign-up-and-sign-in-policy.md) with username and password.| GA | GA | |
 | [Profile editing flow](add-profile-editing-policy.md) | GA | GA | |
 | [Self-Service password reset](add-password-reset-policy.md) | GA| GA| |
 | [Force password reset](force-password-reset.md) | GA | NA | |
-| [Phone sign-up and sign-in](phone-authentication-user-flows.md) | GA | GA | |
-| [Conditional Access and Identity Protection](conditional-access-user-flow.md) | GA | GA | Not available for SAML applications |
+| [Self-Service password reset](add-password-reset-policy.md) | GA| GA| Available in China cloud, but only for custom policies.
+| [Force password reset](force-password-reset.md) | GA | GA | Available in China cloud, but only for custom policies. |
+| [Phone sign-up and sign-in](phone-authentication-user-flows.md) | GA | GA | Available in China cloud, but only for custom policies. |
 | [Smart lockout](threat-management.md) | GA | GA | |
+| [Conditional Access and Identity Protection](conditional-access-user-flow.md) | GA | GA | Not available for SAML applications. Limited CA features are available in China cloud. Identity Protection is not available in China cloud. |
 | [CAPTCHA](add-captcha.md) | Preview | Preview | You can enable it during sign-up or sign-in for Local accounts. |
 
 ## OAuth 2.0 application authorization flows
@@ -86,15 +87,15 @@ The following table summarizes the Security Assertion Markup Language (SAML) app
 
 |Feature  |User flow  |Custom policy  |Notes  |
 |---------|:---------:|:---------:|---------|
-| [Multi-language support](localization.md)| GA | GA | |
-| [Custom domains](custom-domain.md)| GA | GA | |
+| [Multi-language support](localization.md)| GA | GA | Available in China cloud, but only for custom policies. |
+| [Custom domains](custom-domain.md)| GA | GA | Available in China cloud, but only for custom policies. |
 | [Custom email verification](custom-email-mailjet.md) | NA | GA| |
 | [Customize the user interface with built-in templates](customize-ui.md) | GA| GA| |
 | [Customize the user interface with custom templates](customize-ui-with-html.md) | GA| GA| By using HTML templates. |
-| [Page layout version](page-layout.md) | GA | GA | |
-| [JavaScript](javascript-and-page-layout.md) | GA | GA | |
+| [Page layout version](page-layout.md) | GA | GA | Available in China cloud, but only for custom policies. |
+| [JavaScript](javascript-and-page-layout.md) | GA | GA | Available in China cloud, but only for custom policies. |
 | [Embedded sign-in experience](embedded-login.md) | NA |  Preview| By using the inline frame element `<iframe>`. |
-| [Password complexity](password-complexity.md) | GA | GA | |
+| [Password complexity](password-complexity.md) | GA | GA | Available in China cloud, but only for custom policies. |
 | [Disable email verification](disable-email-verification.md) | GA|  GA| Not recommended for production environments. Disabling email verification in the sign-up process may lead to spam. |
 
 
@@ -106,7 +107,7 @@ The following table summarizes the Security Assertion Markup Language (SAML) app
 |---------|:---------:|:---------:|---------|
 |[AD FS](identity-provider-adfs.md) | NA | GA | |
 |[Amazon](identity-provider-amazon.md) | GA | GA | |
-|[Apple](identity-provider-apple-id.md) | GA | GA | |
+|[Apple](identity-provider-apple-id.md) | GA | GA | Available in China cloud, but only for custom policies. |
 |[Microsoft Entra ID (Single-tenant)](identity-provider-azure-ad-single-tenant.md) | GA | GA | |
 |[Microsoft Entra ID (multitenant)](identity-provider-azure-ad-multi-tenant.md) | NA  | GA | |
 |[Azure AD B2C](identity-provider-azure-ad-b2c.md) | GA | GA | |
@@ -121,7 +122,7 @@ The following table summarizes the Security Assertion Markup Language (SAML) app
 |[Salesforce](identity-provider-salesforce.md) | GA | GA | |
 |[Salesforce (SAML protocol)](identity-provider-salesforce-saml.md) | NA | GA | |
 |[Twitter](identity-provider-twitter.md) | GA | GA | |
-|[WeChat](identity-provider-wechat.md) | Preview | GA | |
+|[WeChat](identity-provider-wechat.md) | Preview | GA | Available in China cloud, but only for custom policies. |
 |[Weibo](identity-provider-weibo.md) | Preview | GA | |
 
 ## Generic identity providers
@@ -153,18 +154,18 @@ The following table summarizes the Security Assertion Markup Language (SAML) app
 
 | Feature |  Custom policy | Notes |
 | ------- | :--: | ----- |
-| [Default SSO session provider](custom-policy-reference-sso.md#defaultssosessionprovider) | GA |  |
-| [External login session provider](custom-policy-reference-sso.md#externalloginssosessionprovider) | GA |  |
-| [SAML SSO session provider](custom-policy-reference-sso.md#samlssosessionprovider) | GA |  |
-| [OAuth SSO Session Provider](custom-policy-reference-sso.md#oauthssosessionprovider)  | GA|  |
+| [Default SSO session provider](custom-policy-reference-sso.md#defaultssosessionprovider) | GA | Available in China cloud, but only for custom policies. |
+| [External login session provider](custom-policy-reference-sso.md#externalloginssosessionprovider) | GA | Available in China cloud, but only for custom policies. |
+| [SAML SSO session provider](custom-policy-reference-sso.md#samlssosessionprovider) | GA | Available in China cloud, but only for custom policies. |
+| [OAuth SSO Session Provider](custom-policy-reference-sso.md#oauthssosessionprovider)  | GA| Available in China cloud, but only for custom policies. |
 
 
 ### Components
 
 | Feature | Custom policy | Notes |
 | ------- | :--: | ----- |
 | [MFA using time-based one-time password (TOTP) with authenticator apps](multi-factor-authentication.md#verification-methods) | GA |  Users can use any authenticator app that supports TOTP verification, such as the [Microsoft Authenticator app](https://www.microsoft.com/security/mobile-authenticator-app).|
-| [Phone factor authentication](phone-factor-technical-profile.md) | GA |  |
+| [Phone factor authentication](phone-factor-technical-profile.md) | GA |  Available in China cloud, but only for custom policies.  |
 | [Microsoft Entra multifactor authentication authentication](multi-factor-auth-technical-profile.md) | GA |  |
 | [One-time password](one-time-password-technical-profile.md) | GA |  |
 | [Microsoft Entra ID](active-directory-technical-profile.md) as local directory | GA |  |

articles/ai-services/cognitive-services-virtual-networks.md

@@ -8,7 +8,7 @@ manager: nitinme
 ms.service: azure-ai-services
 ms.custom: devx-track-azurepowershell, devx-track-azurecli
 ms.topic: how-to
-ms.date: 03/25/2024
+ms.date: 04/05/2024
 ms.author: aahi
 ---
 
@@ -60,6 +60,8 @@ Virtual networks are supported in [regions where Azure AI services are available
 > - `CognitiveServicesManagement`
 > - `CognitiveServicesFrontEnd`
 > - `Storage` (Speech Studio only)
+> 
+> For information on configuring Azure AI Studio, see the [Azure AI Studio documentation](../ai-studio/how-to/configure-private-link.md).
 
 ## Change the default network access rule
 

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

@@ -1,12 +1,12 @@
 ---
 title: 'How to generate reproducible output with Azure OpenAI Service'
 titleSuffix: Azure OpenAI
-description: Learn how to generate reproducible output (preview) with Azure OpenAI Service
+description: Learn how to generate reproducible output (preview) with Azure OpenAI Service.
 services: cognitive-services
 manager: nitinme
 ms.service: azure-ai-openai
 ms.topic: how-to
-ms.date: 11/17/2023
+ms.date: 04/09/2024
 author: mrbullwinkle
 ms.author: mbullwin
 recommendations: false
@@ -15,20 +15,22 @@ recommendations: false
 
 # Learn how to use reproducible output (preview)
 
-By default if you ask an Azure OpenAI Chat Completion model the same question multiple times you are likely to get a different response. The responses are therefore considered to be non-deterministic. Reproducible output is a new  preview feature that allows you to selectively change the default behavior towards producing more deterministic outputs.
+By default if you ask an Azure OpenAI Chat Completion model the same question multiple times you're likely to get a different response. The responses are therefore considered to be non-deterministic. Reproducible output is a new  preview feature that allows you to selectively change the default behavior to help product more deterministic outputs.
 
 ## Reproducible output support
 
 Reproducible output is only currently supported with the following:
 
 ### Supported models
 
-- `gpt-4-1106-preview` ([region availability](../concepts/models.md#gpt-4-and-gpt-4-turbo-preview-model-availability))
-- `gpt-35-turbo-1106` ([region availability)](../concepts/models.md#gpt-35-turbo-model-availability))
+* `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-preview-model-availability)
+* `gpt-4` (0125-Preview) - [region availability](../concepts/models.md#gpt-4-and-gpt-4-turbo-preview-model-availability)
 
 ### API Version
 
-- `2023-12-01-preview`
+Support for reproducible output was first added in API version [`2023-12-01-preview`](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/cognitiveservices/data-plane/AzureOpenAI/inference/preview/2023-12-01-preview/inference.json)
 
 ## Example
 
@@ -43,14 +45,14 @@ from openai import AzureOpenAI
 client = AzureOpenAI(
   azure_endpoint = os.getenv("AZURE_OPENAI_ENDPOINT"), 
   api_key=os.getenv("AZURE_OPENAI_API_KEY"),  
-  api_version="2023-12-01-preview"
+  api_version="2024-02-01"
 )
 
 for i in range(3):
   print(f'Story Version {i + 1}\n---')
 
   response = client.chat.completions.create(
-    model="gpt-4-1106-preview", # Model = should match the deployment name you chose for your 1106-preview model deployment
+    model="gpt-35-turbo-0125", # Model = should match the deployment name you chose for your 0125-preview model deployment
     #seed=42,
     temperature=0.7,
     max_tokens =200, 
@@ -72,7 +74,7 @@ for i in range(3):
 $openai = @{
    api_key     = $Env:AZURE_OPENAI_API_KEY
    api_base    = $Env:AZURE_OPENAI_ENDPOINT # like the following https://YOUR_RESOURCE_NAME.openai.azure.com/
-   api_version = '2023-12-01-preview' # may change in the future
+   api_version = '2024-02-01' # may change in the future
    name        = 'YOUR-DEPLOYMENT-NAME-HERE' # name you chose for your deployment
 }
 
@@ -155,14 +157,14 @@ from openai import AzureOpenAI
 client = AzureOpenAI(
   azure_endpoint = os.getenv("AZURE_OPENAI_ENDPOINT"), 
   api_key=os.getenv("AZURE_OPENAI_API_KEY"),  
-  api_version="2023-12-01-preview"
+  api_version="2024-02-01"
 )
 
 for i in range(3):
   print(f'Story Version {i + 1}\n---')
 
   response = client.chat.completions.create(
-    model="gpt-4-1106-preview", # Model = should match the deployment name you chose for your 1106-preview model deployment
+    model="gpt-35-turbo-0125", # Model = should match the deployment name you chose for your 0125-preview model deployment
     seed=42,
     temperature=0.7,
     max_tokens =200, 
@@ -184,7 +186,7 @@ for i in range(3):
 $openai = @{
    api_key     = $Env:AZURE_OPENAI_API_KEY
    api_base    = $Env:AZURE_OPENAI_ENDPOINT # like the following https://YOUR_RESOURCE_NAME.openai.azure.com/
-   api_version = '2023-12-01-preview' # may change in the future
+   api_version = '2024-02-01' # may change in the future
    name        = 'YOUR-DEPLOYMENT-NAME-HERE' # name you chose for your deployment
 }
 
@@ -250,7 +252,10 @@ Matter coalesced into the simplest elements, hydrogen and helium, which later fo
 ---
 ```
 
-By using the same `seed` parameter of 42 for each of our three requests we're able to produce much more consistent (in this case identical) results.
+By using the same `seed` parameter of 42 for each of our three requests, while keeping all other parameters the same, we're able to produce much more consistent results.
+
+> [!IMPORTANT]  
+> Determinism is not guaranteed with reproducible output. Even in cases where the seed parameter and `system_fingerprint` are the same across API calls it is not currently uncommon to still observe a degree of response variability.  
 
 ## Parameter details
 

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

@@ -103,12 +103,15 @@ When using the API, pass the `filter` parameter in each API request. For example
 * `group_id1, group_id2` are groups attributed to the logged in user. The client application can retrieve and cache users' groups.
 
 
-## Resources configuration
+## Resource configuration
 
 Use the following sections to configure your resources for optimal secure usage. Even if you plan to only secure part of your resources, you still need to follow all the steps below. 
 
 This article describes network settings related to disabling public network for Azure OpenAI resources, Azure AI search resources, and storage accounts. Using selected networks with IP rules is not supported, because the services' IP addresses are dynamic.
 
+> [!TIP]
+> You can use the bash script available on [GitHub](https://github.com/microsoft/sample-app-aoai-chatGPT/blob/main/scripts/validate-oyd-vnet.sh) to validate your setup, and determine if all of the requirements listed here are being met. 
+
 ## Create resource group
 
 Create a resource group, so you can organize all the relevant resources. The resources in the resource group include but are not limited to:

articles/ai-services/speech-service/whisper-overview.md

@@ -61,7 +61,7 @@ Whisper Model via Azure AI Speech might be best for:
 
 Regional support is another consideration. 
 - The Whisper model via Azure OpenAI Service is available in the following regions: EastUS 2, India South, North Central, Norway East, Sweden Central, and West Europe. 
-- The Whisper model via Azure AI Speech is available in the following regions: Australia East, Central US, East US, North Central US, South Central US, Southeast Asia, and West Europe.
+- The Whisper model via Azure AI Speech is available in the following regions: Australia East, East US, North Central US, South Central US, Southeast Asia, UK South, and West Europe.
 
 ## Next steps