Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into melvyn-asc-alerts_ref

Author: memildin

.openpublishing.redirection.json

@@ -5705,6 +5705,11 @@
       "redirect_url": "/azure/connectors/connectors-create-api-sharepoint",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/connectors/connectors-native-query.md",
+      "redirect_url": "/azure/logic-apps/logic-apps-perform-data-operations#filter-array-action",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/logic-apps/logic-apps-enterprise-integration-as2-encode.md",
       "redirect_url": "/azure/logic-apps/logic-apps-enterprise-integration-as2",

articles/app-service/configure-authentication-provider-aad.md

@@ -26,9 +26,9 @@ Follow these best practices when setting up your app and authentication:
 
 ## <a name="express"> </a>Configure with express settings
 
-1. In the [Azure portal], go to your App Service app.
-1. Select **Settings** > **Authentication / Authorization** in the left pane, and make sure that **App Service Authentication** is **On**.
-1. Select **Azure Active Directory**, and then select **Express** under **Management Mode**.
+1. In the [Azure portal], search for and select **App Services**, and then select your app.
+1. In the left pane, under **Settings** select **Authentication / Authorization** and make sure that **App Service Authentication** is **On**.
+1. Select **Azure Active Directory**, and then under **Management Mode** select **Express**.
 1. Select **OK** to register the App Service app in Azure Active Directory. A new app registration is created.
 
    If you want to choose an existing app registration instead:
@@ -62,7 +62,7 @@ You'll need the following information when you configure your App Service app:
 
 Perform the following steps:
 
-1. Sign in to the [Azure portal] and go to your App Service app. Note your app's **URL**. You'll use it to configure your Azure Active Directory app registration.
+1. Sign in to the [Azure portal], search for and select **App Services**, and then select your app. Note your app's **URL**. You'll use it to configure your Azure Active Directory app registration.
 1. Select **Azure Active Directory** > **App registrations** > **New registration**.
 1. In the **Register an application** page, enter a **Name** for your app registration.
 1. In **Redirect URI**, select **Web** and enter the URL of your App Service app and append the path `/.auth/login/aad/callback`. For example, `https://contoso.azurewebsites.net/.auth/login/aad/callback`. 
@@ -83,8 +83,8 @@ Perform the following steps:
 
 ### <a name="secrets"> </a>Add Azure Active Directory information to your App Service app
 
-1. In the [Azure portal], go to your App Service app. 
-1. Select **Settings > Authentication / Authorization** in the left pane, and make sure that **App Service Authentication** is **On**.
+1. In the [Azure portal], search for and select **App Services**, and then select your app. 
+1. In the left pane, under **Settings**, select **Authentication / Authorization** and make sure that **App Service Authentication** is **On**.
 1. (Optional) By default, App Service authentication allows unauthenticated access to your app. To enforce user authentication, set **Action to take when request is not authenticated** to **Log in with Azure Active Directory**.
 1. Under Authentication Providers, select **Azure Active Directory**.
 1. In **Management mode**, select **Advanced** and configure App Service authentication according to the following table:

articles/app-service/configure-common.md

@@ -16,7 +16,11 @@ This topic explains how to configure common settings for web apps, mobile back e
 
 In App Service, app settings are variables passed as environment variables to the application code. For Linux apps and custom containers, App Service passes app settings to the container using the `--env` flag to set the environment variable in the container.
 
-In the [Azure portal], navigate to your app's management page. In the app's left menu, click **Configuration** > **Application settings**.
+In the [Azure portal], search for and select **App Services**, and then select your app. 
+
+![Search for App Services](./media/configure-common/search-for-app-services.png)
+
+In the app's left menu, select **Configuration** > **Application settings**.
 
 ![Application Settings](./media/configure-common/open-ui.png)
 
@@ -77,7 +81,7 @@ App settings have the following JSON formatting:
 
 ## Configure connection strings
 
-In the [Azure portal], navigate to the app's management page. In the app's left menu, click **Configuration** > **Application settings**.
+In the [Azure portal], search for and select **App Services**, and then select your app. In the app's left menu, select **Configuration** > **Application settings**.
 
 ![Application Settings](./media/configure-common/open-ui.png)
 
@@ -148,7 +152,7 @@ Connection strings have the following JSON formatting:
 
 ## Configure general settings
 
-In the [Azure portal], navigate to the app's management page. In the app's left menu, click **Configuration** > **Application settings**.
+In the [Azure portal], search for and select **App Services**, and then select your app. In the app's left menu, select **Configuration** > **General settings**.
 
 ![General settings](./media/configure-common/open-general.png)
 
@@ -171,19 +175,19 @@ Here, you can configure some common settings for the app. Some settings require
 
 This setting is only for Windows apps.
 
-In the [Azure portal], navigate to the app's management page. In the app's left menu, click **Configuration** > **Default documents**.
+In the [Azure portal], search for and select **App Services**, and then select your app. In the app's left menu, select **Configuration** > **Default documents**.
 
-![General settings](./media/configure-common/open-documents.png)
+![Default documents](./media/configure-common/open-documents.png)
 
 The default document is the web page that's displayed at the root URL for a website. The first matching file in the list is used. To add a new default document, click **New document**. Don't forget to click **Save**.
 
 If the app uses modules that route based on URL instead of serving static content, there is no need for default documents.
 
 ## Configure path mappings
 
