fix merge conflict

Author: Kat-Campise

.openpublishing.redirection.json

@@ -648,167 +648,7 @@
     },
     {
       "source_path": "articles/machine-learning/service/how-to-migrate.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/model-management-overview.md",
-      "redirect_url": "/azure/machine-learning",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/model-management-service-deploy.md",
-      "redirect_url": "/azure/machine-learning",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/quickstart-installation.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/quickstart-visual-studio-code-tools.md",
-      "redirect_url": "/azure/machine-learning",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/quickstart-visual-studio-tools.md",
-      "redirect_url": "/azure/machine-learning",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/reference-logging-api.md",
-      "redirect_url": "/azure/machine-learning",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/reference-python-package-overview.md",
-      "redirect_url": "/azure/machine-learning",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/roaming-and-collaboration.md",
-      "redirect_url": "/azure/machine-learning",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/scenario-aerial-image-classification.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/scenario-big-data.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/scenario-churn-prediction.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/scenario-deep-learning-for-predictive-maintenance.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/scenario-distributed-tuning-of-hyperparameters.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/scenario-document-collection-analysis.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/scenario-image-classification-using-cntk.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/scenario-predictive-maintenance.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/scenario-qna-matching.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/scenario-sentiment-analysis-deep-learning.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/scenario-tdsp-biomedical-recognition.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/scenario-tdsp-classifying-us-incomes.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/scenario-time-series-forecasting.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/tutorial-bikeshare-dataprep.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/tutorial-classifying-iris-part-1.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/tutorial-classifying-iris-part-2.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/tutorial-classifying-iris-part-3.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/tutorial-iris-azure-cli.md",
-      "redirect_url": "/azure/machine-learning",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/frequently-asked-questions.md",
-      "redirect_url": "/azure/machine-learning",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/how-to-build-deploy-forecast-models.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/how-to-build-deploy-image-classification-models.md",
-      "redirect_url": "/azure/machine-learning",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/how-to-build-deploy-image-similarity-models.md",
-      "redirect_url": "/azure/machine-learning",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/how-to-build-deploy-object-detection-models.md",
-      "redirect_url": "/azure/machine-learning",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/machine-learning/desktop-workbench/how-to-build-deploy-text-classification-models.md",
-      "redirect_url": "/azure/machine-learning",
+      "redirect_url": "/azure/machine-learning/overview-what-happened-to-workbench",
       "redirect_document_id": false
     },
     {
@@ -2026,6 +1866,16 @@
       "redirect_url": "/azure/cognitive-services/bing-visual-search/quickstarts/client-libraries?pivots=programming-language-python",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/Bing-Autosuggest/quickstarts/csharp-sdk.md",
+      "redirect_url": "/azure/cognitive-services/bing-autosuggest/quickstarts/client-libraries?pivots=programming-language-csharp",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/Bing-Autosuggest/quickstarts/go-sdk.md",
+      "redirect_url": "/azure/cognitive-services/bing-autosuggest/quickstarts/client-libraries?pivots=programming-language-go",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/virtual-machines/linux/classic/rdma-cluster.md",
       "redirect_url": "/azure/virtual-machines/linux/sizes-hpc#rdma-capable-instances",
@@ -2893,7 +2743,7 @@
     },
     {
       "source_path": "articles/machine-learning/service/how-to-build-deploy-forecast-models.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
+      "redirect_url": "/azure/machine-learning/overview-what-is-azure-ml",
       "redirect_document_id": false
     },
     {
@@ -2948,12 +2798,12 @@
     },
     {
       "source_path": "articles/machine-learning/preview/quickstart-installation.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
+      "redirect_url": "/azure/machine-learning/overview-what-is-azure-ml",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/machine-learning/preview/tutorial-bikeshare-dataprep.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
+      "redirect_url": "/azure/machine-learning/overview-what-is-azure-ml",
       "redirect_document_id": false
     },
     {
@@ -3048,17 +2898,17 @@
     },
     {
       "source_path": "articles/machine-learning/preview/tutorial-classifying-iris-part-1.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
+      "redirect_url": "/azure/machine-learning/overview-what-is-azure-ml",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/machine-learning/preview/tutorial-classifying-iris-part-2.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
+      "redirect_url": "/azure/machine-learning/overview-what-is-azure-ml",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/machine-learning/preview/tutorial-classifying-iris-part-3.md",
-      "redirect_url": "/azure/machine-learning/service/overview-what-happened-to-workbench",
+      "redirect_url": "/azure/machine-learning/overview-what-is-azure-ml",
       "redirect_document_id": false
     },
     {
@@ -15205,11 +15055,6 @@
       "redirect_url": "/azure/machine-learning/how-to-create-labeling-projects",
       "redirect_document_id": true
     },
