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

Author: v-alje

.openpublishing.redirection.json

@@ -15405,6 +15405,11 @@
       "redirect_url": "/azure/stream-analytics/stream-analytics-troubleshoot-query",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/backup/backup-introduction-to-azure-backup.md",
+      "redirect_url": "/azure/backup/backup-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/backup/backup-azure-backup-ibiza-faq.md",
       "redirect_url": "/azure/backup/backup-azure-backup-faq",
@@ -26484,6 +26489,11 @@
       "redirect_url": "/azure/marketplace/enable-appsource-marketplace-using-azure-ad",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/marketplace/gtm-promote-your-business.md",
+      "redirect_url": "/azure/marketplace/gtm-your-marketplace-benefits",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/marketplace/become-publisher.md",
       "redirect_url": "/azure/marketplace/partner-center-portal/create-account",
@@ -30879,6 +30889,16 @@
       "redirect_url": "/azure/iot-accelerators/quickstart-connected-factory-deploy",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/iot-accelerators/iot-accelerators-connected-factory-sample-walkthrough.md",
+      "redirect_url": "/azure/iot-accelerators/iot-accelerators-connected-factory-features",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/iot-accelerators/iot-accelerators-connected-factory-gateway-deployment.md",
+      "redirect_url": "/azure/iot-accelerators/iot-accelerators-connected-factory-features",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/iot-accelerators/iot-accelerators-predictive-overview.md",
       "redirect_url": "/azure/iot-accelerators/quickstart-predictive-maintenance-deploy",
@@ -37408,11 +37428,21 @@
       "redirect_url": "/azure/cognitive-services/content-moderator/review-api#workflows",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/cognitive-services/Content-Moderator/FAQs.md",
+      "redirect_url": "/azure/cognitive-services/content-moderator/overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cognitive-services/Content-Moderator/sdk-and-samples.md",
       "redirect_url": "/azure/cognitive-services/content-moderator/samples-dotnet",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/Content-Moderator/Review-Tool-User-Guide/Sign-up.md",
+      "redirect_url": "/azure/cognitive-services/content-moderator/overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cognitive-services/Computer-vision/Vision-API-How-to-Topics/HowToSubscribe.md",
       "redirect_url": "/azure/cognitive-services/cognitive-services-apis-create-account#single-service-subscription",
@@ -37478,6 +37508,11 @@
       "redirect_url": "/azure/cognitive-services/Custom-Vision-Service/getting-started-build-a-classifier",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/Custom-Vision-Service/glossary-of-terms.md",
+      "redirect_url": "/azure/cognitive-services/Custom-Vision-Service/home",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/data-catalog/data-catalog-prerequisites.md",
       "redirect_url": "/azure/data-catalog/data-catalog-get-started",

articles/active-directory/devices/device-management-azure-portal.md

@@ -22,9 +22,9 @@ ms.reviewer: jairoc
 
 ms.collection: M365-identity-device-management
 ---
-# How to manage device identity using the Azure portal
+# Manage device identity using the Azure portal
 
-With device identity management in Azure Active Directory (Azure AD), you can ensure that your users are accessing your resources from devices that meet your standards for security and compliance. 
+With device identity management in Azure Active Directory (Azure AD), you can ensure that your users are accessing your resources from devices that meet your standards for security and compliance.
 
 This article:
 
@@ -115,7 +115,7 @@ This section provides you with information about common device identity manageme
 
 ### Manage an Intune device
 
-If you are an Intune administrator, you can manage devices marked as **Microsoft Intune**. 
+If you are an Intune administrator, you can manage devices marked as **Microsoft Intune**.
 
 ![Manage an Intune device](./media/device-management-azure-portal/31.png)
 
@@ -134,7 +134,7 @@ To enable / disable a device, you have two options:
 **Remarks:**
 
 - You need to be a global administrator or cloud device administrator in Azure AD to enable / disable a device. 
-- Disabling a device prevents a device from successfully authenticating with Azure AD, thereby preventing the device from accessing your Azure AD resources that are guarded by device CA or using your WH4B credentials. 
+- Disabling a device prevents a device from successfully authenticating with Azure AD, thereby preventing the device from accessing your Azure AD resources that are guarded by device CA or using your WH4B credentials.
 
 ### Delete an Azure AD device
 
@@ -152,7 +152,7 @@ To delete a device, you have two options:
 
 - You need to be a global administrator or an Intune administrator in Azure AD to delete a device.
 - Deleting a device:
-   - Prevents a device from accessing your Azure AD resources. 
+   - Prevents a device from accessing your Azure AD resources.
    - Removes all details that are attached to the device, for example, BitLocker keys for Windows devices.  
    - Represents a non-recoverable activity and is not recommended unless it is required.
 
