Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into conmod-updates

Author: PatrickFarley

.openpublishing.redirection.json

@@ -27475,11 +27475,6 @@
       "redirect_url": "/azure/storage/blobs/storage-custom-domain-name",
       "redirect_document_id": true
     },
-    {
-      "source_path": "articles/storage/storage-decide-blobs-files-disks.md",
-      "redirect_url": "/azure/storage/common/storage-decide-blobs-files-disks",
-      "redirect_document_id": true
-    },
     {
       "source_path": "articles/storage/storage-designing-ha-apps-with-ragrs.md",
       "redirect_url": "/azure/storage/common/storage-designing-ha-apps-with-ragrs",
@@ -27780,11 +27775,6 @@
       "redirect_url": "/azure/virtual-machines/windows/incremental-snapshots",
       "redirect_document_id": true
     },
-    {
-      "source_path": "articles/storage/storage-introduction.md",
-      "redirect_url": "/azure/storage/common/storage-introduction",
-      "redirect_document_id": true
-    },
     {
       "source_path": "articles/storage/storage-ios-how-to-use-blob-storage.md",
       "redirect_url": "/azure/storage/blobs/storage-ios-how-to-use-blob-storage",
@@ -39925,6 +39915,11 @@
       "redirect_url": "/azure/app-service/app-service-web-get-started-java",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/storage/common/storage-decide-blobs-files-disks.md",
+      "redirect_url": "/azure/storage/common/storage-introduction",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/cognitive-services/LUIS/luis-get-started-php-add-utterance.md",
       "redirect_url": "/azure/cognitive-services/LUIS/",
@@ -40087,12 +40082,12 @@
     },
     {
       "source_path": "articles/iot-central/tutorial-add-device-pnp.md",
-      "redirect_url": "/azure/iot-central/core/quick-create-pnp-device",
+      "redirect_url": "/azure/iot-central/core/tutorial-connect-pnp-device",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/iot-central/tutorial-define-device-type-pnp.md",
-      "redirect_url": "/azure/iot-central/core/quick-create-pnp-device",
+      "redirect_url": "/azure/iot-central/core/howto-set-up-template",
       "redirect_document_id": false
     },
     {
@@ -46287,7 +46282,7 @@
     },
     {
       "source_path": "articles/iot-central/quick-create-pnp-device-pnp.md",
-      "redirect_url": "/azure/iot-central/core/quick-create-pnp-device/",
+      "redirect_url": "/azure/iot-central/core/quick-create-simulated-device/",
       "redirect_document_id": false
     },
     {
@@ -46352,7 +46347,12 @@
     },
     {
       "source_path": "articles/iot-central/core/quick-create-pnp-device-pnp.md",
-      "redirect_url": "/azure/iot-central/core/quick-create-pnp-device/",
+      "redirect_url": "/azure/iot-central/core/quick-create-simulated-device/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/iot-central/core/quick-create-pnp-device.md",
+      "redirect_url": "/azure/iot-central/core/quick-create-simulated-device/",
       "redirect_document_id": false
     },
     {
@@ -46787,7 +46787,7 @@
     },
     {
       "source_path": "articles/iot-central/preview/quick-create-pnp-device.md",
-      "redirect_url": "/azure/iot-central/core/quick-create-pnp-device/",
+      "redirect_url": "/azure/iot-central/core/quick-create-simulated-device/",
       "redirect_document_id": false
     },
     {
@@ -46885,6 +46885,66 @@
       "redirect_url": "/azure/iot-central/core/tutorial-connect-device-nodejs",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/iot-central/retail/architecture-connected-logistics-pnp.md",
+      "redirect_url": "/azure/iot-central/retail/architecture-connected-logistics",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/iot-central/retail/architecture-digital-distribution-center-pnp.md",
+      "redirect_url": "/azure/iot-central/retail/architecture-digital-distribution-center",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/iot-central/retail/architecture-micro-fulfillment-center-pnp.md",
+      "redirect_url": "/azure/iot-central/retail/architecture-micro-fulfillment-center",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/iot-central/retail/architecture-smart-inventory-management-pnp.md",
+      "redirect_url": "/azure/iot-central/retail/architecture-smart-inventory-management",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/iot-central/retail/overview-iot-central-retail-pnp.md",
+      "redirect_url": "/azure/iot-central/retail/overview-iot-central-retail",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/iot-central/retail/tutorial-in-store-analytics-create-app-pnp.md",
+      "redirect_url": "/azure/iot-central/retail/tutorial-in-store-analytics-create-app",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/iot-central/retail/tutorial-in-store-analytics-customize-dashboard-pnp.md",
+      "redirect_url": "/azure/iot-central/retail/tutorial-in-store-analytics-customize-dashboard",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/iot-central/retail/tutorial-in-store-analytics-export-data-visualize-insights-pnp.md",
+      "redirect_url": "/azure/iot-central/retail/tutorial-in-store-analytics-export-data-visualize-insights",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/iot-central/retail/tutorial-iot-central-connected-logistics-pnp.md",
+      "redirect_url": "/azure/iot-central/retail/tutorial-iot-central-connected-logistics",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/iot-central/retail/tutorial-iot-central-digital-distribution-center-pnp.md",
+      "redirect_url": "/azure/iot-central/retail/tutorial-iot-central-digital-distribution-center",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/iot-central/retail/tutorial-iot-central-smart-inventory-management-pnp.md",
+      "redirect_url": "/azure/iot-central/retail/tutorial-iot-central-smart-inventory-management",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/iot-central/retail/tutorial-micro-fulfillment-center-pnp.md",
+      "redirect_url": "/azure/iot-central/retail/tutorial-micro-fulfillment-center",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/iot-accelerators/iot-accelerators-arduino-iot-devkit-az3166-devkit-remote-monitoringV2.md",
       "redirect_url": "/azure/iot-accelerators/iot-accelerators-arduino-iot-devkit-az3166-devkit-remote-monitoring-v2",
@@ -50593,6 +50653,36 @@
       "source_path": "articles/ansible/index.yml",
       "redirect_url": "/azure/developer/ansible/",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/chef/chef-automation.md",
+      "redirect_url": "/azure/developer/chef/windows-vm-configure",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/chef/chef-extension-portal.md",
+      "redirect_url": "/azure/developer/chef/client-install-from-azure-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/chef/chef-habitat-overview.md",
+      "redirect_url": "/azure/developer/chef/habitat-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/chef/chef-inspec-overview.md",
+      "redirect_url": "/azure/developer/chef/inspec-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/chef/chef-overview.md",
+      "redirect_url": "/azure/developer/chef/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/chef/index.yml",
+      "redirect_url": "/azure/developer/chef/",
+      "redirect_document_id": false
     }
   ]
 }

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/apple-sso-plugin.md

