Skip to content

Commit 5f26e67

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into diskRI
2 parents ab816d3 + b249df6 commit 5f26e67

File tree

77 files changed

+1144
-655
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

+1144
-655
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -841,6 +841,11 @@
841841
"redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-azure-subscription",
842842
"redirect_document_id": false
843843
},
844+
{
845+
"source_path": "articles/cognitive-services/QnAMaker/Concepts/data-sources-supported.md",
846+
"redirect_url": "/azure/cognitive-services/QnAMaker/concepts/knowledge-base",
847+
"redirect_document_id": false
848+
},
844849
{
845850
"source_path": "articles/cognitive-services/QnAMaker/How-To/create-knowledge-base.md",
846851
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/create-publish-knowledge-base",
@@ -2946,6 +2951,11 @@
29462951
"redirect_url": "/azure/cognitive-services/recommendations/overview",
29472952
"redirect_document_id": false
29482953
},
2954+
{
2955+
"source_path": "articles/cognitive-services/Recommendations/overview.md",
2956+
"redirect_url": "https://github.com/microsoft/Product-Recommendations/blob/master/README.md",
2957+
"redirect_document_id": false
2958+
},
29492959
{
29502960
"source_path": "articles/cognitive-services/Video/Home.md",
29512961
"redirect_url": "/azure/media-services/video-indexer/video-indexer-overview",

articles/active-directory-b2c/index.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
ms.collection: collection
1414
author: mmacy
1515
ms.author: marsma
16-
ms.date: 08/29/2019
16+
ms.date: 01/28/2020
1717

1818
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | whats-new
1919

@@ -27,7 +27,7 @@ landingContent:
2727
- linkListType: overview
2828
links:
2929
- text: What is Azure AD B2C?
30-
url: active-directory-b2c-overview.md
30+
url: overview.md
3131
- text: Technical & feature overview
3232
url: technical-overview.md
3333
- linkListType: get-started
@@ -49,13 +49,13 @@ landingContent:
4949
- linkListType: quickstart
5050
links:
5151
- text: Set up sign-in
52-
url: active-directory-b2c-quickstarts-web-app.md
52+
url: quickstart-web-app-dotnet.md
5353
- linkListType: tutorial
5454
links:
5555
- text: Authenticate users a .NET web application
56-
url: active-directory-b2c-tutorials-web-app.md
56+
url: tutorial-web-app-dotnet.md
5757
- text: Grant API access to a .NET web application
58-
url: active-directory-b2c-tutorials-web-api.md
58+
url: tutorial-web-api-dotnet.md
5959
- text: Enable enterprise and social login
6060
url: tutorial-add-identity-providers.md
6161
- linkListType: download
@@ -69,13 +69,13 @@ landingContent:
6969
- linkListType: quickstart
7070
links:
7171
- text: Set up sign-in
72-
url: active-directory-b2c-quickstarts-desktop-app.md
72+
url: quickstart-single-page-app.md
7373
- linkListType: tutorial
7474
links:
7575
- text: Authenticate users in a single-page app
76-
url: active-directory-b2c-tutorials-spa.md
76+
url: tutorial-single-page-app.md
7777
- text: Grant API access to a single-page app
78-
url: active-directory-b2c-tutorials-spa-webapi.md
78+
url: tutorial-single-page-app-webapi.md
7979
- text: Enable enterprise and social login
8080
url: tutorial-add-identity-providers.md
8181
- linkListType: download
@@ -89,13 +89,13 @@ landingContent:
8989
- linkListType: quickstart
9090
links:
9191
- text: Set up sign-in
92-
url: active-directory-b2c-quickstarts-desktop-app.md
92+
url: quickstart-native-app-desktop.md
9393
- linkListType: tutorial
9494
links:
9595
- text: Authenticate users in native clients
96-
url: active-directory-b2c-tutorials-desktop-app.md
96+
url: tutorial-desktop-app.md
9797
- text: Grant API access to native clients
98-
url: active-directory-b2c-tutorials-desktop-app-webapi.md
98+
url: tutorial-desktop-app-webapi.md
9999
- text: Enable enterprise and social login
100100
url: tutorial-add-identity-providers.md
101101
- linkListType: download
@@ -109,15 +109,15 @@ landingContent:
109109
- linkListType: concept
110110
links:
111111
- text: Introduction to user flows
112-
url: active-directory-b2c-reference-policies.md
112+
url: user-flow-overview.md
113113
- linkListType: how-to-guide
114114
links:
115115
- text: Sign up and sign in users
116116
url: tutorial-create-user-flows.md
117117
- text: Customize the user interface
118118
url: customize-ui-overview.md
119119
- text: Enable sign-in with Facebook
120-
url: active-directory-b2c-setup-fb-app.md
120+
url: identity-provider-facebook.md
121121
- linkListType: video
122122
links:
123123
- text: How to configure basic policies (9:41)
@@ -129,17 +129,17 @@ landingContent:
129129
- linkListType: concept
130130
links:
131131
- text: Introduction to custom policies
132-
url: active-directory-b2c-overview-custom.md
132+
url: custom-policy-overview.md
133133
- linkListType: how-to-guide
134134
links:
135135
- text: Sign up and sign in users
136-
url: active-directory-b2c-get-started-custom.md
136+
url: custom-policy-get-started.md
137137
- text: Customize the user interface
138-
url: active-directory-b2c-ui-customization-custom.md
138+
url: custom-policy-ui-customization.md
139139
- text: Enable sign-in with Azure AD multi-tenant
140-
url: active-directory-b2c-setup-commonaad-custom.md
140+
url: identity-provider-azure-ad-multi-tenant-custom.md
141141
- text: Add your own business logic with REST APIs
142-
url: active-directory-b2c-rest-api-validation-custom.md
142+
url: custom-policy-rest-api-claims-validation.md
143143
- linkListType: video
144144
links:
145145
- text: Advanced use cases with Azure AD B2C (4:54)

articles/app-service/configure-authentication-provider-aad.md

Lines changed: 20 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,30 @@ Follow these best practices when setting up your app and authentication:
2424
## <a name="express"> </a>Configure with express settings
2525

2626
1. In the [Azure portal], search for and select **App Services**, and then select your app.
27-
1. In the left pane, under **Settings** select **Authentication / Authorization** and make sure that **App Service Authentication** is **On**.
28-
1. Select **Azure Active Directory**, and then under **Management Mode** select **Express**.
29-
1. Select **OK** to register the App Service app in Azure Active Directory. A new app registration is created.
27+
2. From the left navigation, select **Authentication / Authorization** > **On**.
28+
3. Select **Azure Active Directory** > **Express**.
3029

3130
If you want to choose an existing app registration instead:
3231

33-
1. Choose **Select an existing app** and then search for the name of a previously created app registration within your tenant.
34-
1. Select the app registration and then select **OK**.
35-
1. Then select **OK** on the Azure Active Directory settings page.
32+
1. Choose **Select Existing AD app**, then click **Azure AD App**.
33+
2. Choose an existing app registration and click **OK**.
3634

37-
By default, App Service provides authentication but doesn't restrict authorized access to your site content and APIs. You must authorize users in your app code.
38-
1. (Optional) To restrict app access only to users authenticated by Azure Active Directory, set **Action to take when request is not authenticated** to **Log in with Azure Active Directory**. When you set this functionality, your app requires all requests to be authenticated. It also redirects all unauthenticated to Azure Active Directory for authentication.
35+
3. Select **OK** to register the App Service app in Azure Active Directory. A new app registration is created.
36+
37+
![Express settings in Azure Active Directory](./media/configure-authentication-provider-aad/express-settings.png)
38+
39+
4. (Optional) By default, App Service provides authentication but doesn't restrict authorized access to your site content and APIs. You must authorize users in your app code. To restrict app access only to users authenticated by Azure Active Directory, set **Action to take when request is not authenticated** to **Log in with Azure Active Directory**. When you set this functionality, your app requires all requests to be authenticated. It also redirects all unauthenticated to Azure Active Directory for authentication.
3940

4041
> [!CAUTION]
4142
> Restricting access in this way applies to all calls to your app, which might not be desirable for apps that have a publicly available home page, as in many single-page applications. For such applications, **Allow anonymous requests (no action)** might be preferred, with the app manually starting login itself. For more information, see [Authentication flow](overview-authentication-authorization.md#authentication-flow).
42-
1. Select **Save**.
43+
5. Select **Save**.
4344

4445
## <a name="advanced"> </a>Configure with advanced settings
4546

46-
You can configure app settings manually if you want to use an Azure AD tenant that's different from the one you use to sign in to Azure. To complete this custom configuration, you'll need to:
47+
You can configure app settings manually if you want to use an app registration from a different Azure AD tenant. To complete this custom configuration:
4748

4849
1. Create a registration in Azure AD.
49-
1. Provide some of the registration details to App Service.
50+
2. Provide some of the registration details to App Service.
5051

5152
### <a name="register"> </a>Create an app registration in Azure AD for your App Service app
5253

@@ -62,7 +63,7 @@ Perform the following steps:
6263
1. Sign in to the [Azure portal], search for and select **App Services**, and then select your app. Note your app's **URL**. You'll use it to configure your Azure Active Directory app registration.
6364
1. Select **Azure Active Directory** > **App registrations** > **New registration**.
6465
1. In the **Register an application** page, enter a **Name** for your app registration.
65-
1. In **Redirect URI**, select **Web** and enter the URL of your App Service app and append the path `/.auth/login/aad/callback`. For example, `https://contoso.azurewebsites.net/.auth/login/aad/callback`.
66+
1. In **Redirect URI**, select **Web** and type `<app-url>/.auth/login/aad/callback`. For example, `https://contoso.azurewebsites.net/.auth/login/aad/callback`.
6667
1. Select **Create**.
6768
1. After the app registration is created, copy the **Application (client) ID** and the **Directory (tenant) ID** for later.
6869
1. Select **Branding**. In **Home page URL**, enter the URL of your App Service app and select **Save**.
@@ -78,24 +79,22 @@ Perform the following steps:
7879
1. (Optional) To create a client secret, select **Certificates & secrets** > **New client secret** > **Add**. Copy the client secret value shown in the page. It won't be shown again.
7980
1. (Optional) To add multiple **Reply URLs**, select **Authentication**.
8081

81-
### <a name="secrets"> </a>Add Azure Active Directory information to your App Service app
82+
### <a name="secrets"> </a>Enable Azure Active Directory in your App Service app
8283

8384
1. In the [Azure portal], search for and select **App Services**, and then select your app.
84-
1. In the left pane, under **Settings**, select **Authentication / Authorization** and make sure that **App Service Authentication** is **On**.
85+
1. In the left pane, under **Settings**, select **Authentication / Authorization** > **On**.
8586
1. (Optional) By default, App Service authentication allows unauthenticated access to your app. To enforce user authentication, set **Action to take when request is not authenticated** to **Log in with Azure Active Directory**.
86-
1. Under Authentication Providers, select **Azure Active Directory**.
87+
1. Under **Authentication Providers**, select **Azure Active Directory**.
8788
1. In **Management mode**, select **Advanced** and configure App Service authentication according to the following table:
8889

8990
|Field|Description|
9091
|-|-|
9192
|Client ID| Use the **Application (client) ID** of the app registration. |
9293
|Issuer ID| Use `https://login.microsoftonline.com/<tenant-id>`, and replace *\<tenant-id>* with the **Directory (tenant) ID** of the app registration. |
9394
|Client Secret (Optional)| Use the client secret you generated in the app registration.|
94-
|Allowed Token Audiences| If this is a cloud or server app and you want to allow authentication tokens from a web app, add the **Application ID URI** of the web app here. |
95+
|Allowed Token Audiences| If this is a cloud or server app and you want to allow authentication tokens from a web app, add the **Application ID URI** of the web app here. The configured **Client ID** is *always* implicitly considered to be an allowed audience. |
9596

96-
> [!NOTE]
97-
> The configured **Client ID** is *always* implicitly considered to be an allowed audience, regardless of how you configured the **Allowed Token Audiences**.
98-
1. Select **OK**, and then select **Save**.
97+
2. Select **OK**, and then select **Save**.
9998

10099
You're now ready to use Azure Active Directory for authentication in your App Service app.
101100

@@ -105,11 +104,11 @@ You can register native clients to allow authentication using a client library s
105104

106105
1. In the [Azure portal], select **Active Directory** > **App registrations** > **New registration**.
107106
1. In the **Register an application** page, enter a **Name** for your app registration.
108-
1. In **Redirect URI**, select **Public client (mobile & desktop)** and enter the URL of your App Service app and append the path `/.auth/login/aad/callback`. For example, `https://contoso.azurewebsites.net/.auth/login/aad/callback`.
109-
1. Select **Create**.
107+
1. In **Redirect URI**, select **Public client (mobile & desktop)** and type the URL `<app-url>/.auth/login/aad/callback`. For example, `https://contoso.azurewebsites.net/.auth/login/aad/callback`.
110108

111109
> [!NOTE]
112110
> For a Windows application, use the [package SID](../app-service-mobile/app-service-mobile-dotnet-how-to-use-client-library.md#package-sid) as the URI instead.
111+
1. Select **Create**.
113112
1. After the app registration is created, copy the value of **Application (client) ID**.
114113
1. Select **API permissions** > **Add a permission** > **My APIs**.
115114
1. Select the app registration you created earlier for your App Service app. If you don't see the app registration, make sure that you've added the **user_impersonation** scope in [Create an app registration in Azure AD for your App Service app](#register).
@@ -121,21 +120,6 @@ You have now configured a native client application that can access your App Ser
121120

122121
[!INCLUDE [app-service-mobile-related-content-get-started-users](../../includes/app-service-mobile-related-content-get-started-users.md)]
123122

124-
<!-- Images. -->
125-
126-
[0]: ./media/app-service-mobile-how-to-configure-active-directory-authentication/app-service-webapp-url.png
127-
[1]: ./media/app-service-mobile-how-to-configure-active-directory-authentication/app-service-aad-app_registration.png
128-
[2]: ./media/app-service-mobile-how-to-configure-active-directory-authentication/app-service-aad-app-registration-create.png
129-
[3]: ./media/app-service-mobile-how-to-configure-active-directory-authentication/app-service-aad-app-registration-config-appidurl.png
130-
[4]: ./media/app-service-mobile-how-to-configure-active-directory-authentication/app-service-aad-app-registration-config-replyurl.png
131-
[5]: ./media/app-service-mobile-how-to-configure-active-directory-authentication/app-service-aad-endpoints.png
132-
[6]: ./media/app-service-mobile-how-to-configure-active-directory-authentication/app-service-aad-endpoints-fedmetadataxml.png
133-
[7]: ./media/app-service-mobile-how-to-configure-active-directory-authentication/app-service-webapp-auth.png
134-
[8]: ./media/configure-authentication-provider-aad/app-service-webapp-auth-config.png
135-
136-
137-
138123
<!-- URLs. -->
139124

140125
[Azure portal]: https://portal.azure.com/
141-
[alternative method]:#advanced
87.6 KB
Loading

articles/batch/batch-task-output-file-conventions.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ If your scenario differs from those listed above, you may need to consider a dif
4242

4343
## What is the Batch File Conventions standard?
4444

45-
The [Batch File Conventions standard](https://github.com/Azure/azure-sdk-for-net/tree/psSdkJson6/src/SDKs/Batch/Support/FileConventions#conventions) provides a naming scheme for the destination containers and blob paths to which your output files are written. Files persisted to Azure Storage that adhere to the File Conventions standard are automatically available for viewing in the Azure portal. The portal is aware of the naming convention and so can display files that adhere to it.
45+
The [Batch File Conventions standard](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/batch/Microsoft.Azure.Batch.Conventions.Files) provides a naming scheme for the destination containers and blob paths to which your output files are written. Files persisted to Azure Storage that adhere to the File Conventions standard are automatically available for viewing in the Azure portal. The portal is aware of the naming convention and so can display files that adhere to it.
4646

4747
The File Conventions library for .NET automatically names your storage containers and task output files according to the File Conventions standard. The File Conventions library also provides methods to query output files in Azure Storage according to job ID, task ID, or purpose.
4848

@@ -224,15 +224,15 @@ The [source code][github_file_conventions] for the File Conventions library is a
224224
- See [Persist task data to Azure Storage with the Batch service API](batch-task-output-files.md) to learn how to use the Batch service API to persist output data.
225225

226226
[forum_post]: https://social.msdn.microsoft.com/Forums/en-US/87b19671-1bdf-427a-972c-2af7e5ba82d9/installing-applications-and-staging-data-on-batch-compute-nodes?forum=azurebatch
227-
[github_file_conventions]: https://github.com/Azure/azure-sdk-for-net/tree/AutoRest/src/Batch/FileConventions
228-
[github_file_conventions_readme]: https://github.com/Azure/azure-sdk-for-net/blob/AutoRest/src/Batch/FileConventions/README.md
227+
[github_file_conventions]: https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/batch/Microsoft.Azure.Batch.Conventions.Files
228+
[github_file_conventions_readme]: https://github.com/Azure/azure-sdk-for-net/blob/master/sdk/batch/Microsoft.Azure.Batch.Conventions.Files/README.md
229229
[github_persistoutputs]: https://github.com/Azure/azure-batch-samples/tree/master/CSharp/ArticleProjects/PersistOutputs
230230
[github_samples]: https://github.com/Azure/azure-batch-samples
231231
[net_batchclient]: https://msdn.microsoft.com/library/azure/microsoft.azure.batch.batchclient.aspx
232232
[net_cloudjob]: https://msdn.microsoft.com/library/azure/microsoft.azure.batch.cloudjob.aspx
233233
[net_cloudstorageaccount]: https://docs.microsoft.com/java/api/com.microsoft.azure.storage._cloud_storage_account
234234
[net_cloudtask]: https://msdn.microsoft.com/library/azure/microsoft.azure.batch.cloudtask.aspx
235-
[net_fileconventions_readme]: https://github.com/Azure/azure-sdk-for-net/blob/AutoRest/src/Batch/FileConventions/README.md
235+
[net_fileconventions_readme]: https://github.com/Azure/azure-sdk-for-net/blob/master/sdk/batch/Microsoft.Azure.Batch.Conventions.Files/README.md
236236
[net_joboutputkind]: https://msdn.microsoft.com/library/azure/microsoft.azure.batch.conventions.files.joboutputkind.aspx
237237
[net_joboutputstorage]: https://msdn.microsoft.com/library/azure/microsoft.azure.batch.conventions.files.joboutputstorage.aspx
238238
[net_joboutputstorage_saveasync]: https://msdn.microsoft.com/library/azure/microsoft.azure.batch.conventions.files.joboutputstorage.saveasync.aspx

0 commit comments

Comments
 (0)