Skip to content

Commit 937f1ae

Browse files
author
gitName
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into patch-149587
2 parents 14f6490 + e6a7d41 commit 937f1ae

File tree

324 files changed

+3816
-2154
lines changed

Some content is hidden

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

324 files changed

+3816
-2154
lines changed

.openpublishing.redirection.json

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/network-watcher/traffic-analytics-schema-update.md",
5+
"redirect_url": "/previous-versions/azure/network-watcher/traffic-analytics-schema-update",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/network-watcher/network-watcher-visualize-nsg-flow-logs-open-source-tools.md",
10+
"redirect_url": "/previous-versions/azure/network-watcher/network-watcher-visualize-nsg-flow-logs-open-source-tools",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/network-watcher/network-watcher-nsg-grafana.md",
15+
"redirect_url": "/previous-versions/azure/network-watcher/network-watcher-nsg-grafana",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/network-watcher/network-watcher-analyze-nsg-flow-logs-graylog.md",
20+
"redirect_url": "/previous-versions/azure/network-watcher/network-watcher-analyze-nsg-flow-logs-graylog",
21+
"redirect_document_id": false
22+
},
323
{
424
"source_path": "articles/api-management/migrate-stv1-to-stv2-no-vnet.md",
525
"redirect_url": "/previous-versions/azure/api-management/migrate-stv1-to-stv2-no-vnet",
@@ -6945,4 +6965,4 @@
69456965
"redirect_document_id": false
69466966
}
69476967
]
6948-
}
6968+
}

