Skip to content

Commit 24e2371

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 31665bb + bd89e00 commit 24e2371

File tree

1,893 files changed

+22740
-18028
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,893 files changed

+22740
-18028
lines changed

.openpublishing.redirection.json

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,109 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/databox-online/azure-stack-edge-overview.md",
5+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-overview",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/databox-online/azure-stack-edge-deploy-prep.md",
10+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-deploy-prep",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/databox-online/azure-stack-edge-deploy-install.md",
15+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-deploy-install",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/databox-online/azure-stack-edge-deploy-connect-setup-activate.md",
20+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-deploy-connect-setup-activate",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/databox-online/azure-stack-edge-deploy-add-shares.md",
25+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-deploy-add-shares",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/databox-online/azure-stack-edge-deploy-configure-compute-advanced.md",
30+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-deploy-configure-compute-advanced",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/databox-online/azure-stack-edge-deploy-configure-compute.md",
35+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-deploy-configure-compute",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/databox-online/azure-stack-edge-system-requirements.md",
40+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-system-requirements",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/databox-online/azure-stack-edge-technical-specifications-compliance.md",
45+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-technical-specifications-compliance",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/databox-online/azure-stack-edge-create-iot-edge-module.md",
50+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-create-iot-edge-module",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/databox-online/azure-stack-edge-manage-compute.md",
55+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-manage-compute",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/databox-online/azure-stack-edge-manage-shares.md",
60+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-manage-shares",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "articles/databox-online/azure-stack-edge-manage-users.md",
65+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-manage-users",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "articles/databox-online/azure-stack-edge-manage-bandwidth-schedules.md",
70+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-manage-bandwidth-schedules",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "articles/databox-online/azure-stack-edge-manage-access-power-connectivity-mode.md",
75+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-manage-access-power-connectivity-mode",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path": "articles/databox-online/azure-stack-edge-troubleshoot.md",
80+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-troubleshoot",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path": "articles/databox-online/azure-stack-edge-troubleshoot-iot-edge.md",
85+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-troubleshoot-iot-edge",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path": "articles/databox-online/azure-stack-edge-migrate-fpga-gpu.md",
90+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-migrate-fpga-gpu",
91+
"redirect_document_id": false
92+
},
93+
{
94+
"source_path": "articles/databox-online/azure-stack-edge-2101-release-notes.md",
95+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-2101-release-notes",
96+
"redirect_document_id": false
97+
},
98+
{
99+
"source_path": "articles/databox-online/azure-stack-edge-2301-release-notes.md",
100+
"redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-2301-release-notes",
101+
},
102+
{
103+
"source_path": "articles/network-watcher/nsg-flow-logs-rest.md",
104+
"redirect_url": "/previous-versions/azure/network-watcher/nsg-flow-logs-rest",
105+
"redirect_document_id": false
106+
},
3107
{
4108
"source_path": "articles/automation/update-management/configure-alerts.md",
5109
"redirect_url": "/azure/update-manager/manage-alerts",
@@ -2715,6 +2819,11 @@
27152819
"redirect_url": "/azure/bastion/bastion-connect-vm-ssh-linux",
27162820
"redirect_document_id": false
27172821
},
2822+
{
2823+
"source_path_from_root": "/articles/bastion/quickstart-developer-sku.md",
2824+
"redirect_url": "/azure/bastion/quickstart-developer",
2825+
"redirect_document_id": false
2826+
},
27182827
{
27192828
"source_path_from_root": "/articles/bastion/bastion-connect-vm-rdp.md",
27202829
"redirect_url": "/azure/bastion/bastion-connect-vm-rdp-windows",
@@ -6185,6 +6294,11 @@
61856294
"redirect_url": "/azure/virtual-network/vnet-integration-for-azure-services",
61866295
"redirect_document_id": false
61876296
},
6297+
{
6298+
"source_path_from_root": "/articles/cyclecloud/how-to/ccws/cleanup-roles.md",
6299+
"redirect_url": "/azure/cyclecloud/how-to/ccws/deploy-with-cli",
6300+
"redirect_document_id": false
6301+
},
61886302
{
61896303
"source_path": "articles/cloud-services/applications-dont-support-tls-1-2.md",
61906304
"redirect_url": "/previous-versions/azure/cloud-services/applications-dont-support-tls-1-2",
@@ -6509,6 +6623,16 @@
65096623
"source_path": "articles/cloud-services/schema-csdef-workerrole.md",
65106624
"redirect_url": "/previous-versions/azure/cloud-services/schema-csdef-workerrole",
65116625
"redirect_document_id": false
6626+
},
6627+
{
6628+
"source_path": "articles/reliability/migrate-sql-managed-instance.md",
6629+
"redirect_url": "/azure/azure-sql/managed-instance/instance-zone-redundancy-configure",
6630+
"redirect_document_id": false
6631+
},
6632+
{
6633+
"source_path": "articles/operational-excellence/relocation-managed-identity.md",
6634+
"redirect_url": "/entra/identity/managed-identities-azure-resources/how-to-managed-identity-regional-move",
6635+
"redirect_document_id": false
65126636
}
65136637
]
65146638
}

articles/active-directory-b2c/billing.md

Lines changed: 3 additions & 3 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: 09/11/2024
8+
ms.date: 03/10/2025
99
ms.author: kengaderdus
1010
ms.subservice: b2c
1111
ms.custom: fasttrack-edit
@@ -29,7 +29,7 @@ A monthly active user (MAU) is a unique user that performs an authentication wit
2929

3030
If Azure AD B2C [Go-Local add-on](data-residency.md#go-local-add-on) is available in your country/region, and you enable it, you'll be charged per MAU, which is an added charge to your Azure AD B2C [Premium P1 or P2 pricing](https://azure.microsoft.com/pricing/details/active-directory-b2c/) license. Learn more [About Local Data Residency add-on](#about-go-local-add-on)
3131

32-
Also, if you choose to provide higher levels of assurance by using multifactor authentication (MFA) for Voice and SMS, you'll be charged a worldwide flat fee for each MFA attempt that month, whether the sign in is successful or unsuccessful.
32+
Also, if you choose to provide higher levels of assurance by using multifactor authentication (MFA) for Voice and SMS, you'll be charged a fee for each MFA attempt that month, whether the sign in is successful or unsuccessful.
3333

3434

3535
> [!IMPORTANT]
@@ -85,7 +85,7 @@ A subscription linked to an Azure AD B2C tenant can be used for the billing of A
8585
### Create the link
8686

8787
1. Sign in to the [Azure portal](https://portal.azure.com).
88-
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.
88+
1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Microsoft Entra tenant from the **Directories + subscriptions** menu.
8989
1. Select **Create a resource**, and then, in the **Search services and Marketplace** field, search for and select **Azure Active Directory B2C**.
9090
1. Select **Create**.
9191
1. Select **Link an existing Azure AD B2C Tenant to my Azure subscription**.

articles/active-directory-b2c/enable-authentication-wpf-desktop-app-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,4 @@ During the [desktop app registration](configure-authentication-sample-wpf-deskto
129129

130130
## Next steps
131131

132-
- To learn more, see [MSAL for .NET, UWP, NetCore, and Xamarin configuration options](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki).
132+
- To learn more, see [MSAL for .NET, UWP and NetCore configuration options](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki).

0 commit comments

Comments
 (0)