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

Banani-Rath · Banani-Rath · commit a0a6d655adf6 · 2019-10-14T11:31:35.000Z
diff --git a/articles/active-directory/authentication/concept-authentication-passwordless.md b/articles/active-directory/authentication/concept-authentication-passwordless.md
@@ -52,7 +52,7 @@ A security key **MUST** implement the following features and extensions from the
 | 3 | hmac-secret | This extension ensures you can sign in to your device when it's off-line or in airplane mode. |
 | 4 | Multiple accounts per RP | This feature ensures you can use the same security key across multiple services like Microsoft Account and Azure Active Directory. |
 
-The following providers offer FIDO2 security keys of different form factors that are known to be compatible with the paswordless experience. Microsoft encourages customers to evaluate the security properties of these keys by contacting the vendor as well as FIDO Alliance.
+The following providers offer FIDO2 security keys of different form factors that are known to be compatible with the passwordless experience. Microsoft encourages customers to evaluate the security properties of these keys by contacting the vendor as well as FIDO Alliance.
 
 | Provider | Contact |
 | --- | --- |
diff --git a/articles/app-service/webjobs-create.md b/articles/app-service/webjobs-create.md
@@ -1,13 +1,11 @@
 ﻿---
 title: Run Background tasks with WebJobs - Azure App Service
 description: Learn how to use WebJobs to run background tasks in Azure App Service web apps, API apps, or mobile apps.
-services: app-service
 author: ggailey777
-manager: jeconnoc
-editor: jimbe
-ms.assetid: af01771e-54eb-4aea-af5f-f883ff39572b
+manager: wgallace
+s.assetid: af01771e-54eb-4aea-af5f-f883ff39572b
 ms.service: app-service
-ms.topic: article
+ms.topic: conceptual
 ms.date: 10/16/2018
 ms.author: glenga
 ms.reviewer: msangapu;david.ebbo;suwatch;pbatum;naren.soni
@@ -18,14 +16,14 @@ ms.custom: seodec18
 
 # Run Background tasks with WebJobs in Azure App Service
 
