Skip to content

Commit 3dc3d9c

Browse files
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into us1668382a
2 parents dfbe550 + c15cd9c commit 3dc3d9c

File tree

55 files changed

+546
-269
lines changed

Some content is hidden

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

55 files changed

+546
-269
lines changed

.openpublishing.redirection.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14968,7 +14968,7 @@
1496814968
"redirect_document_id": false
1496914969
},
1497014970
{
14971-
"source_path": "articles/machine-learning/machine-learning/how-to-ui-sample-classification-predict-flight-delay.md",
14971+
"source_path": "articles/machine-learning/how-to-ui-sample-classification-predict-flight-delay.md",
1497214972
"redirect_url": "/azure/machine-learning/how-to-designer-sample-classification-flight-delay",
1497314973
"redirect_document_id": false
1497414974
},

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
---

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)

articles/active-directory/develop/GuidedSetups/active-directory-mobileanddesktopapp-windowsdesktop-configure-arp.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ editor: ''
99

1010
ms.assetid: 820acdb7-d316-4c3b-8de9-79df48ba3b06
1111
ms.service: active-directory
12+
ms.subservice: develop
1213
ms.devlang: na
1314
ms.topic: conceptual
1415
ms.tgt_pltfrm: na
1516
ms.workload: identity
16-
ms.date: 05/09/2017
17+
ms.date: 01/29/2020
1718
ms.author: ryanwi
1819
ms.custom: aaddev
1920
---

articles/active-directory/fundamentals/active-directory-properties-area.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ services: active-directory
55
author: msaburnley
66
manager: daveba
77
ms.service: active-directory
8+
ms.subservice: fundamentals
89
ms.workload: identity
910
ms.topic: conceptual
1011
ms.date: 04/17/2018

articles/active-directory/fundamentals/active-directory-whatis.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ author: msaburnley
66
manager: daveba
77

88
ms.service: active-directory
9+
ms.subservice: fundamentals
910
ms.topic: overview
1011
ms.date: 07/31/2019
1112
ms.author: ajburnle

articles/active-directory/hybrid/how-to-connect-fed-sha256-guidance.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ manager: daveba
99
editor: ''
1010
ms.assetid: cf6880e2-af78-4cc9-91bc-b64de4428bbd
1111
ms.service: active-directory
12+
ms.subservice: hybrid
1213
ms.workload: identity
1314
ms.tgt_pltfrm: na
1415
ms.devlang: na

0 commit comments

Comments
 (0)