Merge branch 'main' into cz-20230213-configtier

browsers/internet-explorer/includes/microsoft-365-ie-end-of-support.md

@@ -1,16 +1,12 @@
 ---
 author: aczechowski
 ms.author: aaroncz
-ms.date: 12/16/2022
+ms.date: 02/14/2023
 ms.reviewer: cathask
 manager: aaroncz
 ms.prod: ie11
 ms.topic: include
 ---
 
-> [!WARNING]
+> [!CAUTION]
-> **Update:** The retired, out-of-support Internet Explorer 11 desktop application is scheduled to be permanently disabled through a Microsoft Edge update on certain versions of Windows 10 on February 14, 2023.
+> **Update:** The retired, out-of-support Internet Explorer 11 desktop application has been permanently disabled through a Microsoft Edge update on certain versions of Windows 10. For more information, see [Internet Explorer 11 desktop app retirement FAQ](https://aka.ms/iemodefaq).
->
-> We highly recommend setting up IE mode in Microsoft Edge and disabling IE11 prior to this date to ensure your organization does not experience business disruption.
->
-> For more information, see [Internet Explorer 11 desktop app retirement FAQ](https://aka.ms/iemodefaq).

windows/client-management/mdm/windowsadvancedthreatprotection-csp.md

@@ -40,6 +40,7 @@ WindowsAdvancedThreatProtection
 ----Configuration
 --------SampleSharing
 --------TelemetryReportingFrequency
+--------AadDdeviceId
 ----Offboarding
 ----DeviceTagging
 --------Group
@@ -48,34 +49,34 @@ WindowsAdvancedThreatProtection
 
 The following list describes the characteristics and parameters.
 
-<a href="" id="--device-vendor-msft-windowsadvancedthreatprotection"></a>**./Device/Vendor/MSFT/WindowsAdvancedThreatProtection**
+**./Device/Vendor/MSFT/WindowsAdvancedThreatProtection**
 The root node for the Windows Defender Advanced Threat Protection configuration service provider.
 
 Supported operation is Get.
 
-<a href="" id="onboarding"></a>**Onboarding**
+**Onboarding**
 Sets Windows Defender Advanced Threat Protection Onboarding blob and initiates onboarding to Windows Defender Advanced Threat Protection.
 
 The data type is a string.
 
 Supported operations are Get and Replace.
 
-<a href="" id="healthstate"></a>**HealthState**
+**HealthState**
 Node that represents the Windows Defender Advanced Threat Protection health state.
 
-<a href="" id="healthstate-lastconnected"></a>**HealthState/LastConnected**
+**HealthState/LastConnected**
 Contains the timestamp of the last successful connection.
 
 Supported operation is Get.
 
-<a href="" id="healthstate-senseisrunning"></a>**HealthState/SenseIsRunning**
+**HealthState/SenseIsRunning**
 Boolean value that identifies the Windows Defender Advanced Threat Protection Sense running state.
 
 The default value is false.
 
 Supported operation is Get.
 
-<a href="" id="healthstate-onboardingstate"></a>**HealthState/OnboardingState**
+**HealthState/OnboardingState**
 Represents the onboarding state.
 
 Supported operation is Get.
@@ -85,15 +86,15 @@ The following list shows the supported values:
 - 0 (default) – Not onboarded
 - 1 – Onboarded
 
-<a href="" id="healthstate-orgid"></a>**HealthState/OrgId**
+**HealthState/OrgId**
 String that represents the OrgID.
 
 Supported operation is Get.
 
-<a href="" id="configuration"></a>**Configuration**
+**Configuration**
 Represents Windows Defender Advanced Threat Protection configuration.
 
-<a href="" id="configuration-samplesharing"></a>**Configuration/SampleSharing**
+**Configuration/SampleSharing**
 Returns or sets the Windows Defender Advanced Threat Protection Sample Sharing configuration parameter.
 
 The following list shows the supported values:
@@ -103,7 +104,7 @@ The following list shows the supported values:
 
 Supported operations are Get and Replace.
 
-<a href="" id="configuration-telemetryreportingfrequency"></a>**Configuration/TelemetryReportingFrequency**
+**Configuration/TelemetryReportingFrequency**
 Added in Windows 10, version 1703. Returns or sets the Windows Defender Advanced Threat Protection diagnostic data reporting frequency.
 
 The following list shows the supported values:
@@ -113,26 +114,31 @@ The following list shows the supported values:
 
 Supported operations are Get and Replace.
 
-<a href="" id="offboarding"></a>**Offboarding**
+**Configuration/AadDeviceId**
+Returns or sets the Intune's reported known AadDeviceId for the machine
+
+Supported operations are Get and Replace.
+
+**Offboarding**
 Sets the Windows Defender Advanced Threat Protection Offboarding blob and initiates offboarding to Windows Defender Advanced Threat Protection.
 
 The data type is a string.
 
 Supported operations are Get and Replace.
 
-<a href="" id="devicetagging"></a>**DeviceTagging**
+**DeviceTagging**
 Added in Windows 10, version 1709. Represents Windows Defender Advanced Threat Protection configuration for managing role based access and device tagging.
 
 Supported operation is Get.
 
-<a href="" id="group"></a>**DeviceTagging/Group**
+**DeviceTagging/Group**
 Added in Windows 10, version 1709. Device group identifiers.
 
 The data type is a string.
 
 Supported operations are Get and Replace.
 
-<a href="" id="criticality"></a>**DeviceTagging/Criticality**
+**DeviceTagging/Criticality**
 Added in Windows 10, version 1709. Asset criticality value. Supported values:
 
 - 0 - Normal
@@ -217,6 +223,16 @@ Supported operations are Get and Replace.
         </Target>
       </Item>
     </Get>
+    <Get>
+      <CmdID>7</CmdID>
+      <Item>
+        <Target>
+          <LocURI>
+            ./Device/Vendor/MSFT/WindowsAdvancedThreatProtection/Configuration/AadDeviceId
+          </LocURI>
+        </Target>
+      </Item>
+    </Get>
     <Get>
       <CmdID>11</CmdID>
       <Item>

windows/deployment/update/deployment-service-overview.md

@@ -96,13 +96,6 @@ To learn more about the deployment service and the deployment process, see:
 - [Deploy expedited updates using Graph Explorer](deployment-service-expedited-updates.md)
 - [Deploy driver and firmware updates using Graph Explorer](deployment-service-drivers.md)
 
-### Use Microsoft Intune
-
-Microsoft Intune integrates with the deployment service to provide Windows client update management capabilities. For more information, see:
-
-- [Feature updates for Windows 10 and later policy in Intune](/mem/intune/protect/windows-10-feature-updates)
-- [Expedite Windows quality updates in Microsoft Intune](/mem/intune/protect/windows-10-expedite-updates)
-
 ### Scripting common actions using PowerShell
 
 The Microsoft Graph SDK includes a PowerShell extension that you can use to script and automate common update actions. For more information, see [Get started with the Microsoft Graph PowerShell SDK](/graph/powershell/get-started).
@@ -117,3 +110,10 @@ Microsoft Graph makes deployment service APIs available through. Get started wit
 - Windows Update for Business deployment service [sample driver deployment application](https://github.com/microsoftgraph/windowsupdates-webapplication-sample) on GitHub
 - [Windows updates API overview in Microsoft Graph](/graph/windowsupdates-concept-overview)
 
+### Use Microsoft Intune
+
+Microsoft Intune integrates with the deployment service to provide Windows client update management capabilities. For more information, see:
+
+- [Feature updates for Windows 10 and later policy in Intune](/mem/intune/protect/windows-10-feature-updates)
+- [Expedite Windows quality updates in Microsoft Intune](/mem/intune/protect/windows-10-expedite-updates)
+