@@ -174,9 +174,9 @@ To view or copy the BitLocker keys, you need to be either the owner of the devic
 
 - Global Administrator
 - Helpdesk Administrator
-- Security Administrators
-- Security Readers
-- Intune Service Administrators
+- Security Administrator
+- Security Reader
+- Intune Service Administrator
 
 > [!NOTE]
 > Hybrid Azure AD Joined Windows 10 devices do not have an owner. So, if you are looking for a device by owner and didn't find it, search by the device ID.

articles/active-directory/devices/overview.md

@@ -16,7 +16,7 @@ ms.devlang: na
 ms.topic: overview
 ms.date: 06/04/2019
 ms.author: joflore
-ms.reviewer: jairoc
+ms.reviewer: sandeo
 #Customer intent: As an IT admin, I want to learn how to bring and manage device identities in Azure AD, so that I can ensure that my users are accessing my resources from devices that meet my standards for security and compliance.
 
 ms.collection: M365-identity-device-management
@@ -30,7 +30,7 @@ In a mobile-first, cloud-first world, Azure Active Directory (Azure AD) enables
 
 Through devices in Azure AD, your users are getting access to your corporate assets. To protect your corporate assets, as an IT administrator, you want to manage these devices identities. This enables you to make sure that your users are accessing your resources from devices that meet your standards for security and compliance.
 
-Device management is also the foundation for [device-based conditional access](../conditional-access/require-managed-devices.md). With device-based conditional access, you can ensure that access to resources in your environment is only possible with managed devices.
+Device identity management is also the foundation for [device-based conditional access](../conditional-access/require-managed-devices.md). With device-based conditional access, you can ensure that access to resources in your environment is only possible with managed devices.
 
 ## Getting devices in Azure AD
 
@@ -148,9 +148,9 @@ As a rule of a thumb, you should use:
 
 ## Next steps
 
-- To get an overview of how to manage device identities in the Azure portal, see [Managing devices identities using the Azure portal](device-management-azure-portal.md).
+- To get an overview of how to manage device identities in the Azure portal, see [Managing device identities using the Azure portal](device-management-azure-portal.md).
 - To set up:
    - Azure Active Directory registered Windows 10 devices, see [How to configure Azure Active Directory registered Windows 10 devices](../user-help/device-management-azuread-registered-devices-windows10-setup.md).
    - Azure Active Directory joined devices, see [How to plan your Azure Active Directory join implementation](azureadjoin-plan.md).
-   - Hybrid Azure AD joined devices, see [How to plan your hybrid Azure Active Directory join implementation](hybrid-azuread-join-plan.md).   
+   - Hybrid Azure AD joined devices, see [How to plan your hybrid Azure Active Directory join implementation](hybrid-azuread-join-plan.md).
 - To learn more about device-based conditional access, see [Configure Azure Active Directory device-based conditional access policies](../conditional-access/require-managed-devices.md).

articles/active-directory/user-help/user-help-auth-app-faq.md

@@ -38,7 +38,7 @@ The Microsoft Authenticator app replaced the Azure Authenticator app, and is the
 |I got a new device or restored my device from a backup. How do I set up my accounts in the Microsoft Authenticator app again?|If you’re running an iOS device, have turned on **iCloud Backup**, and have created a backup of your accounts on your old device; you can use that backup to recover your account credentials on your new device. For more info, see the [Backup and recover account credentials with the Microsoft Authenticator app](user-help-auth-app-backup-recovery.md) article.|
 |I lost my device or moved on to a new device. How do I make sure notifications don't continue to go to my old device?|Adding the Microsoft Authenticator app to your new device won't automatically remove the app from your old device. Even deleting the app from your old device isn't enough. You must both delete the app from your old device and tell Microsoft or your organization to forget the old device and unregister it from your account.<ul><li>**To remove the app from a device using a personal Microsoft account.** Go to the two-step verification area of your [Account Security](https://account.microsoft.com/security) page and choose to turn off verification for your old device.</li><li>**To remove the app from a device using a work or school Microsoft account.** Go to the two-step verification area of your [MyApps](https://myapps.microsoft.com/) page or to your organization’s custom portal and choose to turn off verification for your old device.</li></ul>|
 |How do I remove an account from the app?|<ul><li>**iOS.** From the main screen, select the menu button, then select **Edit accounts**. Tap the red icon next to the account name, and tap **Remove Account**.</li><li>**Android.** From the main screen, select the menu button, then **Edit accounts**. Tap the **X** next to the account name.</li></ul>If you have a device that is registered with your organization, you may need to complete an extra step to remove your account. On these devices, the Microsoft Authenticator app is automatically registered as a device administrator. If you want to completely uninstall the app, you need to first unregister the app in the app settings.|
