Fixed merge conflicts

2025-06-19 04:13:41 +00:00 · 2016-08-03 17:44:44 -07:00
parent 1f3b23b2c4 28aeb96d0f
commit 61aa4fc171
4 changed files with 51 additions and 42 deletions
--- a/windows/manage/appv-about-appv.md
+++ b/windows/manage/appv-about-appv.md
@ -36,7 +36,7 @@ Review the following sections for information about significant changes that app
 ## <a href="" id="bkmk-51-prereq-configs"></a>App-V for Windows software prerequisites and supported configurations
-See the following links for the App-V for Windows software prerequisites and supported configurations.
+Review the following topics for information about App-V for Windows software prerequisites and supported configurations.
 <table>
 <colgroup>
@ -45,7 +45,7 @@ See the following links for the App-V for Windows software prerequisites and sup
 </colgroup>
 <thead>
 <tr class="header">
-<th align="left">Links to prerequisites and supported configurations</th>
+<th align="left">Links to prerequisites and supported configurations topics</th>
 <th align="left">Description</th>
 </tr>
 </thead>
@ -56,21 +56,20 @@ See the following links for the App-V for Windows software prerequisites and sup
 </tr>
 <tr class="even">
 <td align="left"><p>[App-V Supported Configurations](appv-supported-configurations.md)</p></td>
