From cd812d03bbb35945134b90fbb9bea112456891e8 Mon Sep 17 00:00:00 2001 From: Justin Hall Date: Tue, 11 Jul 2017 11:35:40 -0700 Subject: [PATCH 1/3] copyedits --- .../applocker/delete-an-applocker-rule.md | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/windows/device-security/applocker/delete-an-applocker-rule.md b/windows/device-security/applocker/delete-an-applocker-rule.md index fa2e49bffb..8626baa6de 100644 --- a/windows/device-security/applocker/delete-an-applocker-rule.md +++ b/windows/device-security/applocker/delete-an-applocker-rule.md @@ -34,21 +34,25 @@ AppLocker, see [Administer AppLocker](administer-applocker.md#bkmk-using-snapins When this procedure is performed on the local device, the AppLocker policy takes effect immediately. **To clear AppLocker policies on a single system or remote systems** -Use the Set-AppLockerPolicy cmdlet with the -XMLPolicy parameter using a .XML file which contains the following contents: +Use the Set-AppLockerPolicy cmdlet with the -XMLPolicy parameter, using an .XML file that contains the following contents: - -  -  -  -  - + +  +  +  +  + -To use the Set-AppLockerPolicy cmdlet, we must first import the Applocker modules.  To do this: +To use the Set-AppLockerPolicy cmdlet, first import the Applocker modules: -PS C:\Users\Administrator> import-module AppLocker + ```powershell + PS C:\Users\Administrator> import-module AppLocker + ``` -We will create a file for example called clear.xml and place it in the same directory that we are executing our cmdlet.  And fill it with the XML Contents above.  Then you must execute using the following command: +We will create a file (for example, clear.xml), place it in the same directory where we are executing our cmdlet, and add the preceding XML contents. Then run the following command: -C:\Users\Administrator> Set-AppLockerPolicy -XMLPolicy .\clear.xml + ```powershell + C:\Users\Administrator> Set-AppLockerPolicy -XMLPolicy .\clear.xml + ``` This will remove all AppLocker Policies on a machine and could be potentially scripted to use on multiple machines using remote execution tools with accounts with proper access. From 29ab6d569dd8edb7e0bed5c995cf9ac9630ba583 Mon Sep 17 00:00:00 2001 From: Justin Hall Date: Tue, 11 Jul 2017 12:02:21 -0700 Subject: [PATCH 2/3] fixed syntax --- .../device-security/applocker/delete-an-applocker-rule.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/windows/device-security/applocker/delete-an-applocker-rule.md b/windows/device-security/applocker/delete-an-applocker-rule.md index 8626baa6de..4f50ad433f 100644 --- a/windows/device-security/applocker/delete-an-applocker-rule.md +++ b/windows/device-security/applocker/delete-an-applocker-rule.md @@ -44,15 +44,11 @@ Use the Set-AppLockerPolicy cmdlet with the -XMLPolicy parameter, using an .XML To use the Set-AppLockerPolicy cmdlet, first import the Applocker modules: - - ```powershell + PS C:\Users\Administrator> import-module AppLocker - ``` We will create a file (for example, clear.xml), place it in the same directory where we are executing our cmdlet, and add the preceding XML contents. Then run the following command: - - ```powershell + C:\Users\Administrator> Set-AppLockerPolicy -XMLPolicy .\clear.xml - ``` This will remove all AppLocker Policies on a machine and could be potentially scripted to use on multiple machines using remote execution tools with accounts with proper access. From cda012d2eddd50c8db8121c024ea8d08be5c29c0 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Wed, 12 Jul 2017 17:44:36 +0000 Subject: [PATCH 3/3] Merged PR 2180: Repair deployment tools TOC Add an item to the TOC under deployment tools and complete the index page in this section. --- windows/deployment/TOC.md | 3 +- .../windows-10-deployment-tools-reference.md | 54 ++++--------------- .../deployment/windows-10-deployment-tools.md | 23 ++++++++ .../windows-deployment-scenarios-and-tools.md | 2 +- 4 files changed, 35 insertions(+), 47 deletions(-) create mode 100644 windows/deployment/windows-10-deployment-tools.md diff --git a/windows/deployment/TOC.md b/windows/deployment/TOC.md index f0d87363f9..27a5ebe9be 100644 --- a/windows/deployment/TOC.md +++ b/windows/deployment/TOC.md @@ -105,8 +105,9 @@ #### [Replace a Windows 7 SP1 client with Windows 10 using Configuration Manager](deploy-windows-sccm/replace-a-windows-7-client-with-windows-10-using-configuration-manager.md) #### [Perform an in-place upgrade to Windows 10 using Configuration Manager](upgrade/upgrade-to-windows-10-with-system-center-configuraton-manager.md) -### [Windows 10 deployment tools](windows-10-deployment-tools-reference.md) +### [Windows 10 deployment tools](windows-10-deployment-tools.md) +#### [Windows 10 deployment scenarios and tools](windows-deployment-scenarios-and-tools.md) #### [Convert MBR partition to GPT](mbr-to-gpt.md) #### [Configure a PXE server to load Windows PE](configure-a-pxe-server-to-load-windows-pe.md) #### [Windows ADK for Windows 10 scenarios for IT Pros](windows-adk-scenarios-for-it-pros.md) diff --git a/windows/deployment/windows-10-deployment-tools-reference.md b/windows/deployment/windows-10-deployment-tools-reference.md index 2a08717439..d6f852cae5 100644 --- a/windows/deployment/windows-10-deployment-tools-reference.md +++ b/windows/deployment/windows-10-deployment-tools-reference.md @@ -10,50 +10,14 @@ author: greg-lindsay # Windows 10 deployment tools - Learn about the tools available to deploy Windows 10. -## In this section - - - ---- - - - - - - - - - - - - - - - - - - - - - - - - -
TopicDescription

[Windows 10 deployment tools reference](windows-deployment-scenarios-and-tools.md)

To successfully deploy the Windows 10 operating system and applications for your organization, it is essential that you know about the available tools to help with the process. In this topic, you will learn about the most commonly used tools for Windows 10 deployment.

[Windows ADK for Windows 10 scenarios for IT Pros](windows-adk-scenarios-for-it-pros.md)

The Windows Assessment and Deployment Kit (Windows ADK) contains tools that can be used by IT Pros to deploy Windows.

[Volume Activation Management Tool (VAMT) Technical Reference](volume-activation/volume-activation-management-tool.md)

The Volume Activation Management Tool (VAMT) enables network administrators and other IT professionals to automate and centrally manage the Windows®, Microsoft® Office, and select other Microsoft products volume and retail-activation process.

[User State Migration Tool (USMT) Technical Reference](usmt/usmt-technical-reference.md)

The User State Migration Tool (USMT) 10.0 is included with the Windows Assessment and Deployment Kit (Windows ADK) for Windows 10. USMT provides a highly customizable user-profile migration experience for IT professionals.

- -  - -  - -  - - - - - +|Topic |Description | +|------|------------| +|[Windows 10 deployment scenarios and tools](windows-deployment-scenarios-and-tools.md) |To successfully deploy the Windows 10 operating system and applications for your organization, it is essential that you know about the available tools to help with the process. In this topic, you will learn about the most commonly used tools for Windows 10 deployment. | +|[Convert MBR partition to GPT](mbr-to-gpt.md) |This topic provides detailed instructions for using the MBR2GPT partition conversion tool. | +|[Configure a PXE server to load Windows PE](configure-a-pxe-server-to-load-windows-pe.md) |This guide describes how to configure a PXE server to load Windows PE by booting a client computer from the network. | +|[Windows ADK for Windows 10 scenarios for IT Pros](windows-adk-scenarios-for-it-pros.md) |The Windows Assessment and Deployment Kit (Windows ADK) contains tools that can be used by IT Pros to deploy Windows. | +|[Deploy Windows To Go in your organization](deploy-windows-to-go.md) |This topic helps you to deploy Windows To Go in your organization. Before you begin deployment, make sure that you have reviewed the topics [Windows To Go: feature overview](planning/windows-to-go-overview.md) and [Prepare your organization for Windows To Go](planning/prepare-your-organization-for-windows-to-go.md) to ensure that you have the correct hardware and are prepared to complete the deployment. You can then use the steps in this topic to start your Windows To Go deployment. | +|[Volume Activation Management Tool (VAMT) Technical Reference](volume-activation/volume-activation-management-tool.md) |The Volume Activation Management Tool (VAMT) enables network administrators and other IT professionals to automate and centrally manage the Windows®, Microsoft® Office, and select other Microsoft products volume and retail-activation process. | +|[User State Migration Tool (USMT) Technical Reference](usmt/usmt-technical-reference.md) |The User State Migration Tool (USMT) 10.0 is included with the Windows Assessment and Deployment Kit (Windows ADK) for Windows 10. USMT provides a highly customizable user-profile migration experience for IT professionals | diff --git a/windows/deployment/windows-10-deployment-tools.md b/windows/deployment/windows-10-deployment-tools.md new file mode 100644 index 0000000000..d6f852cae5 --- /dev/null +++ b/windows/deployment/windows-10-deployment-tools.md @@ -0,0 +1,23 @@ +--- +title: Windows 10 deployment tools (Windows 10) +description: Learn about the tools available to deploy Windows 10. +ms.assetid: 5C4B0AE3-B2D0-4628-9E73-606F3FAA17BB +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +author: greg-lindsay +--- + +# Windows 10 deployment tools + +Learn about the tools available to deploy Windows 10. + +|Topic |Description | +|------|------------| +|[Windows 10 deployment scenarios and tools](windows-deployment-scenarios-and-tools.md) |To successfully deploy the Windows 10 operating system and applications for your organization, it is essential that you know about the available tools to help with the process. In this topic, you will learn about the most commonly used tools for Windows 10 deployment. | +|[Convert MBR partition to GPT](mbr-to-gpt.md) |This topic provides detailed instructions for using the MBR2GPT partition conversion tool. | +|[Configure a PXE server to load Windows PE](configure-a-pxe-server-to-load-windows-pe.md) |This guide describes how to configure a PXE server to load Windows PE by booting a client computer from the network. | +|[Windows ADK for Windows 10 scenarios for IT Pros](windows-adk-scenarios-for-it-pros.md) |The Windows Assessment and Deployment Kit (Windows ADK) contains tools that can be used by IT Pros to deploy Windows. | +|[Deploy Windows To Go in your organization](deploy-windows-to-go.md) |This topic helps you to deploy Windows To Go in your organization. Before you begin deployment, make sure that you have reviewed the topics [Windows To Go: feature overview](planning/windows-to-go-overview.md) and [Prepare your organization for Windows To Go](planning/prepare-your-organization-for-windows-to-go.md) to ensure that you have the correct hardware and are prepared to complete the deployment. You can then use the steps in this topic to start your Windows To Go deployment. | +|[Volume Activation Management Tool (VAMT) Technical Reference](volume-activation/volume-activation-management-tool.md) |The Volume Activation Management Tool (VAMT) enables network administrators and other IT professionals to automate and centrally manage the Windows®, Microsoft® Office, and select other Microsoft products volume and retail-activation process. | +|[User State Migration Tool (USMT) Technical Reference](usmt/usmt-technical-reference.md) |The User State Migration Tool (USMT) 10.0 is included with the Windows Assessment and Deployment Kit (Windows ADK) for Windows 10. USMT provides a highly customizable user-profile migration experience for IT professionals | diff --git a/windows/deployment/windows-deployment-scenarios-and-tools.md b/windows/deployment/windows-deployment-scenarios-and-tools.md index d1fe29aa6f..8290d3383d 100644 --- a/windows/deployment/windows-deployment-scenarios-and-tools.md +++ b/windows/deployment/windows-deployment-scenarios-and-tools.md @@ -9,7 +9,7 @@ ms.sitesec: library author: mtniehaus --- -# Windows 10 deployment tools reference +# Windows 10 deployment scenarios and tools To successfully deploy the Windows 10 operating system and applications for your organization, it is essential that you know about the available tools to help with the process. In this topic, you will learn about the most commonly used tools for Windows 10 deployment.