Skip to content

Commit 23ea068

Browse files
authored
Merge pull request #108387 from MicrosoftDocs/master
3/19 PM Publish
2 parents 056f46e + 3a134f8 commit 23ea068

File tree

249 files changed

+1951
-1566
lines changed

Some content is hidden

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

249 files changed

+1951
-1566
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18559,6 +18559,11 @@
1855918559
"redirect_url": "/azure/virtual-machines/workloads/redhat/redhat-rhui",
1856018560
"redirect_document_id": false
1856118561
},
18562+
{
18563+
"source_path": "articles/virtual-machines/linux/rhel-images.md",
18564+
"redirect_url": "/azure/virtual-machines/workloads/redhat/redhat-images",
18565+
"redirect_document_id": false
18566+
},
1856218567
{
1856318568
"source_path": "articles/virtual-machine-scale-sets/virtual-machine-scale-sets-advanced-autoscale.md",
1856418569
"redirect_url": "/azure/monitoring-and-diagnostics/insights-advanced-autoscale-virtual-machine-scale-sets",
@@ -49604,6 +49609,11 @@
4960449609
"source_path": "articles/postgresql/howto-tls-configurations.md",
4960549610
"redirect_url": "/azure/postgresql/concepts-ssl-connection-security",
4960649611
"redirect_document_id": false
49612+
},
49613+
{
49614+
"source_path": "articles/lab-services/classroom-labs/class-type-deep-learning-natural-processing.md",
49615+
"redirect_url": "/azure/lab-services/classroom-labs/class-type-deep-learning-natural-language-processing",
49616+
"redirect_document_id": false
4960749617
}
4960849618
]
4960949619
}

articles/active-directory/app-provisioning/export-import-provisioning-configuration.md

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: 'Export or import your provisioning configuration by using the Microsoft Graph API | Microsoft Docs'
3-
description: Learn how to export and import provisioning configuration using the Microsoft Graph API.
2+
title: 'Export your provisioning configuration and roll back to a known good state for disaster recovery.| Microsoft Docs'
3+
description: Learn how to export your provisioning configuration and roll back to a known good state for disaster recovery.
44
services: active-directory
55
author: cmmdesai
66
documentationcenter: na
@@ -13,14 +13,15 @@ ms.devlang: na
1313
ms.topic: article
1414
ms.tgt_pltfrm: na
1515
ms.workload: identity
16-
ms.date: 09/09/2019
16+
ms.date: 03/19/2020
1717
ms.author: chmutali
1818

1919
ms.collection: M365-identity-device-management
2020
---
2121
# Export your provisioning configuration and roll back to a known good state
2222

