Skip to content

Commit bbe3cb6

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 646194b + 74662f8 commit bbe3cb6

File tree

77 files changed

+1842
-1341
lines changed

Some content is hidden

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

77 files changed

+1842
-1341
lines changed

.openpublishing.redirection.data-factory.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,16 @@
2525
"redirect_url": "/azure/data-factory/transform-data-using-custom-activity",
2626
"redirect_document_id": false
2727
}
28+
,
29+
{
30+
"source_path_from_root": "/articles/data-factory/blog.md",
31+
"redirect_url": "https://techcommunity.microsoft.com/t5/Azure-Data-Factory/bg-p/AzureDataFactoryBlog",
32+
"redirect_document_id": false
33+
},
34+
{
35+
"source_path_from_root": "/articles/data-factory/pricing.md",
36+
"redirect_url": "https://azure.microsoft.com/pricing/details/data-factory/",
37+
"redirect_document_id": false
38+
}
2839
]
2940
}

articles/active-directory-b2c/billing.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,7 @@ To change your pricing tier, follow these steps:
110110
1. Select the pricing tier that includes the features you want to enable.
111111

112112
![Screenshot that shows how to select the pricing tier.](media/billing/select-tier.png)
113-
114-
> [!NOTE]
115-
> Currently, Azure AD Premium P1 for Azure AD B2C is the default pricing tier, and it's equivalent to Azure AD Free tier, but it costs money. Therefore, in terms of features, Azure AD Premium P1 license when applied to Azure AD tenant, isn't equivalent to Azure AD B2C Premium P1 license in a Azure AD B2C tenant, and the same is true for Premium P2 license. Hence, you expect that some features available in Azure AD tenant may be missing in Azure AD B2C even when the tenants have Azure AD Premium P2 and Azure AD B2C Premium P2 licenses respectively. For instance, Azure AD Premium P2 offers identity protection in Azure AD B2C tenants, but does not offer other Azure AD Premium P2 features that apply to Azure AD tenants. Learn more about [Azure AD B2C pricing](https://azure.microsoft.com/pricing/details/active-directory-b2c/).
113+
116114

117115
## Switch to MAU billing (pre-November 2019 Azure AD B2C tenants)
118116

articles/active-directory/authentication/howto-mfa-nps-extension.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ When you install the extension, you need the *Tenant ID* and admin credentials f
106106

107107
The NPS server must be able to communicate with the following URLs over ports 80 and 443:
108108

109+
* *https:\//strongauthenticationservice.auth.microsoft.com*
109110
* *https:\//adnotifications.windowsazure.com*
110111
* *https:\//login.microsoftonline.com*
111112
* *https:\//credentials.azure.com*

articles/active-directory/conditional-access/plan-conditional-access.md

Lines changed: 83 additions & 272 deletions
Large diffs are not rendered by default.

articles/active-directory/fundamentals/active-directory-data-storage-eu.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.service: active-directory
1010
ms.subservice: fundamentals
1111
ms.workload: identity
1212
ms.topic: conceptual
13-
ms.date: 01/12/2022
13+
ms.date: 01/20/2022
1414
ms.custom: "it-pro, seodec18"
1515
ms.collection: M365-identity-device-management
1616
---
@@ -36,10 +36,6 @@ For more information about what user information is collected by Azure Multi-Fac
3636

3737
If a customer creates a new enterprise application (whether through Azure AD Gallery or non-Gallery) and enables password-based SSO, the Application sign in URL, and custom capture sign in fields are stored in the United States. For more information, see [Configure password-based single sign-on](../manage-apps/configure-password-single-sign-on-non-gallery-applications.md)
3838

39-
## Microsoft Azure Active Directory B2C (Azure AD B2C)
40-
41-
Azure AD B2C policy configuration data and Key Containers are stored in U.S. datacenters, which do not contain any user personal data. For more info about policy configurations, see the [Azure Active Directory B2C: Built-in policies](../../active-directory-b2c/user-flow-overview.md) article.
42-
4339
## Microsoft Azure Active Directory B2B (Azure AD B2B)
4440

4541
Azure AD B2B stores invitations with redeem link and redirect URL information in US datacenters. In addition, email address of users that unsubscribe from receiving B2B invitations are also stored in U.S. datacenters.

articles/active-directory/fundamentals/whats-new-archive.md

Lines changed: 279 additions & 58 deletions
Large diffs are not rendered by default.

articles/active-directory/fundamentals/whats-new.md

Lines changed: 48 additions & 230 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)