Updates based on feedback

Author: dknappettmsft

articles/virtual-desktop/administrative-template.md

@@ -1,31 +1,30 @@
 ---
 title: Administrative template for Azure Virtual Desktop
-description: Learn how to use the administrative template for Azure Virtual Desktop with Group Policy and Intune to configure settings.
+description: Learn how to use the administrative template for Azure Virtual Desktop with Group Policy to configure settings.
 author: dknappettmsft
 ms.topic: how-to
-ms.date: 10/21/2022
+ms.date: 10/27/2022
 ms.author: daknappe
 ---
 # Administrative template for Azure Virtual Desktop
 
-We've created an administrative template for Azure Virtual Desktop to configure some features of Azure Virtual Desktop. You can use the template with Group Policy and Intune, which enables you to centrally configure session hosts that are joined to Azure Active Directory (Azure AD) or to an Active Directory (AD) domain. You can also use the template with Group Policy locally on each session host, but this isn't recommended to manage session hosts at scale.
+We've created an administrative template for Azure Virtual Desktop to configure some features of Azure Virtual Desktop. You can use the template with Group Policy, which enables you to centrally configure session hosts that are joined to an Active Directory (AD) domain. You can also use the template with Group Policy locally on each session host, but this isn't recommended to manage session hosts at scale.
 
 You can configure the following features with the administrative template:
 
 - [Screen capture protection](screen-capture-protection.md)
 - [RDP Shortpath for managed networks](rdp-shortpath.md?tabs=managed-networks)
 - [Watermarking](watermarking.md)
 
-## Prerequisites
+> [!NOTE]
+> Importing the administrative template to Microsoft Intune is currently not supported. You should eventually be able to configure these features using the Intune settings catalog.
 
-TODO: CHECK
+## Prerequisites
 
 You'll need the following permission:
 
 - For Group Policy in an Active Directory domain, you'll need to be a member of the **Domain Admins** security group.
 
-- For Intune, you'll need to be assigned the **Intune administrator** role-based access control (RBAC) role.
-
 - For local Group Policy on a session host, you'll need to be a member of the local **Administrators** security group.
 
 ## Add the administrative template
@@ -47,31 +46,6 @@ To add the administrative template, select a tab for your scenario and follow th
 
    :::image type="content" source="media/administrative-template-group-policy.png" alt-text="Screenshot of the Group Policy Management Editor showing Azure Virtual Desktop policy settings." lightbox="media/administrative-template-group-policy.png":::
 
