From d0bbe4be60c5c06bc778e12e2235ad69064c5126 Mon Sep 17 00:00:00 2001 From: LizRoss Date: Tue, 1 Nov 2016 14:15:19 -0700 Subject: [PATCH 1/9] Fixing broken links --- ...on-groups-on-a-stand-alone-computer-by-using-powershell51.md | 2 +- ...-with-system-center-configuration-manager-2012-both-uevv2.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mdop/appv-v5/how-to-manage-connection-groups-on-a-stand-alone-computer-by-using-powershell51.md b/mdop/appv-v5/how-to-manage-connection-groups-on-a-stand-alone-computer-by-using-powershell51.md index c78817a012..8c0e37ebc8 100644 --- a/mdop/appv-v5/how-to-manage-connection-groups-on-a-stand-alone-computer-by-using-powershell51.md +++ b/mdop/appv-v5/how-to-manage-connection-groups-on-a-stand-alone-computer-by-using-powershell51.md @@ -35,7 +35,7 @@ This topic explains the following procedures: 2. Repeat **step 1** of this procedure for each package in the connection group. -**To add and enable the connection group on the App-V client** +**To add and enable the connection group on the App-V client** 1. Add the connection group by typing the following command: diff --git a/mdop/uev-v2/configuring-ue-v-2x-with-system-center-configuration-manager-2012-both-uevv2.md b/mdop/uev-v2/configuring-ue-v-2x-with-system-center-configuration-manager-2012-both-uevv2.md index acfc53f384..5806ca016a 100644 --- a/mdop/uev-v2/configuring-ue-v-2x-with-system-center-configuration-manager-2012-both-uevv2.md +++ b/mdop/uev-v2/configuring-ue-v-2x-with-system-center-configuration-manager-2012-both-uevv2.md @@ -103,7 +103,7 @@ It might be necessary to change the PowerShell execution policy to allow these s 2. In the **User Agent** tab, set the **PowerShell Execution Policy** to **Bypass** -**Create the First UE-V Policy Configuration Item** +**Create the First UE-V Policy Configuration Item** 1. Copy the default settings configuration file from the UE-V Config Pack installation directory to a location visible to your ConfigMgr Admin Console: From fa2e3779e1972b3f7af5498c53fafe8aada8c52d Mon Sep 17 00:00:00 2001 From: LizRoss Date: Tue, 1 Nov 2016 14:41:20 -0700 Subject: [PATCH 2/9] Fixing broken bookmarks --- windows/deploy/introduction-vamt.md | 8 ++++---- windows/deploy/usmt-exclude-files-and-settings.md | 2 +- ...guring-uev-with-system-center-configuration-manager.md | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/windows/deploy/introduction-vamt.md b/windows/deploy/introduction-vamt.md index 3d51c0dd02..133b8e6966 100644 --- a/windows/deploy/introduction-vamt.md +++ b/windows/deploy/introduction-vamt.md @@ -22,18 +22,18 @@ VAMT can be installed on, and can manage, physical or virtual instances. VAMT ca - [Enterprise Environment](#bkmk-enterpriseenvironment) - [VAMT User Interface](#bkmk-userinterface) -## Managing Multiple Activation Key (MAK) and Retail Activation +## Managing Multiple Activation Key (MAK) and Retail Activation You can use a MAK or a retail product key to activate Windows, Windows Server, or Office on an individual computer or a group of computers. VAMT enables two different activation scenarios: - **Online activation.** Many enterprises maintain a single Windows system image or Office installation package for deployment across the enterprise. Occasionally there is also a need to use retail product keys in special situations. Online activation enables you to activate over the Internet any products installed with MAK, KMS host, or retail product keys on one or more connected computers within a network. This process requires that each product communicate activation information directly to Microsoft. - **Proxy activation.** This activation method enables you to perform volume activation for products installed on client computers that do not have Internet access. The VAMT host computer distributes a MAK, KMS Host key (CSVLK), or retail product key to one or more client products and collects the installation ID (IID) from each client product. The VAMT host sends the IIDs to Microsoft on behalf of the client products and obtains the corresponding Confirmation IDs (CIDs). The VAMT host then installs the CIDs on the client products to complete the activation. Using this method, only the VAMT host computer needs Internet access. You can also activate products installed on computers in a workgroup that is completely isolated from any larger network, by installing a second instance of VAMT on a computer within the workgroup. Then, use removable media to transfer activation data between this new instance of VAMT and the Internet-connected VAMT host. -## Managing Key Management Service (KMS) Activation +## Managing Key Management Service (KMS) Activation In addition to MAK or retail activation, you can use VAMT to perform volume activation using the Key Management Service (KMS). VAMT can install and activate GVLK (KMS client) keys on client products. GVLKs are the default product keys used by Volume License editions of Windows Vista, Windows 7, Windows 8, Windows 10, Windows Server 2008, Windows Server 2008 R2, and Windows Server 2012 as well as Microsoft Office 2010. VAMT treats a KMS Host key (CSVLK) product key identically to a retail-type product key; therefore, the experience for product key entry and activation management are identical for both these product key types. -## Enterprise Environment +## Enterprise Environment VAMT is commonly implemented in enterprise environments. The following illustrates three common environments—Core Network, Secure Zone, and Isolated Lab. @@ -42,7 +42,7 @@ VAMT is commonly implemented in enterprise environments. The following illustrat In the Core Network environment, all computers are within a common network managed by Active Directory® Domain Services (AD DS). The Secure Zone represents higher-security Core Network computers that have additional firewall protection. The Isolated Lab environment is a workgroup that is physically separate from the Core Network, and its computers do not have Internet access. The network security policy states that no information that could identify a specific computer or user may be transferred out of the Isolated Lab. -## VAMT User Interface +## VAMT User Interface The following screenshot shows the VAMT graphical user interface. diff --git a/windows/deploy/usmt-exclude-files-and-settings.md b/windows/deploy/usmt-exclude-files-and-settings.md index e856679334..a70c486b1f 100644 --- a/windows/deploy/usmt-exclude-files-and-settings.md +++ b/windows/deploy/usmt-exclude-files-and-settings.md @@ -246,7 +246,7 @@ The following .xml file unconditionally excludes the system folders of `C:\Windo ``` -## Create a Config.xml File +## Create a Config XML File You can create and modify a Config.xml file if you want to exclude components from the migration. Excluding components using this file is easier than modifying the migration .xml files because you do not need to be familiar with the migration rules and syntax. Config.xml is an optional file that you can create using the **/genconfig** command-line option with the ScanState tool. For example, you can use the Config.xml file to exclude the settings for one of the default applications. In addition, creating and modifying this file is the only way to exclude the operating-system settings that are migrated to computers running Windows. - **To exclude the settings for a default application:** Specify `migrate="no"` for the application under the <Applications> section of the Config.xml file. diff --git a/windows/manage/uev-configuring-uev-with-system-center-configuration-manager.md b/windows/manage/uev-configuring-uev-with-system-center-configuration-manager.md index c81a7384be..ec06465c51 100644 --- a/windows/manage/uev-configuring-uev-with-system-center-configuration-manager.md +++ b/windows/manage/uev-configuring-uev-with-system-center-configuration-manager.md @@ -104,7 +104,7 @@ It might be necessary to change the PowerShell execution policy to allow these s 2. In the **User Agent** tab, set the **PowerShell Execution Policy** to **Bypass**   -**Create the first UE-V policy configuration item** +**Create the first UE-V policy configuration item** 1. Copy the default settings configuration file from the UE-V Config Pack installation directory to a location visible to your ConfigMgr Admin Console: @@ -171,7 +171,7 @@ It might be necessary to change the PowerShell execution policy to allow these s 3. Reimport the CAB file. The version in ConfigMgr will be updated. -## Generate a UE-V Template Baseline +## Generate a UE-V Template Baseline UE-V templates are distributed using a baseline containing multiple configuration items. Each configuration item contains the discovery and remediation scripts needed to install one UE-V template. The actual UE-V template is embedded within the remediation script for distribution using standard Configuration Item functionality. From a4a46c338084ead6b61bb93a1b4f228a7495ab94 Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Tue, 1 Nov 2016 15:01:11 -0700 Subject: [PATCH 3/9] Update usmt-exclude-files-and-settings.md --- windows/deploy/usmt-exclude-files-and-settings.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/deploy/usmt-exclude-files-and-settings.md b/windows/deploy/usmt-exclude-files-and-settings.md index a70c486b1f..975f11e54a 100644 --- a/windows/deploy/usmt-exclude-files-and-settings.md +++ b/windows/deploy/usmt-exclude-files-and-settings.md @@ -32,7 +32,7 @@ If you specify an <exclude> rule, always specify a corresponding <inclu - [Example 1: How to migrate all files from C:\\ except .mp3 files](#example-1-how-to-migrate-all-files-from-c-except-mp3-files) -- [Example 2: How to migrate all files located in C:\\Data except files in C:\\Data\\tmp](#example-2-how-to-migrate-all-files-located-in-c-data-except-files-in-c-data-tmp) +- [Example 2: How to migrate all files located in C:\\Data except files in C:\\Data\\tmp](#example-2-how-to-migrate-all-files-located-in-cdata-except-files-in-cdatatmp) - [Example 3: How to exclude the files in a folder but include all subfolders](#example-3-how-to-exclude-the-files-in-a-folder-but-include-all-subfolders) From a38623e1da44621dee5f0b916d63410a55a25650 Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Wed, 2 Nov 2016 07:28:23 -0700 Subject: [PATCH 4/9] add link to API --- windows/manage/lockdown-xml.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/manage/lockdown-xml.md b/windows/manage/lockdown-xml.md index 282c9805d9..936ed8c310 100644 --- a/windows/manage/lockdown-xml.md +++ b/windows/manage/lockdown-xml.md @@ -385,7 +385,7 @@ For a list of the settings and quick actions that you can allow or block, see [S You can add custom configurations by role. In addition to the role configuration, you must also install a login application on the device. The app displays a list of available roles on the device; the user taps a role, such as "Manager"; the configuration defined for the "Manager" role is applied. - [Learn how to create a login application that will work with your Lockdown XML file.](https://github.com/Microsoft/Windows-universal-samples/tree/master/Samples/DeviceLockdownAzureLogin) + [Learn how to create a login application that will work with your Lockdown XML file.](https://github.com/Microsoft/Windows-universal-samples/tree/master/Samples/DeviceLockdownAzureLogin) For reference, see the [Windows.Embedded.DeviceLockdown API](https://msdn.microsoft.com/library/windows/apps/windows.embedded.devicelockdown). In the XML file, you define each role with a GUID and name, as shown in the following example: From 14acedfa75030bb4ce939f50783540804fb2249d Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Wed, 2 Nov 2016 07:33:48 -0700 Subject: [PATCH 5/9] fix ports --- devices/surface-hub/connect-and-display-with-surface-hub.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devices/surface-hub/connect-and-display-with-surface-hub.md b/devices/surface-hub/connect-and-display-with-surface-hub.md index c32f557d19..3d1a589760 100644 --- a/devices/surface-hub/connect-and-display-with-surface-hub.md +++ b/devices/surface-hub/connect-and-display-with-surface-hub.md @@ -233,7 +233,7 @@ Surface Hub is compatible with a range of hardware. Choose the processor and mem ### Graphics adapter -In replacement PC mode, Surface Hub supports any graphics adapter that can produce a DisplayPort signal. You'll improve your experience with a graphics adapter that can match Surface Hub's resolution and refresh rate. For example, though the best and recommended replacement PC experience on the Surface Hub is with a 120Hz video signal, 60Hz video signals are also supported. +In replacement PC mode, Surface Hub supports any graphics adapter that can produce a DisplayPort signal. You'll improve your experience with a graphics adapter that can match Surface Hub's resolution and refresh rate. For example, the best and recommended replacement PC experience on the Surface Hub is with a 120Hz video signal. **55" Surface Hubs** - For best experience, use a graphics card capable of 1080p resolution at 120Hz. @@ -295,7 +295,7 @@ Replacement PC ports on 55" Surface Hub.

PC video

Video input

-

DisplayPort 1.2

+

DP 1.2

  • Full screen display of 1080p at 120 Hz, plus audio

  • HDCP compliant

    • @@ -352,7 +352,7 @@ Replacement PC ports on 84" Surface Hub.

    PC video

    Video input

    -

    DisplayPort 1.2 (2x)

    +

    DP 1.2 (2x)

    • Full screen display of 2160p at 120 Hz, plus audio

    • HDCP compliant

      • From a19a02676986802173cfa3f96e04308e840fc2f6 Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Wed, 2 Nov 2016 08:50:42 -0700 Subject: [PATCH 6/9] fixed broken link --- .../manage/configure-windows-telemetry-in-your-organization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/manage/configure-windows-telemetry-in-your-organization.md b/windows/manage/configure-windows-telemetry-in-your-organization.md index 87818ca231..fe4b2ee601 100644 --- a/windows/manage/configure-windows-telemetry-in-your-organization.md +++ b/windows/manage/configure-windows-telemetry-in-your-organization.md @@ -201,7 +201,7 @@ The data gathered at this level includes: - **Windows Defender/Endpoint Protection**. Windows Defender and System Center Endpoint Protection requires some information to function, including: anti-malware signatures, diagnostic information, User Account Control settings, Unified Extensible Firmware Interface (UEFI) settings, and IP address. > [!NOTE] - > This reporting can be turned off and no information is included if a customer is using third party antimalware software, or if Windows Defender is turned off. For more info, see [Windows Defender](disconnect-your-organization-from-microsoft.md#windows-defender). + > This reporting can be turned off and no information is included if a customer is using third party antimalware software, or if Windows Defender is turned off. For more info, see [Windows Defender](manage-connections-from-windows-operating-system-components-to-microsoft-services#bkmk-defender). Microsoft recommends that Windows Update, Windows Defender, and MSRT remain enabled unless the enterprise uses alternative solutions such as Windows Server Update Services, System Center Configuration Manager, or a third party antimalware solution. Windows Update, Windows Defender, and MSRT provide core Windows functionality such as driver and OS updates, including security updates. From 856394914f0777a44630ae70c17dc8129815d911 Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Wed, 2 Nov 2016 08:55:31 -0700 Subject: [PATCH 7/9] change author name --- windows/plan/act-technical-reference.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/plan/act-technical-reference.md b/windows/plan/act-technical-reference.md index 29e311a2f5..efdc2ffb32 100644 --- a/windows/plan/act-technical-reference.md +++ b/windows/plan/act-technical-reference.md @@ -6,7 +6,7 @@ ms.prod: w10 ms.mktglfcycl: plan ms.pagetype: appcompat ms.sitesec: library -author: TrudyHa +author: eross-msft --- # Application Compatibility Toolkit (ACT) Technical Reference From e04ebe84a4a9dd1976ac0cd09fc2603d62e432e8 Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Wed, 2 Nov 2016 08:56:50 -0700 Subject: [PATCH 8/9] fixed broken link --- .../deploy-catalog-files-to-support-code-integrity-policies.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/keep-secure/deploy-catalog-files-to-support-code-integrity-policies.md b/windows/keep-secure/deploy-catalog-files-to-support-code-integrity-policies.md index d322b1015a..ba8e5d4999 100644 --- a/windows/keep-secure/deploy-catalog-files-to-support-code-integrity-policies.md +++ b/windows/keep-secure/deploy-catalog-files-to-support-code-integrity-policies.md @@ -76,7 +76,7 @@ To trust this catalog file within a code integrity policy, the catalog must firs For information about signing catalog files by using a certificate and SignTool.exe, a free tool available in the Windows SDK, see the next section, [Catalog signing with SignTool.exe](#catalog-signing-with-signtoolexe). -For information about adding the signing certificate to a code integrity policy, see [Add a catalog signing certificate to a code integrity policy](deploy-code-integrity-policies-steps.md#add-a-catalog-signing-certificate-to-a-code-integrity-policy). +For information about adding the signing certificate to a code integrity policy, see [Add a catalog signing certificate to a code integrity policy](#add-a-catalog-signing-certificate-to-a-code-integrity-policy). ## Catalog signing with SignTool.exe From 38e4be63a84602f8ec852e6727c0d72c737af0c1 Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Wed, 2 Nov 2016 09:02:01 -0700 Subject: [PATCH 9/9] fixing link --- .../manage/configure-windows-telemetry-in-your-organization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/manage/configure-windows-telemetry-in-your-organization.md b/windows/manage/configure-windows-telemetry-in-your-organization.md index fe4b2ee601..3bb9df599b 100644 --- a/windows/manage/configure-windows-telemetry-in-your-organization.md +++ b/windows/manage/configure-windows-telemetry-in-your-organization.md @@ -201,7 +201,7 @@ The data gathered at this level includes: - **Windows Defender/Endpoint Protection**. Windows Defender and System Center Endpoint Protection requires some information to function, including: anti-malware signatures, diagnostic information, User Account Control settings, Unified Extensible Firmware Interface (UEFI) settings, and IP address. > [!NOTE] - > This reporting can be turned off and no information is included if a customer is using third party antimalware software, or if Windows Defender is turned off. For more info, see [Windows Defender](manage-connections-from-windows-operating-system-components-to-microsoft-services#bkmk-defender). + > This reporting can be turned off and no information is included if a customer is using third party antimalware software, or if Windows Defender is turned off. For more info, see [Windows Defender](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-defender). Microsoft recommends that Windows Update, Windows Defender, and MSRT remain enabled unless the enterprise uses alternative solutions such as Windows Server Update Services, System Center Configuration Manager, or a third party antimalware solution. Windows Update, Windows Defender, and MSRT provide core Windows functionality such as driver and OS updates, including security updates.