Merge pull request #16864 from MicrosoftDocs/main

Publish main to live, 12/05, 11:00 AM IST

memdocs/configmgr/osd/deploy-use/use-pxe-to-deploy-windows-over-the-network.md

@@ -43,7 +43,7 @@ To deploy operating systems to Configuration Manager clients that make PXE boot
 > [!NOTE]
 > When you configure a single PXE-enabled distribution point to support multiple subnets, it's not supported to use DHCP options. To allow the network to forward client PXE requests to PXE-enabled distribution points, configure IP helpers on the routers.
 
-When you enable a PXE responder on a distribution point without Windows Deployment Service, it can be on the same server as the DHCP service.<!--3734270, SCCMDocs-pr #3416--> Add the following settings to support this configuration:
+When you enable a PXE responder on a distribution point without Windows Deployment Service, it can be on the same server as the DHCP service.<!--3734270, SCCMDocs-pr #3416--> When the PXE responder and DHCP are on the same server, add the following settings to support this configuration:
 
 - Set the DWord value **DoNotListenOnDhcpPort** to `1` in the following registry key: `HKLM\Software\Microsoft\SMS\DP`.
 - Set DHCP option 60 to `PXEClient`.

memdocs/intune/industry/education/tutorial-school-deployment/common-config-ipads-optional.md

@@ -29,10 +29,10 @@ To learn more, see:
 |---|---|:---:|---|---|
 | Managed Settings > Bluetooth | **:::no-loc text="Enabled":::** | True | Enable the Bluetooth setting. | [:::no-loc text="Enabled":::](https://developer.apple.com/documentation/devicemanagement/settingscommand/command/settings/bluetooth) |
 | Restrictions | **:::no-loc text="Force Automatic Date And Time":::** | True | Enables the Set Automatically feature in Date & Time and the user can't disable it.<br><br>**Note:**<ul><li>Location services must be enabled during Setup Assistant.</li><li>Manual Time Zone policy will return an error if this policy is set to True.</li></ul> | [:::no-loc text="forceAutomaticDateAndTime":::](https://developer.apple.com/documentation/devicemanagement/restrictions) |
-| Managed Settings > Time Zone | **:::no-loc text="Time Zone":::** | **Example**:<br> America/Los_Angeles<br> Asia/Tokyo<br> Australia/Brisbane<br><br>See complete list in [:::no-loc text="IANA time zone database":::](https://data.iana.org/time-zones/tzdb/zone.tab). | If the **forceAutomaticDateAndTime** restriction is set in Restrictions, this setting fails with an error. Otherwise, setting this value disables automatic time zone logic. The user is still able to change the time zone; for example, by turning automatic date and time back on. The intention is to allow setting the time zone when automatic determination isn't available, such as when Location Services are off. | [:::no-loc text="TimeZone":::](https://developer.apple.com/documentation/devicemanagement/settingscommand/command/settings/timezone) |
+| Managed Settings > Time Zone | **:::no-loc text="Time Zone":::** | **Example**:<br> :::no-loc text="America/Los_Angeles"::: <br> :::no-loc text="Asia/Tokyo"::: <br> :::no-loc text="Australia/Brisbane"::: <br><br>See complete list in [:::no-loc text="IANA time zone database":::](https://data.iana.org/time-zones/tzdb/zone.tab). | If the **forceAutomaticDateAndTime** restriction is set in Restrictions, this setting fails with an error. Otherwise, setting this value disables automatic time zone logic. The user is still able to change the time zone; for example, by turning automatic date and time back on. The intention is to allow setting the time zone when automatic determination isn't available, such as when Location Services are off. | [:::no-loc text="TimeZone":::](https://developer.apple.com/documentation/devicemanagement/settingscommand/command/settings/timezone) |
 | Restrictions | **:::no-loc text="Allow Bluetooth Modification":::** | False | Prevents modification of Bluetooth settings. | [:::no-loc text="allowBluetoothModification":::](https://developer.apple.com/documentation/devicemanagement/restrictions) |
 | Restrictions | **:::no-loc text="Allow USB Restricted Mode":::** | True | Allows iOS devices to always connect to USB accessories while locked. If the system has Lockdown mode enabled, it ignores this value. | [:::no-loc text="allowUSBRestrictedMode":::](https://developer.apple.com/documentation/devicemanagement/restrictions) |
-| Restrictions | **:::no-loc text="Blocked App Bundle IDs":::** | **Example:**<br> com.apple.facetime<br> com.apple.findmy<br> com.apple.Home<br> com.apple.MobileStore<br> com.apple.MobileSMS<br> com.apple.Music<br> com.apple.podcasts<br> com.apple.stocks<br> com.apple.tv<br> com.apple.store.Jolly<br> com.apple.supportapp | Prevents showing or launching apps with bundle IDs in the array. | [:::no-loc text="blockedAppBundleIDs":::](https://developer.apple.com/documentation/devicemanagement/restrictions) |
+| Restrictions | **:::no-loc text="Blocked App Bundle IDs":::** | **Example:**<br> :::no-loc text="com.apple.facetime"::: <br> :::no-loc text="com.apple.findmy"::: <br> :::no-loc text="com.apple.Home"::: <br>  :::no-loc text="com.apple.MobileStore"::: <br> :::no-loc text="com.apple.MobileSMS"::: <br>  :::no-loc text="com.apple.Music"::: <br> :::no-loc text="com.apple.podcasts"::: <br> :::no-loc text="com.apple.stocks"::: <br> :::no-loc text="com.apple.tv"::: <br> :::no-loc text="com.apple.store.Jolly"::: <br> :::no-loc text="com.apple.supportapp"::: | Prevents showing or launching apps with bundle IDs in the array. | [:::no-loc text="blockedAppBundleIDs":::](https://developer.apple.com/documentation/devicemanagement/restrictions) |
 | Restrictions | **:::no-loc text="Enforced Software Update Delay":::** | 30 | How many days to delay a software update on the device. | [:::no-loc text="enforcedSoftwareUpdateDelay":::](https://developer.apple.com/documentation/devicemanagement/restrictions) |
 | Restrictions | **:::no-loc text="Force Classroom Automatically Join Classes":::** | True | Automatically gives permission to the teacher's requests without prompting the student. | [:::no-loc text="forceClassroomAutomaticallyJoinClasses":::](https://developer.apple.com/documentation/devicemanagement/restrictions) |
 | Restrictions | **:::no-loc text="Force Classroom Request Permission To Leave Classes":::** | True | A student enrolled in an unmanaged course through Classroom needs to request permission from the teacher to leave the course. | [:::no-loc text="forceClassroomRequestPermissionToLeaveClasses":::](https://developer.apple.com/documentation/devicemanagement/restrictions) |