-# [Intune (preview)](#tab/intune)
-
-1. Download the latest [Azure Virtual Desktop administrative template files](https://aka.ms/avdgpo) and extract the contents of the .cab file and .zip archive.
-
-1. See [Import custom ADMX and ADML administrative templates into Microsoft Intune](/mem/intune/configuration/administrative-templates-import-custom) for steps to add the Azure Virtual Desktop administrative template to Intune.
-
-   > [!IMPORTANT]
-   > There is a known issue with importing the Azure Virtual Desktop administrative template files into Intune. Before you import the files, follow the steps below:
-   >
-   > 1. Open `terminalserver-avd.admx` in a text editor.
-   >
-   > 1. Remove the following lines, then save the file:
-   >
-   >    ```xml
-   >    <using prefix="terminalserver" namespace="Microsoft.Policies.TerminalServer" />
-   >    ```
-   >
-   >    ```xml
-   >    <parentCategory ref="terminalserver:TS_TERMINAL_SERVER" />
-   >    ```
-
-1. To verify that the Azure Virtual Desktop administrative template is available, [create a profile using the the imported administrative template](/mem/intune/configuration/administrative-templates-import-custom#create-a-profile-using-your-imported-files). For **Configuration settings**, browse to **Computer Configuration** > **Azure Virtual Desktop**. You should see configuration settings for Azure Virtual Desktop, as shown in the following screenshot:
-
-   :::image type="content" source="media/administrative-template-intune.png" alt-text="Screenshot of Intune profile configuration settings showing Azure Virtual Desktop policy settings." lightbox="media/administrative-template-intune.png":::
-
 # [Local Group Policy](#tab/local-group-policy)
 
 1. Download the latest [Azure Virtual Desktop administrative template files](https://aka.ms/avdgpo) and extract the contents of the .cab file and .zip archive.

articles/virtual-desktop/screen-capture-protection.md

@@ -1,17 +1,16 @@
 ---
-title: Azure Virtual Desktop screen capture protection
+title: Screen capture protection in Azure Virtual Desktop
 titleSuffix: Azure
-description: How to set up screen capture protection for Azure Virtual Desktop.
+description: Learn how to enable screen capture protection in Azure Virtual Desktop (preview) to help prevent sensitive information from being captured on client endpoints.
 author: femila
-ms.topic: conceptual
-ms.date: 09/14/2022
+ms.topic: how-to
+ms.date: 10/27/2022
 ms.author: femila
-ms.service: virtual-desktop
 ---
 
-# Screen capture protection
+# Screen capture protection in Azure Virtual Desktop
 
-The screen capture protection feature prevents sensitive information from being captured on the client endpoints. When you enable this feature, remote content will be automatically blocked or hidden in screenshots and screen shares. Also, the Remote Desktop client will hide content from malicious software that may be capturing the screen.
+Screen capture protection, alongside [watermarking](watermarking.md), helps prevent sensitive information from being captured on client endpoints. When you enable screen capture protection, remote content will be automatically blocked or hidden in screenshots and screen shares. Also, the Remote Desktop client will hide content from malicious software that may be capturing the screen.
 
 ## Prerequisites
 

articles/virtual-desktop/watermarking.md

@@ -3,7 +3,7 @@ title: Watermarking in Azure Virtual Desktop (preview)
 description: Learn how to enable watermarking in Azure Virtual Desktop (preview) to help prevent sensitive information from being captured on client endpoints.
 author: dknappettmsft
 ms.topic: how-to
-ms.date: 10/21/2022
+ms.date: 10/27/2022
 ms.author: daknappe
 ---
 # Watermarking in Azure Virtual Desktop (preview)
@@ -12,16 +12,17 @@ ms.author: daknappe
 > Watermarking is currently in PREVIEW.
 > See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
 
-Watermarking (preview), alongside [screen capture protection](screen-capture-protection.md), helps prevent sensitive information from being captured on client endpoints. When you enable watermarking, QR code watermarks appear as part of remote sessions to desktops and apps. The QR code contains the *connection ID* of a remote session that admins can use to trace the session. Watermarking is configured on session hosts and enforced by the Remote Desktop client.
+Watermarking (preview), alongside [screen capture protection](screen-capture-protection.md), helps prevent sensitive information from being captured on client endpoints. When you enable watermarking, QR code watermarks appear as part of remote desktops. The QR code contains the *connection ID* of a remote session that admins can use to trace the session. Watermarking is configured on session hosts and enforced by the Remote Desktop client.
 
 Here's a screenshot showing what watermarking looks like when it's enabled:
 
 :::image type="content" source="media/watermarking-result.png" alt-text="A screenshot showing watermarking enabled on a remote desktop." lightbox="media/watermarking-result.png":::
 
-
 > [!IMPORTANT]
 > - Once watermarking is enabled on a session host, only clients that support watermarking can connect to that session host. If you try to connect from an unsupported client, the connection will fail and you'll get an error message that is not specific.
 >
+> - Watermarking is for remote desktops only. With remote apps, watermarking is not applied and the connection is allowed.
+>
 > - If you connect to a session host directly (not through Azure Virtual Desktop) using the Remote Desktop Connection app (`mstsc.exe`), watermarking is not applied and the connection is allowed.
 
 ## Prerequisites
@@ -30,7 +31,7 @@ You'll need the following things before you can use watermarking:
 
 - A Remote Desktop client that supports watermarking. The following clients currently support watermarking:
 
-  - TODO: ADD LINK Windows Desktop client, version 1.2.3317 or later, on Windows 10 and later.
+  - [Windows Desktop client](users/connect-windows.md?toc=%2Fazure%2Fvirtual-desktop%2Ftoc.json&bc=%2Fazure%2Fvirtual-desktop%2Fbreadcrumb%2Ftoc.json), version 1.2.3317 or later, on Windows 10 and later.
 
 - [Azure Virtual Desktop Insights](azure-monitor.md) configured for your environment.
 
@@ -94,4 +95,4 @@ To find out the session information from the QR code by querying Azure Monitor L
 ## Next steps
 
 - Learn more about [Azure Virtual Desktop Insights](azure-monitor.md).
-- For more information about Azure Monitor Log Analytics, see [Overview of Log Analytics in Azure Monitor](../azure-monitor/logs/log-analytics-overview.md).
+- For more information about Azure Monitor Log Analytics, see [Overview of Log Analytics in Azure Monitor](../azure-monitor/logs/log-analytics-overview.md).