From b83d11b566d8c6ae64812062c7357d44f09a7375 Mon Sep 17 00:00:00 2001 From: Peter Smith Date: Fri, 5 Mar 2021 10:46:36 -0800 Subject: [PATCH 1/4] Update vpn-connection-type.md Help fix some customer confusion -- the adapter is called "SSTP" even though it's also used for the plug-in protocols. We have a customer that doesn't want to use a particular VPN plug-in because of concerns that it's using or attempting to use the wrong protocol. --- windows/security/identity-protection/vpn/vpn-connection-type.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/security/identity-protection/vpn/vpn-connection-type.md b/windows/security/identity-protection/vpn/vpn-connection-type.md index a0330b3425..de5aca388c 100644 --- a/windows/security/identity-protection/vpn/vpn-connection-type.md +++ b/windows/security/identity-protection/vpn/vpn-connection-type.md @@ -41,7 +41,7 @@ There are many options for VPN clients. In Windows 10, the built-in plug-in and - [SSTP](https://technet.microsoft.com/library/ff687819.aspx) - SSTP is supported for Windows desktop editions only. SSTP cannot be configured using mobile device management (MDM), but it is one of the protocols attempted in the **Automatic** option. + SSTP is supported for Windows desktop editions only. SSTP cannot be configured using mobile device management (MDM), but it is one of the protocols attempted in the **Automatic** option. Note: when a VPN plug-in is used, the adapter will be listed as an SSTP adapter even though the VPN protocol used is the plug-in's protocol. - Automatic From 06de20553e51da2ddeedc22020b8e4eb87bfaf37 Mon Sep 17 00:00:00 2001 From: mrmiller1972 <39915569+mrmiller1972@users.noreply.github.com> Date: Thu, 18 Mar 2021 13:19:17 -0400 Subject: [PATCH 2/4] Update windows-10-subscription-activation.md The abbreviation GVLK is not defined and may not be familiar to readers. Replaced GVLKs with "Generic Volume License Keys (GVLKs)" --- windows/deployment/windows-10-subscription-activation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/deployment/windows-10-subscription-activation.md b/windows/deployment/windows-10-subscription-activation.md index 8ea91fd4cc..e974dc183f 100644 --- a/windows/deployment/windows-10-subscription-activation.md +++ b/windows/deployment/windows-10-subscription-activation.md @@ -23,7 +23,7 @@ Starting with Windows 10, version 1703 Windows 10 Pro supports the Subscription With Windows 10, version 1903 the Subscription Activation feature also supports the ability to step-up from Windows 10 Pro Education to the Enterprise grade edition for educational institutions—**Windows 10 Education**. -The Subscription Activation feature eliminates the need to manually deploy Windows 10 Enterprise or Education images on each target device, then later standing up on-prem key management services such as KMS or MAK based activation, entering GVLKs, and subsequently rebooting client devices. +The Subscription Activation feature eliminates the need to manually deploy Windows 10 Enterprise or Education images on each target device, then later standing up on-prem key management services such as KMS or MAK based activation, entering Generic Volume License Keys (GVLKs), and subsequently rebooting client devices. ## Subscription Activation for Windows 10 Enterprise From baa7c5e33dceedc33749486d708f6224350be20d Mon Sep 17 00:00:00 2001 From: Kateyanne <67609554+Kateyanne@users.noreply.github.com> Date: Thu, 18 Mar 2021 13:17:09 -0700 Subject: [PATCH 3/4] Update windows/security/identity-protection/vpn/vpn-connection-type.md Co-authored-by: Trond B. Krokli <38162891+illfated@users.noreply.github.com> --- .../security/identity-protection/vpn/vpn-connection-type.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/windows/security/identity-protection/vpn/vpn-connection-type.md b/windows/security/identity-protection/vpn/vpn-connection-type.md index de5aca388c..806f2df6c1 100644 --- a/windows/security/identity-protection/vpn/vpn-connection-type.md +++ b/windows/security/identity-protection/vpn/vpn-connection-type.md @@ -41,7 +41,10 @@ There are many options for VPN clients. In Windows 10, the built-in plug-in and - [SSTP](https://technet.microsoft.com/library/ff687819.aspx) - SSTP is supported for Windows desktop editions only. SSTP cannot be configured using mobile device management (MDM), but it is one of the protocols attempted in the **Automatic** option. Note: when a VPN plug-in is used, the adapter will be listed as an SSTP adapter even though the VPN protocol used is the plug-in's protocol. + SSTP is supported for Windows desktop editions only. SSTP cannot be configured using mobile device management (MDM), but it is one of the protocols attempted in the **Automatic** option. + + > [!NOTE] + > When a VPN plug-in is used, the adapter will be listed as an SSTP adapter, even though the VPN protocol used is the plug-in's protocol. - Automatic @@ -85,4 +88,3 @@ In Intune, you can also include custom XML for third-party plug-in profiles: - From 90a980f2abd29d593c75eed63bbf980024453ba7 Mon Sep 17 00:00:00 2001 From: Gary Moore Date: Thu, 18 Mar 2021 17:46:37 -0700 Subject: [PATCH 4/4] Added automatic image borders --- .../security/identity-protection/vpn/vpn-connection-type.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/windows/security/identity-protection/vpn/vpn-connection-type.md b/windows/security/identity-protection/vpn/vpn-connection-type.md index 806f2df6c1..89a4c83d9b 100644 --- a/windows/security/identity-protection/vpn/vpn-connection-type.md +++ b/windows/security/identity-protection/vpn/vpn-connection-type.md @@ -66,11 +66,13 @@ See [VPN profile options](vpn-profile-options.md) and [VPNv2 CSP](https://msdn.m The following image shows connection options in a VPN Profile configuration policy using Microsoft Intune: -![Available connection types](images/vpn-connection-intune.png) +> [!div class="mx-imgBorder"] +> ![Available connection types](images/vpn-connection-intune.png) In Intune, you can also include custom XML for third-party plug-in profiles: -![Custom XML](images/vpn-custom-xml-intune.png) +> [!div class="mx-imgBorder"] +> ![Custom XML](images/vpn-custom-xml-intune.png) ## Related topics