+This article shows how to deploy WebJobs by using the [Azure portal](https://portal.azure.com) to upload an executable or script. For information about how to develop and deploy WebJobs by using Visual Studio, see [Deploy WebJobs using Visual Studio](webjobs-dotnet-deploy-vs.md).
+
 ## Overview
-WebJobs is a feature of [Azure App Service](https://docs.microsoft.com/azure/app-service/) that enables you to run a program or script in the same context as a web app, API app, or mobile app. There is no additional cost to use WebJobs.
+WebJobs is a feature of [Azure App Service](index.yml) that enables you to run a program or script in the same context as a web app, API app, or mobile app. There is no additional cost to use WebJobs.
 
 > [!IMPORTANT]
 > WebJobs is not yet supported for App Service on Linux.
 
-This article shows how to deploy WebJobs by using the [Azure portal](https://portal.azure.com) to upload an executable or script. For information about how to develop and deploy WebJobs by using Visual Studio, see [Deploy WebJobs using Visual Studio](webjobs-dotnet-deploy-vs.md).
-
 The Azure WebJobs SDK can be used with WebJobs to simplify many programming tasks. For more information, see [What is the WebJobs SDK](https://github.com/Azure/azure-webjobs-sdk/wiki).
 
 Azure Functions provides another way to run programs and scripts. For a comparison between WebJobs and Functions, see [Choose between Flow, Logic Apps, Functions, and WebJobs](../azure-functions/functions-compare-logic-apps-ms-flow-webjobs.md).
@@ -178,6 +176,8 @@ You can enter a [NCRONTAB expression](../azure-functions/functions-bindings-time
 
 To learn more, see [Scheduling a triggered WebJob](webjobs-dotnet-deploy-vs.md#scheduling-a-triggered-webjob).
 
+[!INCLUDE [webjobs-cron-timezone-note](../../includes/webjobs-cron-timezone-note.md)]
+
 ## <a name="ViewJobHistory"></a> View the job history
 
 1. Select the WebJob you want to see history for, and then select the **Logs** button.
diff --git a/articles/app-service/webjobs-dotnet-deploy-vs.md b/articles/app-service/webjobs-dotnet-deploy-vs.md
@@ -1,18 +1,12 @@
 ---
 title: Develop and deploy WebJobs using Visual Studio - Azure 
 description: Learn how to develop and deploy Azure WebJobs to Azure App Service using Visual Studio.
-services: app-service
-documentationcenter: ''
 author: ggailey777
-manager: jeconnoc
-
+manager: gwallace
 ms.assetid: a3a9d320-1201-4ac8-9398-b4c9535ba755
 ms.service: app-service
-ms.devlang: dotnet
-ms.topic: article
-ms.tgt_pltfrm: na
+ms.topic: conceptual
 ms.custom: vs-azure
-ms.workload: azure-vs
 ms.date: 02/18/2019
 ms.author: glenga
 ms.reviewer: david.ebbo;suwatch;pbatum;naren.soni
@@ -227,6 +221,8 @@ When you [create a WebJob from the Azure portal](webjobs-create.md), the setting
 
 WebJobs uses the same CRON expressions for scheduling as the timer trigger in Azure Functions. To learn more about CRON support, see the [timer trigger reference article](../azure-functions/functions-bindings-timer.md#ncrontab-expressions).
 
+[!INCLUDE [webjobs-cron-timezone-note](../../includes/webjobs-cron-timezone-note.md)]
+
 ### setting.job reference
 
 The following settings are supported by WebJobs:
diff --git a/articles/azure-maps/tutorial-search-location.md b/articles/azure-maps/tutorial-search-location.md
@@ -215,7 +215,7 @@ This section shows how to use the Maps [Search API](https://docs.microsoft.com/r
 4. You can see the raw data that the map is rendering by entering the following HTTPRequest in your browser. Replace \<Your Azure Maps Key\> with your primary key.
 
    ```http
-   https://atlas.microsoft.com/search/poi/json?api-version=2&query=gasoline%20station&subscription-key=<subscription-key>&lat=47.6292&lon=-122.2337&radius=100000
+   https://atlas.microsoft.com/search/poi/json?api-version=1.0&query=gasoline%20station&subscription-key=<subscription-key>&lat=47.6292&lon=-122.2337&radius=100000
    ```
 
 At this point, the MapSearch page can display the locations of points of interest that are returned from a fuzzy search query. Let's add some interactive capabilities and more information about the locations.
diff --git a/articles/azure-monitor/insights/network-performance-monitor.md b/articles/azure-monitor/insights/network-performance-monitor.md
@@ -47,6 +47,7 @@ NPM can monitor connectivity between networks and applications in any part of th
 * South UK
 * Central India
 * US Government Virginia
+* China East 2
 
 
 The list of supported regions for ExpressRoute Monitor is available in the [documentation](https://docs.microsoft.com/azure/expressroute/how-to-npm?utm_swu=8117).
diff --git a/articles/frontdoor/waf-front-door-rate-limit-powershell.md b/articles/frontdoor/waf-front-door-rate-limit-powershell.md
@@ -74,9 +74,7 @@ In the following example, the limit is set to 1000. Requests from any client to
 
 Find the name of the resource group that contains the Front Door profile using `Get-AzureRmResourceGroup`. Next, configure a security policy with a custom rate limit rule using [New-AzFrontDoorWafPolicy](/powershell/module/az.frontdoor/new-azfrontdoorwafpolicy) in the specified resource group that contains the Front Door profile.
 
-The below example uses the Resource Group name *myResourceGroupFD1* with the assumption that you have created the Front Door profile using instructions provided in the [Quickstart: Create a Front Door](quickstart-create-front-door.md) article.
-
- using [New-AzFrontDoorWafPolicy](/powershell/module/az.frontdoor/new-azfrontdoorwafpolicy).
+The below example uses the Resource Group name *myResourceGroupFD1* with the assumption that you have created the Front Door profile using instructions provided in the [Quickstart: Create a Front Door](quickstart-create-front-door.md) article using [New-AzFrontDoorWafPolicy](/powershell/module/az.frontdoor/new-azfrontdoorwafpolicy).
 
 ```powershell-interactive
    $ratePolicy = New-AzFrontDoorWafPolicy `
diff --git a/articles/service-fabric/service-fabric-application-scenarios.md b/articles/service-fabric/service-fabric-application-scenarios.md
@@ -70,7 +70,7 @@ Here's an example application that uses stateless services:
 ![Application that uses stateless services][Image1]
 
 Here's an example application that uses stateful services:
-![Application that uses stateless services][Image2]
+![Application that uses stateful services][Image2]
 
 ## Next steps
 
diff --git a/articles/virtual-machines/workloads/sap/hana-network-architecture.md b/articles/virtual-machines/workloads/sap/hana-network-architecture.md
@@ -135,7 +135,14 @@ By default deployment, three network routing considerations are important for SA
 * SAP HANA on Azure (Large Instances) units have an assigned IP address from the server IP pool address range that you submitted when requesting the HANA Large Instance deployment. For more information, see [SAP HANA (Large Instances) infrastructure and connectivity on Azure](hana-overview-infrastructure-connectivity.md?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json). This IP address is accessible through the Azure subscriptions and circuit  that connects Azure virtual networks to HANA Large Instances. The IP address assigned out of that server IP pool address range is directly assigned to the hardware unit. It's *not* assigned through NAT anymore, as was the case in the first deployments of this solution. 
 
 ### Direct Routing to HANA Large Instances
-By default the transitive routing between HANA Large Instance units and on-premise or between HANA Large Instance routing that are deployed in two different regions does not work. There are several possibilities to enable such a transitive routing.
+
+By default, the transitive routing does not work in these scenarios:
+
+* Between HANA Large Instance units and an on-premises deployment.
+
+* Between HANA Large Instance routing that are deployed in two different regions.
+
+There are three ways to enable transitive routing in those scenarios:
 
 - A reverse-proxy to route data, to and from. For example, F5 BIG-IP, NGINX with Traffic Manager deployed in the Azure virtual network that connects to HANA Large Instances and to on-premise as a virtual firewall/traffic routing solution.
 - Using [IPTables rules](http://www.linuxhomenetworking.com/wiki/index.php/Quick_HOWTO_%3a_Ch14_%3a_Linux_Firewalls_Using_iptables#.Wkv6tI3rtaQ) in a Linux VM to enable routing between on-premises locations and HANA Large Instance units, or between HANA Large Instance units in different regions. The VM running IPTables needs to be deployed in the Azure virtual network that connects to HANA Large Instances and to on-premise. The VM needs to be sized accordingly, so, that the network throughput of the VM is sufficient for the expected network traffic. For details on VM network bandwidth, check the article [Sizes of Linux virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/linux/sizes?toc=%2fazure%2fvirtual-network%2ftoc.json).
@@ -190,4 +197,4 @@ The figure shows how the different virtual networks in both regions are connecte
 > If you used multiple ExpressRoute circuits, AS Path prepending and Local Preference BGP settings should be used to ensure proper routing of traffic.
 
 **Next steps**
-- Refer [SAP HANA (Large Instances) storage architecture](hana-storage-architecture.md)
+- Refer [SAP HANA (Large Instances) storage architecture](hana-storage-architecture.md)
diff --git a/includes/webjobs-cron-timezone-note.md b/includes/webjobs-cron-timezone-note.md
@@ -0,0 +1,10 @@
+---
+author: ggailey777
+ms.service: app-service
+ms.topic: include
+ms.date: 10/13/2019
+ms.author: glenga
+---
+
+> [!NOTE]  
+> The default time zone used to run CRON expressions is Coordinated Universal Time (UTC). To have your CRON expression run based on another time zone, create an app setting for your function app named WEBSITE_TIME_ZONE. To learn more, see [NCRONTAB time zones](../articles/azure-functions/functions-bindings-timer.md#ncrontab-time-zones).
