Merge pull request #107993 from cherylmc/always

Update vpn-gateway articles to virtual wan

Author: v-shils

articles/virtual-wan/TOC.yml

@@ -52,26 +52,28 @@
       href: virtual-wan-site-to-site-portal.md
   - name: User VPN (point-to-site)
     items:
-    - name: Create User VPN (point-to-site) connections
+    - name: Create a User VPN connection
       href: virtual-wan-point-to-site-portal.md
-    - name: Configure certificates for User VPN
+    - name: Configure certificates
       href: certificates-point-to-site.md
-    - name: Configure Azure AD tenant for User VPN
+    - name: Configure Azure AD tenant
       href: openvpn-azure-ad-tenant.md
-    - name: Configure Always On VPN user tunnel
-      href: ../vpn-gateway/vpn-gateway-howto-always-on-user-tunnel.md?toc=%2fazure%2fvirtual-wan%2ftoc.json
-    - name: Configure Always On VPN device tunnel
-      href: ../vpn-gateway/vpn-gateway-howto-always-on-device-tunnel.md?toc=%2fazure%2fvirtual-wan%2ftoc.json
+    - name: Download a VPN profile
+      href: ../vpn-gateway/about-vpn-profile-download.md?toc=%2fazure%2fvirtual-wan%2ftoc.json
+    - name: Download global and hub-based profiles
+      href: global-hub-profile.md
     - name: Configure OpenVPN clients
       href: ../vpn-gateway/vpn-gateway-howto-openvpn-clients.md?toc=%2fazure%2fvirtual-wan%2ftoc.json
-    - name: Enable Multi-Factor Authentication(MFA) for User VPN
+    - name: Configure Always On VPN user tunnel
+      href: howto-always-on-user-tunnel.md
+    - name: Configure Always On VPN device tunnel
+      href: howto-always-on-device-tunnel.md
+    - name: Enable Multi-Factor Authentication(MFA)
       href: openvpn-azure-ad-mfa.md   
-    - name: Configure Azure AD authentication for User VPN
+    - name: Configure Azure AD authentication
       href: virtual-wan-point-to-site-azure-ad.md
-    - name: Configure Multi-application Azure AD authentication for User VPN
+    - name: Configure Multi-application Azure AD authentication
       href: openvpn-azure-ad-tenant-multi-app.md  
-    - name: Download global and hub-based User VPN profiles
-      href: global-hub-profile.md
   - name: Configure routing
     items:
     - name: Route traffic from a virtual hub to an NVA

articles/virtual-wan/howto-always-on-device-tunnel.md

@@ -0,0 +1,37 @@
+---
+title: 'Configure an Always-On VPN tunnel'
+titleSuffix: Azure Virtual WAN
+description: Steps to configure Always On VPN device tunnel for Virtual WAN
+services: virtual-wan
+author: cherylmc
+
+ms.service: virtual-wan
+ms.topic: conceptual
+ms.date: 03/13/2020
+ms.author: cherylmc
+
+---
+# Configure an Always On VPN device tunnel for Virtual WAN
+
+[!INCLUDE [intro](../../includes/vpn-gateway-vwan-always-on-intro.md)]
+
+## Prerequisites
+
+You must create a point-to-site configuration and edit the virtual hub assignment. See the following sections for instructions:
+
+* [Create a P2S configuration](virtual-wan-point-to-site-portal.md#p2sconfig)
+* [Edit the hub assignment](virtual-wan-point-to-site-portal.md#edit)
+
+## Configure the device tunnel
+
+[!INCLUDE [device tunnel](../../includes/vpn-gateway-vwan-always-on-device.md)]
+
+## To remove a profile
+
+To remove the profile, run the following command:
+
+![Cleanup](./media/howto-always-on-device-tunnel/cleanup.png)
+
+## Next steps
+
+For more information about Virtual WAN, see the [FAQ](virtual-wan-faq.md).

articles/virtual-wan/howto-always-on-user-tunnel.md

@@ -0,0 +1,45 @@
+---
+title: 'Configure an Always-On VPN user tunnel'
+titleSuffix: Azure Virtual WAN
+description: This article describes how to configure an Always On VPN user tunnel for your Virtual WAN
+services: vpn-gateway
+author: cherylmc
+
+ms.service: vpn-gateway
+ms.topic: conceptual
+ms.date: 03/13/2020
+ms.author: cherylmc
+
+---
+# Configure an Always On VPN user tunnel for Virtual WAN
+
+[!INCLUDE [intro](../../includes/vpn-gateway-vwan-always-on-intro.md)]
+
+## Prerequisites
+
+You must create a point-to-site configuration and edit the virtual hub assignment. See the following sections for instructions:
+
+* [Create a P2S configuration](virtual-wan-point-to-site-portal.md#p2sconfig)
+* [Edit the hub assignment](virtual-wan-point-to-site-portal.md#edit)
+
+## Configure a user tunnel
+
+[!INCLUDE [user tunnel](../../includes/vpn-gateway-vwan-always-on-user.md)]
+
+## To remove a profile
+
+To remove a profile, use the following steps:
+
+1. Run the following command:
+
+   ```powershell
+   C:\> Remove-VpnConnection UserTest  
+   ```
+
+1. Disconnect the connection, and clear the **Connect automatically** check box.
+
+   ![Cleanup](./media/howto-always-on-user-tunnel/disconnect.jpg)
+
+## Next steps
+
+For more information about Virtual WAN, see the [FAQ](virtual-wan-faq.md).

articles/virtual-wan/media/howto-always-on-device-tunnel/cleanup.png

@@ -19,6 +19,8 @@ ms.author: cherylmc
 
  Use the instructions in the [Configure a Point-to-Site VPN connection](vpn-gateway-howto-point-to-site-resource-manager-portal.md) article to configure the VPN gateway to use IKEv2 and certificate-based authentication.
 
+## Configure a user tunnel
+
 [!INCLUDE [user configuration](../../includes/vpn-gateway-vwan-always-on-user.md)]
 
 ## To remove a profile

articles/virtual-wan/media/howto-always-on-user-tunnel/disconnect.jpg

@@ -13,8 +13,6 @@
 ---
 
 
-## Configure a user tunnel
-
 1. Install client certificates on the Windows 10 client, as shown in this [point-to-site VPN client](../articles/vpn-gateway/point-to-site-how-to-vpn-client-install-azure-cert.md) article. The certificate must be in the current user store.
 
 1. Configure the Always On VPN client through PowerShell, Configuration Manager, or Intune by following the instructions in [Configure Windows 10 client Always On VPN connections](https://docs.microsoft.com/windows-server/remote/remote-access/vpn/always-on-vpn/deploy/vpn-deploy-client-vpn-connections).