update article for virtual wan and vpn-gateway

cherylmc · cherylmc · commit 5e68beacedcb · 2020-03-18T10:51:21.000-07:00
update

format
diff --git a/articles/virtual-wan/TOC.yml b/articles/virtual-wan/TOC.yml
@@ -58,9 +58,9 @@
       href: certificates-point-to-site.md
     - name: Configure Azure AD tenant
       href: openvpn-azure-ad-tenant.md
-    - 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
+    - name: Client profile
+      href: about-vpn-profile-download.md
+    - name: Global and hub-based profile
       href: global-hub-profile.md
     - name: Configure OpenVPN clients
       href: ../vpn-gateway/vpn-gateway-howto-openvpn-clients.md?toc=%2fazure%2fvirtual-wan%2ftoc.json
diff --git a/articles/virtual-wan/about-vpn-profile-download.md b/articles/virtual-wan/about-vpn-profile-download.md
@@ -0,0 +1,23 @@
+---
+title: 'Azure Virtual WAN: User VPN client profiles'
+description: This helps you work with the client profile file
+services: virtual-wan
+author: cherylmc
+
+ms.service: virtual-wan
+ms.topic: article
+ms.date: 03/18/2020
+ms.author: cherylmc
+
+---
+# Working with User VPN client profiles
+
+The downloaded profile file contains information that is necessary to configure a VPN connection. This article will help you obtain and understand the information necessary for a User VPN client profile.
+
+[!INCLUDE [client profiles](../../includes/vpn-gateway-vwan-vpn-profile-download.md)]
+
+* The **OpenVPN folder** contains the *ovpn* profile that needs to be modified to include the key and the certificate. For more information, see [Configure OpenVPN clients](../vpn-gateway/vpn-gateway-howto-openvpn-clients.md#windows).
+
+## Next steps
+
+For more information about Virtual WAN User VPN, see [Create a User VPN connection](virtual-wan-point-to-site-portal.md).
diff --git a/articles/virtual-wan/virtual-wan-point-to-site-azure-ad.md b/articles/virtual-wan/virtual-wan-point-to-site-azure-ad.md
@@ -1,22 +1,22 @@
 ---
-title: 'Configure Azure AD authentication for Point-to-Site connection to Azure | Microsoft Docs'
-description: In this tutorial, learn how to configure Azure Active Directory authentication for User VPN.
+title: 'Configure Azure AD authentication for User VPN connection: Virtual WAN'
+description: Learn how to configure Azure Active Directory authentication for User VPN.
 services: virtual-wan
 author: anzaman
 
 ms.service: virtual-wan
-ms.topic: tutorial
-ms.date: 02/07/2019
+ms.topic: conceptual
+ms.date: 03/17/2020
 ms.author: alzam
 
 ---
-# Tutorial: Create a User VPN connection by using Azure Virtual WAN
+# Configure Azure Active Directory authentication for User VPN
 
-This tutorial shows you how to configure Azure AD authentication for User VPN in Virtual WAN to connect to your resources in Azure over an OpenVPN VPN connection. Azure Active Directory authentication is only available for gateways using OpenVPN protocol and clients running Windows.
+This article shows you how to configure Azure AD authentication for User VPN in Virtual WAN to connect to your resources in Azure over an OpenVPN VPN connection. Azure Active Directory authentication is only available for gateways using OpenVPN protocol and clients running Windows.
 
 This type of connection requires a client to be configured on the client computer. For more information about Virtual WAN, see the [Virtual WAN Overview](virtual-wan-about.md).
 
-In this tutorial, you learn how to:
+In this article, you learn how to:
 
 > [!div class="checklist"]
 > * Create a WAN
@@ -122,7 +122,7 @@ Use the VPN profile to configure your clients.
 To connect, you need to download the Azure VPN Client and import the VPN client profile that was downloaded in the previous steps on every computer that wants to connect to the VNet.
 
 > [!NOTE]
-> Azure AD authentication is supported only for OpenVPN® protocol connections.
+> Azure AD authentication is supported only for OpenVPN&reg; protocol connections.
 >
 
 #### To download the Azure VPN client
diff --git a/articles/vpn-gateway/about-vpn-profile-download.md b/articles/vpn-gateway/about-vpn-profile-download.md
@@ -6,62 +6,18 @@ author: cherylmc
 
 ms.service: vpn-gateway
 ms.topic: article
-ms.date: 03/11/2020
+ms.date: 03/17/2020
 ms.author: cherylmc
 
 ---
 # About P2S VPN client profiles
 
 The downloaded profile file contains information that is necessary to configure a VPN connection. This article will help you obtain and understand the information necessary for a VPN client profile.
 
-## 1. Download the file
-
-Run the following commands. Copy the result URL to your browser in order to download the profile zip file.
-
-```azurepowershell-interactive
-$profile = New-AzVpnClientConfiguration -ResourceGroupName AADAuth -Name AADauthGW -AuthenticationMethod "EapTls"
-   
-$PROFILE.VpnProfileSASUrl
-```
-
-## 2. Extract the zip file
-
-Extract the zip file. The file contains the following folders:
-
-* AzureVPN
-* Generic
-* OpenVPN (If you enabled the OpenVPN and Azure AD authentication settings on the gateway. See [Create a tenant](openvpn-azure-ad-tenant.md).)
-
-## 3. Retrieve information
-
-In the **AzureVPN** folder, navigate to the ***azurevpnconfig.xml*** file and open it with Notepad. Make a note of the text between the following tags.
-
-```
-<audience>          </audience>
-<issuer>            </issuer>
-<tennant>           </tennant>
-<fqdn>              </fqdn>
-<serversecret>      </serversecret>
-```
-
-## Profile details
-
-When you add a connection, use the information you collected in the previous step for the profile details page. The fields correspond to the following information:
-
-   * **Audience:** Identifies the recipient resource the token is intended for
-   * **Issuer:** Identifies the Security Token Service (STS) that emitted the token as well as the Azure AD tenant
-   * **Tenant:** Contains an immutable, unique identifier of the directory tenant that issued the token
-   * **FQDN:** The fully qualified domain name (FQDN) on the Azure VPN gateway
-   * **ServerSecret:** The VPN gateway preshared key
-
-## Folder contents
+[!INCLUDE [client profiles](../../includes/vpn-gateway-vwan-vpn-profile-download.md)]
 
 * The **OpenVPN folder** contains the *ovpn* profile that needs to be modified to include the key and the certificate. For more information, see [Configure OpenVPN clients for Azure VPN Gateway](vpn-gateway-howto-openvpn-clients.md#windows). This folder will not be present in the zip file if Azure AD authentication is selected on the VPN gateway. Instead, the azurevpnconfig.xml will be in the AzureVPN folder.
 
-* The **generic folder** contains the public server certificate and the VpnSettings.xml file. The VpnSettings.xml file contains information needed to configure a generic client.
-
-* The downloaded zip file may also contain **WindowsAmd64** and **WindowsX86** folders. These folders contain the installer for SSTP and IKEv2 for Windows clients. You need admin rights on the client to install them.
-
 ## Next steps
 
 For more information about point-to-site, see [About point-to-site](point-to-site-about.md).
diff --git a/includes/vpn-gateway-vwan-vpn-profile-download.md b/includes/vpn-gateway-vwan-vpn-profile-download.md
@@ -0,0 +1,58 @@
+---
+ title: include file
+ description: include file
+ services: vpn-gateway
+ author: cherylmc
+ ms.service: vpn-gateway
+ ms.topic: include
+ ms.date: 03/17/2020
+ ms.author: cherylmc
+ ms.custom: include file
+
+#intent: this file is used for both virtual wan and vpn gateway articles
+---
+## 1. Download the file
+
+Run the following commands. Copy the result URL to your browser in order to download the profile zip file.
+
+```azurepowershell-interactive
+$profile = New-AzVpnClientConfiguration -ResourceGroupName AADAuth -Name AADauthGW -AuthenticationMethod "EapTls"
+   
+$PROFILE.VpnProfileSASUrl
+```
+
+## 2. Extract the zip file
+
+Extract the zip file. The file contains the following folders:
+
+* AzureVPN
+* Generic
+* OpenVPN (If you have enabled the OpenVPN and Azure AD authentication settings on the gateway.)
+
+## 3. Retrieve information
+
+In the **AzureVPN** folder, navigate to the ***azurevpnconfig.xml*** file and open it with Notepad. Make a note of the text between the following tags.
+
+```
+<audience>          </audience>
+<issuer>            </issuer>
+<tennant>           </tennant>
+<fqdn>              </fqdn>
+<serversecret>      </serversecret>
+```
+
+## Profile details
+
+When you add a connection, use the information you collected in the previous step for the profile details page. The fields correspond to the following information:
+
+   * **Audience:** Identifies the recipient resource the token is intended for
+   * **Issuer:** Identifies the Security Token Service (STS) that emitted the token as well as the Azure AD tenant
+   * **Tenant:** Contains an immutable, unique identifier of the directory tenant that issued the token
+   * **FQDN:** The fully qualified domain name (FQDN) on the Azure VPN gateway
+   * **ServerSecret:** The VPN gateway preshared key
+
+## Folder contents
+
+* The **generic folder** contains the public server certificate and the VpnSettings.xml file. The VpnSettings.xml file contains information needed to configure a generic client.
+
+* The downloaded zip file may also contain **WindowsAmd64** and **WindowsX86** folders. These folders contain the installer for SSTP and IKEv2 for Windows clients. You need admin rights on the client to install them.
