Skip to content

Commit a122ae6

Browse files
authored
Merge branch 'master' into edits1202b
2 parents e7bd595 + 34b24c6 commit a122ae6

File tree

3,992 files changed

+41505
-25433
lines changed

Some content is hidden

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

3,992 files changed

+41505
-25433
lines changed

.openpublishing.redirection.json

Lines changed: 100 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/sql-database/sql-database-feature-restrictions.md",
5+
"redirect_url": "/azure/sql-database",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/digital-twins/how-to-use-legacy-aad.md",
510
"redirect_url": "/azure/digital-twins/quickstart-view-occupancy-dotnet#set-permissions-for-your-app",
@@ -40,6 +45,26 @@
4045
"redirect_url": "/azure//virtual-machines/windows/sql/virtual-machines-windows-portal-sql-create-failover-cluster-premium-file-share",
4146
"redirect_document_id": false
4247
},
48+
{
49+
"source_path": "articles/virtual-machines/windows/maintenance-and-updates.md",
50+
"redirect_url": "/azure/virtual-machines/maintenance-and-updates?toc=/azure/virtual-machines/windows/toc.json&bc=/azure/virtual-machines/windows/breadcrumb/toc.json",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/virtual-machines/linux/maintenance-and-updates.md",
55+
"redirect_url": "/azure/virtual-machines/maintenance-and-updates?toc=/azure/virtual-machines/linux/toc.json&bc=/azure/virtual-machines/linux/breadcrumb/toc.json",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/virtual-machines/windows/maintenance-notifications.md",
60+
"redirect_url": "/azure/virtual-machines/maintenance-notifications?toc=/azure/virtual-machines/windows/toc.json&bc=/azure/virtual-machines/windows/breadcrumb/toc.json",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "articles/virtual-machines/linux/maintenance-notifications.md",
65+
"redirect_url": "/azure/virtual-machines/maintenance-notifications?toc=/azure/virtual-machines/linux/toc.json&bc=/azure/virtual-machines/linux/breadcrumb/toc.json",
66+
"redirect_document_id": false
67+
},
4368
{
4469
"source_path": "articles/machine-learning/service/how-to-load-data.md",
4570
"redirect_url": "/azure/machine-learning/service/how-to-create-register-datasets",
@@ -532,11 +557,21 @@
532557
"redirect_url": "/azure/machine-learning",
533558
"redirect_document_id": false
534559
},
560+
{
561+
"source_path": "articles/cognitive-services/QnAMaker/Quickstarts/get-answer-from-kb-using-postman.md",
562+
"redirect_url": "/azure/cognitive-services//QnAMaker/Quickstarts/get-answer-from-knowledge-base-using-url-tool",
563+
"redirect_document_id": false
564+
},
565+
{
566+
"source_path": "articles/cognitive-services/QnAMaker/Quickstarts/get-answer-from-kb-using-curl.md",
567+
"redirect_url": "/azure/cognitive-services//QnAMaker/Quickstarts/get-answer-from-knowledge-base-using-url-tool",
568+
"redirect_document_id": false
569+
},
535570
{
536571
"source_path": "articles/cognitive-services/LUIS/luis-how-to-add-example-utterances.md",
537572
"redirect_url": "/azure/cognitive-services/LUIS/luis-how-to-add-entities",
538573
"redirect_document_id": false
539-
},
574+
},
540575
{
541576
"source_path": "articles/cognitive-services/LUIS/luis-tutorial-prebuilt-intents-entities.md",
542577
"redirect_url": "/azure/cognitive-services/LUIS/tutorial-machine-learned-entity",
@@ -11427,6 +11462,11 @@
1142711462
"redirect_url": "/azure/event-hubs/",
1142811463
"redirect_document_id": false
1142911464
},
11465+
{
11466+
"source_path": "articles/event-hubs/event-hubs-create-kafka-enabled.md",
11467+
"redirect_url": "/azure/event-hubs/event-hubs-create",
11468+
"redirect_document_id": false
11469+
},
1143011470
{
1143111471
"source_path": "articles/event-hubs/event-hubs-csharp-ephcs-getstarted.md",
1143211472
"redirect_url": "/azure/event-hubs/event-hubs-dotnet-standard-getstarted-send",
@@ -12374,17 +12414,17 @@
1237412414
},
1237512415
{
1237612416
"source_path": "articles/cosmos-db/logging.md",
12377-
"redirect_url": "/azure/cosmos-db/monitor-cosmos-db.md",
12417+
"redirect_url": "/azure/cosmos-db/monitor-cosmos-db",
1237812418
"redirect_document_id": false
1237912419
},
1238012420
{
1238112421
"source_path": "articles/cosmos-db/cosmos-db-azure-monitor-metrics.md",
12382-
"redirect_url": "/azure/cosmos-db/monitor-cosmos-db.md",
12422+
"redirect_url": "/azure/cosmos-db/monitor-cosmos-db",
1238312423
"redirect_document_id": false
1238412424
},
1238512425
{
1238612426
"source_path": "articles/cosmos-db/monitor-accounts.md",
12387-
"redirect_url": "/azure/cosmos-db/monitor-cosmos-db.md",
12427+
"redirect_url": "/azure/cosmos-db/monitor-cosmos-db",
1238812428
"redirect_document_id": false
1238912429
},
1239012430
{
@@ -15582,6 +15622,11 @@
1558215622
"redirect_url": "/azure/monitoring-and-diagnostics/insights-advanced-autoscale-virtual-machine-scale-sets",
1558315623
"redirect_document_id": false
1558415624
},
15625+
{
15626+
"source_path": "articles/virtual-machine-scale-sets/virtual-machine-scale-sets-use-low-priority.md",
15627+
"redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-use-spot",
15628+
"redirect_document_id": true
15629+
},
1558515630
{
1558615631
"source_path": "articles/virtual-machine-scale-sets/virtual-machine-scale-sets-cli-quick-create-cli-nodejs.md",
1558715632
"redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-create",
@@ -26303,7 +26348,7 @@
2630326348
},
2630426349
{
2630526350
"source_path": "articles/security-center/security-center-policies-overview.md",
26306-
"redirect_url": "/azure/security-center/tutorial-security-policy.md",
26351+
"redirect_url": "/azure/security-center/tutorial-security-policy",
2630726352
"redirect_document_id": false
2630826353
},
2630926354
{
@@ -26476,6 +26521,11 @@
2647626521
"redirect_url": "/azure/hdinsight/spark/apache-spark-overview",
2647726522
"redirect_document_id": true
2647826523
},
26524+
{
26525+
"source_path": "articles/hdinsight/spark/apache-spark-eventhub-streaming.md",
26526+
"redirect_url": "/azure/hdinsight/spark/apache-spark-ipython-notebook-machine-learning",
26527+
"redirect_document_id": false
26528+
},
2647926529
{
2648026530
"source_path": "articles/hdinsight/storm/apache-storm-sensor-data-analysis.md",
2648126531
"redirect_url": "https://azure.microsoft.com/resources/samples/hdinsight-java-storm-eventhub/",
@@ -43761,6 +43811,51 @@
4376143811
"source_path": "articles/healthcare-apis/configure-cosmos-db.md",
4376243812
"redirect_url": "/azure/healthcare-apis/configure-database",
4376343813
"redirect_document_id": false
43814+
},
43815+
{
43816+
"source_path": "articles/media-services/previous/media-services-azure-media-clipper-portal.md",
43817+
"redirect_url": "/azure/media-services/latest",
43818+
"redirect_document_id": false
43819+
},
43820+
{
43821+
"source_path": "articles/media-services/previous/media-services-azure-media-clipper-getting-started.md",
43822+
"redirect_url": "/azure/media-services/latest",
43823+
"redirect_document_id": false
43824+
},
43825+
{
43826+
"source_path": "articles/media-services/previous/media-services-azure-media-clipper-load-assets.md",
43827+
"redirect_url": "/azure/media-services/latest",
43828+
"redirect_document_id": false
43829+
},
43830+
{
43831+
"source_path": "articles/media-services/previous/media-services-azure-media-clipper-keyboard-shortcuts.md",
43832+
"redirect_url": "/azure/media-services/latest",
43833+
"redirect_document_id": false
43834+
},
43835+
{
43836+
"source_path": "articles/media-services/previous/media-services-azure-media-clipper-localization.md",
43837+
"redirect_url": "/azure/media-services/latest",
43838+
"redirect_document_id": false
43839+
},
43840+
{
43841+
"source_path": "articles/media-services/previous/media-services-azure-media-clipper-submit-job.md",
43842+
"redirect_url": "/azure/media-services/latest",
43843+
"redirect_document_id": false
43844+
},
43845+
{
43846+
"source_path": "articles/media-services/previous/media-services-azure-media-clipper-overview.md",
43847+
"redirect_url": "/azure/media-services/latest",
43848+
"redirect_document_id": false
43849+
},
43850+
{
43851+
"source_path": "articles/lab-services/classroom-labs/how-to-enable-multi-vm-environment.md",
43852+
"redirect_url": "/azure/lab-services/classroom-labs/how-to-enable-nested-virtualization-template-vm",
43853+
"redirect_document_id": false
43854+
},
43855+
{
43856+
"source_path": "articles/service-bus-messaging/migrate-java-apps-wild-fly.md",
43857+
"redirect_url": "/azure/app-service/containers/configure-language-java#use-service-bus-as-a-message-broker",
43858+
"redirect_document_id": false
4376443859
}
4376543860
]
4376643861
}

