Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: Banani-Rath

.openpublishing.redirection.json

@@ -3040,6 +3040,21 @@
       "redirect_url": "/azure/iot-edge/how-to-install-iot-edge-linux",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/iot-edge/how-to-register-device-portal.md",
+      "redirect_url": "/azure/iot-edge/how-to-register-device",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/iot-edge/how-to-register-device-vscode.md",
+      "redirect_url": "/azure/iot-edge/how-to-register-device",
+      "redirect_document_id": false
+    },
+        {
+      "source_path": "articles/iot-edge/how-to-register-device-cli.md",
+      "redirect_url": "/azure/iot-edge/how-to-register-device",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cognitive-services/cognitive-services-recommendations-quick-start.md",
       "redirect_url": "/azure/cognitive-services/recommendations/overview",
@@ -36168,6 +36183,46 @@
       "redirect_url": "/azure/key-vault/vs-key-vault-add-connected-service",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/iot-central/core/howto-create-event-rules-pnp.md",
+      "redirect_url": "/azure/iot-central/core/tutorial-create-telemetry-rules",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/iot-central/core/howto-create-telemetry-rules-pnp.md",
+      "redirect_url": "/azure/iot-central/core/tutorial-create-telemetry-rules",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/iot-central/core/tutorial-configure-rules-pnp.md",
+      "redirect_url": "/azure/iot-central/core/tutorial-create-telemetry-rules",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/iot-central/core/tutorial-monitor-devices-pnp.md",
+      "redirect_url": "/azure/iot-central/core/quick-monitor-devices-pnp",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/iot-central/tutorial-add-device-pnp.md",
+      "redirect_url": "/azure/iot-central/quick-create-pnp-device-pnp",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/iot-central/tutorial-define-device-type-pnp.md",
+      "redirect_url": "/azure/iot-central/quick-create-pnp-device-pnp",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/iot-central/howto-export-data-blob-storage-pnp.md",
+      "redirect_url": "/azure/iot-central/howto-export-data-pnp",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/iot-central/howto-export-data-event-hubs-service-bus-pnp.md",
+      "redirect_url": "/azure/iot-central/howto-export-data-pnp",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/iot-central/howto-generate-connection-string.md",
       "redirect_url": "/azure/iot-central",

articles/active-directory-b2c/active-directory-b2c-how-to-enable-billing.md

@@ -41,14 +41,14 @@ Here's how to make the switch to MAU billing for an existing Azure AD B2C resour
 
 1. Sign in to the [Azure portal](https://portal.azure.com) as the subscription owner.
 1. Select the **Directory + subscription** filter in the top menu, and then select the Azure AD B2C directory that you want to upgrade to MAU billing.<br/>
-    :::image type="content" source="media/active-directory-b2c-how-to-enable-billing/portal-mau-01-select-b2c-directory.png" alt-text="Directory and subscription filter in Azure portal":::
+    ![Directory and subscription filter in Azure portal](media/active-directory-b2c-how-to-enable-billing/portal-mau-01-select-b2c-directory.png)
 1. In the left menu, select **Azure AD B2C**. Or, select **All services** and search for and select **Azure AD B2C**.
 1. On the **Overview** page of the Azure AD B2C tenant, select the link under **Resource name**. You're directed to the Azure AD B2C resource in your Azure AD tenant.<br/>
-    :::image type="content" source="media/active-directory-b2c-how-to-enable-billing/portal-mau-02-b2c-resource-link.png" alt-text="Azure AD B2C resource link highlighted in Azure portal":::
+    ![Azure AD B2C resource link highlighted in Azure portal](media/active-directory-b2c-how-to-enable-billing/portal-mau-02-b2c-resource-link.png)
 1. On the **Overview** page of the Azure AD B2C resource, under **Billable Units**, select the **Per Authentication (Change to MAU)** link.<br/>
-    :::image type="content" source="media/active-directory-b2c-how-to-enable-billing/portal-mau-03-change-to-mau-link.png" alt-text="Change to MAU link highlighted in Azure portal":::
+    ![Change to MAU link highlighted in Azure portal](media/active-directory-b2c-how-to-enable-billing/portal-mau-03-change-to-mau-link.png)
 1. Select **Confirm** to complete the upgrade to MAU billing.<br/>
-    :::image type="content" source="media/active-directory-b2c-how-to-enable-billing/portal-mau-04-confirm-change-to-mau.png" alt-text="MAU-based billing confirmation dialog in Azure portal":::
+    ![MAU-based billing confirmation dialog in Azure portal](media/active-directory-b2c-how-to-enable-billing/portal-mau-04-confirm-change-to-mau.png)
 
 ### What to expect when you transition to MAU billing from per-authentication billing
 

articles/active-directory-b2c/active-directory-b2c-tutorials-spa.md

@@ -111,6 +111,9 @@ The sample supports sign-up, sign-in, profile editing, and password reset. This
 
 ### Sign up using an email address
 
+> [!WARNING]
+> After sign-up or sign-in, you might see an [insufficient permissions error](#error-insufficient-permissions). Due to the code sample's current implementation, this error is expected. This issue will be resolved in a future version of the code sample, at which time this warning will be removed.
+
 1. Select **Login** to initiate the *B2C_1_signupsignin1* user flow you specified in an earlier step.
 1. Azure AD B2C presents a sign-in page with a sign-up link. Since you don't yet have an account, select the **Sign up now** link.
 1. The sign-up workflow presents a page to collect and verify the user's identity using an email address. The sign-up workflow also collects the user's password and the requested attributes defined in the user flow.
@@ -127,15 +130,15 @@ You can now use your email address and password to sign in to the application.
 
 ### Error: insufficient permissions
 
-After you sign in, the app displays an insufficient permissions error - this is **expected**:
+After you sign in, the application may return an insufficient permissions error:
 
 ```Output
 ServerError: AADB2C90205: This application does not have sufficient permissions against this web resource to perform the operation.
 Correlation ID: ce15bbcc-0000-0000-0000-494a52e95cd7
 Timestamp: 2019-07-20 22:17:27Z
 ```
 
-You receive this error because the web application is attempting to access a web API protected by the demo directory, *fabrikamb2c*. Because your access token is valid only for your Azure AD directory, the API call is therefore unauthorized.
+You receive this error because the web application is attempting to access a web API protected by the demo directory, *fabrikamb2c*. Because your access token is valid only for your Azure AD directory, the API call is unauthorized.
 
 To fix this error, continue on to the next tutorial in the series (see [Next steps](#next-steps)) to create a protected web API for your directory.
 

articles/active-directory/authentication/howto-authentication-passwordless-deployment.md

@@ -183,7 +183,7 @@ The following are sample test cases for passwordless authentication with securit
 | The user can sign in with FIDO2 device (1809) | User can select Security Key from sign in window, and successfully sign in. |
 | The user can register FIDO2 device (1903) | User can register FIDO2 device at Settings > Accounts > sign in options > Security Key |
 | The user can reset FIDO2 device (1903) | User can reset FIDO2 device at Settings > Accounts > sign in options > Security Key |
-| The user can sign in with FIDO2 device (1809) | User can select Security Key from sign in window, and successfully sign in. |
+| The user can sign in with FIDO2 device (1903) | User can select Security Key from sign in window, and successfully sign in. |
 
 **Passwordless FIDO sign in to Azure AD web apps**
 

articles/active-directory/develop/migrate-objc-adal-msal.md

@@ -71,7 +71,7 @@ There are two ways to provide scopes in MSAL:
 
 * Provide a list of all the permissions your apps needs. For example: 
 
-    `@[@"https://graph.microsot.com/directory.read", @"https://graph.microsoft.com/directory.write"]`
+    `@[@"https://graph.microsoft.com/directory.read", @"https://graph.microsoft.com/directory.write"]`
 
     In this case, the app requests the `directory.read` and `directory.write` permissions. The user will be asked to consent for those permissions if they haven't consented to them before for this app. The application might also receive additional permissions that the user has already consented to for the application. The user will only be prompted to consent for new permissions, or permissions that haven't been granted.
 

articles/active-directory/develop/msal-js-known-issues-ie-edge-browsers.md

@@ -1,5 +1,5 @@
 ---
-title: Known issues on browsers (Microsoft Authentication Library for JavaScript) 
+title: Known issues on Internet Explorer and Microsoft Edge (MSAL for JavaScript) 
 titleSuffix: Microsoft identity platform
 description: Learn about know issues when using the Microsoft Authentication Library for JavaScript (MSAL.js) with Internet Explorer and Microsoft Edge browsers.
 services: active-directory

articles/active-directory/develop/msal-js-known-issues-safari-browser.md

@@ -1,5 +1,5 @@
 ---
-title: Known issues on browsers (Microsoft Authentication Library for JavaScript) 
+title: Known issues on Safari browser (MSAL for JavaScript) 
 titleSuffix: Microsoft identity platform
 description: Learn about know issues when using the Microsoft Authentication Library for JavaScript (MSAL.js) with Safari browser.
 services: active-directory

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

@@ -15,7 +15,7 @@ ms.tgt_pltfrm: na
 ms.workload: identity
 ms.date: 09/16/2019
 ms.author: twhitney
-ms.custom: aaddev, identityplatformtop40
+ms.custom: aaddev, identityplatformtop40, scenarios:getting-started, languages:Android
 #Customer intent: As an application developer, I want to learn how Android native apps can call protected APIs that require login and access tokens using the Microsoft identity platform endpoint.
 ms.collection: M365-identity-device-management
 ---

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

@@ -16,7 +16,7 @@ ms.tgt_pltfrm: na
 ms.workload: identity
 ms.date: 04/11/2019
 ms.author: jmprieur
-ms.custom: aaddev, identityplatformtop40
+ms.custom: aaddev, identityplatformtop40, scenarios:getting-started, languages:ASP.NET
 #Customer intent: As an application developer, I want to know how to write an ASP.NET web app that can sign in personal accounts, as well as work and school accounts from any Azure Active Directory instance.
 ms.collection: M365-identity-device-management
 ---

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

@@ -16,7 +16,7 @@ ms.workload: identity
 ms.date: 09/24/2019
 ms.author: twhitney
 ms.reviewer: jmprieur, saeeda
-ms.custom: aaddev, identityplatformtop40 
+ms.custom: aaddev, identityplatformtop40, scenarios:getting-started, languages:iOS
 #Customer intent: As an application developer, I want to learn how to sign in users and call Microsoft Graph from my iOS or macOS application.
 ms.collection: M365-identity-device-management
 ---