Skip to content

Commit 8aeea8c

Browse files
KingdomOfEndsKingdomOfEnds
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into tsi-refresh-two
2 parents e1e3cdb + b39bdc5 commit 8aeea8c

File tree

1,043 files changed

+12237
-6934
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,043 files changed

+12237
-6934
lines changed

‎.openpublishing.redirection.json

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,16 @@
532532
"redirect_url": "/azure/machine-learning",
533533
"redirect_document_id": false
534534
},
535+
{
536+
"source_path": "articles/cognitive-services/QnAMaker/Quickstarts/get-answer-from-kb-using-postman.md",
537+
"redirect_url": "/azure/cognitive-services//QnAMaker/Quickstarts/get-answer-from-knowledge-base-using-url-tool",
538+
"redirect_document_id": false
539+
},
540+
{
541+
"source_path": "articles/cognitive-services/QnAMaker/Quickstarts/get-answer-from-kb-using-curl.md",
542+
"redirect_url": "/azure/cognitive-services//QnAMaker/Quickstarts/get-answer-from-knowledge-base-using-url-tool",
543+
"redirect_document_id": false
544+
},
535545
{
536546
"source_path": "articles/cognitive-services/LUIS/luis-how-to-add-example-utterances.md",
537547
"redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-add-entities",
@@ -26303,7 +26313,7 @@
2630326313
},
2630426314
{
2630526315
"source_path": "articles/security-center/security-center-policies-overview.md",
26306-
"redirect_url": "/azure/security-center/tutorial-security-policy.md",
26316+
"redirect_url": "/azure/security-center/tutorial-security-policy",
2630726317
"redirect_document_id": false
2630826318
},
2630926319
{
@@ -26476,6 +26486,11 @@
2647626486
"redirect_url": "/azure/hdinsight/spark/apache-spark-overview",
2647726487
"redirect_document_id": true
2647826488
},
26489+
{
26490+
"source_path": "articles/hdinsight/spark/apache-spark-eventhub-streaming.md",
26491+
"redirect_url": "/azure/hdinsight/spark/apache-spark-ipython-notebook-machine-learning",
26492+
"redirect_document_id": false
26493+
},
2647926494
{
2648026495
"source_path": "articles/hdinsight/storm/apache-storm-sensor-data-analysis.md",
2648126496
"redirect_url": "https://azure.microsoft.com/resources/samples/hdinsight-java-storm-eventhub/",

‎articles/active-directory-b2c/active-directory-b2c-quickstarts-desktop-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Quickstart - Set up sign-in for a desktop app using Azure Active Directory B2C
3-
description: Run a sample WPF desktop application that uses Azure Active Directory B2C to provide account sign-in.
3+
description: In this Quickstart, run a sample WPF desktop application that uses Azure Active Directory B2C to provide account sign-in.
44
services: active-directory-b2c
55
author: mmacy
66
manager: celestedg

‎articles/active-directory-b2c/active-directory-b2c-quickstarts-spa.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Quickstart - Set up sign-in for a single-page app using Azure Active Directory B2C
3-
description: Run a sample single-page application that uses Azure Active Directory B2C to provide account sign-in.
3+
description: In this Quickstart, run a sample single-page application that uses Azure Active Directory B2C to provide account sign-in.
44
services: active-directory-b2c
55
author: mmacy
66
manager: celestedg

‎articles/active-directory-b2c/active-directory-b2c-quickstarts-web-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Quickstart - Set up sign in for an ASP.NET application using Azure Active Directory B2C
3-
description: Run a sample ASP.NET web app that uses Azure Active Directory B2C to provide account sign-in.
3+
description: In this Quickstart, run a sample ASP.NET web app that uses Azure Active Directory B2C to provide account sign-in.
44
services: active-directory-b2c
55
author: mmacy
66
manager: celestedg

‎articles/active-directory-b2c/active-directory-b2c-tutorials-spa-webapi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Tutorial - Grant access to an ASP.NET Core web API from a single-page application - Azure Active Directory B2C
3-
description: Learn how to use Active Directory B2C to protect a .NET Core web API and call the API from a single-page Node.js application.
3+
description: In this tutorial, learn how to use Active Directory B2C to protect a .NET Core web API and call the API from a single-page Node.js application.
44
services: active-directory-b2c
55
author: mmacy
66
manager: celestedg

‎articles/active-directory-b2c/active-directory-b2c-tutorials-spa.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: 'Tutorial: Enable authentication in a single-page application - Azure Active Directory B2C'
3-
description: Learn how to use Azure Active Directory B2C to provide user login for a single page application (JavaScript).
2+
title: 'Tutorial - Enable authentication in a single-page application - Azure Active Directory B2C'
3+
description: In this tutorial, learn how to use Azure Active Directory B2C to provide user login for a single page application (JavaScript).
44
services: active-directory-b2c
55
author: mmacy
66
manager: celestedg

‎articles/active-directory-b2c/active-directory-b2c-user-migration.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ manager: celestedg
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 08/31/2019
11+
ms.date: 11/26/2019
1212
ms.author: marsma
1313
ms.subservice: B2C
1414
---
1515

16-
# Azure Active Directory B2C: User migration
16+
# Migrate users to Azure Active Directory B2C
1717

1818
When you migrate your identity provider to Azure Active Directory B2C (Azure AD B2C), you might also need to migrate the user accounts. This article explains how to migrate existing user accounts from any identity provider to Azure AD B2C. The article is not meant to be prescriptive, but rather, it describes a few scenarios. The developer is responsible for the suitability of each approach.
1919

@@ -302,7 +302,17 @@ In Solution Explorer, right-click on the `AADB2C.UserMigration.API`, select "Pub
302302

303303
The preceding technical profile defines one input claim: `signInName` (send as email). On sign-in, the claim is sent to your RESTful endpoint.
304304

305-
After you define the technical profile for your RESTful API, tell your Azure AD B2C policy to call the technical profile. The XML snippet overrides `SelfAsserted-LocalAccountSignin-Email`, which is defined in the base policy. The XML snippet also adds `ValidationTechnicalProfile`, with ReferenceId pointing to your technical profile `LocalAccountUserMigration`.
305+
After you define the technical profile for your RESTful API, configure the existing `SelfAsserted-LocalAccountSignin-Email` technical profile to additionally call your REST API technical profile by overriding it within your *TrustFrameworkExtensions.xml* file:
306+
307+
```XML
308+
<TechnicalProfile Id="SelfAsserted-LocalAccountSignin-Email">
309+
<ValidationTechnicalProfiles>
310+
<ValidationTechnicalProfile ReferenceId="LocalAccountUserMigration" />
311+
</ValidationTechnicalProfiles>
312+
</TechnicalProfile>
313+
```
314+
315+
Then, change the `Id` of the `LocalAccountSignIn` technical profile to `LocalAccountUserMigration`.
306316

307317
### Step 4.4: Upload the policy to your tenant
308318

‎articles/active-directory/authentication/active-directory-certificate-based-authentication-android.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
title: Certificate-based authentication on Android - Azure Active Directory
2+
title: Android certificate-based authentication - Azure Active Directory
33
description: Learn about the supported scenarios and the requirements for configuring certificate-based authentication in solutions with Android devices
44

55
services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: article
9-
ms.date: 01/15/2018
9+
ms.date: 11/21/2019
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo

‎articles/active-directory/authentication/active-directory-certificate-based-authentication-get-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
title: Get started with certificate-based authentication - Azure Active Directory
2+
title: Certificate-based authentication - Azure Active Directory
33
description: Learn how to configure certificate-based authentication in your environment
44

55
services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: article
9-
ms.date: 01/15/2018
9+
ms.date: 11/21/2019
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo

‎articles/active-directory/authentication/active-directory-passwords-troubleshoot.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
2-
title: Self-service password reset troubleshooting - Azure Active Directory
2+
title: Troubleshoot self-service password reset - Azure Active Directory
33
description: Troubleshooting Azure AD self-service password reset
44

55
services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: troubleshooting
9-
ms.date: 02/01/2019
9+
ms.date: 11/21/2019
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo

0 commit comments

Comments
 (0)