@@ -23,7 +23,7 @@ ms.custom: aaddev
 > This preview version is provided without a service level agreement, and it's not recommended for production workloads. Certain features might not be supported or might have constrained capabilities.
 > For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).
 
-The *Microsoft Enterprise SSO plug-in for Apple devices* provides single sign-on (SSO) for Active Directory accounts across all applications that support Apple's [Enterprise Single Sign-On](https://developer.apple.com/documentation/authenticationservices) feature. Microsoft worked closely with Apple to develop this plug-in to increase your application's usability while providing the best protection that Apple and Microsoft can provide.
+The *Microsoft Enterprise SSO plug-in for Apple devices* provides single sign-on (SSO) for Azure Active Directory (Azure AD) accounts across all applications that support Apple's [Enterprise Single Sign-On](https://developer.apple.com/documentation/authenticationservices) feature. Microsoft worked closely with Apple to develop this plug-in to increase your application's usability while providing the best protection that Apple and Microsoft can provide.
 
 In this Public Preview release, the Enterprise SSO plug-in is available only for iOS devices and is distributed in certain Microsoft applications.
 
@@ -33,7 +33,7 @@ Our first use of the Enterprise SSO plug-in is with our new [shared device mode]
 
 The Microsoft Enterprise SSO plug-in for Apple devices offers the following benefits:
 
