Merge branch 'main' of https://github.com/microsoftdocs/memdocs-pr into streamline-settings-list-for-baselines

Author: Brenduns

.openpublishing.redirection.json

@@ -1,5 +1,25 @@
 {
     "redirections": [
+        {
+            "source_path": "memdocs/intune/configuration/vpn-settings-windows-phone-8-1.md",
+            "redirect_url": "https://support.microsoft.com/windows/windows-phone-8-1-end-of-support-faq-7f1ef0aa-0aaf-0747-3724-5c44456778a3",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "memdocs/intune/configuration/email-settings-windows-phone-8-1.md",
+            "redirect_url": "https://support.microsoft.com/windows/windows-phone-8-1-end-of-support-faq-7f1ef0aa-0aaf-0747-3724-5c44456778a3",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "memdocs/intune/configuration/device-restrictions-windows-phone-8-1.md",
+            "redirect_url": "https://support.microsoft.com/windows/windows-phone-8-1-end-of-support-faq-7f1ef0aa-0aaf-0747-3724-5c44456778a3",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "memdocs/intune/configuration/custom-settings-windows-phone-8-1.md",
+            "redirect_url": "https://support.microsoft.com/windows/windows-phone-8-1-end-of-support-faq-7f1ef0aa-0aaf-0747-3724-5c44456778a3",
+            "redirect_document_id": false
+        },
         {
             "source_path": "memdocs/intune/apps/store-apps-windows-phone-8-1.md",
             "redirect_url": "/mem/intune/apps/apps-add",

memdocs/configmgr/comanage/tutorial-co-manage-clients.md

@@ -149,7 +149,7 @@ Automatic enrollment also lets users enroll their Windows 10 or later devices to
     > [!NOTE]
     > Some tenants may not have these options to configure.<!-- SCCMDocs#1230 -->
     >
-    > **Microsoft Intune** is how you configure the MDM app for Azure AD. **Microsoft Intune Enrollment** is a specific Azure AD app that's created when you apply multi-factor authentication policies for iOS and Android enrollment. For more information, see [Require multi-factor authentication for Intune device enrollments](/intune/enrollment/multi-factor-authentication).
+    > **Microsoft Intune** is how you configure the MDM app for Azure AD. **Microsoft Intune Enrollment** is a specific Azure AD app that's created when you apply multi-factor authentication policies for iOS and Android enrollment. For more information, see [Require multi-factor authentication for Intune device enrollments](../../intune/enrollment/multi-factor-authentication.md).
 
 5. For MDM user scope, select **All**, and then **Save**.  
 
@@ -159,6 +159,9 @@ With hybrid Azure AD set-up and Configuration Manager client configurations in p
 
 When you enable co-management, you'll assign a collection as a *Pilot group*. This is a group that contains a small number of clients to test your co-management configurations. We recommend you create a suitable collection before you start the procedure. Then you can select that collection without exiting the procedure to do so. You may need multiple collections since you can assign a different *Pilot group* for each workload.
 
+> [!NOTE]
+> Since devices are enrolled in the Microsoft Intune service based on its Azure AD device token, and not a user token, only the default [Intune enrollment restriction](../../intune/enrollment/enrollment-restrictions-set.md) will apply to the enrollment. 
+
 ### Enable co-management for versions 2111 and later
 
 [!INCLUDE [Enable Co-management starting in version 2111](includes/enable-co-management-2111.md)]

memdocs/configmgr/core/get-started/2019/includes/1909/3556022.md

@@ -92,7 +92,7 @@ The tool doesn't currently have any tasks to migrate the database from on-premis
 
 - [Backup and restore the database](../../../../servers/manage/backup-and-recovery.md)
 - [Configure a SQL Server Always On availability group and allow the data to replicate](../../../../servers/deploy/configure/sql-server-alwayson-for-a-highly-available-site-database.md#changes-for-site-backup)
-- [Migrate a SQL Server database to an Azure SQL Server VM](/azure/virtual-machines/windows/sql/virtual-machines-windows-migrate-sql)
+- [Migrate a SQL Server database to an Azure SQL Server VM](/azure/azure-sql/virtual-machines/windows/migrate-to-vm-from-sql-server)
 
 #### Site system roles
 

memdocs/configmgr/core/support/azure-migration-tool.md

@@ -144,7 +144,7 @@ The tool doesn't currently have any tasks to migrate the database from on-premis
 
 - [Backup and restore the database](../servers/manage/backup-and-recovery.md)
 - [Configure a SQL Server Always On availability group and allow the data to replicate](../servers/deploy/configure/sql-server-alwayson-for-a-highly-available-site-database.md#changes-for-site-backup)
-- [Migrate a SQL Server database to an Azure SQL Server VM](/azure/virtual-machines/windows/sql/virtual-machines-windows-migrate-sql)
+- [Migrate a SQL Server database to an Azure SQL Server VM](/azure/azure-sql/virtual-machines/windows/migrate-to-vm-from-sql-server)
 
 ## Site system roles
 

memdocs/configmgr/core/understand/site-size-performance-faq.yml

@@ -94,9 +94,9 @@ sections:
           For more information and recommendations on how to maximize Premium Storage performance and run SQL Servers in Azure IaaS VMs, see:
           
           - [Optimize application performance](/azure/storage/storage-premium-storage-performance#optimize-application-performance)
-           
-          - [Disks guidance](/azure/virtual-machines/windows/sql/virtual-machines-windows-sql-performance#disks-guidance)
-          
+
+          - [Disks guidance](/azure/azure-sql/virtual-machines/windows/performance-guidelines-best-practices-checklist#storage)
+
           **Example: Azure-based site server** 
           
           [Sizing guidelines](../plan-design/configs/site-size-performance-guidelines.md#general-sizing-guidelines) for a colocated site server and SQL Server with **50,000** clients are eight cores, 32 GB, and 1200 IOPS for site server inboxes, and 2800 IOPS for SQL Server files.
@@ -110,7 +110,7 @@ sections:
           | 1xP30 (1024 GB)   | 64k ReFS      | SQL Server (all files<sup>2</sup>) | 2800                 | 3112             |
           
           1. This value is from [Example disk configurations](../plan-design/configs/site-size-performance-guidelines.md#example-disk-configurations).
-          2. [Azure guidance](/azure/virtual-machines/windows/sql/virtual-machines-windows-sql-performance#disks-guidance) allows for placing the TempDB on the local, SSD-based *D:* drive, given it won't exceed available space and allows for additional disk I/O distribution.
+          2. [Azure guidance](/azure/azure-sql/virtual-machines/windows/performance-guidelines-best-practices-checklist#storage) allows for placing the TempDB on the local, SSD-based *D:* drive, given it won't exceed available space and allows for additional disk I/O distribution.
           
           **Example: Azure-based site server (for instant performance increase)** 
           
@@ -128,7 +128,7 @@ sections:
           
           1. Disks are striped using Storage Spaces.
           2. This value is from [Example disk configurations](../plan-design/configs/site-size-performance-guidelines.md#example-disk-configurations). VM size limits performance.
-          3. [Azure guidance](/azure/virtual-machines/windows/sql/virtual-machines-windows-sql-performance#disks-guidance) allows for placing the TempDB on the local, SSD-based *D:* drive, given it won't exceed available space and allows for additional disk I/O distribution.
+          3. [Azure guidance](/azure/azure-sql/virtual-machines/windows/performance-guidelines-best-practices-checklist#storage) allows for placing the TempDB on the local, SSD-based *D:* drive, given it won't exceed available space and allows for additional disk I/O distribution.
           
           If you need more performance in future, you can upsize your VM to a DS14v2, which will double CPU and memory. The additional disk bandwidth allowed by that VM size will also instantly boost the available disk IOPS on your previously configured disks.
           
@@ -142,7 +142,7 @@ sections:
           
           1. Disks are striped using Storage Spaces.
           2. This value is from [Example disk configurations](../plan-design/configs/site-size-performance-guidelines.md#example-disk-configurations). VM size limits performance.
-          3. [Azure guidance](/azure/virtual-machines/windows/sql/virtual-machines-windows-sql-performance#disks-guidance) allows for placing the TempDB on the local, SSD-based *D:* drive, given it won't exceed available space and allows for additional disk I/O distribution.
+          3. [Azure guidance](/azure/azure-sql/virtual-machines/windows/performance-guidelines-best-practices-checklist#storage) allows for placing the TempDB on the local, SSD-based *D:* drive, given it won't exceed available space and allows for additional disk I/O distribution.
           
   - name: Other common SQL Server-related performance questions
     questions:

memdocs/configmgr/develop/core/servers/configure/how-to-configure-network-discovery.md

@@ -1,6 +1,7 @@
 ---
 title: "Configure Network Discovery"
 titleSuffix: "Configuration Manager"
+description: "Learn how to configure the Network Discovery settings in Configuration Manager."
 ms.date: "09/20/2016"
 ms.prod: "configuration-manager"
 ms.technology: configmgr-sdk

memdocs/configmgr/sum/deploy-use/manage-office-365-proplus-updates.md

@@ -5,7 +5,7 @@ description: Configuration Manager synchronizes Microsoft 365 Apps client update
 author: mestew
 ms.author: mstewart
 manager: dougeby
-ms.date: 01/05/2022
+ms.date: 05/09/2022
 ms.topic: conceptual
 ms.prod: configuration-manager
 ms.technology: configmgr-sum
@@ -195,14 +195,14 @@ For update packages released on and after June 9, 2020, the title will begin wit
 </br>
 </br>
 
-|New Channel name|Previous Channel name|
-|--|--|
-|Semi-Annual Enterprise Channel|Semi-Annual Channel|
-|Semi-Annual Enterprise Channel (Preview)|Semi-Annual Channel (Targeted)|
-|Monthly Enterprise Channel|NA|
-|Current Channel|Monthly Channel|
-|Current Channel (Preview)|Monthly Channel (Targeted)|
-|Beta Channel </br> </br> Beta Channel needs to be updated from the Office CDN on the internet instead of having Configuration Manager manage the update process. For more information, see [Use Configuration Manager to install Office Insider builds](https://insider.office.com/business/deploy/windows/configuration-manager).|Insider|
+|New Channel name|Previous Channel name|CDNBaseUrl|
+|--|--|--|
+|Semi-Annual Enterprise Channel|Semi-Annual Channel|`http://officecdn.microsoft.com/pr/7ffbc6bf-bc32-4f92-8982-f9dd17fd3114`|
+|Semi-Annual Enterprise Channel (Preview)|Semi-Annual Channel (Targeted)|`http://officecdn.microsoft.com/pr/b8f9b850-328d-4355-9145-c59439a0c4cf`|
+|Monthly Enterprise Channel|NA|`http://officecdn.microsoft.com/pr/55336b82-a18d-4dd6-b5f6-9e5095c314a6`|
+|Current Channel|Monthly Channel|`http://officecdn.microsoft.com/pr/492350f6-3a01-4f97-b9c0-c7c6ddf67d60`|
+|Current Channel (Preview)|Monthly Channel (Targeted)|`http://officecdn.microsoft.com/pr/64256afe-f5d9-4f86-8936-8840a6a4f5be`|
+|Beta Channel </br> </br> Beta Channel needs to be updated from the Office CDN on the internet instead of having Configuration Manager manage the update process. For more information, see [Use Configuration Manager to install Office Insider builds](https://insider.office.com/business/deploy/windows/configuration-manager).|Insider|`http://officecdn.microsoft.com/pr/5440fd1f-7ecb-4221-8110-145efaa6372f`|
 
 For more information about how to modify your ADRs, see [Automatically deploy software updates](automatically-deploy-software-updates.md). For more information about the name change, see [Name change for Office 365 ProPlus](/deployoffice/name-change).
 

memdocs/intune/apps/app-protection-policy-settings-ios.md

@@ -47,7 +47,7 @@ There are three categories of policy settings: *Data relocation*, *Access requir
 | Setting | How to use | Default value |
 |------|----------|-------|
 | **Backup Org data to iTunes and iCloud backups** | Select **Block** to prevent this app from backing up work or school data to iTunes and iCloud. Select **Allow** to allow this app to back up of work or school data to iTunes and iCloud. | **Allow**  |
-| **Send Org data to other apps** | Specify what apps can receive data from this app: <ul><li>**All apps**: Allow transfer to any app. The receiving app will have the ability to read and edit the data.</li><li>**None**: Do not allow data transfer to any app, including other policy-managed apps. If the user performs a managed open-in function and transfers a document, the data will be encrypted and unreadable.</li><li> **Policy managed apps**: Allow transfer only to other policy-managed apps. <p><p>**Note:** _Users may be able to transfer content via Open-in or Share extensions to unmanaged apps on unenrolled devices or enrolled devices that allow sharing to unmanaged apps. Transferred data is encrypted by Intune and unreadable by unmanaged apps._</li><li> **Policy managed apps with OS sharing**: Only allow data transfer to other policy managed apps, as well as file transfers to other MDM managed apps on enrolled devices. <p><p>**Note:** _The **Policy managed apps with OS sharing** value is applicable to MDM enrolled devices only. If this setting is targeted to a user on an unenrolled device, the behavior of the **Policy managed apps** value applies. Users will be able to transfer unencrypted content via Open-in or Share extensions to any application allowed by the iOS MDM allowOpenFromManagedtoUnmanaged setting, assuming the sending app has the IntuneMAMUPN configured; for more information, see [How to manage data transfer between iOS apps in Microsoft Intune](data-transfer-between-apps-manage-ios.md). See https://developer.apple.com/business/documentation/Configuration-Profile-Reference.pdf for more information on this iOS/iPadOS MDM setting._<p><p></li><li>**Policy managed apps with Open-In/Share filtering**: Allow transfer only to other policy managed apps, and filter OS Open-in/Share dialogs to only display policy managed apps. To configure the filtering of the **Open-In/Share** dialog, it requires both the app(s) acting as the file/document source and the app(s) that can open this file/document to have the Intune SDK for iOS version 8.1.1 or above. <p><p>**Note:** _Users may be able to transfer content via Open-in or Share extensions to unmanaged apps if Intune private data type are supported by the app. Transferred data is encrypted by Intune and unreadable by unmanaged apps._</li></ul><br>In addition, when set to **Policy managed apps** or **None**, the Spotlight search (enables searching data within apps) and Siri shortcuts iOS features are blocked. <p><p>This policy can also apply to iOS/iPadOS Universal Links. General web links are managed by the **Open app links in Intune Managed Browser** policy setting. <p> There are some exempt apps and services to which Intune may allow data transfer by default. In addition, you can create your own exemptions if you need to allow data to transfer to an app that doesn't support Intune APP. See [data transfer exemptions](#data-transfer-exemptions) for more information. | **All apps** |
+| **Send Org data to other apps** | Specify what apps can receive data from this app: <ul><li>**All apps**: Allow transfer to any app. The receiving app will have the ability to read and edit the data.</li><li>**None**: Do not allow data transfer to any app, including other policy-managed apps. If the user performs a managed open-in function and transfers a document, the data will be encrypted and unreadable.</li><li> **Policy managed apps**: Allow transfer only to other policy-managed apps. <p><p>**Note:** _Users may be able to transfer content via Open-in or Share extensions to unmanaged apps on unenrolled devices or enrolled devices that allow sharing to unmanaged apps. Transferred data is encrypted by Intune and unreadable by unmanaged apps._</li><li> **Policy managed apps with OS sharing**: Only allow data transfer to other policy managed apps, as well as file transfers to other MDM managed apps on enrolled devices. <p><p>**Note:** _The **Policy managed apps with OS sharing** value is applicable to MDM enrolled devices only. If this setting is targeted to a user on an unenrolled device, the behavior of the **Policy managed apps** value applies. Users will be able to transfer unencrypted content via Open-in or Share extensions to any application allowed by the iOS MDM allowOpenFromManagedtoUnmanaged setting, assuming the sending app has the IntuneMAMUPN and IntuneMAMOID configured; for more information, see [How to manage data transfer between iOS apps in Microsoft Intune](data-transfer-between-apps-manage-ios.md). See https://developer.apple.com/business/documentation/Configuration-Profile-Reference.pdf for more information on this iOS/iPadOS MDM setting._<p><p></li><li>**Policy managed apps with Open-In/Share filtering**: Allow transfer only to other policy managed apps, and filter OS Open-in/Share dialogs to only display policy managed apps. To configure the filtering of the **Open-In/Share** dialog, it requires both the app(s) acting as the file/document source and the app(s) that can open this file/document to have the Intune SDK for iOS version 8.1.1 or above. <p><p>**Note:** _Users may be able to transfer content via Open-in or Share extensions to unmanaged apps if Intune private data type are supported by the app. Transferred data is encrypted by Intune and unreadable by unmanaged apps._</li></ul><br>In addition, when set to **Policy managed apps** or **None**, the Spotlight search (enables searching data within apps) and Siri shortcuts iOS features are blocked. <p><p>This policy can also apply to iOS/iPadOS Universal Links. General web links are managed by the **Open app links in Intune Managed Browser** policy setting. <p> There are some exempt apps and services to which Intune may allow data transfer by default. In addition, you can create your own exemptions if you need to allow data to transfer to an app that doesn't support Intune APP. See [data transfer exemptions](#data-transfer-exemptions) for more information. | **All apps** |
 | <ul>**Select apps to exempt** | This option is available when you select *Policy managed apps* for the previous option.   |   |
 | <ul>**Select universal links to exempt** | Specify which iOS/iPadOS [Universal Links](#universal-links) should open in the specified *unmanaged* application instead of the protected browser specified by the **Restrict web content transfer with other apps** setting. You must contact the application developer to determine the correct universal link format for each application.   |   |
 | <ul>**Select managed universal links** | Specify which iOS/iPadOS [Universal Links](#universal-links) should open in the specified *managed* application instead of the protected browser specified by the **Restrict web content transfer with other apps** setting. You must contact the application developer to determine the correct universal link format for each application.   |   |

memdocs/intune/apps/apps-add-android-for-work.md

@@ -8,7 +8,7 @@ keywords:
 author: Erikre
 ms.author: erikre
 manager: dougeby
-ms.date: 03/29/2022
+ms.date: 05/05/2022
 ms.topic: how-to
 ms.service: microsoft-intune
 ms.subservice: apps
@@ -235,6 +235,7 @@ For dedicated, fully managed, and corporate-owned work profile devices, you can
 
 - **Default**: The app's updates are subject to default conditions (described above). 
 - **High Priority**: The app will update as soon as possible from when a new update is released, disregarding all of the default conditions. This may be disruptive for some users since the update can occur while the device is being used.
+- **Postpone**: When the app receives a new update, a 90-day waiting period is triggered. After 90 days, the app is updated to the newest version available, even if that version was not the update that triggered the waiting period. Note that the 90-day window is not configurable. To terminate the waiting period early, change the update mode to either **Default** or **High Priority**.
 
 To edit the app update mode:
 1. Sign in to the [Microsoft Endpoint Manager admin center](https://go.microsoft.com/fwlink/?linkid=2109431).