Merge pull request #6287 from MicrosoftDocs/main

Taojunshen · web-flow · commit 2409783e7fa7 · 2021-12-04T07:13:51.000+08:00
12/3/2021 PM Publish
diff --git a/memdocs/analytics/proactive-remediations.md b/memdocs/analytics/proactive-remediations.md
@@ -31,7 +31,7 @@ In this tutorial, you learn how to:
 
 Proactive remediations are script packages that can detect and fix common support issues on a user's device before they even realize there's a problem. These remediations can help reduce support calls. You can create your own script package, or deploy one of the script packages we've written and used in our environment for reducing support tickets.
 
-Each script package consists of a detection script, a remediation script, and metadata. Through Intune, you can deploy these script packages and see reports on their effectiveness. We're actively developing new script packages and would like to know your experiences using them.
+Each script package consists of a detection script, a remediation script, and metadata. Through Intune, you can deploy these script packages and see reports on their effectiveness.
 
 ## <a name="bkmk_prereq"></a> Prerequisites
 
diff --git a/memdocs/configmgr/apps/deploy-use/packages-and-programs.md b/memdocs/configmgr/apps/deploy-use/packages-and-programs.md
@@ -119,9 +119,9 @@ Packages can use some new features of Configuration Manager, including distribut
 
         - **Runs with UNC name**: Specify that the program runs with a Universal Naming Convention (UNC) name. This setting is the default.  
 
-        - **Requires drive letter**: Specify that the program requires a drive letter to fully qualify its location. For this setting, Configuration Manager can use any available drive letter on the client.  
+        - **Requires drive letter**: Specify that the program requires a drive letter to fully qualify its location. For this setting, Configuration Manager can use any available drive letter on the client.  This setting requires the deployment to use the Deployment option **Run program from distribution point** and the package's Data Access option enabled to **Copy the content in this package to a package share on distribution points**.
 
-        - **Requires specific drive letter**: Specify that the program requires a specific drive letter that you specify to fully qualify its location. For example, **Z:**. If the client is already using the specified drive letter, the program doesn't run.  
+        - **Requires specific drive letter**: Specify that the program requires a specific drive letter that you specify to fully qualify its location. For example, **Z:**. If the client is already using the specified drive letter, the program doesn't run.  This setting requires the deployment to use the Deployment option **Run program from distribution point** and the package's Data Access option enabled to **Copy the content in this package to a package share on distribution points**.
 
     - **Reconnect to distribution point at log on**: Indicate whether the client reconnects to the distribution point when the user signs in. By default, the wizard doesn't enable this option.
 
