Skip to content

Commit 8071bbc

Browse files
Learn Build Service GitHub AppLearn Build Service GitHub App
authored andcommitted
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 86fad0b + 41273f9 commit 8071bbc

42 files changed

Lines changed: 602 additions & 278 deletions

File tree

Some content is hidden

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

articles/active-directory-b2c/phone-based-mfa.md

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: kengaderdus
77
manager: CelesteDG
88
ms.service: azure-active-directory
99
ms.topic: how-to
10-
ms.date: 10/23/2024
10+
ms.date: 11/05/2025
1111
ms.author: kengaderdus
1212
ms.subservice: b2c
1313
ms.custom: sfi-image-nochange
@@ -93,7 +93,7 @@ Take the following actions to help mitigate fraudulent sign-ups.
9393
- [Configure a Conditional Access policy](conditional-access-user-flow.md) to block sign-ins based on location (applies to sign-in flows only, not sign-up flows).
9494
- To prevent automated attacks on your consumer-facing apps, [enable CAPTCHA](add-captcha.md). Azure AD B2C’s CAPTCHA supports both audio and visual CAPTCHA challenges, and applies to both sign-up and sign-in flows for your local accounts.
9595

96-
- Remove country codes that aren't relevant to your organization from the drop-down menu where the user verifies their phone number (this change will apply to future sign-ups):
96+
- Remove country/region codes that aren't relevant to your organization from the drop-down menu where the user verifies their phone number (this change will apply to future sign-ups):
9797

