Skip to content

Commit 638d8ec

Browse files
authored
Merge pull request #191060 from MicrosoftDocs/main
Merge Main to Live, 4 AM
2 parents d6dc8ce + 9864fff commit 638d8ec

File tree

154 files changed

+1945
-709
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+1945
-709
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -698,6 +698,11 @@
698698
"redirect_url": "/azure/frontdoor/front-door-rules-engine",
699699
"redirect_document_id": false
700700
},
701+
{
702+
"source_path_from_root": "/articles/frontdoor/concept-route.md",
703+
"redirect_url": "/azure/frontdoor/front-door-route-matching",
704+
"redirect_document_id": false
705+
},
701706
{
702707
"source_path_from_root": "/articles/app-service-web/web-sites-dotnet-deploy-aspnet-mvc-app-membership-oauth-sql-database.md",
703708
"redirect_url": "/aspnet/core/security/authorization/secure-data",

articles/active-directory/cloud-sync/how-to-troubleshoot.md

Lines changed: 82 additions & 106 deletions
Large diffs are not rendered by default.

articles/active-directory/develop/quickstart-configure-app-expose-web-apis.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ First, follow these steps to create an example scope named `Employees.Read.All`:
4444
1. Sign in to the <a href="https://portal.azure.com/" target="_blank">Azure portal</a>.
4545
1. If you have access to multiple tenants, use the **Directory + subscription** filter :::image type="icon" source="./media/quickstart-configure-app-expose-web-apis/portal-01-directory-subscription-filter.png" border="false"::: in the top menu to select the tenant containing your client app's registration.
4646
1. Select **Azure Active Directory** > **App registrations**, and then select your API's app registration.
47-
1. Select **Expose an API** > **Add a scope**.
47+
1. Select **Expose an API**
48+
1. Select **Set** next to **Application ID URI** if you haven't yet configured one.
49+
50+
You can use the default value of `api://<application-client-id>` or another [supported App ID URI pattern](reference-app-manifest.md#identifieruris-attribute). The App ID URI acts as the prefix for the scopes you'll reference in your API's code, and it must be globally unique.
51+
1. Select **Add a scope**:
4852

4953
:::image type="content" source="media/quickstart-configure-app-expose-web-apis/portal-02-expose-api.png" alt-text="An app registration's Expose an API pane in the Azure portal":::
5054

51-
1. You're prompted to set an **Application ID URI** if you haven't yet configured one.
5255

53-
The App ID URI acts as the prefix for the scopes you'll reference in your API's code, and it must be globally unique. You can use the default value provided, which is in the form `api://<application-client-id>`, or specify a more readable URI like `https://contoso.com/api`.
54-
55-
More information on valid app ID URI patterns is available in the [Azure AD app manifest reference](reference-app-manifest.md).
5656

5757
1. Next, specify the scope's attributes in the **Add a scope** pane. For this walk-through, you can use the example values or specify your own.
5858

articles/active-directory/governance/create-access-review.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,7 @@ For more information, see [License requirements](access-reviews-overview.md#lice
158158

159159
A multi-stage review allows the administrator to define two or three sets of reviewers to complete a review one after another. In a single-stage review, all reviewers make a decision within the same period and the last reviewer to make a decision "wins". In a multi-stage review, two or three independent sets of reviewers make a decision within their own stage, and the next stage doesn't happen until a decision is made in the previous stage. Multi-stage reviews can be used to reduce the burden on later-stage reviewers, allow for escalation of reviewers, or have independent groups of reviewers agree on decisions.
160160
> [!WARNING]
161-
> Data of users included in multi-stage access reviews are a part of the audit record at the start of the review. Administrators may delete the data at any time by deleting the multi-stage access review series.
162-
[!INCLUDE [GDPR-related guidance](../../../includes/gdpr-intro-sentence.md)]
161+
> Data of users included in multi-stage access reviews are a part of the audit record at the start of the review. Administrators may delete the data at any time by deleting the multi-stage access review series. For general information about GDPR and protecting user data, see the [GDPR section of the Microsoft Trust Center](https://www.microsoft.com/trust-center/privacy/gdpr-overview) and the [GDPR section of the Service Trust portal](https://servicetrust.microsoft.com/ViewPage/GDPRGetStarted).
163162
164163
1. After you have selected the resource and scope of your review, move on to the **Reviews** tab.
165164

articles/api-management/import-logic-app-as-api.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Import a Logic App as an API with the Azure portal | Microsoft Docs
3-
description: This article shows you how to use API Management (APIM) to import Logic App as an API.
3+
description: This article shows you how to use API Management to import a Logic App (Consumption) resource as an API.
44
services: api-management
55
documentationcenter: ''
66
author: dlepow
@@ -26,10 +26,13 @@ In this article, you learn how to:
2626
> - Import a Logic App as an API
2727
> - Test the API in the Azure portal
2828
29+
> [!NOTE]
30+
> API Management supports automated import of a Logic App (Consumption) resource. which runs in the multi-tenant Logic Apps environment. Learn more about [single-tenant versus muti-tenant Logic Apps](../logic-apps/single-tenant-overview-compare.md).
31+
2932
## Prerequisites
3033

3134
- Complete the following quickstart: [Create an Azure API Management instance](get-started-create-service-instance.md)
32-
- Make sure there is a Logic App in your subscription that exposes an HTTP endpoint. For more information, [Trigger workflows with HTTP endpoints](../logic-apps/logic-apps-http-endpoint.md)
35+
- Make sure there is a Consumption plan-based Logic App resource in your subscription that exposes an HTTP endpoint. For more information, [Trigger workflows with HTTP endpoints](../logic-apps/logic-apps-http-endpoint.md)
3336

3437
[!INCLUDE [api-management-navigate-to-instance.md](../../includes/api-management-navigate-to-instance.md)]
3538

0 commit comments

Comments
 (0)