-    {
-      "source_path": "articles/machine-learning/service/how-to-create-portal-experiments.md",
-      "redirect_url": "/azure/machine-learning/tutorial-first-experiment-automated-ml",
-      "redirect_document_id": false
-    },
     {
       "source_path": "articles/machine-learning/service/how-to-create-register-datasets.md",
       "redirect_url": "/azure/machine-learning/how-to-create-register-datasets",
@@ -39835,11 +39680,6 @@
       "redirect_url": "/azure/application-insights/app-insights-snapshot-debugger",
       "redirect_document_id": false
     },
-    {
-      "source_path": "articles/machine-learning/service/quickstart-installation.md",
-      "redirect_url": "/azure/machine-learning/desktop-workbench/quickstart-installation",
-      "redirect_document_id": true
-    },
     {
       "source_path": "articles/machine-learning/service/how-to-build-deploy-onnx.md",
       "redirect_url": "/azure/machine-learning/service/concept-onnx",
@@ -42800,6 +42640,11 @@
       "redirect_url": "/azure/machine-learning/service/how-to-monitor-data-drift",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/machine-learning/service/how-to-create-portal-experiments.md",
+      "redirect_url": "/azure/machine-learning/how-to-use-automated-ml-for-ml-models",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/governance/policy/samples/allowed-app-gate-sku.md",
       "redirect_url": "/azure/governance/policy/samples/index",
@@ -47037,7 +46882,7 @@
     },
     {
       "source_path": "articles/iot-central/core/tutorial-connect-device.md",
-      "redirect_url": "/azure/iot-central/core/tutorial-connect-device-nodejs/",
+      "redirect_url": "/azure/iot-central/core/tutorial-connect-device-nodejs",
       "redirect_document_id": true
     },
     {

articles/active-directory/app-provisioning/how-provisioning-works.md

@@ -63,7 +63,7 @@ When you configure provisioning to a SaaS application, one of the types of attri
 
 For outbound provisioning from Azure AD to a SaaS application, relying on [user or group assignments](../manage-apps/assign-user-or-group-access-portal.md) is the most common way to determine which users are in scope for provisioning. Because user assignments are also used for enabling single sign-on, the same method can be used for managing both access and provisioning. Assignment-based scoping doesn't apply to inbound provisioning scenarios such as Workday and Successfactors.
 
-* **Groups.** With an Azure AD Premium license plan, you can use groups to assign access to a SaaS application. Then, when the provisioning scope is set to **Sync only assigned users and groups**, the Azure AD provisioning service will provision or de-provision users based on whether they're members of a group that's assigned to the application. The group object itself isn't provisioned unless the application supports group objects.
+* **Groups.** With an Azure AD Premium license plan, you can use groups to assign access to a SaaS application. Then, when the provisioning scope is set to **Sync only assigned users and groups**, the Azure AD provisioning service will provision or de-provision users based on whether they're members of a group that's assigned to the application. The group object itself isn't provisioned unless the application supports group objects. Ensure that groups assigned to your application have the property "SecurityEnabled" set to "False".
 
 * **Dynamic groups.** The Azure AD user provisioning service can read and provision users in [dynamic groups](../users-groups-roles/groups-create-rule.md). Keep these caveats and recommendations in mind:
 

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

@@ -538,7 +538,7 @@ To explore specific ADAL errors, the source code in the [azure-activedirectory-l
 
 #### Operating system errors
 
-iOS errors may arise during sign-in when users use web views, and the nature of authentication. This can be caused by conditions such as SSL errors, timeouts, or network errors:
+iOS errors may arise during sign-in when users use web views, and the nature of authentication. This can be caused by conditions such as TLS errors, timeouts, or network errors:
 
 - For Entitlement Sharing, logins are not persistent and the cache appears empty. You can resolve by adding the following line of code to the keychain:
   `[[ADAuthenticationSettings sharedInstance] setSharedCacheKeychainGroup:nil];`

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

@@ -1,18 +1,13 @@
 ---
-title: Azure AD v2 Windows Desktop Getting Started - Config | Microsoft Docs
+title: Azure AD v2 Windows Desktop Getting Started - Config
 description: How a Windows Desktop .NET (XAML) application can get an access token and call an API protected by Azure Active Directory v2 endpoint.
 services: active-directory
-documentationcenter: dev-center-name
-author: andretms
+author: jmprieur
 manager: CelesteDG
-editor: ''
 
-ms.assetid: 820acdb7-d316-4c3b-8de9-79df48ba3b06
 ms.service: active-directory
 ms.subservice: develop
-ms.devlang: na
 ms.topic: conceptual
-ms.tgt_pltfrm: na
 ms.workload: identity
 ms.date: 01/29/2020
 ms.author: ryanwi

articles/active-directory/develop/active-directory-authentication-protocols.md

@@ -1,11 +1,10 @@
 ---
-title: Microsoft identity platform authentication protocols | Microsoft Docs
+title: Microsoft identity platform authentication protocols
 description: An overview of the authentication protocols supported by Microsoft identity platform
 author: rwike77
 services: active-directory
 manager: CelesteDG
 
-ms.assetid: 7a838ae2-c24c-4304-b6c0-e77fb888e6c0
 ms.service: active-directory
 ms.subservice: develop
 ms.topic: conceptual

articles/active-directory/develop/active-directory-certificate-credentials.md

@@ -6,7 +6,6 @@ services: active-directory
 author: rwike77
 manager: CelesteDG
 
-ms.assetid: 88f0c64a-25f7-4974-aca2-2acadc9acbd8
 ms.service: active-directory
 ms.subservice: develop
 ms.workload: identity

articles/active-directory/develop/active-directory-enterprise-app-role-management.md

@@ -6,7 +6,6 @@ services: active-directory
 author: jeevansd
 manager: CelesteDG
 
-ms.assetid: eb2b3741-3cde-45c8-b639-a636f3df3b74
 ms.service: active-directory
 ms.subservice: develop
 ms.custom: aaddev 

articles/active-directory/develop/active-directory-graph-api-quickstart.md

@@ -5,7 +5,6 @@ services: active-directory
 author: rwike77
 manager: CelesteDG
 
-ms.assetid: 9dc268a9-32e8-402c-a43f-02b183c295c5
 ms.service: active-directory
 ms.subservice: develop
 ms.topic: conceptual

articles/active-directory/develop/active-directory-graph-api.md

@@ -1,11 +1,10 @@
 ---
-title: Azure Active Directory Graph API | Microsoft Docs
+title: Azure Active Directory Graph API
 description: An overview and quickstart guide for Azure AD Graph API, which allows programmatic access to Azure AD through REST API endpoints.
 services: active-directory
 author: rwike77
 manager: CelesteDG
 
-ms.assetid: 5471ad74-20b3-44df-a2b5-43cde2c0a045
 ms.service: active-directory
 ms.subservice: develop
 ms.topic: conceptual

articles/active-directory/develop/active-directory-how-applications-are-added.md

@@ -6,7 +6,6 @@ services: active-directory
 author: rwike77
 manager: CelesteDG
 
-ms.assetid: 3321d130-f2a8-4e38-b35e-0959693f3576
 ms.service: active-directory
 ms.subservice: develop
 ms.topic: conceptual