-|Why does the app request so many permissions?|Here is a full list of permissions that can be asked for, and how they are used in the app. The specific permissions you see depend on the type of phone you have.<ul><li>**Camera.** Used to scan QR codes when you add a work, school, or non-Microsoft account.</li><li>**Contacts and phone.** Used to simplify the process by finding existing accounts on your phone when you sign in with your personal Microsoft account.</li><li>**SMS.** Used to make sure your phone number matches the number on record. When you sign in with your personal Microsoft account for the first time. We send a text message to the phone where you downloaded the app that includes a 6-8 digit verification code. Instead of asking you to find this code and enter it in the app, it's found in the text message for you.</li><li>**Draw over other apps.** The notification you get that verifies your identity is also displayed on any other app that might be running.</li><li>**Receive data from the internet.** This permission is required for sending notifications.</li><li>**Prevent phone from sleeping.** If you register your device with your organization, your organization can change this policy on your phone.</li><li>**Control vibration.** You can choose whether you would like a vibration whenever you receive a notification to verify your identity.</li><li>**Use fingerprint hardware.** Some work and school accounts require an additional PIN whenever you verify your identity. To make the process easier, we allow you to use your fingerprint instead of entering the PIN.</li><li> **View network connections.** When you add a Microsoft account, the app requires network/internet connection.</li><li>**Read the contents of your storage**. This permission is only used when you report a technical problem through the app settings. Some information from your storage is collected to diagnose the issue.</li><li>**Full network access.** This permission is required for sending notifications to verify your identity.</li><li>**Run at startup.** If you restart your phone, this permission ensures that you continue you receive notifications to verify your identity.</li></ul>|
+|Why does the app request so many permissions?|Here's the full list of permissions that might be asked for, and how they're used by the app. The specific permissions you see will depend on the type of phone you have.<ul><li>**Camera.** Used to scan QR codes when you add a work, school, or non-Microsoft account.</li><li>**Contacts and phone.** The app requires this permission so it can search for existing work or school Microsoft accounts on your phone and add them to the app, helping to ensure your account works properly. This permission also helps save you time while adding your personal Microsoft accounts, by automatically filling in some of the info for you, like your first and last name.</li><li>**SMS.** Used to make sure your phone number matches the number on record. When you sign in with your personal Microsoft account for the first time. We send a text message to the phone where you downloaded the app that includes a 6-8 digit verification code. Instead of asking you to find this code and enter it in the app, it's found in the text message for you.</li><li>**Draw over other apps.** The notification you get that verifies your identity is also displayed on any other app that might be running.</li><li>**Receive data from the internet.** This permission is required for sending notifications.</li><li>**Prevent phone from sleeping.** If you register your device with your organization, your organization can change this policy on your phone.</li><li>**Control vibration.** You can choose whether you would like a vibration whenever you receive a notification to verify your identity.</li><li>**Use fingerprint hardware.** Some work and school accounts require an additional PIN whenever you verify your identity. To make the process easier, we allow you to use your fingerprint instead of entering the PIN.</li><li> **View network connections.** When you add a Microsoft account, the app requires network/internet connection.</li><li>**Read the contents of your storage**. This permission is only used when you report a technical problem through the app settings. Some information from your storage is collected to diagnose the issue.</li><li>**Full network access.** This permission is required for sending notifications to verify your identity.</li><li>**Run at startup.** If you restart your phone, this permission ensures that you continue you receive notifications to verify your identity.</li></ul>|
 |Why does the Microsoft Authenticator app allow you to approve a request without unlocking the device?|You don't have to unlock your device to approve verification requests because all you need to prove is that you have your phone with you. Two-step verification requires proving two things – a thing you know, and a thing you have. The thing you know is your password. The thing you have is your phone (set up with the Microsoft Authenticator app and registered as an MFA proof.) Therefore, having the phone and approving the request meets the criteria for the second factor of authentication.|
 |Why aren’t all my accounts showing up when I open the Microsoft Authenticator app on my Apple Watch?|The Microsoft Authenticator app only supports using Microsoft personal or school or work accounts with push notifications on the Apple Watch companion app. For your other accounts, like Google or Facebook, you’ll have to open the authenticator app on your phone to view your verification codes.|
 |Why can’t I approve or deny notifications on my Apple Watch?|First, make sure you’ve upgraded to the Microsoft Authenticator app, version 6.0.0 or higher on your iPhone. After that, open the Microsoft Authenticator companion app on your Apple Watch and look for any accounts with a **Set Up** button beneath them. You must complete that set up process to approve notifications for those accounts.|