diff --git a/memdocs/intune/enrollment/android-enroll.md b/memdocs/intune/enrollment/android-enroll.md
@@ -58,8 +58,10 @@ For Samsung Knox Standard devices, there are [more prerequisites](android-samsun
 
 ## Next steps
 
-- [Set up Android Enterprise personally-owned work profile enrollments](android-work-profile-enroll.md)
-- [Set up Android Enterprise dedicated device enrollments](android-kiosk-enroll.md)
-- [Set up Android Enterprise fully managed enrollments](android-fully-managed-enroll.md)
+- [Set up Android Enterprise personally-owned work profile enrollment](android-work-profile-enroll.md)
+- [Set up Android Enterprise dedicated device enrollment](android-kiosk-enroll.md)
+- [Set up Android Enterprise fully managed enrollment](android-fully-managed-enroll.md)
 - [Set up Android device administrator enrollment](android-enroll-device-administrator.md)
 - [Set up Android Enterprise corporate-owned work profile](android-corporate-owned-work-profile-enroll.md)
+- [Set up Android (AOSP) corporate-owned user-associated enrollment](android-aosp-corporate-owned-user-associated-enroll.md)
+- [Set up Android (AOSP) corporate-owned userless enrollment](android-aosp-corporate-owned-userless-enroll.md)
diff --git a/memdocs/intune/enrollment/device-enrollment.md b/memdocs/intune/enrollment/device-enrollment.md
@@ -8,7 +8,7 @@ keywords:
 author: Lenewsad
 ms.author: lanewsad
 manager: dougeby
-ms.date: 4/24/2021
+ms.date: 12/03/2021
 ms.topic: overview
 ms.service: microsoft-intune
 ms.subservice: enrollment
@@ -43,9 +43,9 @@ By default, devices for all platforms are allowed to enroll in Intune. However,
 
 ## iOS/iPadOS enrollment methods
 
-| **Method** | **Reset Required** | [**User Affinity**](device-enrollment-program-enroll-ios.md#create-an-apple-enrollment-profile) | **Locked** | **Details** |
+| **Method** | **Reset required** | **User affinity** | **Locked** | **Details** |
 |:---:|:---:|:---:|:---:|:---:|
-| | Devices are wiped during enrollment. | Associates each device with a user.| If yes, users can't unenroll devices. | |
+|Method used to enroll devices. |If yes, devices are wiped during enrollment. | If yes, each device is associated with a user.| If yes, users can't unenroll devices. |More information about method. |
 |**[BYOD](#bring-your-own-device)** | No| Yes | No | [More information](apple-mdm-push-certificate-get.md)|
 |**[DEM](#device-enrollment-manager)**| No |No |No | [More information](device-enrollment-manager-enroll.md)|
 |**[ADE](#apple-automated-device-enrollment)**| Yes | Optional | Optional|[More information](device-enrollment-program-enroll-ios.md)|
@@ -54,16 +54,18 @@ By default, devices for all platforms are allowed to enroll in Intune. However,
 
 ## macOS enrollment methods
 
-| **Method** |  **Reset Required** |  **User Affinity** | **Locked** | **Details**|
+| **Method** |  **Reset required** |  **User affinity** | **Locked** | **Details**|
 |:---:|:---:|:---:|:---:|:---:|
+|Method used to enroll devices. |If yes, devices are wiped during enrollment. | If yes, each device is associated with a user.| If yes, users can't unenroll devices. |More information about method.  |
 |**[BYOD](#bring-your-own-device)** | No| Yes | No | [More information](macos-enroll.md)|
 |**[DEM](#device-enrollment-manager)**| No |No |No  | [More information](device-enrollment-manager-enroll.md)|
 |**[ADE](#apple-automated-device-enrollment)**| Yes | Optional | Optional|[More information](device-enrollment-program-enroll-macos.md)|
 
 ## Windows enrollment methods
 
-| **Method** | **Reset Required** | **User Affinity** | **Locked** | **Details**|
+| **Method** | **Reset required** | **User affinity** | **Locked** | **Details**|
 |:---:|:---:|:---:|:---:|:---:|
+|Method used to enroll devices. | If yes, devices are wiped during enrollment. | If yes, each device is associated with a user.| If yes, users can't unenroll devices. | More information about method. |
 |**[BYOD](#bring-your-own-device)** | No | Yes | No | [More information](windows-enroll.md)|
 |**[DEM](#device-enrollment-manager)**| No |No |No |[More information](device-enrollment-manager-enroll.md)|
 |**Auto-enroll** | No |Yes |No | [More information](windows-enroll.md#enable-windows-automatic-enrollment)|
@@ -76,15 +78,19 @@ By default, devices for all platforms are allowed to enroll in Intune. However,
 
 ### Personal enrollment methods
 
-| **Personal** | **Enrollment Methods** | **Reset Required** | **User Affinity** | **Locked** | **Details**|
+| **Enrollment type** | **Enrollment method** | **Reset required** | **User affinity** | **Locked** | **Details**|
 |:---:|:---:|:---:|:---:|:---:|:---:|
+|Name of enrollment type. |Method used to enroll devices.| If yes, devices are wiped during enrollment. | If yes, each device is associated with a user.| If yes, users can't unenroll devices. |More information about method. |
 |**Android Device Admin**|**User initiated via Company Portal** | No | Yes | No | [More information](../user-help/enroll-device-android-company-portal.md)|
 |**Android Enterprise personally-owned with Work Profile**|**User initiated via Company Portal**| No | Yes | No | [More information](android-work-profile-enroll.md)|
 
 ### Corporate enrollment methods
 
-| **Corporate** | **Enrollment Methods** | **Reset Required** | **User Affinity** | **Locked** | **Details**|
+| **Enrollment type** | **Enrollment method** | **Reset required** | **User affinity** | **Locked** | **Details**|
 |:---:|:---:|:---:|:---:|:---:|:---:|
+|Name of enrollment type. |Method used to enroll devices.| If yes, devices are wiped during enrollment. | If yes, each device is associated with a user.| If yes, users can't unenroll devices. |More information about method. |
+|**Android (AOSP) user-associated**|**QR code**|Yes|Yes|Configurable via policy|[More information](../enrollment/android-aosp-corporate-owned-user-associated-enroll.md)
+|**Android (AOSP) userless**|**QR code**|Yes|No|Configurable via policy|[More information](../enrollment/android-aosp-corporate-owned-userless-enroll.md)
 |**Android Device Admin**|**[DEM](#device-enrollment-manager) initiated via Company Portal**| No | No | No |[More information](device-enrollment-manager-enroll.md)|
 |**Android Device Admin**|**(Pre-declared IMEI or SN) User initiated via Company Portal**| No | Yes | No | [More information](corporate-identifiers-add.md)|
 |**Android Device Admin with Zebra Mobility Extensions**|**User or [DEM](#device-enrollment-manager) initiated via Company Portal**| No | Yes if user initiated, No if [DEM](#device-enrollment-manager) initiated | No | [More information](../configuration/android-zebra-mx-overview.md)|
diff --git a/memdocs/intune/fundamentals/china.md b/memdocs/intune/fundamentals/china.md
@@ -55,6 +55,7 @@ Because the China services are operated by a partner from inside China, there ar
 - To follow local regulations and provide improved functionality, the Intune client experience (Company Portal app) may differ in China.
 - Fencing isn't available.
 - Mobile Application Management (MAM) availability is conditional on those apps being available in People's Republic of China.
+- Intune operated by 21Vianet doesn't support Android (AOSP) management for corporate devices.  
 
 ## You control customer data
 
@@ -80,4 +81,4 @@ The Tenant Administrator role for Intune operated by 21Vianet can request data f
 
 ## Next steps
 
-[Learn more about Intune supported configurations](supported-devices-browsers.md)
+[Learn more about Intune supported configurations](supported-devices-browsers.md)
diff --git a/memdocs/intune/protect/microsoft-tunnel-overview.md b/memdocs/intune/protect/microsoft-tunnel-overview.md
@@ -5,7 +5,7 @@ keywords:
 author: brenduns
 ms.author: brenduns
 manager: dougeby
-ms.date: 10/25/2021
+ms.date: 12/03/2021
 ms.topic: how-to
 ms.service: microsoft-intune
 ms.subservice: protect
@@ -34,6 +34,9 @@ This article introduces the tunnel, how it works, and its architecture.
 
 If you're ready to deploy the Microsoft Tunnel, see [Prerequisites for the Microsoft Tunnel](microsoft-tunnel-prerequisites.md), and then [Configure the Microsoft Tunnel](microsoft-tunnel-configure.md).
 
+> [!TIP]
+> Download the Microsoft Tunnel Deployment Guide v2 from the [*Microsoft Download Center*](https://www.microsoft.com/download/details.aspx?id=102274).
+
 ## Overview of Microsoft Tunnel
 
 Microsoft Tunnel Gateway installs onto a container that runs on a Linux server. The Linux server can be a physical box in your on-premises environment or a virtual machine that runs on-premises or in the cloud. You'll deploy a Microsoft Tunnel client app and Intune VPN profiles to your iOS and Android devices to enable them to use the tunnel to connect to corporate resources. When the tunnel is hosted in the cloud, you’ll need to use a solution like Azure ExpressRoute to extend your on-premises network to the cloud.
diff --git a/memdocs/intune/protect/windows-update-settings.md b/memdocs/intune/protect/windows-update-settings.md
@@ -7,7 +7,7 @@ keywords:
 author: brenduns
 ms.author: brenduns
 manager: dougeby
-ms.date: 11/16/2021
+ms.date: 12/03/2021
 ms.topic: reference
 ms.service: microsoft-intune
 ms.subservice: protect
@@ -18,7 +18,7 @@ ms.localizationpriority: medium
 #ROBOTS:
 #audience:
 
-ms.reviewer: davidmeb; bryanke
+ms.reviewer: davguy; bryanke
 ms.suite: ems
 search.appverid: MET150
 #ms.tgt_pltfrm:
@@ -29,18 +29,16 @@ ms.collection:
 ---
 
 
-# Windows update settings for Intune  
+# Windows update settings for Intune
 
 View the Windows 10 and Windows 11 Update settings that you can [configure and manage](windows-update-for-business-configure.md) with Microsoft Intune.  
 
 When you configure settings for Windows update rings in Intune, you're configuring the Windows Update settings. If a Windows update setting has a Windows 10 or Windows 11 version dependency, the version dependency is noted in the settings details.  
 
-## Update settings  
+## Update settings
 
 Update settings control what bits a device will download, and when. For more information about the behavior of each setting, see the Windows reference documentation.  
 
-
- 
 - **Microsoft product updates**  
   **Default**:  Allow  
   Windows Update CSP: [Update/AllowMUUpdateService](/windows/client-management/mdm/policy-csp-update#update-allowmuupdateservice)
@@ -141,8 +139,8 @@ User experience settings control the end-user experience for device restart and
       **Default**: 5 PM  
       Windows Update CSP: [Update/ActiveHoursEnd](/windows/client-management/mdm/policy-csp-update#update-activehoursend)  
 
-  - **Auto install and restart at scheduled time** - Specify an installation day and time. If unspecified, installation runs at 3 AM daily, followed by a 15-minute countdown to a restart. Logged on users can delay countdown and restart.   
-  Windows Update CSP: [Update/AllowAutoUpdate](/windows/client-management/mdm/policy-csp-update#update-allowautoupdate)  
+  - **Auto install and restart at scheduled time** - Specify an installation day and time. If unspecified, installation runs at 3 AM daily, followed by a 15-minute countdown to a restart. Logged on users can delay countdown and restart.  
+    Windows Update CSP: [Update/AllowAutoUpdate](/windows/client-management/mdm/policy-csp-update#update-allowautoupdate)  
 
     This option supports additional settings.  
 
@@ -153,7 +151,7 @@ User experience settings control the end-user experience for device restart and
       **Default**: Any Day  
 
     - **Scheduled install time** - Specify the time of day when you want updates to install.  
-      **Default**: 3 AM   
+      **Default**: 3 AM
   
       > [!IMPORTANT]  
       > The device might not complete the installation at the specified time because of power policies, user absence, and so on. In this case, it will not attempt installation until the specified time occurs again or until a deadline you have specified is reached.
@@ -162,7 +160,6 @@ User experience settings control the end-user experience for device restart and
 
   - **Reset to default** - Restore the original auto update settings on machines that run the Windows 10 October 2018 Update or later, and that run Windows 11.  These original auto update settings allow Windows to use automatically determined active hours to schedule the best time to install updates and restart the system after it installs the updates.
 
-
 - **Restart checks**  
   **Default**: Allow  
   Windows Update CSP: [Update/SetEDURestart](/windows/client-management/mdm/policy-csp-update#update-setedurestart)  
@@ -178,34 +175,11 @@ User experience settings control the end-user experience for device restart and
 
 - **Option to check for Windows updates**  
   **Default**: Enable  
-  Windows Update CSP: [Update/SetDisableUXWUAccess](/windows/client-management/mdm/policy-csp-update#update-setdisableuxwuaccess) 
+  Windows Update CSP: [Update/SetDisableUXWUAccess](/windows/client-management/mdm/policy-csp-update#update-setdisableuxwuaccess)
 
   - **Enable** - Allow device users to use Windows Update scan to find updates.
   - **Disable** - Prevent device users from accessing the Windows Update scan.  
 
-- **Require user approval to dismiss restart notification**  
-  **Default**: Not configured  
-  Windows Update CSP: [Update/AutoRestartRequiredNotificationDismissal](/windows/client-management/mdm/policy-csp-update#update-autorestartrequirednotificationdismissal)
-  
-  - **No** - Automatic Dismissal after 25 seconds.
-  - **Yes** - Require User Dismissal.
-   
-- **Remind user prior to required auto-restart with dismissible reminder (hours)**  
-  **Default**: 4  
-  Windows Update CSP: [Update/ScheduleRestartWarning](/windows/client-management/mdm/policy-csp-update#update-schedulerestartwarning)  
-
-  Specify how long in advance of an automatic restart to display a dismissible notification to a device user about that restart. Values of **2**, **4**, **8**, **12**, or **24** hours are supported.  
-  
-  When you clear the default value, this setting becomes *Not configured*.  
-
-- **Remind user prior to required auto-restart with permanent reminder (minutes)**  
-  **Default**: 15  
-  Windows Update CSP: [Update/ScheduleImminentRestartWarning](/windows/client-management/mdm/policy-csp-update#update-scheduleimminentrestartwarning)  
-
-  Specify how long in advance of an automatic restart to display a non-dismissible warning to a device user about that restart. Values of **15**, **30** or **60** minutes are supported.  
-
-  When you clear the default value, this setting becomes *Not configured*.  
-
 - **Change notification Update level**  
   **Default**: Use the default Windows Update notifications  
   Windows Update CSP: [Update/UpdateNotificationLevel](/windows/client-management/mdm/policy-csp-update#update-updatenotificationlevel)
@@ -220,7 +194,7 @@ User experience settings control the end-user experience for device restart and
 
 - **Use deadline settings**  
   **Default**: Not configured  
- 
+
   Allows user to use deadline settings.  
 
   - **Not configured**
diff --git a/memdocs/intune/user-help/install-a-new-version-of-the-company-portal-app.md b/memdocs/intune/user-help/install-a-new-version-of-the-company-portal-app.md
@@ -40,10 +40,12 @@ ms.collection:
 - Windows 11  
 
  
-Get the latest version of the Company Portal app on your Android, iOS, macOS, or Windows device. Your organization may require you to update the app on your device when:  
+Get the latest version of the Microsoft Intune Company Portal app on your Android, iOS, macOS, or Windows device. We recommend using the latest version of the Company Portal app on your device because it contains the latest bug fixes and security updates. 
 
-* A newer version of Company Portal becomes available.
-* Your version of Company Portal is no longer supported. 
+Your organization may require you to update the app on your device when:  
+
+* A newer version of Company Portal becomes available.  
+* Your version of Company Portal is no longer supported.  
 
 If an update is required, you'll receive a notification from Company Portal.  
 
@@ -97,6 +99,7 @@ To turn on automatic updates:
 
 Organizations may disable app updates. If this option is unavailable on your device, use the first set of Windows 10/11 instructions to update your app. 
 
+
 ## Next steps  
 
 Still need help? Contact your IT support person. For contact information, check the [Company Portal website](https://go.microsoft.com/fwlink/?linkid=2010980).
diff --git a/windows-365/enterprise/zoom-support.md b/windows-365/enterprise/zoom-support.md
