Skip to content

Commit a7fd4d8

Browse files
TaojunshenTaojunshen
authored
Merge pull request #274387 from MicrosoftDocs/main
5/6/2024 AM Publish
2 parents b1a5e86 + bbcce6f commit a7fd4d8

File tree

35 files changed

+236
-91
lines changed

35 files changed

+236
-91
lines changed

‎articles/active-directory-b2c/self-asserted-technical-profile.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,8 @@ The following example demonstrates the use of a self-asserted technical profile
176176
<UseTechnicalProfileForSessionManagement ReferenceId="SM-AAD" />
177177
</TechnicalProfile>
178178
```
179-
179+
> [!NOTE]
180+
> When you collect the password claim value in the self-asserted technical profile, that value is only available within the same technical profile or within a validation technical profiles that are referenced by that same self-asserted technical profile. When execution of that self-asserted technical profile completes, and moves to another technical profile, the password's value is lost. Consequently, password claim can only be stored in the orchestration step in which it is collected.
180181
### Output claims sign-up or sign-in page
181182

182183
In a combined sign-up and sign-in page, note the following when using a content definition [DataUri](contentdefinitions.md#datauri) element that specifies a `unifiedssp` or `unifiedssd` page type:

‎articles/ai-services/openai/includes/model-matrix/provisioned-models.md

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,30 @@ description: PTU-managed model availability by region.
55
manager: nitinme
66
ms.service: azure-ai-openai
77
ms.topic: include
8-
ms.date: 04/29/2024
8+
ms.date: 05/06/2024
99
---
1010

11-
| **Region** | **gpt-4**, **0613** | **gpt-4**, **1106-Preview** | **gpt-4**, **0125-Preview** | **gpt-4**, **turbo-2024-04-09** | **gpt-4-32k**, **0613** | **gpt-35-turbo**, **1106** | **gpt-35-turbo**, **0125** |
12-
|:-------------------|:-------------------:|:---------------------------:|:---------------------------:|:-----------------------:|:-----------------------:|:--------------------------:|:--------------------------:|
13-
| australiaeast | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
14-
| brazilsouth | ✅ | ✅ | - | - | ✅ | ✅ | - |
15-
| canadacentral | ✅ | - | - | - | ✅ | - | ✅ |
16-
| canadaeast | ✅ | ✅ | - | - | - | ✅ | - |
17-
| eastus | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
18-
| eastus2 | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
19-
| francecentral | ✅ | ✅ | ✅ | - | ✅ | - | ✅ |
20-
| germanywestcentral | ✅ | ✅ | ✅ | - | ✅ | ✅ | - |
21-
| japaneast | - | ✅ | ✅ | - | - | - | ✅ |
22-
| koreacentral | ✅ | - | - | - | ✅ | ✅ | - |
23-
| northcentralus | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
24-
| norwayeast | ✅ | - | ✅ | - | ✅ | - | - |
25-
| polandcentral | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
26-
| southafricanorth | ✅ | ✅ | - | - | ✅ | ✅ | - |
27-
| southcentralus | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
28-
| southindia | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
29-
| swedencentral | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
30-
| switzerlandnorth | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
31-
| switzerlandwest | - | - | - | - | - | - | ✅ |
32-
| uksouth | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
33-
| westus | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
34-
| westus3 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
11+
| **Region** | **gpt-4**, **0613** | **gpt-4**, **1106-Preview** | **gpt-4**, **0125-Preview** | **gpt-4**, **turbo-2024-04-09** | **gpt-4-32k**, **0613** | **gpt-35-turbo**, **1106** | **gpt-35-turbo**, **0125** |
12+
|:-------------------|:-------------------:|:---------------------------:|:---------------------------:|:-------------------------------:|:-----------------------:|:--------------------------:|:--------------------------:|
13+
| australiaeast | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
14+
| brazilsouth | ✅ | ✅ | - | - | ✅ | ✅ | - |
15+
| canadacentral | ✅ | - | - | - | ✅ | - | ✅ |
16+
| canadaeast | ✅ | ✅ | - | - | - | ✅ | - |
17+
| eastus | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
18+
| eastus2 | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
19+
| francecentral | ✅ | ✅ | ✅ | - | ✅ | - | ✅ |
20+
| germanywestcentral | ✅ | ✅ | ✅ | - | ✅ | ✅ | - |
21+
| japaneast | - | ✅ | ✅ | - | - | - | ✅ |
22+
| koreacentral | ✅ | - | - | - | ✅ | ✅ | - |
23+
| northcentralus | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
24+
| norwayeast | ✅ | - | ✅ | - | ✅ | - | - |
25+
| polandcentral | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
26+
| southafricanorth | ✅ | ✅ | - | - | ✅ | ✅ | - |
27+
| southcentralus | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
28+
| southindia | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
29+
| swedencentral | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
30+
| switzerlandnorth | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
31+
| switzerlandwest | - | - | - | - | - | - | ✅ |
32+
| uksouth | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
33+
| westus | ✅ | ✅ | ✅ | - | ✅ | ✅ | ✅ |
34+
| westus3 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |

‎articles/ai-services/openai/includes/model-matrix/standard-models.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ ms.date: 03/28/2024
2828
| uksouth | - | ✅ | ✅ | - | - | - | ✅ | ✅ | ✅ | - | ✅ | - | - | ✅ | - | - | - | - | - | - | - | - |
2929
| westeurope | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | - | ✅ |
3030
| westus | - | ✅ | - | ✅ | - | - | - | - | ✅ | - | - | - | - | ✅ | - | - | - | - | - | - | - | - |
31-
| westus3 | - | ✅ | - | - | - | - | - | - | - | - | - | - | - | ✅ | - | - | - | - | - | - | - | - |
31+
| westus3 | - | ✅ | - | - | - | - | - | - | - | - | - | - | - | ✅ | - | - | - | - | - |

‎articles/api-management/api-management-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ sections:
6868
- question: |
6969
How do I add a user to the Administrators group?
7070
answer: |
71-
Administrators group is an immutable system group that includes Azure subscription administrators. You can't add a user to this group. For more information, see [How to create and use groups to manage developer accounts in Azure API Management](./api-management-howto-create-groups.md).
71+
The Administrators group is an immutable system group that includes Azure subscription administrators. You can't add a user to this group. For more information, see [How to create and use groups to manage developer accounts in Azure API Management](./api-management-howto-create-groups.md).
7272
7373
- question: |
7474
Why is the policy that I want to add unavailable in the policy editor?

‎articles/app-service/environment/how-to-custom-domain-suffix.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Configure a custom domain suffix for the Azure App Service Environm
44
author: seligj95
55
ms.topic: tutorial
66
ms.custom: devx-track-arm-template
7-
ms.date: 05/01/2024
7+
ms.date: 05/06/2024
88
ms.author: jordanselig
99
zone_pivot_groups: app-service-environment-portal-arm
1010
---
@@ -78,7 +78,7 @@ If you rotate your certificate in Azure Key Vault, the App Service Environment p
7878
1. Select the managed identity you define for your App Service Environment. You can use either a system assigned or user assigned managed identity. You're able to configure your managed identity if you haven't done so already. You can configure the managed identity directly from the custom domain suffix page using the "Add identity" option in the managed identity selection box.
7979
:::image type="content" source="./media/custom-domain-suffix/managed-identity-selection.png" alt-text="Screenshot of a configuration pane to select and update the managed identity for the App Service Environment.":::
8080
1. Select the certificate for the custom domain suffix.
81-
1. If you use a private endpoint to access the key vault, you can't use the default key vault certificate URL the portal interface provides. You must manually enter and use the private link URL, which is in the format *https://KEY-VAULT-NAME.privatelink.vaultcore.azure.net/secrets/CERTIFICATE-NAME*.
81+
1. If you use a private endpoint to access the key vault, since network access is restricted to the private endpoint, you can't use the portal interface to select the certificate. You must manually enter the certificate URL.
8282
1. Select "Save" at the top of the page. To see the latest configuration updates, refresh the page.
8383
:::image type="content" source="./media/custom-domain-suffix/custom-domain-suffix-portal-experience.png" alt-text="Screenshot of an overview of the custom domain suffix portal experience.":::
8484
1. It takes a few minutes for the custom domain suffix configuration to be set. Check the status by selecting "Refresh" at the top of the page. The banner updates with the latest progress. Once complete, the banner will state that the custom domain suffix is configured.
@@ -90,7 +90,7 @@ If you rotate your certificate in Azure Key Vault, the App Service Environment p
9090

9191
## Use Azure Resource Manager to configure custom domain suffix
9292

93-
To configure a custom domain suffix for your App Service Environment using an Azure Resource Manager template, you need to include the below properties. Ensure that you meet the [prerequisites](#prerequisites) and that your managed identity and certificate are accessible and have the appropriate permissions for the Azure Key Vault. If you use a private endpoint to access the key vault, you can't use the default key vault certificate URL. You must use the private link URL, which is in the format *https://KEY-VAULT-NAME.privatelink.vaultcore.azure.net/secrets/CERTIFICATE-NAME*.
93+
To configure a custom domain suffix for your App Service Environment using an Azure Resource Manager template, you need to include the below properties. Ensure that you meet the [prerequisites](#prerequisites) and that your managed identity and certificate are accessible and have the appropriate permissions for the Azure Key Vault.
9494

9595
You need to configure the managed identity and ensure it exists before assigning it in your template. For more information on managed identities, see the [managed identity overview](../../active-directory/managed-identities-azure-resources/overview.md).
9696

0 commit comments

Comments
 (0)