Skip to content

Commit 9d397fb

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into us401764-cli-posh-nat-firewall
2 parents 9feebca + 9413100 commit 9d397fb

File tree

1,924 files changed

+22224
-27467
lines changed

Some content is hidden

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

1,924 files changed

+22224
-27467
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/private-multi-access-edge-compute-mec/index.yml",
5+
"redirect_url": "/previous-versions/azure/private-multi-access-edge-compute-mec/index",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/network-watcher/traffic-analytics-schema-update.md",
510
"redirect_url": "/previous-versions/azure/network-watcher/traffic-analytics-schema-update",

articles/active-directory-b2c/api-connectors-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Using Azure AD B2C, you can add your own business logic to a user journey by cal
8787
![Diagram of a RESTful service claims exchange](media/api-connectors-overview/restful-service-claims-exchange.png)
8888

8989
> [!NOTE]
90-
> HTTP requests may be cancelled if there is a slow or no response from the RESTful service to Azure AD B2C. The default timeout is 10 seconds and the default retry count is one (meaning there are 2 tries in total).
90+
> HTTP requests may be cancelled if there is a slow or no response from the RESTful service to Azure AD B2C. The default timeout is 10 seconds for custom policies and 5 seconds for user flows. The default retry count is one (meaning there are 2 tries in total).
9191
9292
## Calling a RESTful service
9393

articles/active-directory-b2c/authorization-code-flow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ A successful token response looks like this:
233233
| access_token |The signed JWT that you requested. |
234234
| scope |The scopes that the token is valid for. You also can use the scopes to cache tokens for later use. |
235235
| expires_in |The length of time that the token is valid (in seconds). |
236-
| refresh_token |An OAuth 2.0 refresh token. The app can use this token to acquire additional tokens after the current token expires. Refresh tokens are long-lived, and can be used to retain access to resources for extended periods of time. For more information, see the [Azure AD B2C token reference](tokens-overview.md). |
236+
| refresh_token |An OAuth 2.0 refresh token. The app can use this token to acquire additional tokens after the current token expires. Refresh tokens are long-lived and can be used to retain access to resources for extended periods of time. For more information, see the [Azure AD B2C token reference](tokens-overview.md). |
237237

238238
Error responses look like this:
239239

articles/active-directory-b2c/custom-policies-series-call-rest-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ to:
216216
```xml
217217
<ValidationTechnicalProfile ReferenceId="ValidateAccessCodeViaHttp"/>
218218
```
219-
At this point, the Technical Profile with `Id` *CheckAccessCodeViaClaimsTransformationChecker* isn't needed, and can be removed.
219+
At this point, the Technical Profile with `Id` *CheckAccessCodeViaClaimsTransformationChecker* isn't needed and can be removed.
220220

221221

222222
## Step 3 - Upload custom policy file

articles/api-management/api-management-features.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: dlepow
66

77
ms.service: azure-api-management
88
ms.topic: concept-article
9-
ms.date: 05/12/2025
9+
ms.date: 05/21/2025
1010
ms.author: danlep
1111
---
1212

