Merge pull request #272369 from cherylmc/s2sv2

shared key

Author: prmerger-automator[bot]

includes/vpn-gateway-add-gw-pip-portal-include.md

@@ -2,7 +2,7 @@
  author: cherylmc
  ms.service: vpn-gateway
  ms.topic: include
- ms.date: 06/23/2023
+ ms.date: 04/16/2024
  ms.author: cherylmc
 
 # The numbers in this include are correct. They add on to sections in multiple articles that are already numbered.
@@ -11,11 +11,11 @@
 
    :::image type="content" source="./media/vpn-gateway-add-gw-pip-portal/pip-values.png" alt-text="Screenshot that shows the Public IP address field." lightbox="./media/vpn-gateway-add-gw-pip-portal/pip-values.png":::
 
-     * **Public IP address type**: For this exercise, if you have the option to choose the address type, select **Standard**.
+     * **Public IP address type**: If you are presented with this option, select **Standard**. The **Basic** public IP address SKU is only supported for **Basic** SKU VPN gateways.
      * **Public IP address**: Leave **Create new** selected.
      * **Public IP address name**: In the text box, enter a name for your public IP address instance.
      * **Public IP address SKU**: Setting is autoselected.
-     * **Assignment**: The assignment is typically autoselected and can be either **Dynamic** or **Static**.
+     * **Assignment**: The assignment is typically autoselected. For the Standard SKU, assignment is always Static.
      * **Enable active-active mode**: Select **Disabled**. Only enable this setting if you're creating an active-active gateway configuration.
      * **Configure BGP**: Select **Disabled**, unless your configuration specifically requires this setting. If you do require this setting, the default ASN is 65515, although this value can be changed.
 4. Select **Review + create** to run validation.

includes/vpn-gateway-add-gw-portal-include.md

@@ -2,14 +2,12 @@
  author: cherylmc
  ms.service: vpn-gateway
  ms.topic: include
- ms.date: 03/12/2024
+ ms.date: 04/16/2024
  ms.author: cherylmc
 ---
 
 1. In **Search resources, services, and docs (G+/)**, enter **virtual network gateway**. Locate **Virtual network gateway** in the **Marketplace** search results and select it to open the **Create virtual network gateway** page.
 
-   :::image type="content" source="./media/vpn-gateway-add-gw-portal/search.png" alt-text="Screenshot that shows the Search field." lightbox="./media/vpn-gateway-add-gw-portal/search-expand.png":::
-
 1. On the **Basics** tab, fill in the values for **Project details** and **Instance details**.
 
    :::image type="content" source="./media/vpn-gateway-add-gw-portal/instance-details.png" alt-text="Screenshot that shows the Instance fields." lightbox="./media/vpn-gateway-add-gw-portal/instance-details.png":::
@@ -24,6 +22,6 @@
    * **Virtual network**: From the dropdown list, select the virtual network to which you want to add this gateway. If you can't see the virtual network for which you want to create a gateway, make sure you selected the correct subscription and region in the previous settings.
    * **Gateway subnet address range** or **Subnet**: The gateway subnet is required to create a VPN gateway.
 
-     At this time, this field has a couple of different behaviors, depending on the virtual network address space and whether you already created a subnet named **GatewaySubnet** for your virtual network.
+     At this time, this field can show various different settings options, depending on the virtual network address space and whether you already created a subnet named **GatewaySubnet** for your virtual network.
 
      If you don't have a gateway subnet *and* you don't see the option to create one on this page, go back to your virtual network and create the gateway subnet. Then, return to this page and configure the VPN gateway.

includes/vpn-gateway-add-local-network-gateway-portal-include.md

@@ -5,7 +5,7 @@
  author: cherylmc
  ms.service: vpn-gateway
  ms.topic: include
- ms.date: 06/23/2023
+ ms.date: 04/16/2024
  ms.author: cherylmc
  ms.custom: include file
 ---

includes/vpn-gateway-add-site-to-site-connection-portal-include.md

@@ -2,10 +2,10 @@
  author: cherylmc
  ms.service: vpn-gateway
  ms.topic: include
- ms.date: 08/10/2023
+ ms.date: 04/16/2024
  ms.author: cherylmc
 ---
-1. Go to your virtual network. On your virtual network page, on the left, select **Connected devices**. Locate your VPN gateway and select it to open it.
+1. Go to your virtual network. On your virtual network page, in the left pane, select **Connected devices**. Locate your VPN gateway and select it to open it.
 1. On the page for the gateway, select **Connections**.
 1. At the top of the **Connections** page, select **+ Add** to open the **Create connection** page.
 
@@ -23,7 +23,7 @@
 
    * **Virtual network gateway**: Select the virtual network gateway from the dropdown list.
    * **Local network gateway**: Select the local network gateway from the dropdown list.
-   * **Shared key**: The value here must match the value that you're using for your local on-premises VPN device.
+   * **Shared key**: The value here must match the value that you're using for your local on-premises VPN device. If this field doesn't appear on your portal page, or you want to later update this key, you can do so once the connection object is created. Go to the connection object you created (example name: VNet1toSite1) and update the key on the **Authentication** page.
    * **IKE Protocol**: Select **IKEv2**.
    * **Use Azure Private IP Address**: Don't select.
    * **Enable BGP**: Don't select.

includes/vpn-gateway-basic-vnet-rm-portal-include.md

@@ -3,10 +3,10 @@ author: cherylmc
 ms.author: cherylmc
 ms.service: vpn-gateway
 ms.topic: include
-ms.date: 03/12/2024
+ms.date: 04/16/2024
 ---
 
-1. Sign in to the [Azure portal](https://portal.azure.com).
+1. Sign in to the Azure portal.
 1. In **Search resources, service, and docs (G+/)** at the top of the portal page, enter **virtual network**. Select **Virtual network** from the **Marketplace** search results to open the **Virtual network** page.
 1. On the **Virtual network** page, select **Create** to open the **Create virtual network** page.
 1. On the **Basics** tab, configure the virtual network settings for **Project details** and **Instance details**. You see a green check mark when the values you enter are validated. You can adjust the values shown in the example according to the settings that you require.
@@ -16,7 +16,7 @@ ms.date: 03/12/2024
    * **Subscription**: Verify that the subscription listed is the correct one. You can change subscriptions by using the dropdown box.
    * **Resource group**: Select an existing resource group or select **Create new** to create a new one. For more information about resource groups, see [Azure Resource Manager overview](../articles/azure-resource-manager/management/overview.md#resource-groups).
    * **Name**: Enter the name for your virtual network.
-   * **Region**: Select the location for your virtual network. The location determines where the resources that you deploy to this virtual network will live.
+   * **Region**: Select the location for your virtual network. The location determines where the resources that you deploy to this virtual network will reside.
 
 1. Select **Next** or **Security** to go to the **Security** tab. For this exercise, leave the default values for all the services on this page.