resolved merge conflict

windows/manage/TOC.md

@@ -62,7 +62,6 @@
 ##### [About Client Configuration Settings](appv-client-configuration-settings.md)
 ##### [Enable the App-V desktop client](appv-enable-the-app-v-desktop-client.md)
 ##### [How to Install the Sequencer](appv-install-the-sequencer.md)
-##### [How to Modify App-V Client Configuration Using the ADMX Template and Group Policy](appv-modify-client-configuration-with-the-admx-template-and-group-policy.md)
 #### [Deploying the App-V Server](appv-deploying-the-appv-server.md)
 ##### [How to Deploy the App-V Server](appv-deploy-the-appv-server.md)
 ##### [How to Deploy the App-V Server Using a Script](appv-deploy-the-appv-server-with-a-script.md)

windows/manage/appv-allow-administrators-to-enable-connection-groups.md

@@ -37,7 +37,7 @@ Use one of the following methods to allow only administrators to enable or disab
 <tr class="odd">
 <td align="left"><p>Group Policy setting</p></td>
 <td align="left"><p>Enable the “Require publish as administrator” Group Policy setting, which is located in the following Group Policy Object node:</p>
-<p><strong>Computer Configuration &gt; Policies &gt; Administrative Templates &gt; System &gt; App-V &gt; Publishing</strong></p></td>
+<p><strong>Computer Configuration &gt; Administrative Templates &gt; System &gt; App-V &gt; Publishing</strong></p></td>
 </tr>
 <tr class="even">
 <td align="left"><p>PowerShell cmdlet</p></td>

windows/manage/appv-client-configuration-settings.md

@@ -14,7 +14,7 @@ Applies to: Windows 10, version 1607
 
 The Microsoft Application Virtualization (App-V) client stores its configuration in the registry. You can gather some useful information about the client if you understand the format of data in the registry. You can also configure many client actions by changing registry entries. This topic lists the App-V Client configuration settings and explains their uses. You can use PowerShell to modify the client configuration settings. For more information about using PowerShell and App-V see [Administering App-V by Using PowerShell](appv-administering-appv-with-powershell.md).
 
-
+You can use Group Policy to configure App-V client settings by using the Group Policy Management Console under **Computer Configuration** > **Administrative Templates** > **System** > **App-V**.
 
 ## App-V Client Configuration Settings: Windows PowerShell
 
