Skip to content

Commit 951e2d4

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into backup-articles-batch2
2 parents f771aad + 82925f9 commit 951e2d4

File tree

240 files changed

+2125
-6203
lines changed

Some content is hidden

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

240 files changed

+2125
-6203
lines changed

.openpublishing.redirection.json

Lines changed: 200 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,120 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/virtual-network/create-virtual-network-classic.md",
5+
"redirect_url": "/previous-versions/azure/virtual-network/create-virtual-network-classic",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/virtual-network/virtual-networks-create-vnet-classic-pportal.md",
10+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-vnet-classic-pportal",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/virtual-network/virtual-networks-create-vnet-classic-netcfg-ps.md",
15+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-vnet-classic-netcfg-ps",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/virtual-network/virtual-networks-create-vnet-classic-cli.md",
20+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-vnet-classic-cli",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/virtual-network/virtual-networks-specifying-a-dns-settings-in-a-virtual-network-configuration-file.md",
25+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-specifying-a-dns-settings-in-a-virtual-network-configuration-file",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/virtual-network/virtual-networks-specifying-dns-settings-in-a-service-configuration-file.md",
30+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-specifying-dns-settings-in-a-service-configuration-file",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/virtual-network/virtual-networks-using-network-configuration-file.md",
35+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-using-network-configuration-file",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/virtual-network/virtual-networks-migrate-to-regional-vnet.md",
40+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-migrate-to-regional-vnet",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/virtual-network/virtual-networks-create-nsg-classic-ps.md",
45+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-nsg-classic-ps",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/virtual-network/virtual-networks-create-nsg-classic-cli.md",
50+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-create-nsg-classic-cli",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/virtual-network/virtual-network-create-udr-classic-ps.md",
55+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-network-create-udr-classic-ps",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/virtual-network/virtual-network-create-udr-classic-cli.md",
60+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-network-create-udr-classic-cli",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "articles/virtual-network/virtual-network-deploy-multinic-classic-ps.md",
65+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-network-deploy-multinic-classic-ps",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "articles/virtual-network/virtual-network-deploy-multinic-classic-cli.md",
70+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-network-deploy-multinic-classic-cli",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "articles/virtual-network/virtual-networks-reserved-public-ip.md",
75+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-reserved-public-ip",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path": "articles/virtual-network/virtual-networks-reserved-private-ip.md",
80+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-reserved-private-ip",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path": "articles/virtual-network/virtual-networks-static-private-ip-classic-cli.md",
85+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-static-private-ip-classic-cli",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path": "articles/virtual-network/virtual-networks-instance-level-public-ip.md",
90+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-instance-level-public-ip",
91+
"redirect_document_id": false
92+
},
93+
{
94+
"source_path": "articles/virtual-network/virtual-networks-acl-powershell.md",
95+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-acl-powershell",
96+
"redirect_document_id": false
97+
},
98+
{
99+
"source_path": "articles/virtual-network/virtual-networks-move-vm-role-to-subnet.md",
100+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-move-vm-role-to-subnet",
101+
"redirect_document_id": false
102+
},
103+
{
104+
"source_path": "articles/virtual-network/virtual-networks-sample-app.md",
105+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-sample-app",
106+
"redirect_document_id": false
107+
},
108+
{
109+
"source_path": "articles/virtual-network/virtual-network-ip-addresses-overview-classic.md",
110+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-network-ip-addresses-overview-classic",
111+
"redirect_document_id": false
112+
},
113+
{
114+
"source_path": "articles/virtual-network/virtual-networks-acl.md",
115+
"redirect_url": "/previous-versions/azure/virtual-network/virtual-networks-acl",
116+
"redirect_document_id": false
117+
},
3118
{
4119
"source_path": "articles/power-bi-workspace-collections/app-token-flow.md",
5120
"redirect_url": "/previous-versions/azure/power-bi-workspace-collections/app-token-flow",
@@ -14847,6 +14962,16 @@
1484714962
"redirect_url": "/azure/machine-learning/tutorial-train-models-with-aml",
1484814963
"redirect_document_id": true
1484914964
},
14965+
{
14966+
"source_path": "articles/machine-learning/how-to-ui-sample-regression-predict-automobile-price-basic.md",
14967+
"redirect_url": "/azure/machine-learning/how-to-designer-sample-regression-automobile-price-basic",
14968+
"redirect_document_id": false
14969+
},
14970+
{
14971+
"source_path": "articles/machine-learning/how-to-ui-sample-classification-predict-flight-delay.md",
14972+
"redirect_url": "/azure/machine-learning/how-to-designer-sample-classification-flight-delay",
14973+
"redirect_document_id": false
14974+
},
1485014975
{
1485114976
"source_path": "articles/log-analytics/log-analytics-add-solutions.md",
1485214977
"redirect_url": "/azure/monitoring/monitoring-solutions",
@@ -44805,6 +44930,16 @@
4480544930
"redirect_url": "/azure/storage/common/storage-use-azcopy-v10",
4480644931
"redirect_document_id": false
4480744932
},
44933+
{
44934+
"source_path": "articles/storage/blobs/storage-blob-static-website-custom-domain.md",
44935+
"redirect_url": "/azure/storage/blobs/static-website-content-delivery-network",
44936+
"redirect_document_id": false
44937+
},
44938+
{
44939+
"source_path": "articles/storage/blobs/storage-https-custom-domain-cdn.md",
44940+
"redirect_url": "/azure/storage/blobs/storage-custom-domain-name#enable-https",
44941+
"redirect_document_id": false
44942+
},
4480844943
{
4480944944
"source_path": "articles/sql-database/sql-database-elastic-jobs-overview.md",
4481044945
"redirect_url": "/azure/sql-database/elastic-jobs-overview",
@@ -47189,6 +47324,71 @@
4718947324
"source_path": "articles/mysql/concepts-aad-authentication.md",
4719047325
"redirect_url": "/azure/mysql/concepts-azure-ad-authentication",
4719147326
"redirect_document_id": false
47327+
},
47328+
{
47329+
"source_path": "articles/load-balancer/quickstart-create-basic-load-balancer-portal.md",
47330+
"redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-portal",
47331+
"redirect_document_id": false
47332+
},
47333+
{
47334+
"source_path": "articles/load-balancer/quickstart-create-basic-load-balancer-cli.md",
47335+
"redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-cli",
47336+
"redirect_document_id": false
47337+
},
47338+
{
47339+
"source_path": "articles/load-balancer/quickstart-create-basic-load-balancer-powershell.md",
47340+
"redirect_url": "articles/load-balancer/quickstart-load-balancer-standard-public-powershell",
47341+
"redirect_document_id": false
47342+
},
47343+
{
47344+
"source_path": "articles/load-balancer/load-balancer-get-started-internet-arm-template.md",
47345+
"redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-template",
47346+
"redirect_document_id": false
47347+
},
47348+
{
47349+
"source_path": "articles/load-balancer/create-load-balancer-rest-api.md",
47350+
"redirect_url": "/rest/api/load-balancer/loadbalancers/createorupdate",
47351+
"redirect_document_id": false
47352+
},
47353+
{
47354+
"source_path": "articles/load-balancer/load-balancer-get-started-internet-az-portal.md",
47355+
"redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-portal",
47356+
"redirect_document_id": false
47357+
},
47358+
{
47359+
"source_path": "articles/load-balancer/load-balancer-get-started-internet-az-cli.md",
47360+
"redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-cli",
47361+
"redirect_document_id": false
47362+
},
47363+
{
47364+
"source_path": "articles/load-balancer/load-balancer-get-started-internet-az-powershell.md",
47365+
"redirect_url": "/azure/load-balancer/quickstart-create-standard-load-balancer-powershell",
47366+
"redirect_document_id": false
47367+
},
47368+
{
47369+
"source_path": "articles/load-balancer/load-balancer-get-started-internet-availability-zones-zonal-portal.md",
47370+
"redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-portal",
47371+
"redirect_document_id": false
47372+
},
47373+
{
47374+
"source_path": "articles/load-balancer/load-balancer-get-started-internet-availability-zones-zonal-powershell.md",
47375+
"redirect_url": "/azure/load-balancer/quickstart-create-standard-load-balancer-powershell",
47376+
"redirect_document_id": false
47377+
},
47378+
{
47379+
"source_path": "articles/load-balancer/load-balancer-get-started-internet-availability-zones-zonal-cli.md",
47380+
"redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-cli",
47381+
"redirect_document_id": false
47382+
},
47383+
{
47384+
"source_path": "articles/load-balancer/load-balancer-standard-public-zone-redundant-cli.md",
47385+
"redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-cli",
47386+
"redirect_document_id": false
47387+
},
47388+
{
47389+
"source_path": "articles/load-balancer/load-balancer-standard-public-zonal-cli.md",
47390+
"redirect_url": "/azure/load-balancer/quickstart-load-balancer-standard-public-cli",
47391+
"redirect_document_id": false
4719247392
}
4719347393
]
4719447394
}

