Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into tutorial-message-enrichments

paulth1 · paulth1 · commit 6d94e6d93130 · 2020-01-15T12:50:04.000-08:00
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
diff --git a/articles/cosmos-db/understand-your-bill.md b/articles/cosmos-db/understand-your-bill.md
@@ -17,7 +17,8 @@ With Azure Cosmos DB, you are billed hourly based on the provisioned throughput
 
 This article uses some examples to help you understand the details you see on the monthly bill. The numbers shown in the examples may be different if your Azure Cosmos containers have a different amount of throughput provisioned, if they span across multiple regions or run for a different for a period over a month.
 
->!Note: Billing is for any portion of a wall-clock hour, not a 60 minute duration.
+> [!NOTE]
+> Billing is for any portion of a wall-clock hour, not a 60 minute duration.
 
 ## Billing examples
 
diff --git a/articles/iot-hub/quickstart-device-streams-proxy-csharp.md b/articles/iot-hub/quickstart-device-streams-proxy-csharp.md
@@ -147,7 +147,7 @@ dotnet run {DeviceConnectionString} localhost 22
 
 ### Run the service-local proxy application
 
-In another local terminal window, navigate to `device-streams-proxy/service` in your unzipped project folder. Keep the following information handy:
+In another local terminal window, navigate to `iot-hub/quickstarts/device-streams-proxy/service` in your unzipped project folder. Keep the following information handy:
 
 | Parameter name | Parameter value |
 |----------------|-----------------|
diff --git a/articles/load-balancer/load-balancer-ipv6-internet-cli.md b/articles/load-balancer/load-balancer-ipv6-internet-cli.md
@@ -19,8 +19,8 @@ ms.author: allensu
 # Create a public load balancer with IPv6 using Azure CLI
 
 >[!NOTE] 
->This article describes an introductory IPv6 feature to allow Basic Load Balancers to provide both IPv4 and IPv6 connectivity.  More comprehensive IPv6 connectivity is now available with [IPv6 for Azure VNETs](../virtual-network/ipv6-overview.md) which integrates IPv6 connectivity with your Virtual Networks and includes key features such as IPv6 Network Security Group rules, IPv6 User-defined routing, IPv6 Basic and Standard load balancing, and more.  IPv6 for Azure VNETs is the recommended standard for IPv6 applications in Azure. 
-Please see [IPv6 for Azure VNET Powershell Deployment](../virtual-network/virtual-network-ipv4-ipv6-dual-stack-standard-load-balancer-powershell.md) 
+>This article describes an introductory IPv6 feature to allow Basic Load Balancers to provide both IPv4 and IPv6 connectivity. Comprehensive IPv6 connectivity is now available with [IPv6 for Azure VNETs](../virtual-network/ipv6-overview.md) which integrates IPv6 connectivity with your Virtual Networks and includes key features such as IPv6 Network Security Group rules, IPv6 User-defined routing, IPv6 Basic and Standard load balancing, and more.  IPv6 for Azure VNETs is the recommended standard for IPv6 applications in Azure. 
+See [IPv6 for Azure VNET Powershell Deployment](../virtual-network/virtual-network-ipv4-ipv6-dual-stack-standard-load-balancer-powershell.md) 
 
 An Azure load balancer is a Layer-4 (TCP, UDP) load balancer. Load balancers provide high availability by distributing incoming traffic among healthy service instances in cloud services or virtual machines in a load balancer set. Load balancers can also present these services on multiple ports or multiple IP addresses or both.
 
diff --git a/articles/load-balancer/load-balancer-ipv6-internet-ps.md b/articles/load-balancer/load-balancer-ipv6-internet-ps.md
@@ -24,8 +24,8 @@ ms.author: allensu
 > * [Template](load-balancer-ipv6-internet-template.md)
 
 >[!NOTE] 