-<td align="left"><p>Supported operating systems and hardware requirements for the App-V Server, Sequencer, and Client components</p></td>
+<td align="left"><p>Supported operating systems and hardware requirements for the App-V server, sequencer, and client components</p></td>
 </tr>
 </tbody>
 </table>
 **Support for using Configuration Manager with App-V:** App-V supports System Center 2012 R2 Configuration Manager SP1. See [Planning for App-V Integration with Configuration Manager](https://technet.microsoft.com/library/jj822982.aspx) for information about integrating your App-V environment with Configuration Manager.
 ## <a href="" id="bkmk-migrate-to-51"></a>Upgrade to App-V for Windows
-Use the following information to upgrade to App-V for Windows from earlier versions. See [Migrating to App-V from a Previous Version](appv-migrating-to-appv-from-a-previous-version.md) for more information.
+Use the following information to upgrade to App-V for Windows from earlier versions. See [Migrating to App-V for Windows from a Previous Version](appv-migrating-to-appv-from-a-previous-version.md) for more information.
-### Before you start the upgrade
+### Before you begin 
 Review the following information before you start the upgrade:
@ -103,7 +102,7 @@ Review the following information before you start the upgrade:
 </tr>
 <tr class="even">
 <td align="left"><p>Upgrading from App-V 4.x</p></td>
-<td align="left"><p>You must first upgrade to App-V 5.0. You cannot upgrade directly from App-V 4.x to App-V for Windows. For more information, see [Planning for Migrating from a Previous Version of App-V](appv-planning-for-migrating-from-a-previous-version-of-appv.md)</p></li>
+<td align="left"><p>You cannot upgrade directly from App-V 4.x to App-V for Windows. You must first upgrade to App-V 5.0. For more information, see [Planning for Migrating from a Previous Version of App-V](appv-planning-for-migrating-from-a-previous-version-of-appv.md)</p></li>
 </ul>
 <p></p></td>
 </tr>
@ -121,7 +120,6 @@ Review the following information before you start the upgrade:
 </tr>
 </tbody>
 </table>
 ### <a href="" id="bkmk-steps-upgrd-infrastruc"></a>Steps to upgrade the App-V infrastructure
@ -141,10 +139,10 @@ Complete the following steps to upgrade each component of the App-V infrastructu
 </thead>
 <tbody>
 <tr class="odd">
-<td align="left"><p>Step 1: Upgrade the App-V Server.</p>
+<td align="left"><p>Step 1: Upgrade the App-V server components.</p>
 <div class="alert">
 <strong>Note</strong>  
-<p>If you are not using the App-V Server, skip this step and go to the next step.</p>
+<p>If you are not using the App-V server, skip this step and go to the next step.</p>
 </div>
 <div>
@ -166,7 +164,7 @@ Complete the following steps to upgrade each component of the App-V infrastructu
 <tbody>
 <tr class="odd">
 <td align="left"><p>Windows Installer</p></td>
-<td align="left"><p>Skip this step and go to step 2, “If you are upgrading the App-V Server...”</p></td>
+<td align="left"><p>Skip this step and go to step 2, “If you are upgrading the App-V server...”</p></td>
 </tr>
 <tr class="even">
 <td align="left"><p>SQL scripts</p></td>
@ -174,8 +172,8 @@ Complete the following steps to upgrade each component of the App-V infrastructu
 </tr>
 </tbody>
 </table>
-<li><p>If you are upgrading the App-V for Windows Server from App-V 5.0 SP1 Hotfix Package 3 or later, complete the steps in section [Check registry keys after installing the App-V 5.0 SP3 Server](https://technet.microsoft.com/en-us/itpro/mdop/appv-v5/check-reg-key-svr).</p></li>
+<li><p>If you are upgrading to App-V for Windows server from App-V 5.0 SP1 Hotfix Package 3 or later, complete the steps in section [Check registry keys after installing the App-V 5.0 SP3 server](https://technet.microsoft.com/en-us/itpro/mdop/appv-v5/check-reg-key-svr).</p></li>
-<li><p>Follow the steps in [How to Deploy the App-V Server](appv-deploy-the-appv-server.md)</p></li>
+<li><p>Follow the steps in [How to Deploy the App-V server components](appv-deploy-the-appv-server.md)</p></li>
 <p> </p></li>
 </ol></td>
 </tr>
@ -184,7 +182,7 @@ Complete the following steps to upgrade each component of the App-V infrastructu
 <td align="left"><p>See [How to Install the Sequencer](appv-install-the-sequencer.md).</p></td>
 </tr>
 <tr class="odd">
-<td align="left"><p>Step 3: Enable the in-box App-V Client.</p></td>
+<td align="left"><p>Step 3: Enable the in-box App-V client.</p></td>
 <td align="left"><p>See [Enable the App-V desktop client](appv-enable-the-app-v-desktop-client.md).</p></td>
 </tr>
 </tbody>
@ -194,7 +192,7 @@ Complete the following steps to upgrade each component of the App-V infrastructu
 ### Converting packages created using a prior version of App-V
-Use the package converter utility to upgrade virtual application packages created using versions of App-V prior to App-V 5.0. The package converter uses PowerShell to convert packages and can help automate the process if you have many packages that require conversion.
+Use the package converter utility to upgrade virtual application packages created using versions of App-V prior to App-V for Windows, version 1607. The package converter uses PowerShell to convert packages and can help automate the process if you have many packages that require conversion.
 >**Note**  
 App-V for Windows packages are exactly the same as App-V 5.0 packages. There has been no change in the package format between the versions and so there is no need to convert App-V 5.0 packages to App-V for Windows packages.
@ -225,7 +223,7 @@ The Management Console UI no longer requires Silverlight. The Management Console
 <thead>
 <tr class="header">
 <th align="left">New in App-V for Windows</th>
-<th align="left">Prior to App-V</th>
+<th align="left">Prior to App-V for Windows</th>
 </tr>
 </thead>
 <tbody>
@ -367,26 +365,26 @@ In the left pane of the Management Console, the OVERVIEW menu option and its ass
 The following improvements have been made to the package editor in the App-V Sequencer.
-### Import and export the manifest file
+#### Import and export the manifest file
 You can import and export the AppxManifest.xml file. To export the manifest file, select the **Advanced** tab and in the Manifest File box, click **Export...**. You can make changes to the manifest file, such as removing shell extensions or editing file type associations.
 After you make your changes, click **Import...** and select the file you edited. After you successfully import it back in, the manifest file is immediately updated within the package editor.
-**Caution**  
+>**Caution**  
 When you import the file, your changes are validated against the XML schema. If the file is not valid, you will receive an error. Be aware that it is possible to import a file that is validated against the XML schema, but that might still fail to run for other reasons.
-### Addition of Windows 10 to operating systems list
+#### Addition of Windows 10 to operating systems list
 In the Deployment tab, Windows 10 32-bit and Windows 10-64 bit have been added to the list of operating systems for which you can sequence a package. If you select **Any Operating System**, Windows 10 is automatically included among the operating systems that the sequenced package will support.
-### Current path displays at bottom of virtual registry editor
+#### Current path displays at bottom of virtual registry editor
 In the Virtual Registry tab, the path now displays at the bottom of the virtual registry editor, which enables you to determine the currently selected key. Previously, you had to scroll through the registry tree to find the currently selected key.
-### <a href="" id="combined--find-and-replace--dialog-box-and-shortcut-keys-added-in-virtual-registry-editor"></a>Combined “find and replace” dialog box and shortcut keys added in virtual registry editor
+#### <a href="" id="combined--find-and-replace--dialog-box-and-shortcut-keys-added-in-virtual-registry-editor"></a>Combined “find and replace” dialog box and shortcut keys added in virtual registry editor
 In the virtual registry editor, shortcut keys have been added for the Find option (Ctrl+F), and a dialog box that combines the “find” and “replace” tasks has been added to enable you to find and replace values and data. To access this combined dialog box, select a key and do one of the following:
@ -398,19 +396,19 @@ In the virtual registry editor, shortcut keys have been added for the Find optio
 Previously, the “Replace” dialog box did not exist, and you had to make changes manually.
-### Rename registry keys and package files successfully
+#### Rename registry keys and package files successfully
 You can rename virtual registry keys and files without experiencing Sequencer issues. Previously, the Sequencer stopped working if you tried to rename a key.
-### Import and export virtual registry keys
+#### Import and export virtual registry keys
 You can import and export virtual registry keys. To import a key, right-click the node under which to import the key, navigate to the key you want to import, and then click **Import**. To export a key, right-click the key and select **Export**.
-### Import a directory into the virtual file system
+#### Import a directory into the virtual file system
 You can import a directory into the VFS. To import a directory, click the **Package Files** tab, and then click **View** &gt; **Virtual File System** &gt; **Import Directory**. If you try to import a directory that contains files that are already in the VFS, the import fails, and an explanatory message is displayed. Prior to App-V, you could not import directories.
-### Import or export a VFS file without having to delete and then add it back to the package
+#### Import or export a VFS file without having to delete and then add it back to the package
 You can import files to or export files from the VFS without having to delete the file and then add it back to the package. For example, you might use this feature to export a change log to a local drive, edit the file using an external editor, and then re-import the file into the VFS.
@ -420,15 +418,15 @@ To import a file, select the **Package Files** tab and right-click the file that
 After you import a file, you must save the package by clicking **File** &gt; **Save**.
-### Menu for adding a package file has moved
+#### Menu for adding a package file has moved
 The menu option for adding a package file has been moved. To find the Add option, select the **Package Files** tab, then click **View** &gt; **Virtual File System** &gt; **Add File**. Previously, you right-clicked a folder under the VFS node, and chose **Add File**.
-### Virtual registry node expands MACHINE and USER hives by default
+#### Virtual registry node expands MACHINE and USER hives by default
 When you open the virtual registry, the MACHINE and USER hives are shown below the top-level REGISTRY node. Previously, you had to expand the REGISTRY node to show the hives beneath.
-### Enable or disable Browser Helper Objects
+#### Enable or disable Browser Helper Objects
 You can enable or disable Browser Helper Objects by selecting a new check box, Enable Browser Helper Objects, on the Advanced tab of the Sequencer user interface. If Browser Helper Objects:
@ -446,7 +444,7 @@ You can now use the package converter to convert App-V 4.6 packages that contain
 For more information including examples, see [Migrating to App-V for Windows from a Previous Version](appv-migrating-to-appv-from-a-previous-version.md).
-### <a href="" id="bkmk-supmultscripts"></a>Support for multiple scripts on a single event trigger
+#### <a href="" id="bkmk-supmultscripts"></a>Support for multiple scripts on a single event trigger
 App-V supports the use of multiple scripts on a single event trigger for App-V packages, including packages that you are converting from App-V 4.6 to App-V 5.0 or later. To enable the use of multiple scripts, App-V uses a script launcher application, named ScriptRunner.exe, which is installed as part of the App-V client installation.
--- a/windows/manage/appv-deploying-the-appv-server.md
+++ b/windows/manage/appv-deploying-the-appv-server.md
@ -16,9 +16,9 @@ For information about deploying the App-V Server, see [About App-V](appv-about-a
 >**Important**<br>Before you install and configure the App-V servers, you must specify a port where each component will be hosted. You must also add the associated firewall rules to allow incoming requests to access the specified ports. The installer does not modify firewall settings.
-## Download and install App-V Server components
+## Download and install App-V server components
-App-V offers the following five server components, each of which serves a specific purpose in an App-V environment. All five server components are included in the Microsoft Desktop Optimization Pack (MDOP) 2015 ISO package, which can be downloaded from the [Microsoft Developer Network (MSDN)  subscription site](https://msdn.microsoft.com/en-us/subscriptions/downloads/default.aspx#FileId=65215). You must have a MSDN subscription to download MDOP.
+App-V offers the following five server components, each of which serves a specific purpose in an App-V environment. 
 - **Management server.** Use the App-V management server and console to manage your App-V infrastructure. See [Administering App-V with the management console](appv-administering-virtual-applications-with-the-management-console.md) for more information about the management server.
@ -32,6 +32,16 @@ App-V offers the following five server components, each of which serves a specif
 - **Reporting database.** Use the App-V reporting database to facilitate database pre-deployments for App-V reporting. See [How to deploy the App-V server](appv-deploy-the-appv-server.md) for more information about the reporting database.
 All five App-V server components are included in the Microsoft Desktop Optimization Pack (MDOP) 2015 ISO package, which can be downloaded from:
 -   The [MSDN (Microsoft Developer Network) subscriptions site](https://msdn.microsoft.com/en-us/subscriptions/downloads/default.aspx#FileId=65215) You must have a MSDN subscription to download the MDOP ISO package from the MSDN subscriptions site.
 -   The [Volume Licensing Service Center](https://www.microsoft.com/en-us/licensing/default.aspx) if you're using [Windows 10 for Enterprise or Education](https://www.microsoft.com/en-us/WindowsForBusiness/windows-product-home). 
        >**Note** If you're already using App-V 5.x, you don't need to re-deploy the App-V server components as they haven't changed since App-V 5.0 was released.
 In large organizations, you might want to install more than one instance of the server components to get:
 - Fault tolerance for situations when one of the servers is unavailable.
--- a/windows/manage/appv-getting-started.md
+++ b/windows/manage/appv-getting-started.md
@ -11,13 +11,14 @@ ms.prod: w10
 # Getting Started with App-V
-Microsoft Application Virtualization (App-V) enables organizations to deliver Win32 applications to users as virtual applications. Virtual applications are installed on centrally managed servers and delivered to users as a service – in real time and on as as-needed basis. Users launch virtual applications from familiar access points, including the Windows Store, and interact with them as if they were installed locally.
+Microsoft Application Virtualization (App-V) enables organizations to deliver Win32 applications to users as virtual applications. Virtual applications are installed on centrally managed servers and delivered to users as a service – in real time and on as as-needed basis. Users launch virtual applications from familiar access points and interact with them as if they were installed locally.
-With the release of Windows 10, version 1607, App-V is included with the [Windows 10 Enterprise edition](https://www.microsoft.com/en-us/WindowsForBusiness/windows-for-enterprise). If you are new to Windows 10 and App-V, you’ll need to download, activate, and install server- and client-side components to start delivering virtual applications to users. For information about what you need to know before getting started with App-V, see the [Application Virtualization (App-V) overview](appv-for-windows.md).
+With the release of Windows 10, version 1607, App-V is included with the [Windows 10 for Enterprise edition](https://www.microsoft.com/en-us/WindowsForBusiness/windows-for-enterprise). If you are new to Windows 10 and App-V, you’ll need to download, activate, and install server- and client-side components to start delivering virtual applications to users. For information about what you need to know before getting started with App-V, see the [Application Virtualization (App-V) overview](appv-for-windows.md).
 If you’re already using App-V, performing an in-place upgrade to Windows 10 on user devices automatically installs the App-V client and migrates users’ App-V applications and settings. For more information about how to configure an existing App-V installation after upgrading user devices to Windows 10, see [Upgrading to App-V for Windows 10 from an existing installation](appv-upgrading-to-app-v-for-windows-10-from-an-existing-installation.md).
-Important: You can migrate your existing App-V installation to Windows 10 from App-V versions 5.0 SP2 and higher only. If you are using an earlier version of App-V, you’ll need to upgrade from that version to App-V 5.0 SP2 before you upgrade to Windows 10.
+>**Important**
 You can upgrade your existing App-V installation to App-V for Windows from App-V versions 5.0 SP2 and higher only. If you are using an earlier version of App-V, you’ll need to upgrade from that version to App-V 5.0 SP2 before you upgrade.
 For information about previous versions of App-V, see [MDOP Information Experience](https://technet.microsoft.com/itpro/mdop/index).
@ -31,7 +32,7 @@ To start using App-V to deliver virtual applications to users, you’ll need to
 |------------|--|------|
 | App-V server components         | App-V offers five server components that work together to allow you to host and publish virtual applications, generate usage reports, and manage your App-V environment. For information about the server components, see [Deploying the App-V Server](#_Deploying_the_App-V). | The App-V server components are included in the Microsoft Desktop Optimization Pack (MDOP) 2015 ISO package, which can be downloaded from the [MSDN (Microsoft Developer Network) subscriptions site](https://msdn.microsoft.com/en-us/subscriptions/downloads/default.aspx#FileId=65215). <br>You must have a MSDN subscription to download the MDOP ISO package.<br>See [Deploying the App-V Server](appv-deploying-the-appv-server.md) for more information about installing and using the server components. |
 | App-V client and App-V Remote Desktop Services (RDS) client       | The App-V client is the component that runs virtualized applications on user devices. The client enables users to interact with icons and file names to start virtualized applications. | The App-V client is automatically installed with Windows 10. <br>For information about enabling the client, see [Enable the App-V desktop client](appv-enable-the-app-v-desktop-client.md).           |
-| App-V Sequencer      | Use the App-V Sequencer to convert Win32 applications into virtual packages for deployment to user devices. Devices must be running the App-V client to allow users to interact with virtual applications.    | Installed with the [Windows 10 Assessment and Deployment Kit](https://developer.microsoft.com/en-us/windows/hardware/windows-assessment-deployment-kit) (Windows ADK).  |
+| App-V sequencer      | Use the App-V sequencer to convert Win32 applications into virtual packages for deployment to user devices. Devices must be running the App-V client to allow users to interact with virtual applications.    | Installed with the [Windows Assessment and Deployment kit (ADK) for Windows 10, version 1607](https://developer.microsoft.com/en-us/windows/hardware/windows-assessment-deployment-kit).  |
 For more information about these elements, see [High Level Architecture for App-V](appv-high-level-architecture.md).
--- a/windows/manage/appv-release-notes-for-appv-for-windows.md
+++ b/windows/manage/appv-release-notes-for-appv-for-windows.md
@ -9,32 +9,32 @@ ms.prod: w10
 ---
-# Release Notes for App-V
+# Release Notes for App-V for Windows 10, version 1607
 Applies to: Windows 10, version 1607
-The following are known issues in Microsoft Application Virtualization (App-V).
+Review these known issues in Microsoft Application Virtualization (App-V) for Windows.
 ## Error occurs during publishing refresh between App-V 5.0 SP3 Management Server and App-V Client on Windows 10
 An error is generated during publishing refresh when synchronizing packages from the App-V 5.0 SP3 management server to an App-V client on Windows 10 . This error occurs because the App-V 5.0 SP3 server does not understand the Windows 10 operating system that is specified in the publishing URL. The issue is fixed for App-V publishing server, but is not backported to versions of App-V 5.0 SP3 or earlier.
-**Workaround**: Upgrade the App-V 5.0 Management server to the App-V Management server for Windows 10 Clients.
+**Workaround**: Upgrade the App-V 5.0 management server to the App-V management server for Windows 10 clients.
 ## Custom configurations do not get applied for packages that will be published globally if they are set using the App-V Server
 If you assign a package to an AD group that contains machine accounts and apply a custom configuration to that group using the App-V Server, the custom configuration will not be applied to those machines. The App-V Client will publish packages assigned to a machine account globally. However, it stores custom configuration files per user in each user’s profile. Globally published packages will not have access to this custom configuration.
 **Workaround**: Do one of the following:
-   Assign the package to groups containing only user accounts. This will ensure that the package’s custom configuration will be stored in each user’s profile and will be applied correctly.
+-   Assign the package to groups containing only user accounts. This will ensure that the package’s custom configuration is stored in each user’s profile and will be applied correctly.
 -   Create a custom deployment configuration file and apply it to the package on the client using the Add-AppvClientPackage cmdlet with the –DynamicDeploymentConfiguration parameter. See [About App-V Dynamic Configuration](appv-dynamic-configuration.md) for more information.
-   Create a new package with the custom configuration using the App-V Sequencer.
+-   Create a new package with the custom configuration using the App-V sequencer.
-## Server files not deleted after new App-V Server installation
+## Server files not deleted after new App-V for Windows server installation
 If you uninstall the App-V 5.0 SP1 Server and then install the App-V Server, the installation fails, the wrong version of the Management server is installed, and an error message is returned. The issue occurs because the Server files are not being deleted when you uninstall App-V 5.0 SP1, so the installation process does an upgrade instead of a new installation.