Skip to content

Commit 8ad1aad

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into 2020-3-1-CMK-updates
2 parents a9633a8 + abec767 commit 8ad1aad

File tree

480 files changed

+8500
-2742
lines changed

Some content is hidden

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

480 files changed

+8500
-2742
lines changed

.openpublishing.redirection.json

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -800,6 +800,11 @@
800800
"redirect_url": "/azure/machine-learning",
801801
"redirect_document_id": false
802802
},
803+
{
804+
"source_path": "articles/notebooks/use-machine-learning-services-jupyter-notebooks.md",
805+
"redirect_url": "/azure/machine-learning/samples-notebooks",
806+
"redirect_document_id": false
807+
},
803808
{
804809
"source_path": "articles/cognitive-services/QnAMaker/Tutorials/create-publish-query-in-portal.md",
805810
"redirect_url": "/azure/cognitive-services/QnAMaker/Quickstarts/create-publish-knowledge-base",
@@ -1970,6 +1975,26 @@
19701975
"redirect_url": "/azure/cognitive-services/bing-news-search/quickstarts/client-libraries?pivots=programming-language-python",
19711976
"redirect_document_id": false
19721977
},
1978+
{
1979+
"source_path": "articles/cognitive-services/Bing-Video-Search/quickstarts/sdk-csharp-quickstart.md",
1980+
"redirect_url": "/azure/cognitive-services/bing-video-search/quickstarts/client-libraries?pivots=programming-language-csharp",
1981+
"redirect_document_id": false
1982+
},
1983+
{
1984+
"source_path": "articles/cognitive-services/Bing-Video-Search/quickstarts/sdk-java-quickstart.md",
1985+
"redirect_url": "/azure/cognitive-services/bing-video-search/quickstarts/client-libraries?pivots=programming-language-java",
1986+
"redirect_document_id": false
1987+
},
1988+
{
1989+
"source_path": "articles/cognitive-services/Bing-Video-Search/quickstarts/sdk-node-quickstart.md",
1990+
"redirect_url": "/azure/cognitive-services/bing-video-search/quickstarts/client-libraries?pivots=programming-language-javascript",
1991+
"redirect_document_id": false
1992+
},
1993+
{
1994+
"source_path": "articles/cognitive-services/Bing-Video-Search/quickstarts/sdk-python-quickstart.md",
1995+
"redirect_url": "/azure/cognitive-services/bing-video-search/quickstarts/client-libraries?pivots=programming-language-python",
1996+
"redirect_document_id": false
1997+
},
19731998
{
19741999
"source_path": "articles/virtual-machines/linux/classic/rdma-cluster.md",
19752000
"redirect_url": "/azure/virtual-machines/linux/sizes-hpc#rdma-capable-instances",
@@ -31855,11 +31880,6 @@
3185531880
"redirect_url": "/azure/security/fundamentals/abstract-serverless-platform-security",
3185631881
"redirect_document_id": true
3185731882
},
31858-
{
31859-
"source_path": "articles/security/azure-ad-choose-authn.md",
31860-
"redirect_url": "/azure/security/fundamentals/choose-ad-authn",
31861-
"redirect_document_id": true
31862-
},
3186331883
{
3186431884
"source_path": "articles/active-directory/authentication/howto-authentication-passwordless-enable.md",
3186531885
"redirect_url": "/azure/active-directory/authentication/concept-authentication-passwordless",
@@ -38842,8 +38862,8 @@
3884238862
},
3884338863
{
3884438864
"source_path": "articles/cognitive-services/Bing-Video-Search/sdk.md",
38845-
"redirect_url": "/azure/cognitive-services/Bing-Video-Search/quickstarts/sdk-csharp-quickstart",
38846-
"redirect_document_id": true
38865+
"redirect_url": "/azure/cognitive-services/bing-video-search/quickstarts/client-libraries?pivots=programming-language-csharp",
38866+
"redirect_document_id": false
3884738867
},
3884838868
{
3884938869
"source_path": "articles/cognitive-services/Bing-Video-Search/quick-start.md",
@@ -38877,22 +38897,22 @@
3887738897
},
3887838898
{
3887938899
"source_path": "articles/cognitive-services/Bing-Video-Search/video-sdk-java-quickstart.md",
38880-
"redirect_url": "/azure/cognitive-services/Bing-Video-Search/quickstarts/sdk-java-quickstart",
38881-
"redirect_document_id": true
38900+
"redirect_url": "/azure/cognitive-services/bing-video-search/quickstarts/client-libraries?pivots=programming-language-java",
38901+
"redirect_document_id": false
3888238902
},
3888338903
{
3888438904
"source_path": "articles/cognitive-services/Bing-Video-Search/video-sdk-python-quickstart.md",
38885-
"redirect_url": "/azure/cognitive-services/Bing-Video-Search/quickstarts/sdk-python-quickstart",
38886-
"redirect_document_id": true
38905+
"redirect_url": "/azure/cognitive-services/bing-video-search/quickstarts/client-libraries?pivots=programming-language-python",
38906+
"redirect_document_id": false
3888738907
},
3888838908
{
3888938909
"source_path": "articles/cognitive-services/Bing-Video-Search/video-search-sdk-node-quickstart.md",
38890-
"redirect_url": "/azure/cognitive-services/Bing-Video-Search/quickstarts/sdk-node-quickstart",
38891-
"redirect_document_id": true
38910+
"redirect_url": "/azure/cognitive-services/bing-video-search/quickstarts/client-libraries?pivots=programming-language-javascript",
38911+
"redirect_document_id": false
3889238912
},
3889338913
{
3889438914
"source_path": "articles/cognitive-services/Bing-Video-Search/video-search-sdk-quickstart.md",
38895-
"redirect_url": "/azure/cognitive-services/Bing-Video-Search/quickstarts/sdk-csharp-quickstart",
38915+
"redirect_url": "/azure/cognitive-services/bing-video-search/quickstarts/client-libraries?pivots=programming-language-csharp",
3889638916
"redirect_document_id": false
3889738917
},
3889838918
{
@@ -50358,6 +50378,11 @@
5035850378
{
5035950379
"source_path": "articles/cognitive-services/speech-service/quickstart-voice-assistant-java-jre.md",
5036050380
"redirect_url": "/azure/cognitive-services/speech-service/quickstarts/voice-assistants?pivots=programming-language-java&tabs=jre"
50381+
},
50382+
{
50383+
"source_path": "articles/security/fundamentals/choose-ad-authn.md",
50384+
"redirect_url": "/azure/active-directory/hybrid/choose-ad-authn",
50385+
"redirect_document_id": true
5036150386
},
5036250387
{
5036350388
"source_path": "articles/cognitive-services/Speech-Service/quickstart-voice-assistant-csharp-uwp.md",

articles/active-directory/app-provisioning/check-status-user-account-provisioning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.collection: M365-identity-device-management
1919

2020
# Tutorial: Reporting on automatic user account provisioning
2121

22-
Azure Active Directory (Azure AD) includes a [user account provisioning service](user-provisioning.md) that helps automate the provisioning de-provisioning of user accounts in SaaS apps and other systems, for the purpose of end-to-end identity lifecycle management. Azure AD supports pre-integrated user provisioning connectors for all of the applications and systems in the "Featured" section of the [Azure AD application gallery](https://azuremarketplace.microsoft.com/marketplace/apps/category/azure-active-directory-apps?page=1&subcategories=featured).
22+
Azure Active Directory (Azure AD) includes a [user account provisioning service](user-provisioning.md) that helps automate the provisioning de-provisioning of user accounts in SaaS apps and other systems, for the purpose of end-to-end identity lifecycle management. Azure AD supports pre-integrated user provisioning connectors for all of the applications and systems with user provisioning tutorials [here](https://docs.microsoft.com/azure/active-directory/saas-apps/tutorial-list).
2323

2424
This article describes how to check the status of provisioning jobs after they have been set up, and how to troubleshoot the provisioning of individual users and groups.
2525

articles/active-directory/hybrid/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
href: cloud-governed-management-for-on-premises.md
2525
- name: Four steps to a strong identity foundation
2626
href: four-steps.md
27+
- name: Choose a hybrid identity authentication method
28+
href: choose-ad-authn.md
2729
- name: Azure AD Connect and Connect Health
2830
items:
2931
- name: What is Azure AD Connect and Connect Health?
File renamed without changes.

articles/active-directory/hybrid/how-to-connect-sync-feature-preferreddatalocation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Azure AD Connect supports synchronization of the **preferredDataLocation** attri
6464
By default, **preferredDataLocation** is not enabled for synchronization. This feature is intended for larger organizations. The Active Directory schema in Windows Server 2019 has an attribute **msDS-preferredDataLocation** you should use for this purpose. If you have not updated the Active Directory schema and cannot do so, then you must identify an attribute to hold the Office 365 geo for your users. This is going to be different for each organization.
6565

6666
> [!IMPORTANT]
67-
> Azure AD allows the **preferredDataLocation** attribute on **cloud User objects** to be directly configured by using Azure AD PowerShell. Azure AD no longer allows the **preferredDataLocation** attribute on **synchronized User objects** to be directly configured by using Azure AD PowerShell. To configure this attribute on **synchronized User objects**, you must use Azure AD Connect.
67+
> Azure AD allows the **preferredDataLocation** attribute on **cloud User objects** to be directly configured by using Azure AD PowerShell. To configure this attribute on **synchronized User objects**, you must use Azure AD Connect.
6868
6969
Before enabling synchronization:
7070

articles/active-directory/managed-identities-azure-resources/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
- name: Azure App Service and Functions
5252
href: /azure/app-service/overview-managed-identity?context=azure/active-directory/managed-identities-azure-resources/context/msi-context
5353
- name: Azure Event Hubs
54-
href: /azure/event-hubs/authenticate-managed-identity.md?context=azure/active-directory/managed-identities-azure-resources/context/msi-context
54+
href: /azure/event-hubs/authenticate-managed-identity?context=azure/active-directory/managed-identities-azure-resources/context/msi-context
5555
- name: Azure Container Instances
5656
href: /azure/container-instances/container-instances-managed-identity?context=azure/active-directory/managed-identities-azure-resources/context/msi-context
5757
- name: How-to guides
@@ -88,7 +88,7 @@
8888
items:
8989
- name: Acquire an access token
9090
href: how-to-use-vm-token.md
91-
- name: Sign to Powershell and CLI using Managed Identity
91+
- name: Sign to PowerShell and CLI using Managed Identity
9292
href: how-to-use-vm-sign-in.md
9393
- name: Use with Azure SDKs
9494
href: how-to-use-vm-sdk.md

0 commit comments

Comments
 (0)