2323
## Export and import your provisioning configuration from the Azure portal
24+
2425
### How can I export my provisioning configuration?
2526
To export your configuration:
2627
1. In the [Azure portal](https://portal.azure.com/), on the left navigation panel, select **Azure Active Directory**.
@@ -29,15 +30,22 @@ To export your configuration:
2930
5. Click on download in the command bar at the top of the page to download your schema.
3031

3132
### Disaster recovery - roll back to a known good state
32-
Exporting and saving your configuration allows you to roll back to a previous version of your configuration. We recommend exporting your provisioning configuration and saving it for later use anytime you make a change to your attribute mappings or scoping filters. All you need to do is open up the JSON file that you downloaded in the steps above, copy the entire contents of the JSON file, replace the entire contents of the JSON payload in the schema editor, and then save. If there is an active provisioning cycle, it will complete and the next cycle will use the updated schema. The next cycle will also be an initial cycle, which reevaluates every user and group based on the new configuration.
33-
## Step 1: Retrieve your Provisioning App Service Principal ID (Object ID)
33+
Exporting and saving your configuration allows you to roll back to a previous version of your configuration. We recommend exporting your provisioning configuration and saving it for later use anytime you make a change to your attribute mappings or scoping filters. All you need to do is open up the JSON file that you downloaded in the steps above, copy the entire contents of the JSON file, replace the entire contents of the JSON payload in the schema editor, and then save. If there is an active provisioning cycle, it will complete and the next cycle will use the updated schema. The next cycle will also be an initial cycle, which reevaluates every user and group based on the new configuration. Consider the following when rolling back to a previous configuration:
34+
* Users will be evaluated again to determine if they should be in scope. If the scoping filters have changed a user is not in scope any more they will be disabled. While this is the desired behavior in most cases, there are times where you may want to prevent this and can use the [skip out of scope deletions](https://docs.microsoft.com/azure/active-directory/app-provisioning/skip-out-of-scope-deletions) functionality.
35+
* Changing your provisioning configuration restarts the service and triggers an [initial cycle](https://docs.microsoft.com/azure/active-directory/app-provisioning/how-provisioning-works#provisioning-cycles-initial-and-incremental).
36+
37+
38+
## Export and import your provisioning configuration by using the Microsoft Graph API
39+
You can use the Microsoft Graph API and the Microsoft Graph Explorer to export your User Provisioning attribute mappings and schema to a JSON file and import it back into Azure AD. You can also use the steps captured here to create a backup of your provisioning configuration.
40+
41+
### Step 1: Retrieve your Provisioning App Service Principal ID (Object ID)
3442

35-
1. Launch the [Azure portal](https://portal.azure.com), and navigate to the Properties section of your provisioning application. For e.g. if you want to export your *Workday to AD User Provisioning application* mapping navigate to the Properties section of that app.
43+
1. Launch the [Azure portal](https://portal.azure.com), and navigate to the Properties section of your provisioning application. For example, if you want to export your *Workday to AD User Provisioning application* mapping navigate to the Properties section of that app.
3644
1. In the Properties section of your provisioning app, copy the GUID value associated with the *Object ID* field. This value is also called the **ServicePrincipalId** of your App and it will be used in Microsoft Graph Explorer operations.
3745

3846
![Workday App Service Principal ID](./media/export-import-provisioning-configuration/wd_export_01.png)
3947

40-
## Step 2: Sign into Microsoft Graph Explorer
48+
### Step 2: Sign into Microsoft Graph Explorer
4149

4250
1. Launch [Microsoft Graph Explorer](https://developer.microsoft.com/graph/graph-explorer)
4351
1. Click on the "Sign-In with Microsoft" button and sign-in using Azure AD Global Admin or App Admin credentials.
@@ -46,7 +54,7 @@ Exporting and saving your configuration allows you to roll back to a previous ve
4654

4755
1. Upon successful sign-in, you will see the user account details in the left-hand pane.
4856

49-
## Step 3: Retrieve the Provisioning Job ID of the Provisioning App
57+
### Step 3: Retrieve the Provisioning Job ID of the Provisioning App
5058

5159
In the Microsoft Graph Explorer, run the following GET query replacing [servicePrincipalId] with the **ServicePrincipalId** extracted from the [Step 1](#step-1-retrieve-your-provisioning-app-service-principal-id-object-id).
5260

@@ -58,7 +66,7 @@ You will get a response as shown below. Copy the "id attribute" present in the r
5866

5967
[![Provisioning Job ID](./media/export-import-provisioning-configuration/wd_export_03.png)](./media/export-import-provisioning-configuration/wd_export_03.png#lightbox)
6068

61-
## Step 4: Download the Provisioning Schema
69+
### Step 4: Download the Provisioning Schema
6270

6371
In the Microsoft Graph Explorer, run the following GET query, replacing [servicePrincipalId] and [ProvisioningJobId] with the ServicePrincipalId and the ProvisioningJobId retrieved in the previous steps.
6472

@@ -68,7 +76,7 @@ In the Microsoft Graph Explorer, run the following GET query, replacing [service
6876

6977
Copy the JSON object from the response and save it to a file to create a backup of the schema.
7078

71-
## Step 5: Import the Provisioning Schema
79+
### Step 5: Import the Provisioning Schema
7280

7381
> [!CAUTION]
7482
> Perform this step only if you need to modify the schema for configuration that cannot be changed using the Azure portal or if you need to restore the configuration from a previously backed up file with valid and working schema.

articles/active-directory/azuread-dev/active-directory-devhowto-adal-error-handling.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ ms.custom: aaddev
1111
ms.topic: conceptual
1212
ms.workload: identity
1313
ms.date: 02/27/2017
14-
ms.author: ryanwi
1514
---
1615

1716
# Error handling best practices for Azure Active Directory Authentication Library (ADAL) clients
@@ -184,7 +183,7 @@ The operating system can also generate a set of errors, which require error hand
184183
185184
### Error cases and actionable steps: Native client applications
186185
187-
If you're building a native client application, there are a few error handling cases to consider which relate to network issues, transient failures, and other platform-specific errors. In most cases, an application shouldnt perform immediate retries, but rather wait for end-user interaction that prompts a sign-in.
186+
If you're building a native client application, there are a few error handling cases to consider which relate to network issues, transient failures, and other platform-specific errors. In most cases, an application shouldn't perform immediate retries, but rather wait for end-user interaction that prompts a sign-in.
188187
189188
There are a few special cases in which a single retry may resolve the issue. For example, when a user needs to enable data on a device, or completed the Azure AD broker download after the initial failure.
190189

articles/active-directory/b2b/add-user-without-invite.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
title: Add B2B guests without an invitation link or email - Azure AD
44
description: You can let a guest user add other guest users to your Azure AD without redeeming an invitation in Azure Active Directory B2B collaboration.
5-
services: active-directory
65
documentationcenter: ''
76

87
services: active-directory

articles/active-directory/cloud-provisioning/what-is-cloud-provisioning.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ms.topic: overview
1010
ms.date: 12/05/2019
1111
ms.subservice: hybrid
1212
ms.author: billmath
13-
ms.topic: conceptual
1413
ms.collection: M365-identity-device-management
1514
---
1615

@@ -52,7 +51,7 @@ The following table provides a comparison between Azure AD Connect and Azure AD
5251
| Supports installation on a Domain Controller |||
5352
| Support for Windows Server 2012 and Windows Server 2012 R2 |||
5453
| Filter on Domains/OUs/groups |||
55-
| Filter on objects attribute values || |
54+
| Filter on objects' attribute values || |
5655
| Allow minimal set of attributes to be synchronized (MinSync) |||
5756
| Allow removing attributes from flowing from AD to Azure AD |||
5857
| Allow advanced customization for attribute flows || |

articles/active-directory/develop/quickstart-v2-javascript.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ manager: CelesteDG
88

99
ms.service: active-directory
1010
ms.subservice: develop
11-
ms.custom: aaddev
1211
ms.topic: quickstart
1312
ms.workload: identity
1413
ms.date: 04/11/2019

articles/active-directory/develop/v2-permissions-and-consent.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ ms.topic: conceptual
1717
ms.date: 1/3/2020
1818
ms.author: ryanwi
1919
ms.reviewer: hirsin, jesakowi, jmprieur
20-
ms.custom: aaddev
21-
ms.custom: fasttrack-edit
20+
ms.custom: aaddev, fasttrack-edit
2221
---
2322

2423
# Permissions and consent in the Microsoft identity platform endpoint
@@ -196,13 +195,13 @@ When you're ready to request permissions from your organization's admin, you can
196195
```
197196

198197

199-
| Parameter | Condition | Description |
198+
| Parameter | Condition | Description |
200199
|:--------------|:--------------|:-----------------------------------------------------------------------------------------|
201200
| `tenant` | Required | The directory tenant that you want to request permission from. Can be provided in GUID or friendly name format OR generically referenced with organizations as seen in the example. Do not use 'common', as personal accounts cannot provide admin consent except in the context of a tenant. To ensure best compatibility with personal accounts that manage tenants, use the tenant ID when possible. |
202201
| `client_id` | Required | The **Application (client) ID** that the [Azure portal – App registrations](https://go.microsoft.com/fwlink/?linkid=2083908) experience assigned to your app. |
203202
| `redirect_uri` | Required |The redirect URI where you want the response to be sent for your app to handle. It must exactly match one of the redirect URIs that you registered in the app registration portal. |
204203
| `state` | Recommended | A value included in the request that will also be returned in the token response. It can be a string of any content you want. Use the state to encode information about the user's state in the app before the authentication request occurred, such as the page or view they were on. |
205-
|`scope` | Required | Defines the set of permissions being requested by the application. This can be either static (using [`/.default`](#the-default-scope)) or dynamic scopes. This can include the OIDC scopes (`openid`, `profile`, `email`). If you need application permissions, you must use `/.default` to request the statically configured list of permissions. |
204+
|`scope` | Required | Defines the set of permissions being requested by the application. This can be either static (using [`/.default`](#the-default-scope)) or dynamic scopes. This can include the OIDC scopes (`openid`, `profile`, `email`). If you need application permissions, you must use `/.default` to request the statically configured list of permissions. |
206205

207206

208207
At this point, Azure AD requires a tenant administrator to sign in to complete the request. The administrator is asked to approve all the permissions that you have requested in the `scope` parameter. If you've used a static (`/.default`) value, it will function like the v1.0 admin consent endpoint and request consent for all scopes found in the required permissions for the app.

articles/active-directory/fundamentals/active-directory-access-create-new-tenant.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,16 @@ ms.workload: identity
1111
ms.topic: quickstart
1212
ms.date: 09/10/2018
1313
ms.author: ajburnle
14-
ms.custom: "it-pro, seodec18"
14+
ms.custom: "it-pro, seodec18, fasttrack-edit"
1515
ms.collection: M365-identity-device-management
16-
ms.custom: fasttrack-edit
1716
---
1817

1918
# Quickstart: Create a new tenant in Azure Active Directory
2019
You can do all of your administrative tasks using the Azure Active Directory (Azure AD) portal, including creating a new tenant for your organization.
2120

2221
In this quickstart, you'll learn how to get to the Azure portal and Azure Active Directory, and you'll learn how to create a basic tenant for your organization.
2322

24-
If you dont have an Azure subscription, create a [free account](https://azure.microsoft.com/free/) before you begin.
23+
If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/) before you begin.
2524

2625
## Create a new tenant for your organization
2726
After you sign in to the Azure portal, you can create a new tenant for your organization. Your new tenant represents your organization and helps you to manage a specific instance of Microsoft cloud services for your internal and external users.
@@ -53,7 +52,7 @@ After you sign in to the Azure portal, you can create a new tenant for your orga
5352
Your new tenant is created with the domain contoso.onmicrosoft.com.
5453

5554
## Clean up resources
56-
If youre not going to continue to use this application, you can delete the tenant using the following steps:
55+
If you're not going to continue to use this application, you can delete the tenant using the following steps:
5756

5857
- Ensure that you are signed in to the directory that you want to delete through the **Directory + subscription** filter in the Azure Portal, and switching to the target directory if needed.
5958
- Select **Azure Active Directory**, and then on the **Contoso - Overview** page, select **Delete directory**.

articles/active-directory/fundamentals/customize-branding.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ ms.topic: conceptual
1212
ms.date: 09/18/2018
1313
ms.author: ajburnle
1414
ms.reviewer: kexia
15-
ms.custom: "it-pro, seodec18"
16-
ms.custom: fasttrack-edit
15+
ms.custom: "it-pro, seodec18, fasttrack-edit"
1716
ms.collection: M365-identity-device-management
1817
---
1918

@@ -29,7 +28,7 @@ You can customize your Azure AD sign-in pages, which appear when users sign in t
2928
Your custom branding won't immediately appear when your users go to sites such as, www\.office.com. Instead, the user has to sign-in before your customized branding appears. After the user has signed in, the branding may take 15 minutes or longer to appear.
3029

3130
> [!NOTE]
32-
> All branding elements are optional. For example, if you specify a banner logo with no background image, the sign-in page will show your logo with a default background image from the destination site (for example, Office 365).<br><br>Additionally, sign-in page branding doesnt carry over to personal Microsoft accounts. If your users or business guests sign in using a personal Microsoft account, the sign-in page won't reflect the branding of your organization.
31+
> All branding elements are optional. For example, if you specify a banner logo with no background image, the sign-in page will show your logo with a default background image from the destination site (for example, Office 365).<br><br>Additionally, sign-in page branding doesn't carry over to personal Microsoft accounts. If your users or business guests sign in using a personal Microsoft account, the sign-in page won't reflect the branding of your organization.
3332
3433
### To customize your branding
3534
1. Sign in to the [Azure portal](https://portal.azure.com/) using a Global administrator account for the directory.
@@ -67,11 +66,11 @@ Your custom branding won't immediately appear when your users go to sites such a
6766

6867
- **Sign-in page background color.** Specify the hexadecimal color (for example, white is #FFFFFF) that will appear in place of your background image in low-bandwidth connection situations. We recommend using the primary color of your banner logo or your organization color.
6968

70-
- **Square logo image.** Select a .png (preferred) or .jpg image of your organizations logo to appear to users during the setup process for new Windows 10 Enterprise devices. This image is only used for Windows authentication and appears only on tenants that are using [Windows Autopilot]( https://docs.microsoft.com/windows/deployment/windows-autopilot/windows-10-autopilot) for deployment or for password entry pages in other Windows 10 experiences. In some cases it may also appear in the consent dialog.
69+
- **Square logo image.** Select a .png (preferred) or .jpg image of your organization's logo to appear to users during the setup process for new Windows 10 Enterprise devices. This image is only used for Windows authentication and appears only on tenants that are using [Windows Autopilot]( https://docs.microsoft.com/windows/deployment/windows-autopilot/windows-10-autopilot) for deployment or for password entry pages in other Windows 10 experiences. In some cases it may also appear in the consent dialog.
7170

72-
The image cant be larger than 240x240 pixels in size and must have a file size of less than 10 KB. We recommend using a transparent image since the background might not match your logo background. We also recommend not adding padding around the image or it might make your logo look small.
71+
The image can't be larger than 240x240 pixels in size and must have a file size of less than 10 KB. We recommend using a transparent image since the background might not match your logo background. We also recommend not adding padding around the image or it might make your logo look small.
7372

74-
- **Square logo image, dark theme.** Same as the square logo image above. This logo image takes the place of the square logo image when used with a dark background, such as with Windows 10 Azure AD joined screens during the out-of-box experience (OOBE). If your logo looks good on white, dark blue, and black backgrounds, you dont need to add this image.
73+
- **Square logo image, dark theme.** Same as the square logo image above. This logo image takes the place of the square logo image when used with a dark background, such as with Windows 10 Azure AD joined screens during the out-of-box experience (OOBE). If your logo looks good on white, dark blue, and black backgrounds, you don't need to add this image.
7574

7675
- **Show option to remain signed in.** You can choose to let your users remain signed in to Azure AD until explicitly signing out. If you choose **No**, this option is hidden, and users must sign in each time the browser is closed and reopened.
7776

0 commit comments

Comments
 (0)