articles/active-directory-b2c/active-directory-b2c-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ To set up client credential flow, see [Azure Active Directory v2.0 and the OAuth
120120

121121
#### Web API chains (on-behalf-of flow)
122122

123-
Many architectures include a web API that needs to call another downstream web API, where both are secured by Azure AD B2C. This scenario is common in native clients that have a Web API back-end and calls a Microsoft online service such as the Azure AD Graph API.
123+
Many architectures include a web API that needs to call another downstream web API, where both are secured by Azure AD B2C. This scenario is common in native clients that have a Web API back-end and calls a Microsoft online service such as the Microsoft Graph API or Azure AD Graph API.
124124

125125
This chained web API scenario can be supported by using the OAuth 2.0 JWT bearer credential grant, also known as the on-behalf-of flow. However, the on-behalf-of flow is not currently implemented in the Azure AD B2C.
126126

articles/active-directory-b2c/active-directory-b2c-get-started-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ms.subservice: B2C
3030
1. Sign in to the [Azure portal](https://portal.azure.com)
3131
1. Use the **Directory + subscription** filter in the top menu to select the directory that contains your Azure AD B2C tenant.
3232
1. In the left menu, select **Azure AD B2C**. Or, select **All services** and search for and select **Azure AD B2C**.
33-
1. On the Overview page, select **Identity Experience Framework**.
33+
1. On the Overview page, select **Identity Experience Framework** from the **Policies** pane.
3434

3535
### Create the signing key
3636

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-reference-spa.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,5 +245,5 @@ GET https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/
245245
This sample on GitHub is intended to help get you started with Azure AD B2C in a simple web application built on [hello.js][github-hello-js] and using pop-up-style authentication.
246246

247247
<!-- Links - EXTERNAL -->
248-
[github-hello-js-example]: https://github.com/azure-ad-b2c/apps/tree/master/spa/javascript-hellojs-singlepageapp-popup
248+
[github-hello-js-example]: https://github.com/Azure-Samples/active-directory-b2c-javascript-hellojs-singlepageapp
249249
[github-hello-js]: https://github.com/MrSwitch/hello.js

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Record the **Application (client) ID** for use in a later step.
3939

4040
## Configure the sample
4141

42-
In this tutorial, you configure a sample that you can download from GitHub. The sample WPF desktop application demonstrates sign-up, sign-in, and can call a protected web API in Azure AD B2C. [Download a zip file](https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop/archive/master.zip), [browse the repo](https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop), or clone the sample from GitHub.
42+
In this tutorial, you configure a sample that you can download from GitHub. The sample WPF desktop application demonstrates sign-up, sign-in, and can call a protected web API in Azure AD B2C. [Download a zip file](https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop/archive/msalv3.zip), [browse the repo](https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop), or clone the sample from GitHub.
4343

4444
```
4545
git clone https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop.git

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

0 commit comments

Comments
 (0)