@@ -112,4 +112,3 @@ Add or vote on suggestions [here](http://appv.uservoice.com/forums/280448-micros
 
 [Deploying the App-V Sequencer and Configuring the Client](appv-deploying-the-appv-sequencer-and-client.md)
 
-[How to Modify App-V Client Configuration Using the ADMX Template and Group Policy](appv-modify-client-configuration-with-the-admx-template-and-group-policy.md)

windows/manage/appv-deploying-the-appv-sequencer-and-client.md

@@ -26,23 +26,19 @@ The App-V client is the component that runs a virtualized application on a targe
 
 ## Client Configuration Settings
 
-The App-V client stores its configuration in the registry. You can gather some useful information about the client if you understand the format of data in the registry. You can also configure many client actions by changing registry entries.
+The App-V client stores its configuration in the registry. You can gather some useful information about the client if you understand the format of data in the registry. You can also configure many client actions by changing registry entries. For more information, see [About Client Configuration Settings](appv-client-configuration-settings.md).
-
-[About Client Configuration Settings](appv-client-configuration-settings.md)
 
 ## Configure the client by using the ADMX template and Group Policy
 
 You can use Group Policy to configure the client settings for the App-V client and the Remote Desktop Services client.
 
-Perform the following steps on the computer that you will use to manage Group Policy. This is typically the Domain Controller.
+To manage the ADMX template, perform the following steps on the computer that you will use to manage Group Policy. This is typically the Domain Controller.
 
 1.  Save the **.admx** file to the following directory: **Windows \\ PolicyDefinitions**
 
 2.  Save the **.adml** file to the following directory: **Windows \\ PolicyDefinitions \\ <Language Directory>**
 
-After you have completed the preceding steps, you can manage the App-V client configuration settings with the **Group Policy Management** console.
+After you have completed the preceding steps, you can use Group Policy to configure the client settings by using the Group Policy Management Console under **Computer Configuration** > **Administrative Templates** > **System** > **App-V**.
-
-[How to Modify App-V Client Configuration Using the ADMX Template and Group Policy](appv-modify-client-configuration-with-the-admx-template-and-group-policy.md)
 
 ## Understanding Shared Content Store mode for App-V clients
 

windows/manage/appv-enable-administrators-to-publish-packages-with-electronic-software-distribution-solutions.md

@@ -19,7 +19,7 @@ Starting in App-V 5.0 SP3, you can configure the App-V client so that only admin
 
 1.  Navigate to the following Group Policy Object node:
 
-    **Computer Configuration > Policies > Administrative Templates > System > App-V > Publishing**.
+    **Computer Configuration > Administrative Templates > System > App-V > Publishing**.
 
 2.  Enable the **Require publish as administrator** Group Policy setting.
 

windows/manage/appv-modify-client-configuration-with-the-admx-template-and-group-policy.md

@@ -1,25 +1,4 @@
 ---
 title: How to Modify App-V Client Configuration Using the ADMX Template and Group Policy (Windows 10)
-description: How to Modify App-V Client Configuration Using the ADMX Template and Group Policy
+redirect_url: https://technet.microsoft.com/itpro/windows/manage/appv-deploying-the-appv-sequencer-and-client
-author: MaggiePucciEvans
-ms.pagetype: mdop, appcompat, virtualization
-ms.mktglfcycl: deploy
-ms.sitesec: library
-ms.prod: w10
 ---
-
-# How to Modify App-V client configuration using the ADMX template and Group Policy
-
-Applies to: Windows 10, version 1607
-
-You can use Group Policy to configure App-V client settings by using the Group Policy Management Console under **Computer Configuration** > **Policies** > **Administrative Templates** > **System** > **App-V**.
-
-## Have a suggestion for App-V?
-
-Add or vote on suggestions [here](http://appv.uservoice.com/forums/280448-microsoft-application-virtualization). **Got an App-V issue?** Use the [App-V TechNet Forum](https://social.technet.microsoft.com/Forums/en-US/home?forum=mdopappv).
-
-## Related topics
-
-- [Deploying App-V](appv-deploying-appv.md)
-
-- [About Client Configuration Settings](appv-client-configuration-settings.md)

windows/manage/appv-publish-a-packages-with-the-management-console.md

@@ -32,7 +32,7 @@ The ability to enable only administrators to publish or unpublish packages (desc
 
 1.  Navigate to the following Group Policy Object node:
 
-    **Computer Configuration > Policies > Administrative Templates > System > App-V > Publishing**.
+    **Computer Configuration > Administrative Templates > System > App-V > Publishing**.
 
 2.  Enable the **Require publish as administrator** Group Policy setting.
 

windows/manage/appv-reporting.md

@@ -135,9 +135,7 @@ To use App-V reporting you must enable and configure the App-V client. To config
 The following examples show how Windows PowerShell parameters can configure the reporting features of the App-V client.
 
 **Note**  
-The following configuration task can also be configured using Group Policy settings in the App-V ADMX template. The App-V settings are under **Computer Configuration > Administrative Templates > System > App-V**. For more information about using the ADMX template, see [How to Modify App-V Client Configuration Using the ADMX Template and Group Policy](appv-modify-client-configuration-with-the-admx-template-and-group-policy.md).
+The following configuration task can also be configured using Group Policy settings in the App-V ADMX template. The App-V settings are under **Computer Configuration > Administrative Templates > System > App-V**.
-
- 
 
 **To enable reporting and to initiate data collection on the computer running the App-V client**: