Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into diagramupdates

Author: duongau

articles/virtual-wan/virtual-wan-site-to-site-portal.md

@@ -5,7 +5,7 @@ description: Learn how to use Azure Virtual WAN to create a site-to-site VPN con
 author: cherylmc
 ms.service: virtual-wan
 ms.topic: tutorial
-ms.date: 08/09/2023
+ms.date: 01/31/2024
 ms.author: cherylmc
 # Customer intent: As someone with a networking background, I want to connect my local site to my VNets using Virtual WAN and I don't want to go through a Virtual WAN partner.
 ---
@@ -44,23 +44,27 @@ Verify that you've met the following criteria before beginning your configuratio
 
 ## <a name="hub"></a>Configure virtual hub settings
 
-A virtual hub is a virtual network that can contain gateways for site-to-site, ExpressRoute, or point-to-site functionality. For this tutorial, you begin by filling out the **Basics** tab for the virtual hub and then continue on to fill out the site-to-site tab in the next section. It's also possible to create an empty virtual hub (a virtual hub that doesn't contain any gateways) and then add gateways (S2S, P2S, ExpressRoute, etc.) later. Once a virtual hub is created, you'll be charged for the virtual hub, even if you don't attach any sites or create any gateways within the virtual hub.
+A virtual hub is a virtual network that can contain gateways for site-to-site, ExpressRoute, or point-to-site functionality. For this tutorial, you begin by filling out the **Basics** tab for the virtual hub and then continue on to fill out the site-to-site tab in the next section. It's also possible to create an empty virtual hub (a virtual hub that doesn't contain any gateways) and then add gateways (S2S, P2S, ExpressRoute, etc.) later. Once a virtual hub is created, you're charged for the virtual hub, even if you don't attach any sites or create any gateways within the virtual hub.
 
 [!INCLUDE [Create a virtual hub](../../includes/virtual-wan-hub-basics.md)]
 
-Don't create the virtual hub yet. Continue on to the next section to configure additional settings.
+**Don't create the virtual hub yet**. Continue on to the next section to configure more settings.
 
 ## <a name="gateway"></a>Configure a site-to-site gateway
 
-In this section, you configure site-to-site connectivity settings, and then proceed to create the virtual hub and site-to-site VPN gateway. A virtual hub and gateway can take about 30 minutes to create.
+In this section, you configure site-to-site connectivity settings, and then create the virtual hub and site-to-site VPN gateway. A virtual hub and gateway can take about 30 minutes to create.
 
 [!INCLUDE [Create a gateway](../../includes/virtual-wan-tutorial-s2s-gateway-include.md)]
 
 [!INCLUDE [hub warning message](../../includes/virtual-wan-hub-router-provisioning-warning.md)]
 
 ## <a name="site"></a>Create a site
 
-In this section, you create a site. Sites correspond to your physical locations. Create as many sites as you need. For example, if you have a branch office in NY, a branch office in London, and a branch office in LA, you'd create three separate sites. These sites contain your on-premises VPN device endpoints. You can create up to 1000 sites per virtual hub in a virtual WAN. If you had multiple virtual hubs, you can create 1000 per each of those virtual hubs. If you have a Virtual WAN partner CPE device, check with them to learn about their automation to Azure. Typically, automation implies a simple click experience to export large-scale branch information into Azure, and setting up connectivity from the CPE to Azure Virtual WAN VPN gateway. For more information, see [Automation guidance from Azure to CPE partners](virtual-wan-configure-automation-providers.md).
+In this section, you create a site. Sites correspond to your physical locations. Create as many sites as you need. These sites contain your on-premises VPN device endpoints.
+
+For example, if you have a branch office in NY, a branch office in London, and a branch office in LA, you'd create three separate sites. You can create up to 1000 sites per virtual hub in a virtual WAN. If you have multiple virtual hubs, you can create 1000 per each virtual hub.
+
+If you have a Virtual WAN partner CPE device, check with them to learn about their automation to Azure. Typically, automation implies a simple click experience to export large-scale branch information into Azure, and setting up connectivity from the CPE to Azure Virtual WAN VPN gateway. For more information, see [Automation guidance from Azure to CPE partners](virtual-wan-configure-automation-providers.md).
 
 [!INCLUDE [Create a site](../../includes/virtual-wan-tutorial-s2s-site-include.md)]
 
@@ -72,13 +76,13 @@ In this section, you connect your VPN site to the virtual hub.
 
 ## <a name="vnet"></a>Connect a VNet to the virtual hub
 
-In this section, you create a connection between the virtual hub and your VNet.
+In this section, you create a connection between the virtual hub and your virtual network.
 
 [!INCLUDE [Connect](../../includes/virtual-wan-connect-vnet-hub-include.md)]
 
 ## <a name="device"></a>Download VPN configuration
 
-Use the VPN device configuration file to configure your on-premises VPN device. The basic steps are listed below.
+Use the VPN device configuration file to configure your on-premises VPN device. Here are the basic steps:
 
 1. From your Virtual WAN page, go to **Hubs -> Your virtual hub -> VPN (Site to site)** page.
 