->This article describes an introductory IPv6 feature to allow Basic Load Balancers to provide both IPv4 and IPv6 connectivity.  More comprehensive IPv6 connectivity is now available with [IPv6 for Azure VNETs](../virtual-network/ipv6-overview.md) which integrates IPv6 connectivity with your Virtual Networks and includes key features such as IPv6 Network Security Group rules, IPv6 User-defined routing, IPv6 Basic and Standard load balancing, and more.  IPv6 for Azure VNETs is the recommended standard for IPv6 applications in Azure. 
-Please see [IPv6 for Azure VNET Powershell Deployment](../virtual-network/virtual-network-ipv4-ipv6-dual-stack-standard-load-balancer-powershell.md) 
+>This article describes an introductory IPv6 feature to allow Basic Load Balancers to provide both IPv4 and IPv6 connectivity. Comprehensive IPv6 connectivity is now available with [IPv6 for Azure VNETs](../virtual-network/ipv6-overview.md) which integrates IPv6 connectivity with your Virtual Networks and includes key features such as IPv6 Network Security Group rules, IPv6 User-defined routing, IPv6 Basic and Standard load balancing, and more.  IPv6 for Azure VNETs is the recommended standard for IPv6 applications in Azure. 
+See [IPv6 for Azure VNET Powershell Deployment](../virtual-network/virtual-network-ipv4-ipv6-dual-stack-standard-load-balancer-powershell.md) 
 
 An Azure load balancer is a Layer-4 (TCP, UDP) load balancer. The load balancer provides high availability by distributing incoming traffic among healthy service instances in cloud services or virtual machines in a load balancer set. Azure Load Balancer can also present those services on multiple ports, multiple IP addresses, or both.
 
diff --git a/articles/load-balancer/load-balancer-ipv6-internet-template.md b/articles/load-balancer/load-balancer-ipv6-internet-template.md
@@ -25,8 +25,8 @@ ms.author: allensu
 
 
 >[!NOTE] 
->This article describes an introductory IPv6 feature to allow Basic Load Balancers to provide both IPv4 and IPv6 connectivity.  More comprehensive IPv6 connectivity is now available with [IPv6 for Azure VNETs](../virtual-network/ipv6-overview.md) which integrates IPv6 connectivity with your Virtual Networks and includes key features such as IPv6 Network Security Group rules, IPv6 User-defined routing, IPv6 Basic and Standard load balancing, and more.  IPv6 for Azure VNETs is the recommended standard for IPv6 applications in Azure. 
-Please see [IPv6 for Azure VNET Powershell Deployment](../virtual-network/virtual-network-ipv4-ipv6-dual-stack-standard-load-balancer-powershell.md) 
+>This article describes an introductory IPv6 feature to allow Basic Load Balancers to provide both IPv4 and IPv6 connectivity. Comprehensive IPv6 connectivity is now available with [IPv6 for Azure VNETs](../virtual-network/ipv6-overview.md) which integrates IPv6 connectivity with your Virtual Networks and includes key features such as IPv6 Network Security Group rules, IPv6 User-defined routing, IPv6 Basic and Standard load balancing, and more.  IPv6 for Azure VNETs is the recommended standard for IPv6 applications in Azure. 
+See [IPv6 for Azure VNET Powershell Deployment](../virtual-network/virtual-network-ipv4-ipv6-dual-stack-standard-load-balancer-powershell.md)  
 
 An Azure load balancer is a Layer-4 (TCP, UDP) load balancer. The load balancer provides high availability by distributing incoming traffic among healthy service instances in cloud services or virtual machines in a load balancer set. Azure Load Balancer can also present those services on multiple ports, multiple IP addresses, or both.
 
