Merge branch 'main' into release-cm2206-tp

Author: v-alje

memdocs/intune/enrollment/macos-enroll.md

@@ -69,7 +69,7 @@ Intune supports the following enrollment methods for company-owned macOS devices
 ## Bootstrap tokens (preview)    
 
 > [!IMPORTANT]
-> This feature is in [public preview](../fundamentals/public-preview.md). It is not available in GCC High and government cloud tenants.  
+> This feature is in [public preview](../fundamentals/public-preview.md).   
 
 Intune supports the use of bootstrap tokens on enrolled Macs running macOS 10.15 or later. Bootstrap tokens grant volume ownership status to local user and guest accounts, so that non-admin users can approve important operations that an admin would otherwise need to do.  Operations such as: 
 

memdocs/intune/fundamentals/in-development.md

@@ -44,7 +44,6 @@ Intune supports devices running the following operating systems (OS):
 * Android 
 * Windows
 * macOS 
-* Linux
 
 [!INCLUDE [mdm-supported-devices](../includes/mdm-supported-devices.md)]
 

memdocs/intune/fundamentals/supported-devices-browsers.md

@@ -1,33 +1,26 @@
 ### YamlMime:ZonePivotGroups
 groups:
-- id: security-baseline-settings-one
-  title: Security baselines
-  prompt: Choose your security baseline
-  pivots:
-    - id: windows-mdm
-      title: Windows MDM
-    - id: microsoft-defender-atp
-      title: Microsoft Defender for Endpoint
 - id: windows-mdm-versions
   title: Security Baselines for Windows 10 and later
   prompt: Choose a version
   pivots:
-    - id: november-2021
+    - id: mdm-november-2021
       title: November 2021
     - id: mdm-december-2020
       title: December 2020
-    - id: mdm-sept-2020
+    - id: mdm-august-2020
       title: August 2020
 - id: edge-baseline-versions
   title: Edge baseline versions
   prompt: Choose a version
   pivots:
-    - id: edge-october-2019
-      title: October 2019
-    - id: edge-april-2020
-      title: April 2020
     - id: edge-sept-2020
       title: September 2020
+    - id: edge-april-2020
+      title: April 2020
+    - id: edge-october-2019
+      title: October 2019
+
 - id: atp-baseline-versions
   title: ATP baseline versions
   prompt: Choose a version
@@ -46,6 +39,6 @@ groups:
   pivots:
     - id: win365-2110
       title: Version 2110 
-    - id: win365-2101
+    - id: win365-november-2101
       title: Version 2101