Merge pull request #100140 from MicrosoftDocs/master

Merge Master to Live, 3 AM

Author: PMEds28

articles/active-directory/devices/azureadjoin-plan.md

@@ -73,7 +73,7 @@ When you're using AD FS, you need to enable the following WS-Trust endpoints:
  `/adfs/services/trust/2005/certificatemixed`
  `/adfs/services/trust/13/certificatemixed`
 
-If your identity provider does not support these protocols, Azure AD join does not work natively. Beginning with  Windows 10 1809, your users can sign in to an Azure AD joined device with a SAML-based identity provider through [web sign-in on Windows 10](https://docs.microsoft.com/windows/whats-new/whats-new-windows-10-version-1809#web-sign-in-to-windows-10). Currently, web sign-in is a preview feature and is not recommended for production deployments.
+If your identity provider does not support these protocols, Azure AD join does not work natively. Beginning with  Windows 10 1809, your users can sign in to an Azure AD joined device with a SAML-based identity provider through [web sign-in on Windows 10](https://docs.microsoft.com/windows/whats-new/whats-new-windows-10-version-1809#web-sign-in-to-windows-10). Currently, web sign-in is a preview feature and is not meant for production deployments.
 
 >[!NOTE]
 > Currently, Azure AD join does not work with [AD FS 2019 configured with external authentication providers as the primary authentication method](https://docs.microsoft.com/windows-server/identity/ad-fs/operations/additional-authentication-methods-ad-fs#enable-external-authentication-methods-as-primary). Azure AD join defaults to password authentication as the primary method, which results in authentication failures in this scenario

articles/azure-app-configuration/concept-disaster-recovery.md

@@ -1,18 +1,11 @@
 ---
-title: Azure App Configuration resiliency and disaster recovery | Microsoft Docs
-description: An overview of how to implement resiliency and disaster recovery with Azure App Configuration.
-services: azure-app-configuration
-documentationcenter: ''
+title: Azure App Configuration resiliency and disaster recovery
+description: Lean how to implement resiliency and disaster recovery with Azure App Configuration.
 author: yegu-ms
-manager: maiye
-editor: ''
-
+ms.author: yegu
 ms.service: azure-app-configuration
-ms.devlang: na
-ms.topic: overview
-ms.workload: tbd
+ms.topic: conceptual
 ms.date: 05/29/2019
-ms.author: yegu
 ---
 
 # Resiliency and disaster recovery

articles/azure-app-configuration/howto-integrate-azure-managed-service-identity.md

@@ -1,19 +1,12 @@
 ---
-title: Integrate with Azure managed identities | Microsoft Docs
+title: Integrate with Azure managed identities 
 description: Learn how to use Azure managed identities to authenticate with and gain access to Azure App Configuration
 services: azure-app-configuration
-documentationcenter: ''
 author: yegu-ms
-manager: balans
-editor: ''
-
-ms.assetid: 
+ms.author: yegu
 ms.service: azure-app-configuration
-ms.workload: tbd
-ms.devlang: na
 ms.topic: conceptual
 ms.date: 02/24/2019
-ms.author: yegu
 
 ---
 # Integrate with Azure Managed Identities

articles/azure-monitor/platform/itsmc-connections.md

@@ -176,7 +176,7 @@ The following sections provide details about how to connect your ServiceNow prod
 ### Prerequisites
 Ensure the following prerequisites are met:
 - ITSMC installed. More information: [Adding the IT Service Management Connector Solution](../../azure-monitor/platform/itsmc-overview.md#adding-the-it-service-management-connector-solution).
-- ServiceNow supported versions: Madrid, London, Kingston, Jakarta, Istanbul, Helsinki, Geneva.
+- ServiceNow supported versions: New York, Madrid, London, Kingston, Jakarta, Istanbul, Helsinki, Geneva.
 
 **ServiceNow Admins must do the following in their ServiceNow instance**:
 - Generate client ID and client secret for the ServiceNow product. For information on how to generate client ID and secret, see the following information as required:

articles/azure-resource-manager/management/tag-resources.md

@@ -2,7 +2,7 @@
 title: Tag resources for logical organization
 description: Shows how to apply tags to organize Azure resources for billing and managing.
 ms.topic: conceptual
-ms.date: 12/27/2019
+ms.date: 01/03/2020
 ---
 # Use tags to organize your Azure resources
 

articles/azure-resource-manager/templates/template-functions-resource.md

@@ -665,7 +665,7 @@ The **managedBy** property is returned only for resource groups that contain res
 
 ### Remarks
 
-The `resourceGroup()` function can't be used in a template that is [deployed at the subscription level](deploy-to-subscription.md). It can only be used in templates that are deployed to a resource group.
+The `resourceGroup()` function can't be used in a template that is [deployed at the subscription level](deploy-to-subscription.md). It can only be used in templates that are deployed to a resource group. You can use the `resourceGroup()` function in a [linked or nested template (with inner scope)](linked-templates.md) that targets a resource group, even when the parent template is deployed to the subscription. In that scenario, the linked or nested template is deployed at the resource group level. For more information about targeting a resource group in a subscription level deployment, see [Deploy Azure resources to more than one subscription or resource group](cross-resource-group-deployment.md).
 
 A common use of the resourceGroup function is to create resources in the same location as the resource group. The following example uses the resource group location for a default parameter value.
 

articles/backup/backup-azure-mabs-troubleshoot.md

@@ -2,7 +2,7 @@
 title: Troubleshoot Azure Backup Server
 description: Troubleshoot installation, registration of Azure Backup Server, and backup and restore of application workloads.
 ms.reviewer: srinathv
-ms.topic: conceptual
+ms.topic: troubleshooting
 ms.date: 07/05/2019
 ---
 

articles/backup/backup-azure-mars-troubleshoot.md

@@ -2,7 +2,7 @@
 title: Troubleshoot the Azure Backup agent
 description: In this article, learn how to troubleshoot the installation and registration of the Azure Backup agent.
 ms.reviewer: saurse
-ms.topic: conceptual
+ms.topic: troubleshooting
 ms.date: 07/15/2019
 ---
 

articles/backup/backup-azure-sap-hana-database-troubleshoot.md

@@ -1,9 +1,7 @@
 ---
-
-
 title: Troubleshoot SAP HANA databases backup errors
 description: Describes how to troubleshoot common errors that might occur when you use Azure Backup to back up SAP HANA databases.
-ms.topic: conceptual
+ms.topic: troubleshooting
 ms.date: 11/7/2019
 ---
 
@@ -81,27 +79,27 @@ Take care of inputs while restoring a single container database (SDC) for HANA t
 
 Assume an SDC HANA instance "H21" is backed up. The backup items page will show the backup item name as **"h21(sdc)"**. If you attempt to restore this database to another target SDC, say H11, then following inputs need to be provided.
 
-![SDC restore inputs](media/backup-azure-sap-hana-database/hana-sdc-restore.png)
+![Restored SDC database name](media/backup-azure-sap-hana-database/hana-sdc-restore.png)
 
 Note the following points:
 
-- By default, the restored db name will be populated with the backup item name i.e., h21(sdc)
+- By default, the restored db name will be populated with the backup item name. In this case, h21(sdc).
 - Selecting the target as H11 will NOT change the restored db name automatically. **It should be edited to h11(sdc)**. Regarding SDC, the restored db name will be the target instance ID with lowercase letters and 'sdc' appended in brackets.
 - Since SDC can have only single database, you also need to click the checkbox to allow override of the existing database data with the recovery point data.
-- Linux is case-sensitive. Therefore, be careful to preserve the case.
+- Linux is case-sensitive. So be careful to preserve the case.
 
 ### Multiple Container Database (MDC) restore
 
-In multiple container databases for HANA, the standard configuration is SYSTEMDB + 1 or more Tenant DBs. Restoring an entire SAP HANA instance means to restore both SYSTEMDB and Tenant DBs. One restores SYSTEMDB first and then proceeds for Tenant DB. System DB essentially means to override the system information on the selected target. This restore also overrides the BackInt related information in the target instance. Therefore, after the system DB is restored to a target instance, one needs to run the pre-registration script again. Only then the subsequent tenant DB restores will succeed.
+In multiple container databases for HANA, the standard configuration is SYSTEMDB + 1 or more Tenant DBs. Restoring an entire SAP HANA instance means to restore both SYSTEMDB and Tenant DBs. One restores SYSTEMDB first and then proceeds for Tenant DB. System DB essentially means to override the system information on the selected target. This restore also overrides the BackInt related information in the target instance. So after the system DB is restored to a target instance, run the pre-registration script again. Only then the subsequent tenant DB restores will succeed.
 
 ## Upgrading from SAP HANA 1.0 to 2.0
 
-If you're protecting SAP HANA 1.0 databases and wish to upgrade to 2.0, then perform the steps outlined below:
+If you're protecting SAP HANA 1.0 databases and wish to upgrade to 2.0, then perform the following steps:
 
 - [Stop protection](sap-hana-db-manage.md#stop-protection-for-an-sap-hana-database) with retain data for old SDC database.
 - Perform the upgrade. After completion, the HANA is now MDC with a system DB and tenant DB(s)
 - Rerun [pre-registration script](https://aka.ms/scriptforpermsonhana) with correct details of (sid and mdc).
-- Re-register extension for the same machine in Azure Portal (Backup -> view details -> Select the relevant Azure VM -> Re-register).
+- Re-register extension for the same machine in Azure portal (Backup -> view details -> Select the relevant Azure VM -> Re-register).
 - Click Rediscover DBs for the same VM. This action should show the new DBs in step 2 with correct details (SYSTEMDB and Tenant DB, not SDC).
 - Configure backup for these new databases.
 

articles/backup/backup-azure-scdpm-troubleshooting.md

@@ -1,7 +1,7 @@
 ---
 title: Troubleshoot System Center Data Protection Manager
 description: In this article, discover solutions for issues that you might encounter while using System Center Data Protection Manager.
-ms.topic: conceptual
+ms.topic: troubleshooting
 ms.date: 01/30/2019
 ---