Fixing WN Merge conflict

Brenduns · Brenduns · commit d2c51d9bb957 · 2022-02-08T09:28:45.000-08:00
diff --git a/memdocs/configmgr/develop/adminservice/faq.yml b/memdocs/configmgr/develop/adminservice/faq.yml
@@ -35,7 +35,7 @@ sections:
       - question: |
           Are Swagger definitions available?
         answer: |
-          No, the administration service currently doesn't publish an [OpenAPI (Swagger) document](https://apidocs.microsoft.com/).
+          No, the administration service currently doesn't publish an [OpenAPI (Swagger) document](https://swagger.io/docs/).
           
   - name: Remote access
     questions:
@@ -65,4 +65,4 @@ sections:
       - question: |
           How do I learn about what's new with the administration service in each Configuration Manager release?
         answer: |
-          For more information, see [Release notes](release-notes.md).
+          For more information, see [Release notes](release-notes.md).
diff --git a/memdocs/intune/apps/apps-deploy.md b/memdocs/intune/apps/apps-deploy.md
@@ -97,7 +97,7 @@ The following table lists the various options for *assigning* apps to users and
 The app is now assigned to the groups that you selected. For more information about including and excluding app assignments, see [Include and exclude app assignments](apps-inc-exl-assignments.md).
 
 > [!Tip]
-> Intune supports assigning apps to nested groups too. For example, if you assigned an app to the "Enineering Global" group and have "Engineering APAC", "Engineering EMEA" and "Engineering US" nested as child groups, the members of those child groups will also be targeted with the assignment.
+> Intune supports assigning apps to nested groups too. For example, if you assigned an app to the "Engineering Global" group and have "Engineering APAC", "Engineering EMEA" and "Engineering US" nested as child groups, the members of those child groups will also be targeted with the assignment.
 
 ## How conflicts between app intents are resolved
 