articles/active-directory-b2c/billing.md

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: kengaderdus
55
manager: CelesteDG
66
ms.service: azure-active-directory
77
ms.topic: reference
8-
ms.date: 03/10/2025
8+
ms.date: 05/20/2025
99
ms.author: kengaderdus
1010
ms.subservice: b2c
1111
ms.custom: fasttrack-edit
@@ -36,18 +36,6 @@ Also, if you choose to provide higher levels of assurance by using multifactor a
3636
> [!IMPORTANT]
3737
> This article does not contain pricing details. For the latest information about usage billing and pricing, see [Azure Active Directory B2C pricing](https://azure.microsoft.com/pricing/details/active-directory-b2c/). See also [Azure AD B2C region availability and data residency](data-residency.md) for details about where the Azure AD B2C service is available and where user data is stored.
3838
39-
## What do I need to do?
40-
41-
To take advantage of MAU billing, your Azure AD B2C tenant must be linked to an Azure subscription. You might also need to switch your Azure AD B2C tenant to another pricing tier if you want to use Azure AD B2C Premium P2 features, like risk-based Conditional Access policies.
42-
43-
|If your tenant is: |You need to: |
44-
|---------|---------|
45-
| An Azure AD B2C tenant already billed on a per-MAU basis | Do nothing. When users authenticate to your Azure AD B2C tenant, you'll be automatically billed using the MAU-based billing model. |
46-
| An Azure AD B2C tenant not yet linked to a subscription | [Link your Azure AD B2C tenant to a subscription](#link-an-azure-ad-b2c-tenant-to-a-subscription) to activate MAU billing. |
47-
| An Azure AD B2C tenant that was linked to a subscription before November 1, 2019 | [Switch to MAU billing (recommended)](#switch-to-mau-billing-pre-november-2019-azure-ad-b2c-tenants), or stay on the per-authentication billing model. |
48-
| An Azure AD B2C tenant and you want to use premium features (like risk-based Conditional Access policies) | [Change to a Microsoft Entra pricing tier](#change-your-azure-ad-pricing-tier) that supports the features you want to use. |
49-
| | |
50-
5139
## About the monthly active users (MAU) billing model
5240

5341
MAU billing went into effect for Azure AD B2C tenants on **November 1, 2019**. Any Azure AD B2C tenants that you created and linked to a subscription on or after that date have been billed on a per-MAU basis.

articles/active-directory-b2c/conditional-access-identity-protection-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ description: Learn how Identity Protection gives you visibility into risky sign-
44
ms.service: azure-active-directory
55
ms.subservice: b2c
66
ms.topic: overview
7-
ms.date: 01/11/2024
7+
ms.date: 05/20/2025
88
ms.author: kengaderdus
99
author: kengaderdus
10-
manager: CelesteDG
10+
manager: mwongerapk
1111
ms.collection: M365-identity-device-management
1212

1313
#Customer intent: As an Azure AD B2C application owner, I want to enhance the security of my applications by using Identity Protection and Conditional Access, so that I can detect and respond to risky authentications and enforce organizational policies.

articles/active-directory-b2c/find-help-open-support-ticket.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: azure-active-directory
1010

1111
ms.topic: troubleshooting
12-
ms.date: 01/11/2024
12+
ms.date: 05/20/2025
1313
ms.author: kengaderdus
1414
ms.subservice: b2c
1515

articles/active-directory-b2c/identity-protection-investigate-risk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to investigate risky users, and detections in Azure AD B2
44
ms.service: entra-id
55
ms.subservice: conditional-access
66
ms.topic: overview
7-
ms.date: 01/24/2025
7+
ms.date: 05/24/2025
88
ms.author: godonnell
99
author: garrodonnell
1010
manager: CelesteDG

articles/active-directory-b2c/supported-azure-ad-features.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ title: Supported Microsoft Entra ID features
33
description: Learn about Microsoft Entra ID features, which are still supported in Azure AD B2C.
44

55
author: kengaderdus
6-
manager: CelesteDG
6+
manager: mwongerapk
77

88
ms.service: azure-active-directory
99

1010
ms.topic: overview
11-
ms.date: 01/11/2024
11+
ms.date: 05/20/2025
1212
ms.author: kengaderdus
1313
ms.subservice: b2c
1414

@@ -36,4 +36,4 @@ An Azure Active Directory B2C (Azure AD B2C) tenant is different than a Microsof
3636
| [Go-Local add-on](data-residency.md#go-local-add-on) | Microsoft Entra Go-Local add-on enables you to store data in the country/region you choose when your Microsoft Entra tenant.| Just like Microsoft Entra ID, Azure AD B2C supports [Go-Local add-on](data-residency.md#go-local-add-on). |
3737

3838
> [!NOTE]
39-
> **Other Azure resources in your tenant:** <br>In an Azure AD B2C tenant, you can't provision other Azure resources such as virtual machines, Azure web apps, or Azure functions. You must create these resources in your Microsoft Entra tenant.
39+
> **Other Azure resources in your tenant:** <br>In an Azure AD B2C tenant, you can't provision other Azure resources such as virtual machines, Azure web apps, or Azure functions. You must create these resources in your Microsoft Entra tenant.

articles/api-center/includes/api-center-service-limits.md

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

88
ms.service: azure-api-center
99
ms.topic: include
10-
ms.date: 03/ 18/2025
10+
ms.date: 05/19/2025
1111
ms.author: danlep
1212
ms.custom: Include file
1313
---
@@ -29,7 +29,7 @@ ms.custom: Include file
2929
| Maximum number of APIs synchronized from a linked API source | 200 | 2,000<sup>4</sup> |
3030
| Semantic search in API Center portal | No | Yes |
3131

32-
<sup>1</sup> Free plan provided for 90 days, then service is soft-deleted. Use of full service features including API analysis is limited.<br/>
32+
<sup>1</sup> Use of full service features including API analysis is limited.<br/>
3333
<sup>2</sup> To increase a limit in the Standard plan, contact [support](https://azure.microsoft.com/support/options/).<br/>
3434
<sup>3</sup> Custom metadata properties assigned to APIs, deployments, and environments.<br/>
3535
<sup>4</sup> Process can take a few minutes to up to 24 hours to complete.<br/>

articles/api-management/azure-openai-enable-semantic-caching.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Enable semantic caching of responses to Azure OpenAI API requests to reduce band
2727
* Chat Completion API - Deployment used for API consumer calls
2828
* Embeddings API - Deployment used for semantic caching
2929
* The API Management instance must be configured to use managed identity authentication to the Azure OpenAI APIs. For more information, see [Authenticate and authorize access to Azure OpenAI APIs using Azure API Management ](api-management-authenticate-authorize-azure-openai.md#authenticate-with-managed-identity).
30-
* An [Azure Cache for Redis Enterprise](../azure-cache-for-redis/quickstart-create-redis-enterprise.md) or [Azure Managed Redis](../redis/quickstart-create-managed-redis.md) instance. The **RediSearch** module must be enabled on the Redis cache.
30+
* An [Azure Managed Redis](../redis/quickstart-create-managed-redis.md) instance. The **RediSearch** module must be enabled on the Redis cache.
3131
> [!NOTE]
3232
> You can only enable the **RediSearch** module when creating a new Azure Redis Enterprise or Azure Managed Redis cache. You can't add a module to an existing cache. [Learn more](../redis/redis-modules.md)
3333
* External cache configured in the Azure API Management instance. For steps, see [Use an external Redis-compatible cache in Azure API Management](api-management-howto-cache-external.md).

articles/api-management/developer-portal-self-host.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ Update the developer portal URL in any template that has a link in the footer:
432432

433433
## Move from managed to self-hosted developer portal
434434

435-
Over time, your business requirements may change. You can end up in a situation where the managed version of the API Management developer portal no longer satisfies your needs. For example, a new requirement may force you to build a custom widget that integrates with a third-party data provider. Unlike the manged version, the self-hosted version of the portal offers you full flexibility and extensibility.
435+
Over time, your business requirements may change. You can end up in a situation where the managed version of the API Management developer portal no longer satisfies your needs. For example, a new requirement may force you to build a custom widget that integrates with a third-party data provider. Unlike the managed version, the self-hosted version of the portal offers you full flexibility and extensibility.
436436

437437
### Transition process
438438

articles/application-gateway/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,8 @@
289289
href: ../reliability/migrate-app-gateway-v2.md?toc=/azure/application-gateway/toc.json
290290
- name: Proxy buffer configuration
291291
href: proxy-buffers.md
292+
- name: Using Server-sent events
293+
href: use-server-sent-events.md
292294
- name: Custom error pages
293295
href: custom-error.md
294296
- name: Migrate to v2 SKU

0 commit comments

Comments
 (0)