Skip to content

Commit 4a37781

Browse files
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into us1546060k
2 parents cce10ad + 6fdb535 commit 4a37781

File tree

1,344 files changed

+23161
-10352
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,344 files changed

+23161
-10352
lines changed

.openpublishing.redirection.json

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1780,6 +1780,11 @@
17801780
"redirect_url": "/azure/search/search-get-started-postman",
17811781
"redirect_document_id": false
17821782
},
1783+
{
1784+
"source_path": "articles/search/knowledge-store-connect-powerbi.md",
1785+
"redirect_url": "/azure/search/knowledge-store-create-portal",
1786+
"redirect_document_id": true
1787+
},
17831788
{
17841789
"source_path": "articles/search/search-create-index-rest-api.md",
17851790
"redirect_url": "/azure/search/search-get-started-powershell",
@@ -3055,6 +3060,11 @@
30553060
"redirect_url": "/azure/virtual-machines/linux/key-vault-setup",
30563061
"redirect_document_id": true
30573062
},
3063+
{
3064+
"source_path": "articles/key-vault/key-vault-whatis.md",
3065+
"redirect_url": "/azure/key-vault/basic-concepts",
3066+
"redirect_document_id": false
3067+
},
30583068
{
30593069
"source_path": "articles/key-vault/key-vault-versions.md",
30603070
"redirect_url": "/azure/key-vault",
@@ -5117,7 +5127,7 @@
51175127
},
51185128
{
51195129
"source_path": "articles/azure-functions/durable-functions-checkpointing-and-replay.md",
5120-
"redirect_url": "/azure/azure-functions/durable/durable-functions-checkpointing-and-replay",
5130+
"redirect_url": "/azure/azure-functions/durable/durable-functions-orchestrations",
51215131
"redirect_document_id": false
51225132
},
51235133
{
@@ -5240,6 +5250,16 @@
52405250
"redirect_url": "/azure/azure-functions/durable/durable-functions-webjobs-sdk",
52415251
"redirect_document_id": false
52425252
},
5253+
{
5254+
"source_path": "articles/azure-functions/durable/durable-functions-concepts.md",
5255+
"redirect_url": "/azure/azure-functions/durable/durable-functions-overview",
5256+
"redirect_document_id": false
5257+
},
5258+
{
5259+
"source_path": "articles/azure-functions/durable/durable-functions-checkpointing-and-replay.md",
5260+
"redirect_url": "/azure/azure-functions/durable/durable-functions-orchestrations",
5261+
"redirect_document_id": false
5262+
},
52435263
{
52445264
"source_path": "articles/azure-functions/functions-bindings-storage.md",
52455265
"redirect_url": "/azure/azure-functions/functions-bindings-storage-blob",
@@ -37723,11 +37743,6 @@
3772337743
"redirect_url": "/azure/azure-monitor/platform/diagnostic-logs-stream-log-store",
3772437744
"redirect_document_id": false
3772537745
},
37726-
{
37727-
"source_path": "articles/azure-monitor/log-query/simple-logs.md",
37728-
"redirect_url": "/azure/azure-monitor/log-query/log-query-overview",
37729-
"redirect_document_id": false
37730-
},
3773137746
{
3773237747
"source_path": "articles/azure-monitor/log-query/runbook-datacollect.md",
3773337748
"redirect_url": "/azure/azure-monitor/platform/data-collector-api",
@@ -41571,6 +41586,21 @@
4157141586
"redirect_url": "https://github.com/Azure-Samples/cognitive-services-quickstart-code/tree/master/php/ComputerVision/use-domain-model",
4157241587
"redirect_document_id": false
4157341588
},
41589+
{
41590+
"source_path": "articles/cognitive-services/Computer-vision/quickstarts-sdk/csharp-analyze-sdk.md",
41591+
"redirect_url": "/azure/cognitive-services/Computer-vision/quickstarts-sdk/csharp-sdk",
41592+
"redirect_document_id": false
41593+
},
41594+
{
41595+
"source_path": "articles/cognitive-services/Computer-vision/quickstarts-sdk/csharp-hand-text-sdk.md",
41596+
"redirect_url": "/azure/cognitive-services/Computer-vision/quickstarts-sdk/csharp-sdk",
41597+
"redirect_document_id": false
41598+
},
41599+
{
41600+
"source_path": "articles/cognitive-services/Computer-vision/quickstarts-sdk/csharp-thumb-sdk.md",
41601+
"redirect_url": "/azure/cognitive-services/Computer-vision/quickstarts-sdk/csharp-sdk",
41602+
"redirect_document_id": false
41603+
},
4157441604
{
4157541605
"source_path": "articles/cognitive-services/Content-Moderator/Review-Tool-User-Guide/Upload-Images.md",
4157641606
"redirect_url": "/azure/cognitive-services/content-moderator",
@@ -41748,7 +41778,7 @@
4174841778
},
4174941779
{
4175041780
"source_path": "articles/azure-monitor/insights/service-map-configure.md",
41751-
"redirect_url": "/azure/azure-monitor/insights/vminsights-enable-hybrid-cloud",
41781+
"redirect_url": "/azure/azure-monitor/insights/vminsights-enable-overview",
4175241782
"redirect_document_id": false
4175341783
},
4175441784
{

articles/active-directory-b2c/active-directory-b2c-overview-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ The customer identity and access management (CIAM) service in Azure includes:
5151

5252
Azure AD B2C interacts with identity providers, users, other systems, and with the local user directory in sequence to achieve an identity task. For example, sign in a user, register a new user, or reset a password. The Identity Experience Framework and a policy (also called a user journey or a trust framework policy) establishes multi-party trust and explicitly defines the actors, the actions, the protocols, and the sequence of steps to complete.
5353

54-
The Identity Experience Framework is a fully configurable, policy-driven, cloud-based Azure platform that orchestrates trust between entities in standard protocol formats such as OpenID Connect, OAuth, SAML, WSFed, and a few non-standard ones, for example REST API-based system-to-system claims exchanges. The framework creates user-friendly, white-labeled experiences that support HTML and CSS.
54+
The Identity Experience Framework is a fully configurable, policy-driven, cloud-based Azure platform that orchestrates trust between entities in standard protocol formats such as OpenID Connect, OAuth, SAML, and a few non-standard ones, for example REST API-based system-to-system claims exchanges. The framework creates user-friendly, white-labeled experiences that support HTML and CSS.
5555

5656
A custom policy is represented as one or several XML-formatted files that refer to each other in a hierarchical chain. The XML elements define the claims schema, claims transformations, content definitions, claims providers, technical profiles, and user journey orchestration steps, among other elements. A custom policy is accessible as one or several XML files that are executed by the Identity Experience Framework when invoked by a relying party. Developers configuring custom policies must define the trusted relationships in careful detail to include metadata endpoints, exact claims exchange definitions, and configure secrets, keys, and certificates as needed by each identity provider.
5757

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Quickstart - Set up sign-in for a desktop app using Azure Active Directory B2C | Microsoft Docs
3-
description: Run a sample ASP.NET desktop application that uses Azure Active Directory B2C to provide account sign-in.
2+
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.
44
services: active-directory-b2c
55
author: mmacy
66
manager: celestedg
@@ -9,7 +9,7 @@ ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: quickstart
1111
ms.custom: mvc
12-
ms.date: 11/30/2018
12+
ms.date: 09/12/2019
1313
ms.author: marsma
1414
ms.subservice: B2C
1515
---
@@ -23,7 +23,7 @@ Azure Active Directory (Azure AD) B2C provides cloud identity management to keep
2323
## Prerequisites
2424

2525
- [Visual Studio 2019](https://www.visualstudio.com/downloads/) with the **ASP.NET and web development** workload.
26-
- A social account from either Facebook, Google, Microsoft, or Twitter.
26+
- A social account from either Facebook, Google, or Microsoft.
2727
- [Download a zip file](https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop/archive/master.zip) or clone the sample web app from GitHub.
2828

2929
```
@@ -41,10 +41,10 @@ Azure Active Directory (Azure AD) B2C provides cloud identity management to keep
4141
4242
![Screenshot of the sample WPF application](media/active-directory-b2c-quickstarts-desktop-app/wpf-sample-application.png)
4343
44-
The sample supports several sign-up options. These options include using a social identity provider or creating a local account using an email address. For this quickstart, use a social identity provider account from either Facebook, Google, Microsoft, or Twitter.
44+
The sample supports several sign-up options. These options include using a social identity provider or creating a local account using an email address. For this quickstart, use a social identity provider account from either Facebook, Google, or Microsoft.
4545
4646
47-
2. Azure AD B2C presents a custom login page for a fictitious brand called Wingtip Toys for the sample web app. To sign up using a social identity provider, click the button of the identity provider you want to use.
47+
2. Azure AD B2C presents a sign-in page for a fictitious company called Fabrikam for the sample web application. To sign up using a social identity provider, click the button of the identity provider you want to use.
4848
4949
![Sign In or Sign Up page showing identity providers](media/active-directory-b2c-quickstarts-desktop-app/sign-in-or-sign-up-wpf.png)
5050
@@ -62,7 +62,7 @@ Azure AD B2C provides functionality to allow users to update their profiles. The
6262
6363
![Edit profile button highlighted in WPF sample app](media/active-directory-b2c-quickstarts-desktop-app/edit-profile-wpf.png)
6464
65-
2. Choose the identity provider associated with the account you created. For example, if you used Twitter as the identity provider when you created your account, choose Twitter to modify the associated profile details.
65+
2. Choose the identity provider associated with the account you created. For example, if you used Facebook as the identity provider when you created your account, choose Facebook to modify the associated profile details.
6666
6767
3. Change your **Display name** or **City**, and then click **Continue**.
6868

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Quickstart - Set up sign-in for a single-page app using Azure Active Directory B2C | Microsoft Docs
2+
title: Quickstart - Set up sign-in for a single-page app using Azure Active Directory B2C
33
description: 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
@@ -8,7 +8,7 @@ manager: celestedg
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: quickstart
11-
ms.date: 10/24/2018
11+
ms.date: 09/12/2019
1212
ms.author: marsma
1313
ms.subservice: B2C
1414
---
@@ -23,7 +23,7 @@ Azure Active Directory (Azure AD) B2C provides cloud identity management to keep
2323

2424
- [Visual Studio 2019](https://www.visualstudio.com/downloads/) with the **ASP.NET and web development** workload.
2525
- Install [Node.js](https://nodejs.org/en/download/)
26-
- A social account from either Facebook, Google, Microsoft, or Twitter.
26+
- A social account from either Facebook, Google, or Microsoft.
2727
- [Download a zip file](https://github.com/Azure-Samples/active-directory-b2c-javascript-msal-singlepageapp/archive/master.zip) or clone the sample web app from GitHub.
2828

2929
```
@@ -54,9 +54,9 @@ Azure Active Directory (Azure AD) B2C provides cloud identity management to keep
5454
5555
![Single-page application sample app shown in browser](media/active-directory-b2c-quickstarts-spa/sample-app-spa.png)
5656
57-
The sample supports several sign-up options including using a social identity provider or creating a local account using an email address. For this quickstart, use a social identity provider account from either Facebook, Google, Microsoft, or Twitter.
57+
The sample supports several sign-up options including using a social identity provider or creating a local account using an email address. For this quickstart, use a social identity provider account from either Facebook, Google, or Microsoft.
5858
59-
2. Azure AD B2C presents a custom login page for a fictitious brand called Wingtip Toys for the sample web app. To sign up using a social identity provider, click the button of the identity provider you want to use.
59+
2. Azure AD B2C presents a sign-in page for a fictitious company called Fabrikam for the sample web application. To sign up using a social identity provider, click the button of the identity provider you want to use.
6060
6161
![Sign In or Sign Up page showing identity provider buttons](media/active-directory-b2c-quickstarts-spa/sign-in-or-sign-up-spa.png)
6262

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Quickstart - Set up sign in for an ASP.NET application using Azure Active Directory B2C | Microsoft Docs
2+
title: Quickstart - Set up sign in for an ASP.NET application using Azure Active Directory B2C
33
description: 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
@@ -8,7 +8,7 @@ manager: celestedg
88
ms.service: active-directory
99
ms.topic: quickstart
1010
ms.custom: mvc
11-
ms.date: 11/30/2018
11+
ms.date: 09/12/2019
1212
ms.author: marsma
1313
ms.subservice: B2C
1414
---
@@ -22,14 +22,14 @@ Azure Active Directory (Azure AD) B2C provides cloud identity management to keep
2222
## Prerequisites
2323

2424
- [Visual Studio 2019](https://www.visualstudio.com/downloads/) with the **ASP.NET and web development** workload.
25-
- A social account from either Facebook, Google, Microsoft, or Twitter.
25+
- A social account from Facebook, Google, or Microsoft.
2626
- [Download a zip file](https://github.com/Azure-Samples/active-directory-b2c-dotnet-webapp-and-webapi/archive/master.zip) or clone the sample web application from GitHub.
2727

2828
```
2929
git clone https://github.com/Azure-Samples/active-directory-b2c-dotnet-webapp-and-webapi.git
3030
```
3131
32-
These two projects are in the sample solution:
32+
There are two projects are in the sample solution:
3333
3434
- **TaskWebApp** - A web application that creates and edits a task list. The web application uses the **sign-up or sign-in** user flow to sign up or sign in users.
3535
- **TaskService** - A web API that supports the create, read, update, and delete task list functionality. The web API is protected by Azure AD B2C and called by the web application.
@@ -51,9 +51,9 @@ Azure Active Directory (Azure AD) B2C provides cloud identity management to keep
5151
5252
![Sample ASP.NET web app in browser with sign up/sign link highlighted](media/active-directory-b2c-quickstarts-web-app/web-app-sign-in.png)
5353
54-
The sample supports several sign-up options including using a social identity provider or creating a local account using an email address. For this quickstart, use a social identity provider account from either Facebook, Google, Microsoft, or Twitter.
54+
The sample supports several sign-up options including using a social identity provider or creating a local account using an email address. For this quickstart, use a social identity provider account from either Facebook, Google, or Microsoft.
5555
56-
2. Azure AD B2C presents a custom sign-in page for a fictitious brand called Wingtip Toys for the sample web application. To sign up using a social identity provider, click the button of the identity provider you want to use.
56+
2. Azure AD B2C presents a sign-in page for a fictitious company called Fabrikam for the sample web application. To sign up using a social identity provider, click the button of the identity provider you want to use.
5757
5858
![Sign In or Sign Up page showing identity provider buttons](media/active-directory-b2c-quickstarts-web-app/sign-in-or-sign-up-web.png)
5959

0 commit comments

Comments
 (0)