9898
1. Sign in to the [Azure portal](https://portal.azure.com) as the [External ID User Flow Administrator](/entra/identity/role-based-access-control/permissions-reference#external-id-user-flow-administrator) of your Azure AD B2C tenant.
9999
1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Azure AD B2C tenant from the **Directories + subscriptions** menu.
@@ -104,9 +104,9 @@ Take the following actions to help mitigate fraudulent sign-ups.
104104

105105
1. Open the JSON file that was downloaded in the previous step. In the file, search for `DEFAULT`, and replace the line with `"Value": "{\"DEFAULT\":\"Country/Region\",\"US\":\"United States\"}"`. Be sure to set `Overrides` to `true`.
106106

107-
To implement SMS blocking effectively, make sure the Overrides setting is enabled (set to true) only for your organization’s primary or default language. Do not enable Overrides for any secondary or non-primary languages, as this can cause unexpected SMS blocking. Since the countryList in the JSON file acts as an allow list, be sure to include all countries that should be permitted to send SMS in this list for the primary language configuration when Overrides is true.
107+
To implement SMS blocking effectively, make sure the Overrides setting is enabled (set to true) only for your organization’s primary or default language. Do not enable Overrides for any secondary or non-primary languages, as this can cause unexpected SMS blocking. Since the countryList in the JSON file acts as an allow list, be sure to include all countries/regions that should be permitted to send SMS in this list for the primary language configuration when Overrides is true.
108108
> [!NOTE]
109-
> You can customize the list of allowed country codes in the `countryList` element (see the [Phone factor authentication page example](localization-string-ids.md#phone-factor-authentication-page-example)).
109+
> You can customize the list of allowed country/region codes in the `countryList` element (see the [Phone factor authentication page example](localization-string-ids.md#phone-factor-authentication-page-example)).
110110
111111
1. Save the JSON file. In the language details panel, under **Upload new overrides**, select the modified JSON file to upload it.
112112
1. Close the panel and select **Run user flow**. For this example, confirm that **United States** is the only country code available in the dropdown:
@@ -115,11 +115,32 @@ Take the following actions to help mitigate fraudulent sign-ups.
115115

116116
## Mitigate fraudulent sign-ups for custom policy
117117

118-
To help prevent fraudulent sign-ups, remove any country codes that do not apply to your organization by following these steps:
118+
To help prevent fraudulent sign-ups, remove any country/region codes that do not apply to your organization by following these steps:
119119

120-
1. Locate the policy file that defines the `RelyingParty`. For example, in the [Starter Pack](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack), this is usually the SignUpOrSignin.xml file.
120+
1. Locate the policy file that defines the `RelyingParty`. For example, in the [Starter Pack](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack), this is usually the SignUpOrSignin.xml file. See the following snippet.
121121

122-
1. In the `BuildingBlocks` section of this policy file, add the following code. Make sure to include only the country codes relevant to your organization:
122+
```xml
123+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
124+
<TrustFrameworkPolicy xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
125+
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
126+
xmlns="http://schemas.microsoft.com/online/cpim/schemas/2013/06" PolicySchemaVersion="0.3.0.0" TenantId="yourtenant.onmicrosoft.com" PolicyId="B2C_1A_signup_signin" PublicPolicyUri="http://yourtenant.onmicrosoft.com/B2C_1A_signup_signin">
127+
128+
<BasePolicy>
129+
<TenantId>yourtenant.onmicrosoft.com</TenantId>
130+
<PolicyId>B2C_1A_TrustFrameworkExtensions</PolicyId>
131+
</BasePolicy>
132+
133+
<BuildingBlocks>
134+
<!-- Add the XML code outlined in Step 2 if this section. -->
135+
</BuildingBlocks>
136+
137+
<RelyingParty>
138+
...
139+
</RelyingParty>
140+
</TrustFrameworkPolicy>
141+
```
142+
143+
1. In the `BuildingBlocks` section of this policy file, add the following code. Make sure to include only the country/region codes relevant to your organization:
123144

124145
```xml
125146
<BuildingBlocks>
@@ -155,10 +176,13 @@ To help prevent fraudulent sign-ups, remove any country codes that do not apply
155176
</BuildingBlocks>
156177
```
157178

158-
The countryList acts as an allow list. Only the countries you specify in this list (for example, Japan, Bulgaria, and the United States) are permitted to use MFA. All other countries are blocked.
179+
The countryList acts as an allow list. Only the countries/regions you specify in this list (for example, Japan, Bulgaria, and the United States) are permitted to use MFA. All other countries/regions are blocked.
180+
181+
> [!IMPORTANT]
182+
> This code must be added to the relying party policy to ensure the country/region code restrictions are properly enforced on the server side.
159183

160184
## Related content
161185

162186
- Learn about [Identity Protection and Conditional Access for Azure AD B2C](conditional-access-identity-protection-overview.md)
163187

164-
- Apply [Conditional Access to user flows in Azure Active Directory B2C](conditional-access-user-flow.md)
188+
- Apply [Conditional Access to user flows in Azure Active Directory B2C](conditional-access-user-flow.md)

articles/application-gateway/private-link-configure.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: application-gateway
66
author: mbender-ms
77
ms.service: azure-application-gateway
88
ms.topic: how-to
9-
ms.date: 07/09/2025
9+
ms.date: 11/5/2025
1010
ms.author: mbender
1111
ms.custom:
1212
- devx-track-azurecli, devx-track-azurepowershell
@@ -72,6 +72,9 @@ Follow these steps to create the Private Link configuration:
7272
6. Select **Add** to create the configuration.
7373
7. From your Application Gateway settings, copy and save the **Resource ID**. This identifier is required when setting up Private Endpoints from different Microsoft Entra tenants.
7474

75+
>[!CAUTION]
76+
>Private link configuration will momentarily cause traffic disruption (less than 1 minute) while the change is applied. Changes are recommended to be conducted during a maintenance window or period of low-traffic. During this time, you may see connection timeouts or 4XX http status codes returned on request. Add/Remove/Approval/Rejection of private endpoints will not cause traffic disruption.
77+
7578
## Configure Private Endpoint
7679

7780
A Private Endpoint is a network interface that uses a private IP address from your virtual network to connect securely to Azure Application Gateway. Clients use the Private Endpoint's private IP address to establish connections to the Application Gateway through a secure tunnel.

articles/backup/backup-azure-monitoring-alerts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Manage Azure Monitor based alerts for Azure Backup
33
description: Learn about the new and improved alerting capabilities via Azure Monitor and the process to configure Azure Monitor.
44
ms.topic: how-to
5-
ms.date: 11/30/2024
5+
ms.date: 07/03/2025
66
ms.service: azure-backup
77
author: AbhishekMallick-MS
88
ms.author: v-mallicka
@@ -263,4 +263,4 @@ To configure the same, run the following commands:
263263
```
264264

265265
## Next steps
266-
Learn more about [Azure Backup monitoring and reporting](monitoring-and-alerts-overview.md).
266+
Learn more about [Azure Backup monitoring and reporting](monitoring-and-alerts-overview.md).

articles/backup/backup-azure-mysql-flexible-server-about.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Overview - Retention of Azure Database for MySQL - Flexible Server for the Long Term by Using Azure Backup
33
description: This article provides an overview of Azure Database for MySQL - Flexible Server retention for the long term.
44
ms.topic: overview
5-
ms.date: 11/21/2024
5+
ms.date: 01/27/2025
66
ms.service: azure-backup
77
ms.custom: engagement-fy23
88
author: AbhishekMallick-MS

articles/cost-management-billing/troubleshoot-billing/troubleshoot-account-not-found.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.reviewer: jkinma
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: troubleshooting
9-
ms.date: 04/29/2025
9+
ms.date: 11/03/2025
1010
ms.author: jkinma
1111
---
1212

articles/cost-management-billing/troubleshoot-billing/troubleshoot-threshold-billing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.reviewer: Jkinma
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: troubleshooting
9-
ms.date: 04/30/2025
9+
ms.date: 11/03/2025
1010
ms.author: Jkinma
1111
---
1212

articles/cost-management-billing/understand/mca-download-tax-document.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: jkinma39
55
ms.reviewer: jkinma
66
ms.service: cost-management-billing
77
ms.topic: conceptual
8-
ms.date: 04/29/2025
8+
ms.date: 11/03/2025
99
ms.subservice: billing
1010
ms.author: jkinma
1111
---

articles/cost-management-billing/understand/mca-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Roles on the billing profiles have permissions to view and manage invoices and p
3939
4040
### Each billing profile gets a monthly invoice
4141

42-
A monthly invoice is generated at the beginning of the month for each billing profile. The invoice contains all charges from the previous month.
42+
A monthly invoice is generated at the beginning of the month for each billing profile. The invoice contains all usage charges from the previous month. Seat-based subscriptions will be billed separately.
4343

4444
You can view the invoice, download documents, and the change setting to get future invoices by email, in the Azure portal. For more information, see [download invoices for a Microsoft Customer Agreement](../manage/download-azure-invoice-daily-usage-date.md#download-invoices-for-a-microsoft-customer-agreement).
4545

articles/cost-management-billing/understand/mpa-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.reviewer: jkinma
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: concept-article
9-
ms.date: 04/28/2025
9+
ms.date: 11/03/2025
1010
ms.author: jkinma
1111
# customer intent: As a Partner billing administrator, I want manage and use my Microsoft Partner Agreement to manage my customer's billing accounts.
1212
---

articles/defender-for-iot/organizations/billing.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,25 @@
22
title: Microsoft Defender for IoT billing
33
description: Learn how you're billed for the Microsoft Defender for IoT service.
44
ms.topic: concept-article
5-
ms.date: 03/25/2024
5+
ms.date: 11/05/2025
66
ms.custom: enterprise-iot
77
#CustomerIntent: As a Defender for IoT customer, I want to understand how I'm billed for Defender for IoT services so that I can best plan my deployment.
88
---
99

1010
# Defender for IoT billing
1111

12+
> [!NOTE]
13+
> This article is relevant for commercial Defender for IoT customers.
14+
> If you're a government customer, see [government customers trial license](getting-started.md#government-customers-trial-license) or contact your Microsoft sales representative for more information.
15+
16+
1217
As you plan your Microsoft Defender for IoT deployment, you typically want to understand the Defender for IoT pricing plans and billing models so you can optimize your costs.
1318

1419
**OT monitoring** is billed using site-based licenses, where each license applies to an individual site, based on the site size. A site is a physical location, such as a facility, campus, office building, hospital, rig, and so on. Each site can contain any number of network sensors, all of which monitor devices detected in connected networks.
1520

1621
**Enterprise IoT monitoring** supports 5 devices per Microsoft 365 E5 (ME5) or E5 Security license, or is available as standalone, per-device licenses for Microsoft Defender for Endpoint P2 customers.
1722

23+
1824
## Free trial
1925

2026
To evaluate Defender for IoT, start a free trial as follows:

0 commit comments

Comments
 (0)