Merge pull request #7728 from MicrosoftDocs/main

Publish 06/03/2022 3:30 PM PT

Author: Angela Fleischmann

memdocs/autopilot/add-devices.md

@@ -1,18 +1,13 @@
 ---
 title: Manually register devices with Windows Autopilot
 description: Learn how to manually add devices to Windows Autopilot.
-keywords: mdm, setup, windows, windows 10, oobe, manage, deploy, autopilot, ztd, zero-touch, partner, msfb, intune
 ms.prod: w10
-ms.mktglfcycl: deploy
 ms.localizationpriority: medium
-ms.sitesec: library
-ms.pagetype: deploy
-audience: itpro
 author: aczechowski
 ms.author: aaroncz
 ms.reviewer: jubaptis
 manager: dougeby
-ms.date: 08/05/2021
+ms.date: 06/03/2022
 ms.topic: how-to
 ms.collection: 
 - M365-modern-desktop
@@ -166,7 +161,8 @@ Keep these other requirements for the CSV file in mind:
 - You can use only ANSI-format text files (not Unicode). 
 - Headers are case-sensitive. 
 
-Because of these requirements, editing an Excel file and saving it as .csv will not generate a usable file for importing into the Intune portal.
+> [!IMPORTANT]
+> Use a plain-text editor with this CSV file, like Notepad. Don't use Microsoft Excel. Because of the requirements, editing an Excel file and saving it as `.csv` won't generate a usable file for importing to Intune.
    
 When you upload a CSV file to assign a user, make sure that you assign valid User Principal Names (UPNs). If you assign an invalid UPN (that is, an incorrect username), your device might be inaccessible until you remove the invalid assignment. 
 

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/enrollment/windows-enrollment-status.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

@@ -103,9 +103,9 @@ items:
       href: you-need-to-resolve-a-threat-found-by-zips-android.md
   - name: Get help
     items:
-    - name: Report problem to IT support
+    - name: Report a problem 
       href: send-logs-to-your-it-admin-by-email-android.md
-    - name: Share logs with Microsoft developers
+    - name: Share diagnostic details  
       href: send-logs-to-microsoft-android.md
 - name: iOS/iPadOS device management
   items:
@@ -171,9 +171,9 @@ items:
     items:
     - name: Retrieve iOS/iPadOS logs
       href: retrieve-ios-app-logs.md
-    - name: Report problem to IT support
+    - name: Report a problem 
       href: send-errors-to-your-it-admin-ios.md
-    - name: Share logs with Microsoft developers
+    - name: Share app logs 
       href: send-logs-to-microsoft-ios.md
 - name: macOS device management
   items:
@@ -185,9 +185,11 @@ items:
       href: enroll-your-device-in-intune-macos-cp.md
     - name: Enroll your organization-provided macOS device
       href: enroll-company-device-macos.md
+    - name: Unenroll Mac 
+      href: unenroll-your-device-from-intune-macos.md 
   - name: Company Portal for macOS
     items:
-    - name: Manually sync macOS device
+    - name: Sync macOS device
       href: sync-your-device-manually-macos.md
     - name: Manage Company Portal preferences
       href: intune-company-portal-preferences-macos.md
@@ -207,11 +209,9 @@ items:
       href: device-limit-wpj-macos.md
     - name: Help for JAMF-managed devices in Intune
       href: device-little-different-jamf.md
-    - name: Remove device from Intune 
-      href: unenroll-your-device-from-intune-macos.md
   - name: Get help
     items:
-    - name: Report Company Portal problems
+    - name: Report a problem  
       href: send-errors-macos.md
 - name: Windows device management
   items:

memdocs/intune/protect/security-baseline-settings-defender-atp.md

@@ -8,7 +8,7 @@ author: lenewsad
 
 ms.author: lanewsad
 manager: dougeby
-ms.date: 09/27/2021
+ms.date: 06/02/2022
 ms.topic: end-user-help
 ms.prod:
 ms.service: microsoft-intune
@@ -32,26 +32,28 @@ ms.collection:
 
 # Report Company Portal app problems  
 
-Sometimes unexplained errors occur in the Company Portal app. When it happens, you can get help by emailing your IT support person. Company Portal provides you with an email template and helps you upload the diagnostic details to give your IT team the context to support you. 
+Get help or report a problem with the Company Portal app. Company Portal provides you with an email template and helps you upload and send diagnostic details.   
 
-## Report problem to IT support person 
+## Get help from support  
 
-1. When you receive an error message, select **Report**.
+1. When you receive the error message, select **Report**. 
+2. In the Company Portal app, go to the menu bar and select the **Help** menu > **Save Diagnostic Report**. 
+3. Choose a location to save the file. 
+4. Go to **Help** > **Send Diagnostic Report** > **Email details** to compose a message.
+5. Enter your support person's email address in the **To** line.  
+6. Attach the diagnostics report file if it wasn't automatically done.   
+6. In the body of the email, describe your experience with the app. Include the steps you took right up until the error occurred. 
+7. Send the email, and follow up with your support person if needed.      
 
-2. Select the **Help** menu > **Save Diagnostic Report**. Choose a location to save the file. 
+## Share diagnostic details 
 
-3. Email the file to your IT support person. If your email app is configured, you can send the diagnostic report by going to **Help** > **Send Diagnostic Report** > **Email details**. You will need to fill in the email address for your support person. 
+If Company Portal behaves unexpectedly, you can share the diagnostic details with Microsoft. Microsoft uses the Company Portal-specific logs to learn from and improve upon future products. 
 
-4. In the body of the email, describe your experience with the app. If you can remember them, include the steps you took before the error occurred. 
-
-## Share diagnostic details with Company Portal developers 
-
-App developers want to hear from you when unexpected behavior, such as a crash, occurs in Company Portal. Your diagnostic details could help developers find the root cause of a problem and prevent it from happening to other users. 
+1. Open the Company Portal app.
+2. Go to the menu bar and select the **Help** menu > **Send diagnostic report**.  
+3. After the logs are uploaded, you'll receive an incident ID. Copy and save the ID for your personal record. 
 
-To share your diagnostic logs with Microsoft:
+## Contact information  
+To find your organization's contact information, sign in to the Company Portal app or [website](https://go.microsoft.com/fwlink/?linkid=2010980) and select **Support**.   
 
-1. Open the Company Portal app.
-2. Click the **Help** menu > **Send Diagnostic Report**.  After the logs are uploaded, you'll receive an incident ID. Copy and save the ID.
-3. Select **Email details**. In the body of the email, describe your experience with the app. If you can remember them, include the steps you took before the error occurred. 
 
-Still need help? Contact your company support. For contact information, check the [Company Portal website](https://go.microsoft.com/fwlink/?linkid=2010980).