diff --git a/memdocs/intune/fundamentals/whats-new.md b/memdocs/intune/fundamentals/whats-new.md
@@ -72,6 +72,11 @@ To support RHEL 8.5, we’ve also updated the [readiness tool](../protect/micros
 
 For Linux servers that don't load the module, we've provided [instructions](../protect/microsoft-tunnel-prerequisites.md#manually-load-ip_tables) to load them immediately, and to configure the Linux server to automatically load them at boot.
 
+### App management
+
+#### Advanced logging setting in Company Portal app<!-- 12859998  -->
+The **Enable Advanced Logging** setting is available in the Intune Company Portal app versions v5.2202 and higher for iOS/iPadOS and macOS. Device users can able to enable or disable advanced logging on a device. By turning on advanced logging, detailed log reports will be sent to Microsoft to troubleshoot issues. By default, the **Enable Advanced Logging** setting will be off. Device users should keep this setting off unless otherwise instructed by their organization's IT admin. For related information, see [Share Company Portal usage data with Microsoft](../user-help/turn-off-microsoft-usage-data-collection-ios.md) and [Manage Company Portal preferences for macOS](../user-help/intune-company-portal-preferences-macos.md).
+
 ## Week of January 31, 2022
 
 ### Device security
diff --git a/memdocs/intune/protect/media/encrypt-devices/docs_bl_fullyencrypted.png b/memdocs/intune/protect/media/encrypt-devices/docs_bl_fullyencrypted.png
diff --git a/memdocs/intune/protect/media/encrypt-devices/docs_bl_powercfg_surface_nos0possible.png b/memdocs/intune/protect/media/encrypt-devices/docs_bl_powercfg_surface_nos0possible.png
diff --git a/memdocs/intune/protect/media/encrypt-devices/docs_bl_powercfg_surface_s0_possible.png b/memdocs/intune/protect/media/encrypt-devices/docs_bl_powercfg_surface_s0_possible.png
diff --git a/memdocs/intune/protect/media/encrypt-devices/docs_bl_settingscatalog_control_encryption.png b/memdocs/intune/protect/media/encrypt-devices/docs_bl_settingscatalog_control_encryption.png
diff --git a/memdocs/intune/protect/media/encrypt-devices/docs_bl_usedspaceonly.png b/memdocs/intune/protect/media/encrypt-devices/docs_bl_usedspaceonly.png
diff --git a/memdocs/intune/user-help/intune-company-portal-preferences-macos.md b/memdocs/intune/user-help/intune-company-portal-preferences-macos.md
@@ -7,7 +7,7 @@ keywords:
 author: lenewsad
 ms.author: lanewsad
 manager: dougeby
-ms.date: 07/19/2021
+ms.date: 02/07/2022
 ms.topic: end-user-help
 ms.prod:
 ms.service: microsoft-intune
@@ -47,6 +47,15 @@ This setting enables Microsoft to collect data about your Intune Company Portal
 
 To turn off data collection in Company Portal, clear the checkbox next to **Allow Microsoft to collect usage data**.  
 
+## Enable or disable advanced logging
+
+The **Enable Advanced Logging** setting is available in the Intune Company Portal app for macOS devices. Device users can able to enable or disable advanced logging on a device. By turning on advanced logging, detailed log reports will be sent to Microsoft to troubleshoot issues. By default, the **Enable Advanced Logging** setting will be off. Device users should keep this setting off unless otherwise instructed by their organization's IT admin.
+
+To modify this setting on an macOS device:
+1. Open the Company Portal app.
+2. Go to the menu bar and select **Company Portal** > **Preferences**. 
+3. Under **Advanced logging**, modify the checkbox next to **Turn on advanced logging**.
+
 ## 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/memdocs/intune/user-help/turn-off-microsoft-usage-data-collection-ios.md b/memdocs/intune/user-help/turn-off-microsoft-usage-data-collection-ios.md
@@ -8,7 +8,7 @@ author: lenewsad
 
 ms.author: lanewsad
 manager: dougeby
-ms.date: 12/08/2020
+ms.date: 02/07/2022
 ms.topic: end-user-help
 ms.prod:
 ms.service: microsoft-intune
@@ -51,6 +51,15 @@ Change your usage data preferences to turn usage data collection on or off.
 2. Tap **Company Portal**.  
 3. Switch the **Usage Data** toggle to the off position (to stop usage and diagnostic data from being sent to Intune), or to the on position (to allow usage and diagnostic data to be sent to Intune).   
 
+## Enable or disable advanced logging
+
+The **Enable Advanced Logging** setting is available in the Intune Company Portal app for iOS/iPadOS devices. Device users can able to enable or disable advanced logging on a device. By turning on advanced logging, detailed log reports will be sent to Microsoft to troubleshoot issues. By default, the **Enable Advanced Logging** setting will be off. Device users should keep this setting off unless otherwise instructed by their organization's IT admin.
+
+To modify this setting on an iOS/iPadOS device:
+1. Open the **Settings** app.
+2. Find **Comp Portal**.
+3. Under **Diagnostics**, turn on or off the **Enable Advanced Logging** toggle.
+
 ## 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/business-continuity-disaster-recovery.md b/windows-365/enterprise/business-continuity-disaster-recovery.md
@@ -33,7 +33,7 @@ ms.collection: M365-identity-device-management
 Windows 365 provides highly resilient user cloud pcs, including:
 
 - 99.9% highly available Windows 365 Cloud PC user sessions as defined in the [Windows 365 SLA](https://www.microsoft.com/licensing/docs/view/Service-Level-Agreements-SLA-for-Online-Services).
-- Locally Redundant Storage (LRS) with data object resiliency of 11 9s.
+- Disk storage with data object resiliency of 11 9s.
 - Automated in-zone disaster recovery for compute.
 - Recovery Point Objective (RPO) of ~0.
 
@@ -49,7 +49,7 @@ Using these Windows and Microsoft 365 solutions preserves user context and user
 
 ## Data Resilience
 
-If there's a larger disruption, like a full zone or region outage, LRS storage makes sure that data objects on the Cloud PC OS disks are 99.999999999% resilient against data loss, over a given year.
+If there's a larger disruption, like a full zone or region outage, the disk storage provided makes sure that data objects on the Cloud PC OS disks are 99.999999999% resilient against data loss, over a given year.
 
 ## Automated in-zone Disaster Recovery for Compute
 
diff --git a/windows-365/enterprise/in-development.md b/windows-365/enterprise/in-development.md
@@ -90,17 +90,6 @@ Administrators and users will be able to restore a Cloud PC to a state from a pr
 <!-- ***********************************************-->
 ## Monitor and troubleshoot
 
-### Use Collect diagnostics to collect additional details from Windows 365 devices through Intune remote actions<!--37678745 -->
-
-Intune’s remote action to Collect diagnostics will soon collect additional details from Windows 365 Cloud PCs.
-
-The new details for Windows 365 Cloud PCs include the following registry data:
-
-- HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\AddIns\WebRTC Redirector
-- HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Teams\
-
-To learn more about the **Collect diagnostics** remote action, see [Collect diagnostics from a Windows device](/mem/intune/remote-actions/collect-diagnostics).
-
 ### End user manual connectivity check<!--37679345 -->
 
 End users will be able to manually run connectivity checks on their Cloud PCs from [windows365.microsoft.com](https://windows365.microsoft.com).
diff --git a/windows-365/enterprise/remotely-manage-cloud-pc.md b/windows-365/enterprise/remotely-manage-cloud-pc.md
@@ -7,7 +7,7 @@ keywords:
 author: ErikjeMS  
 ms.author: erikje
 manager: dougeby
-ms.date: 08/02/2021
+ms.date: 02/07/2022
 ms.topic: how-to
 ms.service: cloudpc
 ms.subservice: 
@@ -42,6 +42,7 @@ Cloud PCs support the following remote management actions:
 - Update Windows Defender
 - [Reprovisioning](provisioning.md#reprovisioning) (this is a remote action specific to Cloud PC devices)
 - [Resize](resize-cloud-pc.md#resize-a-cloud-pc) (this is a remote action specific to Cloud PC devices)
+- [Collect diagnostics](/mem/intune/remote-actions/collect-diagnostics)
 
 <!-- ########################## -->
 ## Next steps
diff --git a/windows-365/enterprise/requirements-network.md b/windows-365/enterprise/requirements-network.md
@@ -86,6 +86,15 @@ You must allow traffic in your Azure network configuration to the following serv
 
 All endpoints connect over port 443.
 
+### Remote Desktop Protocol (RDP) broker service endpoints
+
+Azure Virtual Desktop RDP broker service endpoints are critical to Cloud PC performance. These endpoints affect both connectivity and latency. To align with the [Microsoft 365 network connectivity principles](/microsoft-365/enterprise/microsoft-365-network-connectivity-principles?view=o365-worldwide#new-office-365-endpoint-categories), you should categorize these endpoints as **Optimize** endpoints.
+
+To make it easier to configure network security controls, use Azure Virtual Desktop service tags to identity those endpoints for direct routing using an [Azure Networking User Defined Route (UDR)](/azure/virtual-network/virtual-networks-udr-overview). A UDR will result in direct routing between your virtual network and the RDP broker for lowest latency. For more information about Azure Service Tags, see (Azure service tags overview)[/azure/virtual-desktop/network-connectivity].
+
+Changing the network routes of a Cloud PC (at the network layer or at the Cloud PC layer (e.g. VPN)), might break the connection between the Cloud PC and the Azure Virtual Desktop RDP broker. If so, the end user will be disconnected from their Cloud PC until a connection be established.
+
+
 ## DNS requirements
 
 As part of the Hybrid Azure AD Join requirements, your Cloud PCs must be able to join on-prem Active Directory. That requires that the Cloud PCs be able to resolve DNS records for your on-prem AD environment.
diff --git a/windows-365/enterprise/whats-new.md b/windows-365/enterprise/whats-new.md
@@ -47,6 +47,23 @@ Learn what new features are available in Windows 365 Enterprise.
 ### Scripts
 -->
 
+<!-- ########################## -->
+## Week of February 7, 2022
+
+<!-- vvvvvvvvvvvvvvvvvvvvvv -->
+## Monitor and troubleshoot
+
+### Use Collect diagnostics to collect additional details from Windows 365 devices through Intune remote actions<!--37678745 -->
+
+Intune’s remote action to Collect diagnostics now collects additional details from Windows 365 Cloud PCs.
+
+The new details for Windows 365 Cloud PCs include the following registry data:
+
+- HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\AddIns\WebRTC Redirector
+- HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Teams\
+
+To learn more about the **Collect diagnostics** remote action, see [Collect diagnostics from a Windows device](/mem/intune/remote-actions/collect-diagnostics).
+
 <!-- ########################## -->
 ## Week of January 17, 2022
 