diff --git a/articles/load-balancer/load-balancer-overview.md b/articles/load-balancer/load-balancer-overview.md
@@ -37,7 +37,7 @@ An **[internal (or private) load balancer](./concepts-limitations.md#internalloa
 For more information on the individual load balancer components, see [Azure Load Balancer components and limitations](./concepts-limitations.md)
 
 >[!NOTE]
-> Microsoft recommends Standard Load Balancer.
+> Microsoft recommends [Standard Load Balancer](./load-balancer-standard-overview.md).
 Standalone VMs, availability sets, and virtual machine scale sets can be connected to only one SKU, never both. Load Balancer and the public IP address SKU must match when you use them with public IP addresses. Load Balancer and public IP SKUs aren't mutable.
 
 ## Why use Azure Load Balancer?
diff --git a/articles/sql-database/media/sql-database-service-tiers-vcore/change-managed-instance-hardware.png b/articles/sql-database/media/sql-database-service-tiers-vcore/change-managed-instance-hardware.png
diff --git a/articles/sql-database/sql-database-managed-instance-configure-replication-tutorial.md b/articles/sql-database/sql-database-managed-instance-configure-replication-tutorial.md
@@ -195,7 +195,7 @@ USE [master]
 GO
 
 -- Drop database if it exists
-IF EXISTS (SELECT *FROM sys.sysdatabases WHERE name = 'ReplTutorial')
+IF EXISTS (SELECT * FROM sys.sysdatabases WHERE name = 'ReplTutorial')
 BEGIN
     DROP DATABASE ReplTutorial
 END
diff --git a/articles/sql-database/sql-database-service-tiers-vcore.md b/articles/sql-database/sql-database-service-tiers-vcore.md
@@ -136,6 +136,16 @@ On the **Basics** tab, select the **Configure database** link in the **Compute +
   
 **To change the hardware generation of an existing managed instance**
 
+# [Portal](#tab/azure-portal)
+
+From the managed instance page, select **Pricing tier** link placed under the Settings section
+
+![change managed instance hardware](media/sql-database-service-tiers-vcore/change-managed-instance-hardware.png)
+
+On the **Pricing tier** page you will be able to change hardware generation as described in the previous steps.
+
+# [PowerShell](#tab/azure-powershell)
+
 Use the following PowerShell script:
 
 ```powershell-interactive
@@ -170,7 +180,9 @@ $properties = New-Object System.Object
 Set-AzResource -Properties $properties -ResourceName $instanceName -ResourceType "Microsoft.SQL/managedInstances" -Sku $sku -ResourceGroupName $resourceGroup -Force -ApiVersion "2015-05-01-preview"
 ```
 
-Make sure to enter your subscription id, name, and resource group of the managed instance.
+Make sure to enter your subscription ID, name, and resource group of the managed instance.
+
+---
 
 ### Hardware availability
 
@@ -209,9 +221,9 @@ On the **Basics** page, provide the following:
 
 On the **Details** page, provide the following:
 
-5. In the **PROBLEM DETAILS** section select the **Provide details** link. 
-6. For **SQL Database quota type** select **M-series**.
-7. For **Region**, select the region to enable M-series.
+1. In the **PROBLEM DETAILS** section select the **Provide details** link. 
+2. For **SQL Database quota type** select **M-series**.
+3. For **Region**, select the region to enable M-series.
     For regions where M-series is available, see [M-series availability](#m-series).
 
 Approved support requests are typically fulfilled within 5 business days.
diff --git a/articles/virtual-machines/troubleshooting/troubleshooting-throttling-errors.md b/articles/virtual-machines/troubleshooting/troubleshooting-throttling-errors.md
@@ -23,7 +23,7 @@ Azure Compute requests may be throttled at a subscription and on a per-region ba
 
 ## Throttling by Azure Resource Manager vs Resource Providers  
 
-As the front door to Azure, Azure Resource Manager does the authentication and first-order validation and throttling of all incoming API requests. Azure Resource Manager call rate limits and related diagnostic response HTTP headers are described [here](https://docs.microsoft.com/azure/azure-resource-manager/resource-manager-request-limits).
+As the front door to Azure, Azure Resource Manager does the authentication and first-order validation and throttling of all incoming API requests. Azure Resource Manager call rate limits and related diagnostic response HTTP headers are described [here](https://docs.microsoft.com/azure/azure-resource-manager/management/request-limits-and-throttling).
  
 When an Azure API client gets a throttling error, the HTTP status is 429 Too Many Requests. To understand if the request throttling is done by Azure Resource Manager or an underlying resource provider like CRP, inspect the `x-ms-ratelimit-remaining-subscription-reads` for GET requests and `x-ms-ratelimit-remaining-subscription-writes` response headers for non-GET requests. If the remaining call count is approaching 0, the subscription’s general call limit defined by Azure Resource Manager has been reached. Activities by all subscription clients are counted together. Otherwise, the throttling is coming from the target resource provider (the one addressed by the `/providers/<RP>` segment of the request URL). 
 
diff --git a/articles/vpn-gateway/media/point-to-site-vpn-client-configuration-azure-cert/catalina.png b/articles/vpn-gateway/media/point-to-site-vpn-client-configuration-azure-cert/catalina.png
diff --git a/articles/vpn-gateway/point-to-site-vpn-client-configuration-azure-cert.md b/articles/vpn-gateway/point-to-site-vpn-client-configuration-azure-cert.md
@@ -6,7 +6,7 @@ services: vpn-gateway
 author: cherylmc
 ms.service: vpn-gateway
 ms.topic: article
-ms.date: 01/10/2020
+ms.date: 01/15/2020
 ms.author: cherylmc
 ---
 
@@ -94,9 +94,14 @@ Use the following steps to configure the native VPN client on Mac for certificat
 4. In the **Generic** folder, from the **VpnSettings.xml** file, copy the **VpnServer** tag value. Paste this value in the **Server Address** and **Remote ID** fields of the profile.
 
    ![server info](./media/point-to-site-vpn-client-configuration-azure-cert/server.png)
-5. Click **Authentication Settings** and select **Certificate**. 
+5. Click **Authentication Settings** and select **Certificate**. For **Catalina**, click **None** and then **certificate**
 
    ![authentication settings](./media/point-to-site-vpn-client-configuration-azure-cert/authsettings.png)
+
+   * For Catalina, select **None** and then **Certificate**. **Select** the correct certificate:
+   
+   ![catalina](./media/point-to-site-vpn-client-configuration-azure-cert/catalina.png)
+
 6. Click **Select…** to choose the client certificate that you want to use for authentication. This is the certificate that you installed in Step 2.
 
    ![certificate](./media/point-to-site-vpn-client-configuration-azure-cert/certificate.png)
diff --git a/articles/vpn-gateway/vpn-gateway-create-site-to-site-rm-powershell.md b/articles/vpn-gateway/vpn-gateway-create-site-to-site-rm-powershell.md
@@ -7,7 +7,7 @@ author: cherylmc
 
 ms.service: vpn-gateway
 ms.topic: conceptual
-ms.date: 07/31/2019
+ms.date: 01/15/2020
 ms.author: cherylmc
 
 ---
@@ -29,23 +29,15 @@ A Site-to-Site VPN gateway connection is used to connect your on-premises networ
 
 ## <a name="before"></a>Before you begin
 
-[!INCLUDE [updated-for-az](../../includes/updated-for-az.md)]
-
 Verify that you have met the following criteria before beginning your configuration:
 
 * Make sure you have a compatible VPN device and someone who is able to configure it. For more information about compatible VPN devices and device configuration, see [About VPN Devices](vpn-gateway-about-vpn-devices.md).
 * Verify that you have an externally facing public IPv4 address for your VPN device.
 * If you are unfamiliar with the IP address ranges located in your on-premises network configuration, you need to coordinate with someone who can provide those details for you. When you create this configuration, you must specify the IP address range prefixes that Azure will route to your on-premises location. None of the subnets of your on-premises network can over lap with the virtual network subnets that you want to connect to.
 
-[!INCLUDE [cloud-shell-try-it.md](../../includes/cloud-shell-try-it.md)]
-
-### Running PowerShell locally
-
-If you choose to install and use the PowerShell locally, install the latest version of the Azure Resource Manager PowerShell cmdlets. PowerShell cmdlets are updated frequently and you will typically need to update your PowerShell cmdlets to get the latest feature functionality. If you don't update your PowerShell cmdlets, the values specify may fail. 
-
-To find the version you are using, run 'Get-Module -ListAvailable Az'. If you need to upgrade, see [Install the Azure PowerShell module](/powershell/azure/install-az-ps). For more information, see [How to install and configure Azure PowerShell](/powershell/azure/overview).
-If you are running PowerShell locally, you also need to run 'Connect-AzAccount' to create a connection with Azure.
+### Azure PowerShell
 
+[!INCLUDE [powershell](../../includes/vpn-gateway-cloud-shell-powershell-about.md)]
 
 ### <a name="example"></a>Example values
 
@@ -254,6 +246,15 @@ If the IP address prefixes that you want routed to your on-premises location cha
 
 [!INCLUDE [Modify gateway IP address](../../includes/vpn-gateway-modify-lng-gateway-ip-rm-include.md)]
 
+## <a name="deleteconnection"></a>To delete a gateway connection
+
+If you don't know the name of your connection, you can find it by using the 'Get-AzVirtualNetworkGatewayConnection' cmdlet.
+
+```azurepowershell-interactive
+Remove-AzVirtualNetworkGatewayConnection -Name VNet1toSite1 `
+-ResourceGroupName TestRG1
+```
+
 ## Next steps
 
 *  Once your connection is complete, you can add virtual machines to your virtual networks. For more information, see [Virtual Machines](https://docs.microsoft.com/azure/).
diff --git a/articles/vpn-gateway/vpn-gateway-howto-point-to-site-rm-ps.md b/articles/vpn-gateway/vpn-gateway-howto-point-to-site-rm-ps.md
@@ -7,7 +7,7 @@ author: cherylmc
 
 ms.service: vpn-gateway
 ms.topic: conceptual
-ms.date: 09/09/2019
+ms.date: 01/15/2020
 ms.author: cherylmc
 
 ---
@@ -28,13 +28,15 @@ Point-to-Site native Azure certificate authentication connections use the follow
 
 ## Before you begin
 
-[!INCLUDE [updated-for-az](../../includes/updated-for-az.md)]
-
 Verify that you have an Azure subscription. If you don't already have an Azure subscription, you can activate your [MSDN subscriber benefits](https://azure.microsoft.com/pricing/member-offers/msdn-benefits-details) or sign up for a [free account](https://azure.microsoft.com/pricing/free-trial).
 
+### Azure PowerShell
+
 [!INCLUDE [powershell](../../includes/vpn-gateway-cloud-shell-powershell-about.md)]
 
-Most of the steps in this article can use Cloud Shell. However, to upload the root certificate public key, you must either use PowerShell locally, or the Azure portal.
+>[!NOTE]
+> Most of the steps in this article can use Azure Cloud Shell. However, to upload the root certificate public key, you must either use PowerShell locally, or the Azure portal.
+>
 
 ### <a name="example"></a>Example values
 
@@ -166,7 +168,9 @@ If you use self-signed certificates, they must be created using specific paramet
 
 Verify that your VPN gateway has finished creating. Once it has completed, you can upload the .cer file (which contains the public key information) for a trusted root certificate to Azure. Once a.cer file is uploaded, Azure can use it to authenticate clients that have installed a client certificate generated from the trusted root certificate. You can upload additional trusted root certificate files - up to a total of 20 - later, if needed.
 
-You can't upload this information using Azure Cloud Shell. You can either use PowerShell locally on your computer, the [Azure portal steps](vpn-gateway-howto-point-to-site-resource-manager-portal.md#uploadfile).
+>[!NOTE]
+> You can't upload the .cer file using Azure Cloud Shell. You can either use PowerShell locally on your computer, or you can use the [Azure portal steps](vpn-gateway-howto-point-to-site-resource-manager-portal.md#uploadfile).
+>
 
 1. Declare the variable for your certificate name, replacing the value with your own.
 
@@ -181,7 +185,7 @@ You can't upload this information using Azure Cloud Shell. You can either use Po
    $CertBase64 = [system.convert]::ToBase64String($cert.RawData)
    $p2srootcert = New-AzVpnClientRootCertificate -Name $P2SRootCertName -PublicCertData $CertBase64
    ```
-3. Upload the public key information to Azure. Once the certificate information is uploaded, Azure considers it to be a trusted root certificate.
+3. Upload the public key information to Azure. Once the certificate information is uploaded, Azure considers it to be a trusted root certificate. When uploading, make sure you are running PowerShell locally on your computer, or instead, you can use the [Azure portal steps](vpn-gateway-howto-point-to-site-resource-manager-portal.md#uploadfile). You can't upload using Azure Cloud Shell.
 
    ```azurepowershell
    Add-AzVpnClientRootCertificate -VpnClientRootCertificateName $P2SRootCertName -VirtualNetworkGatewayname "VNet1GW" -ResourceGroupName "TestRG" -PublicCertData $CertBase64
diff --git a/articles/vpn-gateway/vpn-gateway-howto-setup-alerts-virtual-network-gateway-log.md b/articles/vpn-gateway/vpn-gateway-howto-setup-alerts-virtual-network-gateway-log.md
@@ -52,10 +52,9 @@ The following example steps will create an alert for a disconnection event that
 6. Fill in the details, and ensure that **Send to Log Analytics** and **TunnelDiagnosticLog** are selected. Choose the Log Analytics Workspace that you created in step 3.
 
    ![Selected check boxes](./media/vpn-gateway-howto-setup-alerts-virtual-network-gateway-log/log-alert5.png  "Select")
-   
-> [!NOTE]
-> It may take a few hours for the data to show up initially.
->
+
+   > [!NOTE]
+   > It may take a few hours for the data to show up initially.
 
 7. Go to the overview for the virtual network gateway resource and select **Alerts** from the **Monitoring** tab. Then create a new alert rule or edit an existing alert rule.
 
diff --git a/includes/vpn-gateway-cloud-shell-powershell-about.md b/includes/vpn-gateway-cloud-shell-powershell-about.md
@@ -28,3 +28,5 @@ You can launch Azure Cloud Shell with:
 **Running PowerShell locally**
 
 You can also install and run the Azure PowerShell cmdlets locally on your computer. PowerShell cmdlets are updated frequently. If you are not running the latest version, the values specified in the instructions may fail. To find the versions of Azure PowerShell installed on your computer, use the `Get-Module -ListAvailable Az` cmdlet. To install or update, see [Install the Azure PowerShell module](/powershell/azure/install-az-ps).
+
+If you are running PowerShell locally, be sure to run 'Connect-AzAccount' to create your connection to Azure.
diff --git a/includes/vpn-gateway-modify-lng-gateway-ip-rm-include.md b/includes/vpn-gateway-modify-lng-gateway-ip-rm-include.md
@@ -5,7 +5,7 @@
  author: cherylmc
  ms.service: vpn-gateway
  ms.topic: include
- ms.date: 02/14/2019
+ ms.date: 01/15/2020
  ms.author: cherylmc
  ms.custom: include file
 ---