-- Provides SSO for Active Directory accounts across all applications that support Apple's Enterprise Single Sign-On feature.
+- Provides SSO for Azure AD accounts across all applications that support Apple's Enterprise Single Sign-On feature.
 - Delivered automatically in the Microsoft Authenticator and can be enabled by any mobile device management (MDM) solution.
 
 ## Requirements

articles/active-directory/develop/identity-videos.md

@@ -1,26 +1,76 @@
 ---
 title: Microsoft identity platform videos | Azure
-description: A list of videos about the Microsoft identity platform
+description: A list of videos about modern authentication and the Microsoft identity platform
 services: active-directory
 author: mmacy
 manager: CelesteDG
+
 ms.service: active-directory
 ms.subservice: develop
 ms.topic: conceptual
 ms.workload: identity
-ms.date: 01/29/2020
+ms.date: 04/08/2020
 ms.author: marsma
 ms.custom: aaddev
 ms.reviewer: celested
 ---
 
 # Microsoft identity platform videos
 
-Learn about the Microsoft identity platform and the Microsoft Authentication libraries (MSAL). They're typically 1-2 minutes long.
+Learn the basics of modern authentication, the Microsoft identity platform, and the Microsoft Authentication Libraries (MSAL).
+
+## Authentication fundamentals
+
+If you're new to concepts like identity providers, security tokens, claims, and audience, this video series is a good place to start.
+___
+
+:::row:::
+    :::column:::
+        1 - Basics: The concepts of modern authentication (4:33)
+    :::column-end:::
+    :::column:::
+        > [!VIDEO https://www.youtube.com/embed/fbSVgC8nGz4?list=PLLasX02E8BPD5vC2XHS_oHaMVmaeHHPLy]
+    :::column-end:::
+     :::column:::
+        2 - Modern authentication for web applications (6:02)
+    :::column-end:::
+    :::column:::
+        > [!VIDEO https://www.youtube.com/embed/tCNcG1lcCHY?list=PLLasX02E8BPD5vC2XHS_oHaMVmaeHHPLy]
+    :::column-end:::
+:::row-end:::
+:::row:::
+    :::column:::
+        3 - Web single sign-on (4:13)
+    :::column-end:::
+    :::column:::
+        > [!VIDEO https://www.youtube.com/embed/51B-jSOBF8U?list=PLLasX02E8BPD5vC2XHS_oHaMVmaeHHPLy]
+    :::column-end:::
+    :::column:::
+        4 - Federated web authentication (6:19)
+    :::column-end:::
+    :::column:::
+        > [!VIDEO https://www.youtube.com/embed/CjarTgjKcX8?list=PLLasX02E8BPD5vC2XHS_oHaMVmaeHHPLy]
+    :::column-end:::
+:::row-end:::
+:::row:::
+    :::column:::
+        5 - Native client applications - Part 1 (8:12)
+    :::column-end:::
+    :::column:::
+        > [!VIDEO https://www.youtube.com/embed/OGMDnuDrAcQ?list=PLLasX02E8BPD5vC2XHS_oHaMVmaeHHPLy]
+    :::column-end:::
+    :::column:::
+        6 - Native client applications - Part 2 (5:33)
+    :::column-end:::
+    :::column:::
+        > [!VIDEO https://www.youtube.com/embed/2RE6IhXfmHY?list=PLLasX02E8BPD5vC2XHS_oHaMVmaeHHPLy]
+    :::column-end:::
+:::row-end:::
 
 ## Microsoft identity platform basics
 
-**Learn basic Microsoft identity platform concepts**
+Learn about the components of the Microsoft identity platform, the Microsoft Authentication Libraries (MSAL), and how these components interact with Azure Active Directory. The One Dev Question videos are 1-2 minutes in length.
+___
 
 :::row:::
     :::column:::
@@ -107,7 +157,8 @@ Learn about the Microsoft identity platform and the Microsoft Authentication lib
 
 ## Migrate from v1.0 to v2.0
 
-**Learn about migrating to the the latest version of the Microsoft identity platform**
+Learn about migrating to the latest version of the Microsoft identity platform, including moving from the Active Directory Authentication Library (ADAL) to MSAL.
+___
 
 :::row:::
     :::column:::

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

@@ -490,8 +490,3 @@ Read more information about MSAL library for Android:
 > [MSAL for Android library wiki](https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki)
 
 [!INCLUDE [Help and support](../../../includes/active-directory-develop-help-support-include.md)]
-
-Help us improve the Microsoft identity platform. Tell us what you think by completing a short two-question survey.
-
-> [!div class="nextstepaction"]
-> [Microsoft identity platform survey](https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbRyKrNDMV_xBIiPGgSvnbQZdUQjFIUUFGUE1SMEVFTkdaVU5YT0EyOEtJVi4u)

articles/active-directory/develop/quickstart-v2-aspnet-core-webapp.md

@@ -165,8 +165,3 @@ Check out the GitHub repo for this ASP.NET Core tutorial for more information in
 
 > [!div class="nextstepaction"]
 > [ASP.NET Core Web App tutorial](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/)
-
-Help us improve the Microsoft identity platform. Tell us what you think by completing a short two-question survey.
-
-> [!div class="nextstepaction"]
-> [Microsoft identity platform survey](https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbRyKrNDMV_xBIiPGgSvnbQZdUQjFIUUFGUE1SMEVFTkdaVU5YT0EyOEtJVi4u)

articles/active-directory/develop/quickstart-v2-aspnet-webapp.md

@@ -202,8 +202,3 @@ Try out the ASP.NET tutorial for a complete step-by-step guide on building appli
 > [Sign-in tutorial](./tutorial-v2-asp-webapp.md)
 
 [!INCLUDE [Help and support](../../../includes/active-directory-develop-help-support-include.md)]
-
-Help us improve the Microsoft identity platform. Tell us what you think by completing a short two-question survey.
-
-> [!div class="nextstepaction"]
-> [Microsoft identity platform survey](https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbRyKrNDMV_xBIiPGgSvnbQZdUQjFIUUFGUE1SMEVFTkdaVU5YT0EyOEtJVi4u)

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

@@ -293,8 +293,3 @@ Try out the tutorial for iOS and macOS for a complete step-by-step guide on buil
 > [Call Graph API tutorial for iOS and macOS](https://docs.microsoft.com/azure/active-directory/develop/guidedsetups/active-directory-ios)
 
 [!INCLUDE [Help and support](../../../includes/active-directory-develop-help-support-include.md)]
-
-Help us improve the Microsoft identity platform. Tell us what you think by completing a short two-question survey.
-
-> [!div class="nextstepaction"]
-> [Microsoft identity platform survey](https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbRyKrNDMV_xBIiPGgSvnbQZdUQjFIUUFGUE1SMEVFTkdaVU5YT0EyOEtJVi4u)

articles/active-directory/develop/quickstart-v2-java-webapp.md

@@ -253,9 +253,4 @@ To know more about the auth flow for this scenario, see the Oauth 2.0 authorizat
 > [!div class="nextstepaction"]
 > [Authorization Code Oauth flow](https://docs.microsoft.com/azure/active-directory/develop/v2-oauth2-auth-code-flow)
 
-Help us improve the Microsoft identity platform. Tell us what you think by completing a short two-question survey.
-
-> [!div class="nextstepaction"]
-> [Microsoft identity platform survey](https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbRyKrNDMV_xBIiPGgSvnbQZdUQjFIUUFGUE1SMEVFTkdaVU5YT0EyOEtJVi4u)
-
 [!INCLUDE [Help and support](../../../includes/active-directory-develop-help-support-include.md)]

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

@@ -304,8 +304,3 @@ To browse the MSAL repo for documentation, FAQ, issues, and more, see:
 
 > [!div class="nextstepaction"]
 > [MSAL.js GitHub repo](https://github.com/AzureAD/microsoft-authentication-library-for-js)
-
-Help us improve the Microsoft identity platform. Tell us what you think by completing a short two-question survey.
-
-> [!div class="nextstepaction"]
-> [Microsoft identity platform survey](https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbRyKrNDMV_xBIiPGgSvnbQZdUQjFIUUFGUE1SMEVFTkdaVU5YT0EyOEtJVi4u)