diff --git a/windows/keep-secure/TOC.md b/windows/keep-secure/TOC.md index 57a7d44fcf..229f23d8f6 100644 --- a/windows/keep-secure/TOC.md +++ b/windows/keep-secure/TOC.md @@ -37,7 +37,16 @@ #### [Testing scenarios for Windows Information Protection (WIP)](testing-scenarios-for-wip.md) ## [Use Windows Event Forwarding to help with intrusion detection](use-windows-event-forwarding-to-assist-in-instrusion-detection.md) ## [Override Process Mitigation Options to help enforce app-related security policies](override-mitigation-options-for-app-related-security-policies.md) -## [VPN profile options](vpn-profile-options.md) +## [Windows 10 VPN technical guide](vpn-guide.md) +### [VPN connection types](vpn-connection-type.md) +### [VPN routing decisions](vpn-routing.md) +### [VPN authentication options](vpn-authentication.md) +### [VPN and conditional access](vpn-conditional-access.md) +### [VPN proxy settings](vpn-proxy-settings.md) +### [VPN name resolution](vpn-name-resolution.md) +### [VPN auto-triggered profile options](vpn-auto-trigger-profile.md) +### [VPN security features](vpn-security-features.md) +### [VPN profile options](vpn-profile-options.md) ## [Windows security baselines](windows-security-baselines.md) ## [Security technologies](security-technologies.md) ### [Access Control Overview](access-control.md) diff --git a/windows/keep-secure/vpn-authentication.md b/windows/keep-secure/vpn-authentication.md new file mode 100644 index 0000000000..b9c68efda2 --- /dev/null +++ b/windows/keep-secure/vpn-authentication.md @@ -0,0 +1,18 @@ +--- +title: VPN authentication options (Windows 10) +description: tbd +ms.assetid: E3F99DF9-863D-4E28-BAED-5C1B1B913523 +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.pagetype: security, networking +author: jdeckerMS +localizationpriority: high +--- + +# VPN authentication options + +**Applies to** +- Windows 10 +- Windows 10 Mobile + diff --git a/windows/keep-secure/vpn-auto-trigger-profile.md b/windows/keep-secure/vpn-auto-trigger-profile.md new file mode 100644 index 0000000000..5e7a723f42 --- /dev/null +++ b/windows/keep-secure/vpn-auto-trigger-profile.md @@ -0,0 +1,18 @@ +--- +title: VPN auto-triggered profile options (Windows 10) +description: tbd +ms.assetid: E3F99DF9-863D-4E28-BAED-5C1B1B913523 +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.pagetype: security, networking +author: jdeckerMS +localizationpriority: high +--- + +# VPN auto-triggered profile options + +**Applies to** +- Windows 10 +- Windows 10 Mobile + diff --git a/windows/keep-secure/vpn-conditional-access.md b/windows/keep-secure/vpn-conditional-access.md new file mode 100644 index 0000000000..28b3b2b71e --- /dev/null +++ b/windows/keep-secure/vpn-conditional-access.md @@ -0,0 +1,18 @@ +--- +title: VPN and conditional access (Windows 10) +description: tbd +ms.assetid: E3F99DF9-863D-4E28-BAED-5C1B1B913523 +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.pagetype: security, networking +author: jdeckerMS +localizationpriority: high +--- + +# VPN and conditional access + +**Applies to** +- Windows 10 +- Windows 10 Mobile + diff --git a/windows/keep-secure/vpn-connection-type.md b/windows/keep-secure/vpn-connection-type.md new file mode 100644 index 0000000000..c03a4aa46d --- /dev/null +++ b/windows/keep-secure/vpn-connection-type.md @@ -0,0 +1,19 @@ +--- +title: VPN connection types (Windows 10) +description: tbd +ms.assetid: E3F99DF9-863D-4E28-BAED-5C1B1B913523 +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.pagetype: security, networking +author: jdeckerMS +localizationpriority: high +--- + +# VPN connection types + +**Applies to** +- Windows 10 +- Windows 10 Mobile + + diff --git a/windows/keep-secure/vpn-guide.md b/windows/keep-secure/vpn-guide.md new file mode 100644 index 0000000000..cd1c7deedc --- /dev/null +++ b/windows/keep-secure/vpn-guide.md @@ -0,0 +1,26 @@ +--- +title: Windows 10 VPN technical guide (Windows 10) +description: tbd +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +author: jdeckerMS +localizationpriority: high +--- + +# Windows 10 VPN technical guide + + +**Applies to** + +- Windows 10 +- Windows 10 Mobile + + + + + + +## Related topics + +- [VPN profile options](vpn-profile-options.md) diff --git a/windows/keep-secure/vpn-name-resolution.md b/windows/keep-secure/vpn-name-resolution.md new file mode 100644 index 0000000000..737258357b --- /dev/null +++ b/windows/keep-secure/vpn-name-resolution.md @@ -0,0 +1,18 @@ +--- +title: VPN name resolution (Windows 10) +description: tbd +ms.assetid: E3F99DF9-863D-4E28-BAED-5C1B1B913523 +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.pagetype: security, networking +author: jdeckerMS +localizationpriority: high +--- + +# VPN name resolution + +**Applies to** +- Windows 10 +- Windows 10 Mobile + diff --git a/windows/keep-secure/vpn-proxy-settings.md b/windows/keep-secure/vpn-proxy-settings.md new file mode 100644 index 0000000000..9d4524a21b --- /dev/null +++ b/windows/keep-secure/vpn-proxy-settings.md @@ -0,0 +1,18 @@ +--- +title: VPN proxy settings (Windows 10) +description: tbd +ms.assetid: E3F99DF9-863D-4E28-BAED-5C1B1B913523 +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.pagetype: security, networking +author: jdeckerMS +localizationpriority: high +--- + +# VPN proxy settings + +**Applies to** +- Windows 10 +- Windows 10 Mobile + diff --git a/windows/keep-secure/vpn-routing.md b/windows/keep-secure/vpn-routing.md new file mode 100644 index 0000000000..c77320ef8b --- /dev/null +++ b/windows/keep-secure/vpn-routing.md @@ -0,0 +1,18 @@ +--- +title: VPN routing decisions (Windows 10) +description: tbd +ms.assetid: E3F99DF9-863D-4E28-BAED-5C1B1B913523 +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.pagetype: security, networking +author: jdeckerMS +localizationpriority: high +--- + +# VPN routing decisions + +**Applies to** +- Windows 10 +- Windows 10 Mobile + diff --git a/windows/keep-secure/vpn-security-features.md b/windows/keep-secure/vpn-security-features.md new file mode 100644 index 0000000000..3095025e3a --- /dev/null +++ b/windows/keep-secure/vpn-security-features.md @@ -0,0 +1,18 @@ +--- +title: VPN security features (Windows 10) +description: tbd +ms.assetid: E3F99DF9-863D-4E28-BAED-5C1B1B913523 +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.pagetype: security, networking +author: jdeckerMS +localizationpriority: high +--- + +# VPN security features + +**Applies to** +- Windows 10 +- Windows 10 Mobile +