@@ -52,7 +52,7 @@ Each API Management [pricing tier](api-management-key-concepts.md#api-management
5252
| Export API to Postman | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
5353
| Export API to MCP server (preview) | No | No | Yes | No | Yes | No | Yes | No |
5454

55-
<sup>1</sup> Enables the use of Microsoft Entra ID (and Azure AD B2C) as an identity provider for user sign in on the developer portal.<br/>
55+
<sup>1</sup> Enables the use of Microsoft Entra ID (and Azure AD B2C or [Microsoft Entra External ID](/entra/external-id/customers/overview-customers-ciam)) as an identity provider for user sign in on the developer portal.<br/>
5656
<sup>2</sup> Including related functionality such as users, groups, issues, applications, and email templates and notifications.<br/>
5757
<sup>3</sup> See [Gateway overview](api-management-gateways-overview.md#feature-comparison-managed-versus-self-hosted-gateways) for a feature comparison of managed versus self-hosted gateways. In the Developer tier, self-hosted gateways are limited to a single gateway node. <br/>
5858
<sup>4</sup> See [Gateway overview](api-management-gateways-overview.md#policies) for differences in policy support in the classic, v2, consumption, and self-hosted gateways. <br/>
@@ -62,4 +62,4 @@ Each API Management [pricing tier](api-management-key-concepts.md#api-management
6262
* [Overview of Azure API Management](api-management-key-concepts.md)
6363
* [API Management limits](/azure/azure-resource-manager/management/azure-subscription-service-limits?toc=/azure/api-management/toc.json&bc=/azure/api-management/breadcrumb/toc.json#api-management-limits)
6464
* [V2 tiers overview](v2-service-tiers-overview.md)
65-
* [API Management pricing](https://azure.microsoft.com/pricing/details/api-management/)
65+
* [API Management pricing](https://azure.microsoft.com/pricing/details/api-management/)

articles/api-management/api-management-howto-developer-portal-customize.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: dlepow
66

77
ms.service: azure-api-management
88
ms.topic: tutorial
9-
ms.date: 04/28/2025
9+
ms.date: 05/28/2025
1010
ms.author: danlep
1111
ms.custom: engagement-fy23
1212
---
@@ -220,5 +220,5 @@ Advance to the next tutorial:
220220
See related content about the developer portal:
221221

222222
- [Azure API Management developer portal overview](developer-portal-overview.md)
223-
- Configure authentication to the developer portal with [usernames and passwords](developer-portal-basic-authentication.md), [Microsoft Entra ID](api-management-howto-aad.md), or [Azure AD B2C](api-management-howto-aad-b2c.md).
223+
- Configure authentication to the developer portal with [usernames and passwords](developer-portal-basic-authentication.md), [Microsoft Entra ID](api-management-howto-aad.md), or [Microsoft Entra External ID](/entra/external-id/customers/overview-customers-ciam).
224224
- Learn more about [customizing and extending](developer-portal-extend-custom-functionality.md) the functionality of the developer portal.

articles/api-management/api-management-howto-mutual-certificates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ After the certificate is uploaded, it shows in the **Certificates** window. If y
6969
> This change is effective immediately, and calls to operations of that API will use the certificate to authenticate on the backend server.
7070
7171
> [!TIP]
72-
> When a certificate is specified for gateway authentication for the backend service of an API, it becomes part of the policy for that API, and can be viewed in the policy editor.
72+
> When a certificate is specified for gateway authentication for the backend service of an API, it becomes part of the policy for that API and can be viewed in the policy editor.
7373
7474
## Disable certificate chain validation for self-signed certificates
7575

articles/api-management/api-management-howto-setup-delegation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: api-management
66

77
ms.service: azure-api-management
88
ms.topic: how-to
9-
ms.date: 06/24/2024
9+
ms.date: 05/24/2025
1010
ms.author: danlep
1111
---
1212

@@ -200,7 +200,7 @@ var signature = digest.toString('base64');
200200
201201
## Related content
202202
- [Learn more about the developer portal.](api-management-howto-developer-portal.md)
203-
- [Authenticate using Microsoft Entra ID](api-management-howto-aad.md) or with [Azure AD B2C](api-management-howto-aad-b2c.md).
203+
- [Authenticate using Microsoft Entra ID](api-management-howto-aad.md) or with [Microsoft Entra External ID](/entra/external-id/customers/overview-customers-ciam).
204204
- More developer portal questions? [Find answers in our FAQ](developer-portal-faq.md).
205205

206206
[Delegating developer sign-in and sign-up]: #delegate-signin-up

articles/api-management/api-management-key-concepts-experiment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Operations in API Management are highly configurable, with control over URL mapp
135135

136136
### Products
137137

138-
Products are how APIs are surfaced to developers. Products in API Management have one or more APIs, and can be *open* or *protected*. Protected products require a subscription key, while open products can be consumed freely.
138+
Products are how APIs are surfaced to developers. Products in API Management have one or more APIs and can be *open* or *protected*. Protected products require a subscription key, while open products can be consumed freely.
139139

140140
When a product is ready for use by developers, it can be published. Once published, it can be viewed or subscribed to by developers. Subscription approval is configured at the product level and can either require an administrator's approval or be automatic.
141141

articles/api-management/api-management-key-concepts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ Operations in API Management are highly configurable, with control over URL mapp
163163

164164
### Products
165165

166-
Products are how APIs are surfaced to API consumers such as app developers. Products in API Management have one or more APIs, and can be *open* or *protected*. Protected products require a subscription key, while open products can be consumed freely.
166+
Products are how APIs are surfaced to API consumers such as app developers. Products in API Management have one or more APIs and can be *open* or *protected*. Protected products require a subscription key, while open products can be consumed freely.
167167

168168
When a product is ready for use by consumers, it can be published. Once published, it can be viewed or subscribed to by users through the developer portal. Subscription approval is configured at the product level and can either require an administrator's approval or be automatic.
169169

0 commit comments

Comments
 (0)