articles/active-directory-b2c/quickstart-native-app-desktop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Azure Active Directory B2C (Azure AD B2C) provides cloud identity management to
2525

2626
- [Visual Studio 2019](https://www.visualstudio.com/downloads/) with the **ASP.NET and web development** workload.
2727
- A social account from either Facebook, Google, or Microsoft.
28-
- [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.
28+
- [Download a zip file](https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop/archive/msalv3.zip) or clone the [Azure-Samples/active-directory-b2c-dotnet-desktop](https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop) repository from GitHub.
2929

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

articles/active-directory/authentication/concept-resilient-controls.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ author: martincoetzer
66
manager: daveba
77
tags: azuread
88
ms.service: active-directory
9+
ms.subservice: authentication
910
ms.topic: conceptual
1011
ms.workload: identity
11-
ms.date: 12/19/2018
12+
ms.date: 01/29/2020
1213
ms.author: martinco
1314
ms.collection: M365-identity-device-management
1415
---
4.91 KB
Loading
-650 Bytes
Loading
5.16 KB
Loading

articles/active-directory/b2b/tutorial-bulk-invite.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ ms.collection: M365-identity-device-management
2828

2929
> [!NOTE]
3030
> As of 12/22/2019, the Bulk invite users (Preview) feature has been temporarily disabled.
31+
> There is currently no known date for when this feature will be re-enabled.
3132
3233
If you use Azure Active Directory (Azure AD) B2B collaboration to work with external partners, you can invite multiple guest users to your organization at the same time. In this tutorial, you learn how to use the Azure portal to send bulk invitations to external users. Specifically, you do the following:
3334

articles/active-directory/cloud-provisioning/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
href: how-to-install.md
4343
- name: Cloud provisioning configuration
4444
href: how-to-configure.md
45+
- name: Use Single Sign-On
46+
href: how-to-sso.md
4547
- name: Plan and design
4648
items:
4749
- name: Topologies and scenarios for Azure AD Connect cloud provisioning

articles/active-directory/cloud-provisioning/how-to-prerequisites.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ You need the following to use Azure AD Connect cloud provisioning:
2525
- An on-premises server for the provisioning agent with Windows 2012 R2 or later.
2626
- On-premises firewall configurations.
2727

28+
>[!NOTE]
29+
>The provisioning agent can currently only be installed on English language servers. Installing an English language pack on a non-English server is not a valid workaround and will result in the agent failing to install.
30+
2831
The rest of the document provides step-by-step instructions for these prerequisites.
2932

3033
### In the Azure Active Directory admin center
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
title: 'How to use Single Sign-on with cloud provisioning'
3+
description: This article describes how to install and use sso with cloud provisioning.
4+
services: active-directory
5+
author: billmath
6+
manager: daveba
7+
ms.service: active-directory
8+
ms.workload: identity
9+
ms.topic: conceptual
10+
ms.date: 01/28/2020
11+
ms.subservice: hybrid
12+
ms.author: billmath
13+
ms.collection: M365-identity-device-management
14+
---
15+
16+
# Using Single Sign-On with cloud provisioning
17+
The following document describes how to use single sign-on with cloud provisioning.
18+
19+
[!INCLUDE [active-directory-cloud-provisioning-sso.md](../../../includes/active-directory-cloud-provisioning-sso.md)]
20+
21+
22+
23+
24+
25+
## Next steps
26+
27+
- [What is provisioning?](what-is-provisioning.md)
28+
- [What is Azure AD Connect cloud provisioning?](what-is-cloud-provisioning.md)

0 commit comments

Comments
 (0)