@@ -88,7 +92,7 @@ Use the VPN device configuration file to configure your on-premises VPN device.
 
 1. Apply the configuration to your on-premises VPN device. For more information, see [VPN device configuration](#vpn-device) in this section.
 
-1. After you've applied the configuration to your VPN devices, it is not required to keep the storage account that you created.
+1. After you've applied the configuration to your VPN devices, you aren't required to keep the storage account that you created.
 
 ### <a name="config-file"></a>About the VPN device configuration file
 
@@ -97,12 +101,12 @@ The device configuration file contains the settings to use when configuring your
 * **vpnSiteConfiguration -** This section denotes the device details set up as a site connecting to the virtual WAN. It includes the name and public IP address of the branch device.
 * **vpnSiteConnections -** This section provides information about the following settings:
 
-    * **Address space** of the virtual hub(s) VNet.<br>Example:
+    * **Address space** of the virtual hub(s) virtual network.<br>Example:
 
         ```
         "AddressSpace":"10.1.0.0/24"
         ```
-    * **Address space** of the VNets that are connected to the virtual hub.<br>Example:
+    * **Address space** of the virutal networks that are connected to the virtual hub.<br>Example:
 
          ```
         "ConnectedSubnets":["10.2.0.0/16","10.3.0.0/16"]
@@ -113,7 +117,7 @@ The device configuration file contains the settings to use when configuring your
         "Instance0":"104.45.18.186"
         "Instance1":"104.45.13.195"
         ```
-    * **Vpngateway connection configuration details** such as BGP, pre-shared key etc. The PSK is the pre-shared key that is automatically generated for you. You can always edit the connection in the **Overview** page for a custom PSK.
+    * **Vpngateway connection configuration details** such as BGP, preshared key etc. The PSK is the preshared key that is automatically generated for you. You can always edit the connection in the **Overview** page for a custom PSK.
   
 ### Example device configuration file
 

includes/virtual-wan-tutorial-s2s-connect-vpn-site-include.md

@@ -1,7 +1,7 @@
 ---
 ms.author: cherylmc
 author: cherylmc
-ms.date: 04/12/2022
+ms.date: 01/31/2024
 ms.service: virtual-wan
 ms.topic: include
 ---
@@ -11,17 +11,17 @@ ms.topic: include
 
 1. On the page for the hub that you created, under **Connectivity** on the left pane, click **VPN (Site to site)** to open the VPN Site to site page.
 
-1. On the **VPN (Site to site)** page, you should see your site. If you don't, you may need to click the **Hub association:x** bubble to clear the filters and view your site.
+1. On the **VPN (Site to site)** page, you should see your site. If you don't, you might need to click the **Hub association:x** bubble to clear the filters and view your site.
 
 1. Select the checkbox next to the name of the site (don't click the site name directly), then click **Connect VPN sites**.
 
    :::image type="content" source="./media/virtual-wan-tutorial-connect-vpn-site-include/connect-site.png" alt-text="Screenshot shows Connect site.":::
 
 1. On the **Connect sites** page, configure the settings.
 
-   :::image type="content" source="./media/virtual-wan-tutorial-connect-vpn-site-include/connect.png" alt-text="Screenshot shows the Connected Sites pane for Virtual HUB ready for a Pre-shared key and associated settings.":::
+   :::image type="content" source="./media/virtual-wan-tutorial-connect-vpn-site-include/connect.png" alt-text="Screenshot shows the Connected Sites pane for Virtual HUB ready for a preshared key and associated settings.":::
 
-   * **Pre-shared key (PSK)**: Enter the pre-shared key used by your VPN device. If you don't enter a key, Azure autogenerates one for you. You would then use that key when configuring your VPN device.
+   * **Pre-shared key (PSK)**: Enter the preshared key used by your VPN device. If you don't enter a key, Azure autogenerates one for you. You would then use that key when configuring your VPN device.
    * **Protocol and IPsec**: You can either leave the default settings for Protocol (IKEv2) and IPsec (Default), or you can configure custom settings. For more information, see [default/custom IPsec](../articles/virtual-wan/virtual-wan-ipsec.md).
    * **Propagate Default Route**: Only change this setting to **Enable** if you know you want to propagate the default route. Otherwise, leave it as **Disable**. You can always modify this setting later.
 
@@ -43,7 +43,7 @@ ms.topic: include
     * **Unknown**: This state is typically seen if the backend systems are working to transition to another status.
     * **Connecting**: The VPN gateway is trying to reach out to the actual on-premises VPN site.
     * **Connected**: Connectivity is established between VPN gateway and the on-premises VPN site.
-    * **Not connected**: Connectivity is not established.
+    * **Not connected**: Connectivity isn't established.
     * **Disconnected**: This status is seen if, for any reason (on-premises or in Azure), the connection was disconnected.
 1. If you want to make changes to your site, select the checkbox next to the site name (don't click the site name directly), then click the **...** context menu.