Merge branch 'main' into 9295335-disable-udp-for-tunnel

Author: MandiOhlinger

memdocs/autopilot/autopilot-support.md

@@ -31,9 +31,9 @@ Before contacting the resources listed below for Windows Autopilot-related issue
 | Audience   |   Support contact     |
 |------------|---------------------------------------|
 | OEM or Channel Partner registering devices as a CSP (via MPC) | Use the help resources available in MPC. Whether you are a named partner or a channel partner (distributor, reseller, SI, etc.), if you’re a CSP registering Autopilot devices through MPC (either manually or through the MPC API), your first-line of support should be the help resources within MPC. |   
-| OEM registering devices using OEM Direct API | Contact [email protected]. Response time depends on priority: <br>Low – 120 hours <br>Normal – 72 hours <br>High – 24 hours <br>Immediate – 4 hours |
-| Enterprise customers | Contact your Technical Account Manager (TAM), or Account Technology Strategist (ATS), or Customer Service Support (CSS) representative. |
-| End-user | Contact your IT administrator. |
+| OEM registering devices using OEM Direct | Contact [email protected]. Response time depends on priority: <br>Low – 120 hours <br>Normal – 72 hours <br>High – 24 hours <br>Immediate – 4 hours <br> Please note that [email protected] is only accessible for OEMs  |
+| Enterprise customers (CompanyIT Administrator) | Contact your Technical Account Manager (TAM), or Account Technology Strategist (ATS), or Customer Service Support (CSS) representative. |
+| End-user | Contact your IT administrator if any, or Channel Partner/OEM. |
 | Microsoft Partner Center (MPC) users | Use the [help resources](https://partner.microsoft.com/support) available in MPC. |
 | Microsoft Store for Business (MSfB) users | Use the help resources available in MSfB. |
 | Intune users | From the Microsoft Endpoint Manager admin center, click [Help and support](https://endpoint.microsoft.com/#blade/Microsoft_Intune_DeviceSettings/TenantAdminMenu/helpSupport). |

memdocs/autopilot/profiles.md

@@ -50,7 +50,7 @@ Autopilot deployment profiles are used to configure the Autopilot devices. You c
 4. Select **Next**.
 5. On the **Out-of-box experience (OOBE)** page, for **Deployment mode**, choose one of these two options:
     - **User-driven**: Devices with this profile are associated with the user enrolling the device. User credentials are required to enroll the device.
-    - **Self-deploying (preview)**: (requires Windows 10, version 1809 or later) Devices with this profile aren't associated with the user enrolling the device. User credentials aren't required to enroll the device. When a device has no user associated with it, user-based compliance policies don't apply to it. When using self-deploying mode, only compliance policies targeting the device will be applied.
+    - **Self-deploying (preview)**: (requires Windows 10, version 1903 or later) Devices with this profile aren't associated with the user enrolling the device. User credentials aren't required to enroll the device. When a device has no user associated with it, user-based compliance policies don't apply to it. When using self-deploying mode, only compliance policies targeting the device will be applied.
 
     ![Screenshot of OOBE page.](images/create-profile-out-of-box.png)
 

memdocs/configmgr/core/clients/manage/collections/collection-evaluation.md

@@ -30,10 +30,6 @@ At a high level, each individual collection evaluation and update follows these
 
 1. Execute the collection query.
 1. Add any systems that are direct members.
-1. Evaluate all *include* collections.
-
-   If the include collections also have query rules, or have include or exclude collections, evaluate them also. If the include collections themselves are limiting collections, evaluate any collections below them. After fully evaluating the tree, return the results to the calling collection.
-
 1. Perform a logical `AND` between the returned results and the limiting collection.
 1. Evaluate the *exclude* collections.
 

memdocs/configmgr/core/clients/manage/collections/media/high-level-collection-update-process.png

@@ -2,7 +2,7 @@
 title: Maintenance tasks
 titleSuffix: Configuration Manager
 description: Understand what maintenance tasks to perform for Configuration Manager sites and hierarchies and when to perform them.
-ms.date: 07/26/2019
+ms.date: 08/02/2020
 ms.prod: configuration-manager
 ms.technology: configmgr-core
 ms.topic: conceptual
@@ -109,9 +109,9 @@ After you install a Configuration Manager site, review the available maintenance
 
  Use the following procedure to help you set up the common settings of maintenance tasks.  
 
-### <a name="bkmk_MTs1906"></a>To set up maintenance tasks for Configuration Manager version 1906
+### <a name="bkmk_MTs1906"></a>To set up maintenance tasks for Configuration Manager
 <!--3555894-->
-Starting in version 1906, site server maintenance tasks can now be viewed, edited, and monitored from their own tab on the details view of a site server. You can still edit maintenance tasks by choosing **Site Maintenance** in the **Settings** group like you did in previous Configuration Manager versions.
+Site server maintenance tasks can now be viewed, edited, and monitored from their own tab on the details view of a site server. You can still edit maintenance tasks by choosing **Site Maintenance** in the **Settings** group like you did in previous Configuration Manager versions.
 
 1. In the Configuration Manager console, go to **Administration** > **Site Configuration** >**Sites**.
 1. Select a site from your list, then click on the **Maintenance Tasks** tab in the detail panel.
@@ -130,19 +130,14 @@ The **Maintenance Tasks** tab gives you information such as:
 - Last completion time
 - If the task completed successfully
 
-### To set up maintenance tasks for Configuration Manager version 1902 and prior
+## Database reindexing can temporarily impact the replication link status
 
-1. In the Configuration Manager console, go to **Administration** > **Site Configuration** >**Sites**.
-2. Choose the site that has the maintenance task that you want to set up.  
-3. On the **Home** tab, in the **Settings** group, choose **Site Maintenance**, and then choose the maintenance task that you want to set up. Only tasks that are available at the selected site are displayed.
-
-4. To set up the task, choose **Edit**. Ensure the **Enable this task** check box is checked, and set up a schedule for when the task runs. If the task also deletes aged data, set up the age of data that will be deleted from the database when the task runs. Choose **OK** to close the task **Properties**.
+When the Configuration Manager database is reindexing, either through the [built in maintenance task](reference-for-maintenance-tasks.md#rebuild-indexes) or SQL Server Management Studio, you may notice that [replication links](monitor-replication.md) will temporarily go into a degraded or failed state during this process. The state degradation occurs because when a reindex is run on the database tables they're blocked and can't be written to. It's an offline operation and is fundamental to [how DBCC REINDEX functions](/sql/t-sql/database-console-commands/dbcc-dbreindex-transact-sql). In order for a sync on a replication group to be considered successful, the site actually has to be able to process the data that it received. This means that during this reindexing process, the link status can bounce between degraded, failed, active, and back again. Depending on how much data is being replicated between the sites, the amount of time to go from a failed state to an active state will vary from environment to environment.
 
-   > [!NOTE]  
-   > For **Delete Aged Status Messages**, you set up the age of data to delete when you set up status filter rules.  
+If the state change during a reindex is problematic for your monitoring, each replication link has a set of [thresholds that can be modified](../../plan-design/hierarchy/database-replication.md#database-replication-thresholds) to adjust when the link goes into a degraded state or when it goes into a failed state. Replication links contain multiple replication groups, which are broken up into two types: global data and site data. Global data attempts to sync every one minute and site data syncs every five minutes. By default, the link changes to degraded when the threshold of 12 failures is reached then changes to the failed state at 24. To set these thresholds, select the link under the **Database Replication** node then select **Link Properties**. In the **Alerts** tab, there are thresholds for setting the link to degraded or failed. By default these values are set to 12 and 24 respectively.
 
-5. To enable or disable the task without editing the task properties, choose the **Enable** or **Disable** button. The button label changes depending on the current configuration of the task.  
-6. When you're finished configuring the maintenance tasks, choose **OK** to finish the procedure.
+> [!IMPORTANT]
+> Take caution when changing these values since the higher the value the longer it will take you to be notified of a problem. When choosing to increase or decrease the value, increment or decrement by 1 and monitor the link closely before making another change to it.
 
 ## Next steps
 

memdocs/configmgr/core/servers/manage/maintenance-tasks.md

@@ -88,7 +88,7 @@ For corporate-owned devices with a work profile, some settings only apply in the
 - **Beam data using NFC (work-profile level)**: **Block** prevents using the Near Field Communication (NFC) technology to beam data from apps. When set to **Not configured** (default), Intune doesn't change or update this setting. By default, the OS might allow using NFC to share data between devices.  
 - **Developer settings**: Choose **Allow** to let users access developer settings on the device. When set to **Not configured** (default), Intune doesn’t change or update this setting. By default, the OS might prevent users from accessing developer settings on the device.
 - **Microphone adjustment**: **Block** prevents users from unmuting the microphone and adjusting the microphone volume. When set to **Not configured** (default), Intune doesn't change or update this setting. By default, the OS might allow users to use and adjust the volume of the microphone on the device.
-- **Factory reset protection emails**: Choose **Google account email addresses**. Enter the email addresses of device administrators that can unlock the device after it's wiped. Be sure to separate the email addresses with a semi-colon, such as `[email protected];[email protected]`. If an email isn't entered, anyone can unlock the device after it's restored to the factory settings. These emails only apply when a non-user factory reset is run, such as running a factory reset using the recovery menu.
+- **Factory reset protection emails**: Choose **Google account email addresses**. Enter the email addresses of device administrators that can unlock the device after it's wiped. Be sure to separate the email addresses with a semi-colon, such as `[email protected];[email protected]`. These emails only apply when a non-user factory reset is run, such as running a factory reset using the recovery menu.
 
   When set to **Not configured** (default), Intune doesn't change or update this setting.
 

memdocs/intune/configuration/device-restrictions-android-for-work.md

@@ -7,7 +7,7 @@ keywords:
 author: MandiOhlinger
 ms.author: mandia
 manager: dougeby
-ms.date: 07/26/2022
+ms.date: 08/02/2022
 ms.topic: how-to
 ms.service: microsoft-intune
 ms.subservice: configuration
@@ -65,6 +65,7 @@ Previously, to configure Google Chrome settings on Windows devices, you created
 This feature applies to:
 
 - Windows 11
+- Windows 10 and later
 
 You can create a universal print policy, add printers, and then deploy this printer list to your managed users. When the policy is deployed, it automatically installs the printers you added. Users can see these printers, and select a printer from your list.
 

memdocs/intune/configuration/settings-catalog-common-features.md

@@ -7,7 +7,7 @@ keywords:
 author: Lenewsad
 ms.author: lanewsad
 manager: dougeby
-ms.date: 4/16/2019
+ms.date: 8/1/2022
 ms.topic: how-to
 ms.service: microsoft-intune
 ms.subservice: enrollment
@@ -40,7 +40,7 @@ For more information about how connectors work, see [Understand Azure AD Applica
 
 You can configure the connector to bypass your on-premises proxy to ensure it uses direct connectivity to the Azure services. We recommend this approach, as long as your network policy allows for it, because it means that you have one less configuration to maintain.
 
-To disable outbound proxy usage for the connector, edit the ``:\Program Files\Microsoft Intune\ODJConnector\ODJConnectorUI\ODJConnectorUI.exe.config`` file and add the proxy address and proxy port in the section shown in this code sample:
+To disable outbound proxy usage for the connector, edit the ``:\Program Files\Microsoft Intune\ODJConnector\ODJConnectorUI\ODJConnectorUI.exe.config`` file and set the default proxy to ` "False" ` as shown in the following code example:  
 
 ```xml
 <?xml version="1.0" encoding="utf-8" ?>
@@ -160,4 +160,4 @@ Once the configuration files have been modified, you'll need to restart the Intu
 
 ## Next steps
 
-[Manage your devices](../remote-actions/device-management.md)
+[Manage your devices](../remote-actions/device-management.md)