Merge pull request #17977 from MicrosoftDocs/main

[AutoPublish] main to live - 05/28 22:31 PDT | 05/29 11:01 IST

Author: padmagit77

intune/intune-service/configuration/settings-catalog-android.md

@@ -51,6 +51,14 @@ This feature applies to:
 
 #### Device Password
 
+  > [!NOTE]
+  > 
+  > - Users on fully managed, and corporate-owned work profile devices are not prompted to set a password. The settings are required, but users might not be notified. Users need to set the password manually. The policy reports as failed until the user sets a password that meets your requirements.
+  >
+  >   To apply the device password settings during device enrollment, assign the device restriction profile to users, not devices. During enrollment, users are asked to set a screen lock. Then, they must choose a device password that meets all the requirements in this device restriction profile.
+  > - On dedicated devices, if the device is set up with single or multi-app kiosk mode, then users are prompted to set a password. Screens force and guide users to create a compliant password before they can continue using the device.
+  > - On dedicated devices that are not using kiosk mode, users are not notified of any password requirement. Users need to set the password manually. The policy reports as failed until the user sets a password that meets your requirements.
+
 **Required password type**: Set the password's complexity requirements. Additional password requirements become available based on your selection.
 
 This feature applies to:
@@ -267,7 +275,7 @@ This feature applies to:
 
 - Android Open Source Project (AOSP) corporate-owned user-associated devices (single user)
 
-**Disable Bluetooth**: If 'True', disables Bluetooth on the device so that users can't pair with other devices. If 'False', Intune doesn't change or update this setting. By default, the OS might enable Bluetooth on the device.
+**Block Bluetooth**: If 'True', disables Bluetooth on the device so that users can't pair with other devices. If 'False', Intune doesn't change or update this setting. By default, the OS might enable Bluetooth on the device.
 
 This feature applies to:
 
@@ -297,4 +305,4 @@ This feature applies to:
 
 - Android Open Source Project (AOSP) corporate-owned userless devices (shared)
 
-- Android Open Source Project (AOSP) corporate-owned user-associated devices (single user)
+- Android Open Source Project (AOSP) corporate-owned user-associated devices (single user)

intune/intune-service/configuration/wi-fi-profile-shared-key.md

@@ -1,13 +1,13 @@
 ---
 # required metadata
 
-title: Create WiFi profile with preshared key in Microsoft Intune
+title: Create Wi-Fi profile with preshared key in Microsoft Intune
 description: Use a custom profile to create a Wi-Fi profile with a preshared key (PSK), and get sample XML code for Android, Android Enterprise, Windows, and EAP-based Wi-Fi profiles in Microsoft Intune.
 keywords:
 author: MandiOhlinger
 ms.author: mandia
 manager: dougeby
-ms.date: 02/19/2025
+ms.date: 05/28/2025
 ms.topic: how-to
 ms.service: microsoft-intune
 ms.subservice: configuration
@@ -30,7 +30,7 @@ ms.collection:
 - M365-identity-device-management
 ---
 
-# Use a custom device profile to create a WiFi profile with a preshared key using Intune
+# Use a custom device profile to create a Wi-Fi profile with a preshared key using Intune
 
 [!INCLUDE [android_device_administrator_support](../includes/android-device-administrator-support.md)]
 
@@ -87,19 +87,20 @@ This article shows you how to create the policy in Intune, and includes an XML e
     2. **Description**: Enter a description for the OMA-URI setting. This setting is optional, but recommended.
     3. **OMA-URI**: Enter one of the following options:
 
-        - **For Android**: `./Vendor/MSFT/WiFi/Profile/SSID/Settings`
-        - **For Windows**: `./Vendor/MSFT/WiFi/Profile/SSID/WlanXml`
+        - **For Android**: `./Vendor/MSFT/WiFi/Profile/{SSID}/Settings`
+        - **For Windows**: `./Vendor/MSFT/WiFi/Profile/{SSID}/WlanXml`
 
         > [!NOTE]
         >
         > - Be sure to include the period character at the beginning of the OMA-URI value.
         > - If the SSID has a space, then add an escape space `%20`.
 
-        SSID (Service Set Identifier) is your Wi-Fi network name that you're creating the policy for. For example, if the Wi-Fi is named `Hotspot-1`, enter `./Vendor/MSFT/WiFi/Profile/Hotspot-1/Settings`. If the Wi-Fi is named `Contoso WiFi`, enter `./Vendor/MSFT/WiFi/Profile/Contoso%20WiFi/Settings` (with the `%20` escape space).
+        SSID (Service Set Identifier) is your Wi-Fi network name that you're creating the policy for. This value is typically the friendly name that users see in their internet connection list. It's possible this friendly name is different than the actual SSID value of your Wi-Fi network. Be sure to enter the friendly name. If you export an existing Intune Wi-Fi profile to XML, the friendly name is listed in `<name>` in `<WLANProfile> <name>`.
+        
+        For example, if the Wi-Fi is named `Hotspot-1`, enter `./Vendor/MSFT/WiFi/Profile/Hotspot-1/Settings`. If the Wi-Fi is named `Contoso WiFi`, enter `./Vendor/MSFT/WiFi/Profile/Contoso%20WiFi/Settings` (with the `%20` escape space).
 
     4. **Data Type**: Select **String**.
-
-    5. **Value**: Paste your XML code. See the [Wi-Fi examples](#android-or-windows-wi-fi-profile-example) in this article. Update each value to match your network settings. The comments section of the code includes some pointers.
+    5. **Value**: Paste your XML code. See the [Wi-Fi examples](#android-or-windows-wi-fi-profile-example) in this article or the [WiFi CSP examples](/windows/client-management/mdm/wifi-csp#examples), which are based on the [wireless profile samples](/windows/win32/nativewifi/wireless-profile-samples). Update each value to match your network settings. The comments section of the code includes some pointers.
     6. Select **Add** to save your changes.
 
 8. Select **Next**.
@@ -297,3 +298,4 @@ After you have the XML file, copy and paste the XML syntax into OMA-URI settings
 ## Resources
 
 - Be sure to [assign the profile](device-profile-assign.md), and [monitor](device-profile-monitor.md) its status.
+- For more information on EAP in general, see [Extensible Authentication Protocol (EAP) for network access](/windows-server/networking/technologies/extensible-authentication-protocol/network-access)