-In the [Azure portal], navigate to the app's management page. In the app's left menu, click **Configuration** > **Path mappings**.
+In the [Azure portal], search for and select **App Services**, and then select your app. In the app's left menu, select **Configuration** > **Path mappings**.
 
-![General settings](./media/configure-common/open-path.png)
+![Path mappings](./media/configure-common/open-path.png)
 
 The **Path mappings** page shows you different things based on the OS type.
 

articles/app-service/deploy-staging-slots.md

@@ -28,7 +28,11 @@ To scale your app to a different tier, make sure that the target tier supports t
 ## Add a slot
 The app must be running in the **Standard**, **Premium**, or **Isolated** tier in order for you to enable multiple deployment slots.
 
-1. In the [Azure portal](https://portal.azure.com/), open your app's [resource page](../azure-resource-manager/management/manage-resources-portal.md#manage-resources).
+
+1. in the [Azure portal](https://portal.azure.com/), search for and select **App Services** and select your app. 
+   
+    ![Search for App Services](./media/web-sites-staged-publishing/search-for-app-services.png)
+   
 
 2. In the left pane, select **Deployment slots** > **Add Slot**.
 
@@ -237,7 +241,7 @@ After the setting is saved, the specified percentage of clients is randomly rout
 After a client is automatically routed to a specific slot, it's "pinned" to that slot for the life of that client session. On the client browser, you can see which slot your session is pinned to by looking at the `x-ms-routing-name` cookie in your HTTP headers. A request that's routed to the "staging" slot has the cookie `x-ms-routing-name=staging`. A request that's routed to the production slot has the cookie `x-ms-routing-name=self`.
 
    > [!NOTE]
-   > Next to the Azure Portal, you can also use the [`az webapp traffic-routing set`](/cli/azure/webapp/traffic-routing#az-webapp-traffic-routing-set) command in the Azure CLI to set the routing percentages from CI/CD tools like DevOps pipelines or other automation systems.
+   > Next to the Azure portal, you can also use the [`az webapp traffic-routing set`](/cli/azure/webapp/traffic-routing#az-webapp-traffic-routing-set) command in the Azure CLI to set the routing percentages from CI/CD tools like DevOps pipelines or other automation systems.
    > 
 
 ### Route production traffic manually
@@ -264,7 +268,7 @@ By default, new slots are given a routing rule of `0%`, shown in grey. When you
 
 ## Delete a slot
 
-Go to your app's resource page. Select **Deployment slots** > *\<slot to delete>* > **Overview**. Select **Delete** on the command bar.  
+Search for and select your app. Select **Deployment slots** > *\<slot to delete>* > **Overview**. Select **Delete** on the command bar.  
 
 ![Delete a deployment slot](./media/web-sites-staged-publishing/DeleteStagingSiteButton.png)
 
@@ -323,16 +327,16 @@ Get-AzLog -ResourceGroup [resource group name] -StartTime 2018-03-07 -Caller Slo
 Remove-AzResource -ResourceGroupName [resource group name] -ResourceType Microsoft.Web/sites/slots –Name [app name]/[slot name] -ApiVersion 2015-07-01
 ```
 
-## Automate with ARM templates
+## Automate with Resource Manager templates
 
-[ARM Templates](https://docs.microsoft.com/azure/azure-resource-manager/template-deployment-overview) are declarative JSON files used to automate the deployment and configuration of Azure resources. To swap slots using ARM templates, you will set two properties on the *Microsoft.Web/sites/slots* and *Microsoft.Web/sites* resources:
+[Azure Resource Manager templates](https://docs.microsoft.com/azure/azure-resource-manager/template-deployment-overview) are declarative JSON files used to automate the deployment and configuration of Azure resources. To swap slots by using Resource Manager templates, you will set two properties on the *Microsoft.Web/sites/slots* and *Microsoft.Web/sites* resources:
 
 - `buildVersion`: this is a string property which represents the current version of the app deployed in the slot. For example: "v1", "1.0.0.1", or "2019-09-20T11:53:25.2887393-07:00".
 - `targetBuildVersion`: this is a string property that specifies what `buildVersion` the slot should have. If the targetBuildVersion does not equal the current `buildVersion`, then this will trigger the swap operation by finding the slot which has the specified `buildVersion`.
 
-### Example ARM Template
+### Example Resource Manager template
 
-The following ARM template will update the `buildVersion` of the staging slot and set the `targetBuildVersion` on the production slot. This will swap the two slots. The template assumes you already have a webapp created with a slot named "staging".
+The following Resource Manager template will update the `buildVersion` of the staging slot and set the `targetBuildVersion` on the production slot. This will swap the two slots. The template assumes you already have a webapp created with a slot named "staging".
 
 ```json
 {
@@ -376,7 +380,7 @@ The following ARM template will update the `buildVersion` of the staging slot an
 }
 ```
 
-This ARM template is idempotent, meaning that it can be executed repeatedly and produce the same state of the slots. After the first execution, `targetBuildVersion` will match the current `buildVersion`, so a swap will not be triggered.
+This Resource Manager template is idempotent, meaning that it can be executed repeatedly and produce the same state of the slots. After the first execution, `targetBuildVersion` will match the current `buildVersion`, so a swap will not be triggered.
 
 <!-- ======== Azure CLI =========== -->
 

articles/app-service/media/configure-common/search-for-app-services.png

@@ -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/app-service/media/web-sites-staged-publishing/search-for-app-services.png

@@ -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-mabs-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-mars-troubleshoot.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
 ---