Skip to content

Commit 74662f8

Browse files
authored
Merge pull request #185629 from MicrosoftDocs/master
1/20 PM Publish
2 parents a5d7876 + c470b55 commit 74662f8

File tree

84 files changed

+1902
-1397
lines changed

Some content is hidden

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

84 files changed

+1902
-1397
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/app-proxy/application-proxy-secure-api-access.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,13 @@ To configure the native app to connect to Azure Active Directory and call the AP
170170

171171
- Paste the **Directory (tenant) ID** in the `<add key="ida:Tenant" value="" />` field. You can find and copy this value (a GUID) from the **Overview** page of either of your apps.
172172

173-
- Paste the AppProxyNativeAppSample **Application (client) ID** in the `<add key="ida:ClientId" value="" />` field. You can find and copy this value (a GUID) from the AppProxyNativeAppSample **Overview** page.
173+
- Paste the AppProxyNativeAppSample **Application (client) ID** in the `<add key="ida:ClientId" value="" />` field. You can find and copy this value (a GUID) from the AppProxyNativeAppSample's **Overview** page, in the left navigation under **Manage**.
174174

175-
- Paste the AppProxyNativeAppSample **Redirect URI** in the `<add key="ida:RedirectUri" value="" />` field. You can find and copy this value (a URI) from the AppProxyNativeAppSample **Authentication** page.
175+
- Paste the AppProxyNativeAppSample **Redirect URI** in the `<add key="ida:RedirectUri" value="" />` field. You can find and copy this value (a URI) from the AppProxyNativeAppSample's **Authentication** page, in the left navigation under **Manage**.
176176

177-
- Paste the SecretAPI **Application ID URI** in the `<add key="todo:TodoListResourceId" value="" />` field. You can find and copy this value (a URI) from the SecretAPI **Expose an API** page.
177+
- Paste the SecretAPI **Application ID URI** in the `<add key="todo:TodoListResourceId" value="" />` field. You can find and copy this value (a URI) from the SecretAPI's **Expose an API** page, in the left navigation under **Manage**.
178178

179-
- Paste the SecretAPI **Home Page URL** in the `<add key="todo:TodoListBaseAddress" value="" />` field. You can find and copy this value (a URL) from the SecretAPI **Branding** page.
179+
- Paste the SecretAPI **Home Page URL** in the `<add key="todo:TodoListBaseAddress" value="" />` field. You can find and copy this value (a URL) from the SecretAPI's **Branding** page, in the left navigation under **Manage**.
180180

181181
After you configure the parameters, build and run the native app. When you select the **Sign In** button, the app lets you sign in, and then displays a success screen to confirm that it successfully connected to the SecretAPI.
182182

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*

0 commit comments

Comments
 (0)