diff --git a/windows/client-management/mdm/eap-configuration.md b/windows/client-management/mdm/eap-configuration.md index cb42cb7572..f5e211ef20 100644 --- a/windows/client-management/mdm/eap-configuration.md +++ b/windows/client-management/mdm/eap-configuration.md @@ -1,12 +1,12 @@ --- title: EAP configuration -description: Learn how to create an Extensible Authentication Protocol (EAP) configuration XML for a VPN profile, including details about EAP certificate filtering in Windows 10. +description: Learn how to create an Extensible Authentication Protocol (EAP) configuration XML for a VPN profile, including details about EAP certificate filtering in Windows. ms.date: 06/26/2017 --- # EAP configuration -This article provides a step-by-step guide for creating an Extensible Authentication Protocol (EAP) configuration XML for a VPN profile, including information about EAP certificate filtering in Windows 10. +This article provides a step-by-step guide for creating an Extensible Authentication Protocol (EAP) configuration XML for a VPN profile, including information about EAP certificate filtering in Windows. While the screenshots are specifically for VPN, the EAP portions are applicable to Wi-Fi and Wired EAP profiles as well. For more information, see [Configure EAP profiles and settings in Windows](/windows-server/networking/technologies/extensible-authentication-protocol/configure-eap-profiles). ## Create an EAP configuration XML for a VPN profile @@ -292,6 +292,8 @@ Alternatively, you can use the following procedure to create an EAP configuratio > [!NOTE] > You can also set all the other applicable EAP Properties through this UI as well. A guide for what these properties mean can be found in the [Extensible Authentication Protocol (EAP) for network access](/windows-server/networking/technologies/extensible-authentication-protocol/network-access) article. -## Related topics +## Related articles -[Configuration service provider reference](index.yml) +* [Configuration service provider reference](index.yml) +* [Extensible Authentication Protocol (EAP) for network access](/windows-server/networking/technologies/extensible-authentication-protocol/network-access) +* [Configure EAP profiles and settings in Windows](/windows-server/networking/technologies/extensible-authentication-protocol/configure-eap-profiles) \ No newline at end of file diff --git a/windows/client-management/mdm/wifi-csp.md b/windows/client-management/mdm/wifi-csp.md index 5a09b0e1ee..784e8088ba 100644 --- a/windows/client-management/mdm/wifi-csp.md +++ b/windows/client-management/mdm/wifi-csp.md @@ -1,7 +1,7 @@ --- title: WiFi CSP description: Learn more about the WiFi CSP. -ms.date: 03/12/2025 +ms.date: 05/13/2025 ms.topic: generated-reference --- @@ -16,12 +16,11 @@ The WiFi configuration service provider provides the functionality to add or del Programming considerations: -- If the authentication method needs a certificate, for example, EAP-TLS requires client certificates, you must configure it through the CertificateStore configuration service provider. The WiFi configuration service provider doesn't provide that functionality; instead, the Wi-Fi profile can specify characteristics of the certificate to be used for choosing the right certificate for that network. The server must successfully enroll the certificate first before deploying the Wi-Fi network configuration. For example, for an EAP-TLS profile, the server must successfully configure and enroll the required client certificate before deploying the Wi-Fi profile. Self-signed certificate works for EAP-TLS/PEAP-MSCHAPv2, but it isn't supported in EAP-TLS. +- If the authentication method needs a certificate (for example, client certificates for EAP-TLS), you must configure it through the [CertificateStore](certificatestore-csp.md) configuration service provider. The WiFi configuration service provider doesn't provide that functionality; instead, the Wi-Fi profile can specify characteristics of the certificate to be used for choosing the right certificate for that network. The server must successfully enroll the certificate first before deploying the Wi-Fi network configuration. For example, for an EAP-TLS profile, the server must successfully configure and enroll the required client certificate before deploying the Wi-Fi profile. Self-signed certificate works for EAP-TLS/PEAP-MSCHAPv2, but it isn't supported in EAP-TLS. - For WEP, WPA, and WPA2-based networks, include the passkey in the network configuration in plaintext. The passkey is encrypted automatically when it's stored on the device. -- The SSID of the Wi-Fi network part of the LocURI node must be a valid URI based on RFC 2396. This condition requires that all non-ASCII characters must be escaped using a %-character. Unicode characters without the necessary escaping aren't supported. -- The `name_goes_here\` must match `name_goes_here`. +- The `SSID` part of the LocURI node must be a valid URI based on RFC 2396. This condition requires that all nonexcluded ASCII characters must be escaped using a %-character, including replacing the space character (' ') with '%20'. Characters (including Unicode) without the necessary escaping aren't supported. - For the WiFi CSP, you can't use the Replace command unless the node already exists. -- Using ProxyPacUrl or ProxyWPAD in Windows 10 client editions (Home, Pro, Enterprise, and Education) will result in failure. +- Using `Proxy`, `ProxyPacUrl` or `ProxyWPAD` in Windows client editions (Home, Pro, Enterprise, and Education) may fail or have no effect. Use [NetworkProxy](networkproxy-csp.md) CSP instead. @@ -108,9 +107,13 @@ The Profile name of the Wi-Fi network. This is added when WlanXml node is added -Specifies the name of the Wi-Fi network (32 bytes maximum) to create, configure, query, or delete. The name is case sensitive and can be represented in ASCII. +Specifies the Profile name of the Wi-Fi network (32 bytes maximum) to create, configure, query, or delete. The name is case sensitive and can be represented in ASCII. In the URI, it must be %-escaped, but the non-%-escaped value is used inside the system. + +> [!NOTE] +> This field is the Profile Name that appears as a "Friendly Name" to the user and contains the Wi-Fi settings information. The non-%-escaped value must correspond to `` in ` `. + +The Profile name can be the same or different from the SSID of the actual network being broadcast (which is under ` `). For example, the broadcast SSID might be "CC_Corp_7" but the Profile name might be "ContosoWiFi". -SSID is the name of network you're connecting to, while Profile name is the name of the Profile that contains the WiFi settings information. If the Profile name isn't set right in the MDM SyncML, as per the information in the WiFi settings XML, it could lead to some unexpected errors. For example, `./Vendor/MSFT/WiFi/Profile//WlanXml`. @@ -125,6 +128,32 @@ SSID is the name of network you're connecting to, while Profile name is the name + +In the following example, the 'ContosoWiFi' Profile is added, targeting the 'CC_Corp_7' SSID. The rest of the profile is omitted for brevity - for complete examples, see [Add a network](#add-a-network). + +```xml + + 300 + + 301 + + + ./Vendor/MSFT/WiFi/Profile/ContosoWiFi/WlanXml + + + chr + + ContosoWiFiCC_Corp_7{...}]]> + + + +``` + +> [!IMPORTANT] +> If the Profile name isn't set correctly in the MDM SyncML, as per the information in the Wi-Fi settings XML (``), it could lead to some unexpected errors at runtime. In other words, if the profile is `Contoso Wi-Fi{...}`, the MDM SyncML must be `./Vendor/MSFT/WiFi/Profile/Contoso%20Wi-Fi/WlanXml`. +> +> In this example, if we instead had `./Vendor/MSFT/WiFi/Profile/CC_Corp_7/WlanXml`, the profile would be considered to be User provisioned, not MDM provisioned, which may cause users to connect to the wrong network. + @@ -200,6 +229,9 @@ Optional node. The format is url:port. Configuration of the network proxy (if an +> [!NOTE] +> Don't use. Using this configuration in Windows client editions may fail or have no effect. Use [NetworkProxy](networkproxy-csp.md) CSP instead. + @@ -240,7 +272,8 @@ Optional node. URL to the PAC file location. > [!NOTE] -> Don't use. Using this configuration in Windows 10 client editions will result in failure. +> Don't use. Using this configuration in Windows client editions may fail or have no effect. Use [NetworkProxy](networkproxy-csp.md) CSP instead. + @@ -281,7 +314,8 @@ Optional node. The presence of the field enables WPAD for proxy lookup. > [!NOTE] -> Don't use. Using this configuration in Windows 10 client editions will result in failure. +> Don't use. Using this configuration in Windows client editions may fail or have no effect. Use [NetworkProxy](networkproxy-csp.md) CSP instead. + @@ -382,12 +416,13 @@ Link to schema: -The profile XML must be escaped, as shown in the examples below. +The profile XML must be escaped, as shown in the following examples. If it exists in the blob, the **keyType** and **protected** elements must come before **keyMaterial**, as shown in the example in [WPA2-Personal Profile Sample](/windows/win32/nativewifi/wpa2-personal-profile-sample). > [!NOTE] -> If you need to specify other advanced conditions, such as specifying criteria for certificates that can be used by the Wi-Fi profile, you can do so by specifying this through the EapHostConfig portion of the WlanXML. For more information, see [EAP configuration](./eap-configuration.md). +> If you need to specify other advanced conditions, such as specifying criteria for certificates that can be used by the Wi-Fi profile, you can do so by specifying this through the [EapHostConfig](/windows/win32/eaphost/eaphostconfigschema-eaphostconfig-element) portion of the WlanXml ([WLANProfile](/windows/win32/nativewifi/wlan-profileschema-elements) > [MSM](/windows/win32/nativewifi/wlan-profileschema-msm-wlanprofile-element) > [security](/windows/win32/nativewifi/wlan-profileschema-security-msm-element) > [OneX](/windows/win32/nativewifi/onexschema-onex-element) > EAPConfig). For more information, see [EAP configuration](./eap-configuration.md) and [Extensible Authentication Protocol (EAP) for network access](/windows-server/networking/technologies/extensible-authentication-protocol/network-access). For an example, see [Wireless profile samples](/windows/win32/nativewifi/wireless-profile-samples). + @@ -401,6 +436,7 @@ If it exists in the blob, the **keyType** and **protected** elements must come b +See [Add a network](#add-a-network) for examples. @@ -466,9 +502,7 @@ The Profile name of the Wi-Fi network. This is added when WlanXml node is added -Specifies the name of the Wi-Fi network (32 bytes maximum) to create, configure, query, or delete. The name is case sensitive and can be represented in ASCII. - -SSID is the name of network you're connecting to, while Profile name is the name of the Profile that contains the WiFi settings information. If the Profile name isn't set right in the MDM SyncML, as per the information in the WiFi settings XML, it could lead to some unexpected errors. For example, `./Vendor/MSFT/WiFi/Profile//WlanXml`. +For more information, see [Device/Profile/{SSID}](#deviceprofilessid). @@ -558,6 +592,9 @@ Optional node. The format is url:port. Configuration of the network proxy (if an +> [!NOTE] +> Don't use. Using this configuration in Windows client editions may fail or have no effect. Use [NetworkProxy](networkproxy-csp.md) CSP instead. + @@ -598,7 +635,8 @@ Optional node. URL to the PAC file location. > [!NOTE] -> Don't use. Using this configuration in Windows 10 client editions will result in failure. +> Don't use. Using this configuration in Windows client editions may fail or have no effect. Use [NetworkProxy](networkproxy-csp.md) CSP instead. + @@ -639,7 +677,8 @@ Optional node. The presence of the field enables WPAD for proxy lookup. > [!NOTE] -> Don't use. Using this configuration in Windows 10 client editions will result in failure. +> Don't use. Using this configuration in Windows client editions may fail or have no effect. Use [NetworkProxy](networkproxy-csp.md) CSP instead. + @@ -740,12 +779,8 @@ Link to schema: -The profile XML must be escaped, as shown in the examples below. -If it exists in the blob, the **keyType** and **protected** elements must come before **keyMaterial**, as shown in the example in [WPA2-Personal Profile Sample](/windows/win32/nativewifi/wpa2-personal-profile-sample). - -> [!NOTE] -> If you need to specify other advanced conditions, such as specifying criteria for certificates that can be used by the Wi-Fi profile, you can do so by specifying this through the EapHostConfig portion of the WlanXML. For more information, see [EAP configuration](./eap-configuration.md). +For more information, see [Device/Profile/{SSID}/WlanXml](#deviceprofilessidwlanxml). @@ -771,7 +806,7 @@ These XML examples show how to perform various tasks using OMA DM. ### Add a network -The following example shows how to add PEAP-MSCHAPv2 network with SSID 'MyNetwork'. +The following example shows how to add a WPA2-Enterprise network with SSID and profile name `MyNetwork` that authenticates with PEAP-MSCHAPv2. This example is based on the sample profile at [WPA2-Enterprise with PEAP-MSCHAPv2 profile sample](/windows/win32/nativewifi/wpa2-enterprise-with-peap-mschapv2-profile-sample). ```xml @@ -787,7 +822,7 @@ The following example shows how to add PEAP-MSCHAPv2 network with SSID 'MyNetwor chr - MyNetwork412D4D534654574C414EMyNetworkfalseESSmanualWPA2AEStrueuser2500025truetruefalse26falsefalsefalsefalsefalse + MyNetwork4d794e6574776f726bMyNetworkfalseESSmanualWPA2AEStrueuser2500025truetruefalse26falsefalsefalsefalsefalse]]> @@ -796,6 +831,49 @@ The following example shows how to add PEAP-MSCHAPv2 network with SSID 'MyNetwor ``` +The following example shows how to add a WPA3-Enterprise network with profile name `My Network` and SSID `MySSID` that authenticates with EAP-TLS. This example is based on the sample profile at [WPA2-Enterprise with TLS profile sample](/windows/win32/nativewifi/wpa2-enterprise-with-tls-profile-sample). + +> [!IMPORTANT] +> Notice how the space is %-escaped in the `LocURI` and unescaped in the `WLANProfile` > `name`. + +```xml + + 300 + + 301 + + + ./Vendor/MSFT/WiFi/Profile/My%20Network/WlanXml + + + chr + + My NetworkMySSIDESSautoWPA3ENTAEStrueenabled720128disabledmachine1300013truetrue00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee ff 00 11 22 33falsetruefalsefalse00112233445566778899aabbccddeeff00112233Client Authentication1.3.6.1.5.5.7.3.2Client Authentication]]> + + + +``` + +The following example shows how to add a WPA3-Personal (transition mode) network with profile name and SSID `MyNetwork` that includes the passphrase `TestPassword1!`. This example is based on the sample profile at [WPA3-Personal with transition mode profile sample](/windows/win32/nativewifi/wpa3-personal-transition-profile-sample). + +```xml + + 300 + + 301 + + + ./Vendor/MSFT/WiFi/Profile/MyNetwork/WlanXml + + + chr + + MyNetworkMyNetworkESSautoWPA3SAEAESfalsetruepassPhrasefalseTestPassword1!]]> + + + +``` + ### Query network profiles The following example shows how to query Wi-Fi profiles installed on an MDM server. @@ -828,7 +906,7 @@ The following example shows the response. ### Remove a network -The following example shows how to remove a network with SSID 'MyNetwork' and no proxy. Removing all network authentication types is done in this same manner. +The following example shows how to remove a network with SSID `MyNetwork` and no proxy. Removing all network authentication types is done in this same manner. ```xml @@ -843,32 +921,13 @@ The following example shows how to remove a network with SSID 'MyNetwork' and no ``` - -### Add a network and certification authority for a server certificate - -The following example shows how to add PEAP-MSCHAPv2 network with SSID 'MyNetwork' and root CA validation for server certificate. - -```xml - - 300 - - 301 - - - ./Vendor/MSFT/WiFi/Profile/MyNetwork/WlanXml - - - chr - - MyNetworkMyNetworkfalseESSmanualWPA2AEStrueuser2500025true InsertCertThumbPrintHere truefalse26falsefalsefalsetruefalse - - - -``` ## Related articles -[Configuration service provider reference](configuration-service-provider-reference.md) +- [Wireless profile samples](/windows/win32/nativewifi/wireless-profile-samples) +- [Configuration service provider reference](configuration-service-provider-reference.md) +- [Extensible Authentication Protocol (EAP) for network access](/windows-server/networking/technologies/extensible-authentication-protocol/network-access) +- [Configure EAP profiles and settings in Windows](/windows-server/networking/technologies/extensible-authentication-protocol/configure-eap-profiles) diff --git a/windows/client-management/mdm/wirednetwork-csp.md b/windows/client-management/mdm/wirednetwork-csp.md index 25003242b3..1b8f00d555 100644 --- a/windows/client-management/mdm/wirednetwork-csp.md +++ b/windows/client-management/mdm/wirednetwork-csp.md @@ -1,7 +1,7 @@ --- title: WiredNetwork CSP description: Learn more about the WiredNetwork CSP. -ms.date: 03/12/2025 +ms.date: 05/14/2025 ms.topic: generated-reference --- @@ -88,6 +88,11 @@ XML describing the wired network configuration and follows the LAN_profile schem +The profile XML must be escaped, as shown in the following examples. + +> [!NOTE] +> If you need to specify other advanced conditions, such as specifying criteria for certificates that can be used by the LAN profile, you can do so by specifying this through the [EapHostConfig](/windows/win32/eaphost/eaphostconfigschema-eaphostconfig-element) portion of the LanXML ([LANProfile](/windows/win32/nativewifi/lan-profileschema-schema) > [MSM](/windows/win32/nativewifi/lan-profileschema-msm-lanprofile-element) > [security](/windows/win32/nativewifi/lan-profileschema-security-msm-element) > [OneX](/windows/win32/nativewifi/onexschema-onex-element) > EAPConfig). For more information, see [EAP configuration](./eap-configuration.md) and [Extensible Authentication Protocol (EAP) for network access](/windows-server/networking/technologies/extensible-authentication-protocol/network-access). For an example, see [Wired Profile Samples](/windows/win32/nativewifi/wired-profile-samples). + @@ -101,6 +106,7 @@ XML describing the wired network configuration and follows the LAN_profile schem +See [Examples](#examples). @@ -167,6 +173,7 @@ XML describing the wired network configuration and follows the LAN_profile schem +For more information, see [Device/LanXML](#devicelanxml). @@ -188,7 +195,7 @@ XML describing the wired network configuration and follows the LAN_profile schem ## Examples -The following example shows how to add a wired network profile: +The following example shows how to add a wired network profile that authenticates with PEAP-MSCHAPv2. This example is based on the sample profile at [PEAP Profile Sample](/windows/win32/nativewifi/peap-profile-sample) ```xml @@ -202,7 +209,7 @@ The following example shows how to add a wired network profile: chr - falsetrue2500025falsetruefalse26falsefalsefalsetruefalsetrue + falsetrue2500025falsetruefalse26falsefalsefalsetruefalsetrue]]> @@ -214,4 +221,7 @@ The following example shows how to add a wired network profile: ## Related articles -[Configuration service provider reference](configuration-service-provider-reference.md) +- [Wired profile samples](/windows/win32/nativewifi/wired-profile-samples) +- [Configuration service provider reference](configuration-service-provider-reference.md) +- [Extensible Authentication Protocol (EAP) for network access](/windows-server/networking/technologies/extensible-authentication-protocol/network-access) +- [Configure EAP profiles and settings in Windows](/windows-server/networking/technologies/extensible-authentication-protocol/configure-eap-profiles) diff --git a/windows/deployment/deploy-enterprise-licenses.md b/windows/deployment/deploy-enterprise-licenses.md index 7ed31ba53c..1b0f748e6f 100644 --- a/windows/deployment/deploy-enterprise-licenses.md +++ b/windows/deployment/deploy-enterprise-licenses.md @@ -9,11 +9,11 @@ ms.service: windows-client ms.subservice: activation ms.localizationpriority: medium ms.topic: how-to -ms.date: 9/03/2024 +ms.date: 05/14/2025 zone_pivot_groups: windows-versions-11-10 appliesto: - - ✅ Windows 11 - - ✅ Windows 10 +- ✅ Windows 11 +- ✅ Windows 10 --- # Deploy Windows Enterprise licenses diff --git a/windows/deployment/update/update-other-microsoft-products.md b/windows/deployment/update/update-other-microsoft-products.md index bc48003620..977b8fc32a 100644 --- a/windows/deployment/update/update-other-microsoft-products.md +++ b/windows/deployment/update/update-other-microsoft-products.md @@ -31,6 +31,7 @@ The following is a list of other Microsoft products that might be updated: - Active Directory Rights Management Service - AppFabric +- Azure Connected Machine agent - Azure File Sync - Bing Bar - Bing IME diff --git a/windows/deployment/vda-subscription-activation.md b/windows/deployment/vda-subscription-activation.md index c84c5ffc60..0672eb7c6e 100644 --- a/windows/deployment/vda-subscription-activation.md +++ b/windows/deployment/vda-subscription-activation.md @@ -9,7 +9,7 @@ ms.service: windows-client ms.subservice: activation ms.localizationpriority: medium ms.topic: how-to -ms.date: 11/14/2023 +ms.date: 05/14/2025 --- # Configure VDA for Windows subscription activation diff --git a/windows/deployment/volume-activation/activate-forest-by-proxy-vamt.md b/windows/deployment/volume-activation/activate-forest-by-proxy-vamt.md index 77b2422ad4..d35cc17005 100644 --- a/windows/deployment/volume-activation/activate-forest-by-proxy-vamt.md +++ b/windows/deployment/volume-activation/activate-forest-by-proxy-vamt.md @@ -5,7 +5,7 @@ ms.author: kaushika author: kaushika-msft manager: cshepard ms.reviewer: nganguly -ms.date: 11/07/2022 +ms.date: 05/14/2025 ms.topic: concept-article ms.service: windows-client ms.subservice: activation diff --git a/windows/deployment/volume-activation/activate-forest-vamt.md b/windows/deployment/volume-activation/activate-forest-vamt.md index 38a2b96e60..e1780347a0 100644 --- a/windows/deployment/volume-activation/activate-forest-vamt.md +++ b/windows/deployment/volume-activation/activate-forest-vamt.md @@ -5,7 +5,7 @@ ms.author: kaushika author: kaushika-msft manager: cshepard ms.reviewer: nganguly -ms.date: 11/07/2022 +ms.date: 05/14/2025 ms.topic: concept-article ms.service: windows-client ms.subservice: activation diff --git a/windows/deployment/volume-activation/activate-using-active-directory-based-activation-client.md b/windows/deployment/volume-activation/activate-using-active-directory-based-activation-client.md index 9db83f0d61..a2710e9a81 100644 --- a/windows/deployment/volume-activation/activate-using-active-directory-based-activation-client.md +++ b/windows/deployment/volume-activation/activate-using-active-directory-based-activation-client.md @@ -8,15 +8,15 @@ ms.reviewer: nganguly ms.service: windows-client ms.subservice: activation ms.localizationpriority: medium -ms.date: 03/29/2024 +ms.date: 05/14/2025 ms.topic: how-to appliesto: - - ✅ Windows 11 - - ✅ Windows 10 - - ✅ Windows Server 2022 - - ✅ Windows Server 2019 - - ✅ Windows Server 2016 - - ✅ Microsoft Office +- ✅ Windows 11 +- ✅ Windows 10 +- ✅ Windows Server 2022 +- ✅ Windows Server 2019 +- ✅ Windows Server 2016 +- ✅ Microsoft Office --- # Activate using Active Directory-based activation diff --git a/windows/deployment/volume-activation/activate-using-key-management-service-vamt.md b/windows/deployment/volume-activation/activate-using-key-management-service-vamt.md index 8b7cb6f4a1..8c504944f0 100644 --- a/windows/deployment/volume-activation/activate-using-key-management-service-vamt.md +++ b/windows/deployment/volume-activation/activate-using-key-management-service-vamt.md @@ -8,14 +8,14 @@ author: kaushika-msft manager: cshepard ms.reviewer: nganguly ms.localizationpriority: medium -ms.date: 03/29/2024 +ms.date: 05/14/2025 ms.topic: how-to appliesto: - - ✅ Windows 11 - - ✅ Windows 10 - - ✅ Windows Server 2022 - - ✅ Windows Server 2019 - - ✅ Windows Server 2016 +- ✅ Windows 11 +- ✅ Windows 10 +- ✅ Windows Server 2022 +- ✅ Windows Server 2019 +- ✅ Windows Server 2016 --- # Activate using Key Management Service diff --git a/windows/deployment/volume-activation/activate-windows-clients-vamt.md b/windows/deployment/volume-activation/activate-windows-clients-vamt.md index 73e7931626..57f5a16314 100644 --- a/windows/deployment/volume-activation/activate-windows-clients-vamt.md +++ b/windows/deployment/volume-activation/activate-windows-clients-vamt.md @@ -6,16 +6,16 @@ author: kaushika-msft manager: cshepard ms.reviewer: nganguly ms.localizationpriority: medium -ms.date: 03/29/2024 +ms.date: 05/14/2025 ms.topic: concept-article ms.service: windows-client ms.subservice: activation appliesto: - - ✅ Windows 11 - - ✅ Windows 10 - - ✅ Windows Server 2022 - - ✅ Windows Server 2019 - - ✅ Windows Server 2016 +- ✅ Windows 11 +- ✅ Windows 10 +- ✅ Windows Server 2022 +- ✅ Windows Server 2019 +- ✅ Windows Server 2016 --- # Activate clients running Windows diff --git a/windows/deployment/volume-activation/active-directory-based-activation-overview.md b/windows/deployment/volume-activation/active-directory-based-activation-overview.md index fd7cd2b724..c5a40f1621 100644 --- a/windows/deployment/volume-activation/active-directory-based-activation-overview.md +++ b/windows/deployment/volume-activation/active-directory-based-activation-overview.md @@ -5,7 +5,7 @@ ms.author: kaushika author: kaushika-msft manager: cshepard ms.reviewer: nganguly -ms.date: 11/07/2022 +ms.date: 05/14/2025 ms.topic: concept-article ms.service: windows-client ms.subservice: activation diff --git a/windows/deployment/volume-activation/add-remove-computers-vamt.md b/windows/deployment/volume-activation/add-remove-computers-vamt.md index b65f84be73..dc2571f16e 100644 --- a/windows/deployment/volume-activation/add-remove-computers-vamt.md +++ b/windows/deployment/volume-activation/add-remove-computers-vamt.md @@ -5,7 +5,7 @@ ms.author: kaushika author: kaushika-msft manager: cshepard ms.reviewer: nganguly -ms.date: 11/07/2022 +ms.date: 05/14/2025 ms.topic: how-to ms.service: windows-client ms.subservice: activation diff --git a/windows/deployment/volume-activation/add-remove-product-key-vamt.md b/windows/deployment/volume-activation/add-remove-product-key-vamt.md index d9c59f7363..b3a4c57307 100644 --- a/windows/deployment/volume-activation/add-remove-product-key-vamt.md +++ b/windows/deployment/volume-activation/add-remove-product-key-vamt.md @@ -5,7 +5,7 @@ ms.author: kaushika author: kaushika-msft manager: cshepard ms.reviewer: nganguly -ms.date: 11/07/2022 +ms.date: 05/14/2025 ms.topic: how-to ms.service: windows-client ms.subservice: activation diff --git a/windows/deployment/volume-activation/configure-client-computers-vamt.md b/windows/deployment/volume-activation/configure-client-computers-vamt.md index 738815801b..07f6b2ea43 100644 --- a/windows/deployment/volume-activation/configure-client-computers-vamt.md +++ b/windows/deployment/volume-activation/configure-client-computers-vamt.md @@ -5,7 +5,7 @@ ms.author: kaushika author: kaushika-msft manager: cshepard ms.reviewer: nganguly -ms.date: 11/07/2022 +ms.date: 05/14/2025 ms.topic: how-to ms.service: windows-client ms.subservice: activation diff --git a/windows/deployment/volume-activation/import-export-vamt-data.md b/windows/deployment/volume-activation/import-export-vamt-data.md index 86d27603bc..d71554e781 100644 --- a/windows/deployment/volume-activation/import-export-vamt-data.md +++ b/windows/deployment/volume-activation/import-export-vamt-data.md @@ -7,7 +7,7 @@ manager: cshepard ms.reviewer: nganguly ms.service: windows-client ms.subservice: activation -ms.date: 11/07/2022 +ms.date: 05/14/2025 ms.topic: how-to --- diff --git a/windows/deployment/volume-activation/install-kms-client-key-vamt.md b/windows/deployment/volume-activation/install-kms-client-key-vamt.md index 4ef1a2e420..73c78fe04a 100644 --- a/windows/deployment/volume-activation/install-kms-client-key-vamt.md +++ b/windows/deployment/volume-activation/install-kms-client-key-vamt.md @@ -6,7 +6,7 @@ author: kaushika-msft manager: cshepard ms.reviewer: nganguly ms.localizationpriority: medium -ms.date: 11/07/2022 +ms.date: 05/14/2025 ms.topic: how-to ms.service: windows-client ms.subservice: activation diff --git a/windows/deployment/volume-activation/install-product-key-vamt.md b/windows/deployment/volume-activation/install-product-key-vamt.md index e18cd1b595..cdc8578780 100644 --- a/windows/deployment/volume-activation/install-product-key-vamt.md +++ b/windows/deployment/volume-activation/install-product-key-vamt.md @@ -6,7 +6,7 @@ author: kaushika-msft manager: cshepard ms.reviewer: nganguly ms.localizationpriority: medium -ms.date: 11/07/2022 +ms.date: 05/14/2025 ms.topic: how-to ms.service: windows-client ms.subservice: activation diff --git a/windows/deployment/volume-activation/install-vamt.md b/windows/deployment/volume-activation/install-vamt.md index 625715f83d..4af009a223 100644 --- a/windows/deployment/volume-activation/install-vamt.md +++ b/windows/deployment/volume-activation/install-vamt.md @@ -6,16 +6,16 @@ author: kaushika-msft manager: cshepard ms.reviewer: nganguly ms.localizationpriority: medium -ms.date: 03/29/2024 +ms.date: 05/14/2025 ms.topic: how-to ms.service: windows-client ms.subservice: activation appliesto: - - ✅ Windows 11 - - ✅ Windows 10 - - ✅ Windows Server 2022 - - ✅ Windows Server 2019 - - ✅ Windows Server 2016 +- ✅ Windows 11 +- ✅ Windows 10 +- ✅ Windows Server 2022 +- ✅ Windows Server 2019 +- ✅ Windows Server 2016 --- # Install VAMT diff --git a/windows/deployment/volume-activation/introduction-vamt.md b/windows/deployment/volume-activation/introduction-vamt.md index 22f9870649..55105df45e 100644 --- a/windows/deployment/volume-activation/introduction-vamt.md +++ b/windows/deployment/volume-activation/introduction-vamt.md @@ -7,7 +7,7 @@ manager: cshepard ms.reviewer: nganguly ms.service: windows-client ms.subservice: activation -ms.date: 11/07/2022 +ms.date: 05/14/2025 ms.topic: overview --- diff --git a/windows/deployment/volume-activation/kms-activation-vamt.md b/windows/deployment/volume-activation/kms-activation-vamt.md index 600f82bc55..428525bef2 100644 --- a/windows/deployment/volume-activation/kms-activation-vamt.md +++ b/windows/deployment/volume-activation/kms-activation-vamt.md @@ -5,7 +5,7 @@ ms.author: kaushika author: kaushika-msft manager: cshepard ms.reviewer: nganguly -ms.date: 11/07/2022 +ms.date: 05/14/2025 ms.topic: how-to ms.service: windows-client ms.subservice: activation diff --git a/windows/deployment/volume-activation/local-reactivation-vamt.md b/windows/deployment/volume-activation/local-reactivation-vamt.md index 648bc3fb1a..9885911bf7 100644 --- a/windows/deployment/volume-activation/local-reactivation-vamt.md +++ b/windows/deployment/volume-activation/local-reactivation-vamt.md @@ -5,7 +5,7 @@ ms.author: kaushika author: kaushika-msft manager: cshepard ms.reviewer: nganguly -ms.date: 11/07/2022 +ms.date: 05/14/2025 ms.topic: how-to ms.service: windows-client ms.subservice: activation diff --git a/windows/deployment/volume-activation/monitor-activation-client.md b/windows/deployment/volume-activation/monitor-activation-client.md index c55011bfdc..088c5af64e 100644 --- a/windows/deployment/volume-activation/monitor-activation-client.md +++ b/windows/deployment/volume-activation/monitor-activation-client.md @@ -9,13 +9,13 @@ ms.localizationpriority: medium ms.topic: concept-article ms.service: windows-client ms.subservice: activation -ms.date: 03/29/2024 +ms.date: 05/14/2025 appliesto: - - ✅ Windows 11 - - ✅ Windows 10 - - ✅ Windows Server 2022 - - ✅ Windows Server 2019 - - ✅ Windows Server 2016 +- ✅ Windows 11 +- ✅ Windows 10 +- ✅ Windows Server 2022 +- ✅ Windows Server 2019 +- ✅ Windows Server 2016 --- # Monitor activation diff --git a/windows/deployment/volume-activation/online-activation-vamt.md b/windows/deployment/volume-activation/online-activation-vamt.md index 1fe1d34886..fe46356c6b 100644 --- a/windows/deployment/volume-activation/online-activation-vamt.md +++ b/windows/deployment/volume-activation/online-activation-vamt.md @@ -5,7 +5,7 @@ ms.author: kaushika author: kaushika-msft manager: cshepard ms.reviewer: nganguly -ms.date: 11/07/2022 +ms.date: 05/14/2025 ms.topic: how-to ms.service: windows-client ms.subservice: activation diff --git a/windows/deployment/volume-activation/plan-for-volume-activation-client.md b/windows/deployment/volume-activation/plan-for-volume-activation-client.md index 73cd02164b..f54cd0c302 100644 --- a/windows/deployment/volume-activation/plan-for-volume-activation-client.md +++ b/windows/deployment/volume-activation/plan-for-volume-activation-client.md @@ -9,13 +9,13 @@ ms.localizationpriority: medium ms.topic: concept-article ms.service: windows-client ms.subservice: activation -ms.date: 03/29/2024 +ms.date: 05/14/2025 appliesto: - - ✅ Windows 11 - - ✅ Windows 10 - - ✅ Windows Server 2022 - - ✅ Windows Server 2019 - - ✅ Windows Server 2016 +- ✅ Windows 11 +- ✅ Windows 10 +- ✅ Windows Server 2022 +- ✅ Windows Server 2019 +- ✅ Windows Server 2016 --- # Plan for volume activation diff --git a/windows/deployment/volume-activation/remove-products-vamt.md b/windows/deployment/volume-activation/remove-products-vamt.md index 1800bc6d71..65bd33e2ba 100644 --- a/windows/deployment/volume-activation/remove-products-vamt.md +++ b/windows/deployment/volume-activation/remove-products-vamt.md @@ -5,7 +5,7 @@ ms.author: kaushika author: kaushika-msft manager: cshepard ms.reviewer: nganguly -ms.date: 11/07/2022 +ms.date: 05/14/2025 ms.topic: how-to ms.service: windows-client ms.subservice: activation diff --git a/windows/deployment/volume-activation/update-product-status-vamt.md b/windows/deployment/volume-activation/update-product-status-vamt.md index 77abfb5a82..16e0d4add2 100644 --- a/windows/deployment/volume-activation/update-product-status-vamt.md +++ b/windows/deployment/volume-activation/update-product-status-vamt.md @@ -5,7 +5,7 @@ ms.author: kaushika author: kaushika-msft manager: cshepard ms.reviewer: nganguly -ms.date: 03/29/2024 +ms.date: 05/14/2025 ms.topic: how-to ms.service: windows-client ms.subservice: activation diff --git a/windows/deployment/volume-activation/use-the-volume-activation-management-tool-client.md b/windows/deployment/volume-activation/use-the-volume-activation-management-tool-client.md index 87c0ac0170..f011d2fb6e 100644 --- a/windows/deployment/volume-activation/use-the-volume-activation-management-tool-client.md +++ b/windows/deployment/volume-activation/use-the-volume-activation-management-tool-client.md @@ -6,16 +6,16 @@ author: kaushika-msft manager: cshepard ms.reviewer: nganguly ms.localizationpriority: medium -ms.date: 03/29/2024 +ms.date: 05/14/2025 ms.topic: concept-article ms.service: windows-client ms.subservice: activation appliesto: - - ✅ Windows 11 - - ✅ Windows 10 - - ✅ Windows Server 2022 - - ✅ Windows Server 2019 - - ✅ Windows Server 2016 +- ✅ Windows 11 +- ✅ Windows 10 +- ✅ Windows Server 2022 +- ✅ Windows Server 2019 +- ✅ Windows Server 2016 --- # Use the Volume Activation Management Tool diff --git a/windows/deployment/volume-activation/vamt-requirements.md b/windows/deployment/volume-activation/vamt-requirements.md index 04d10c166e..11129dc57f 100644 --- a/windows/deployment/volume-activation/vamt-requirements.md +++ b/windows/deployment/volume-activation/vamt-requirements.md @@ -5,7 +5,7 @@ ms.author: kaushika author: kaushika-msft manager: cshepard ms.reviewer: nganguly -ms.date: 03/29/2024 +ms.date: 05/14/2025 ms.topic: concept-article ms.service: windows-client ms.subservice: activation diff --git a/windows/deployment/volume-activation/volume-activation-management-tool.md b/windows/deployment/volume-activation/volume-activation-management-tool.md index c087146a5a..c9a92a2b84 100644 --- a/windows/deployment/volume-activation/volume-activation-management-tool.md +++ b/windows/deployment/volume-activation/volume-activation-management-tool.md @@ -7,7 +7,7 @@ manager: cshepard ms.reviewer: nganguly ms.service: windows-client ms.subservice: activation -ms.date: 03/29/2024 +ms.date: 05/14/2025 ms.topic: overview --- diff --git a/windows/deployment/volume-activation/volume-activation-windows.md b/windows/deployment/volume-activation/volume-activation-windows.md index 311c6869d2..727d76b987 100644 --- a/windows/deployment/volume-activation/volume-activation-windows.md +++ b/windows/deployment/volume-activation/volume-activation-windows.md @@ -6,16 +6,16 @@ author: kaushika-msft manager: cshepard ms.reviewer: nganguly ms.localizationpriority: medium -ms.date: 03/29/2024 +ms.date: 05/14/2025 ms.topic: overview ms.service: windows-client ms.subservice: activation appliesto: - - ✅ Windows 11 - - ✅ Windows 10 - - ✅ Windows Server 2022 - - ✅ Windows Server 2019 - - ✅ Windows Server 2016 +- ✅ Windows 11 +- ✅ Windows 10 +- ✅ Windows Server 2022 +- ✅ Windows Server 2019 +- ✅ Windows Server 2016 --- # Volume activation for Windows diff --git a/windows/deployment/windows-enterprise-e3-overview.md b/windows/deployment/windows-enterprise-e3-overview.md index 7be5082ac3..11ec64ac17 100644 --- a/windows/deployment/windows-enterprise-e3-overview.md +++ b/windows/deployment/windows-enterprise-e3-overview.md @@ -4,15 +4,15 @@ description: Describes Windows Enterprise E3, an offering that delivers, by subs ms.service: windows-client ms.subservice: activation ms.localizationpriority: medium -ms.date: 02/13/2024 +ms.date: 05/14/2025 ms.author: kaushika author: kaushika-msft manager: cshepard ms.reviewer: nganguly ms.topic: concept-article appliesto: - - ✅ Windows 11 - - ✅ Windows 10 +- ✅ Windows 11 +- ✅ Windows 10 --- # Windows Enterprise E3 in CSP diff --git a/windows/deployment/windows-subscription-activation.md b/windows/deployment/windows-subscription-activation.md index 832396c41d..87cc026de0 100644 --- a/windows/deployment/windows-subscription-activation.md +++ b/windows/deployment/windows-subscription-activation.md @@ -10,10 +10,10 @@ manager: cshepard ms.reviewer: nganguly ms.topic: concept-article zone_pivot_groups: windows-versions-11-10 -ms.date: 09/03/2024 +ms.date: 05/14/2025 appliesto: - - ✅ Windows 11 - - ✅ Windows 10 +- ✅ Windows 11 +- ✅ Windows 10 --- # Windows subscription activation diff --git a/windows/security/operating-system-security/network-security/vpn/vpn-authentication.md b/windows/security/operating-system-security/network-security/vpn/vpn-authentication.md index 26a2c22a06..df5f510507 100644 --- a/windows/security/operating-system-security/network-security/vpn/vpn-authentication.md +++ b/windows/security/operating-system-security/network-security/vpn/vpn-authentication.md @@ -71,7 +71,7 @@ For a UWP VPN plug-in, the app vendor controls the authentication method to be u ## Configure authentication -See [EAP configuration](/windows/client-management/mdm/eap-configuration) for EAP XML configuration. +See [EAP configuration](/windows/client-management/mdm/eap-configuration) and [Extensible Authentication Protocol (EAP) for network access](/windows-server/networking/technologies/extensible-authentication-protocol/network-access) for EAP XML configuration. >[!NOTE] >To configure Windows Hello for Business authentication, follow the steps in [EAP configuration](/windows/client-management/mdm/eap-configuration) to create a smart card certificate. [Learn more about Windows Hello for Business.](../../../identity-protection/hello-for-business/index.md). @@ -79,4 +79,3 @@ See [EAP configuration](/windows/client-management/mdm/eap-configuration) for EA The following image shows the field for EAP XML in a Microsoft Intune VPN profile. The EAP XML field only appears when you select a built-in connection type (automatic, IKEv2, L2TP, PPTP). :::image type="content" source="images/vpn-eap-xml.png" alt-text="Screenshot showing EAP XML configuration in Intune profile."::: -