From cd812d03bbb35945134b90fbb9bea112456891e8 Mon Sep 17 00:00:00 2001 From: Justin Hall Date: Tue, 11 Jul 2017 11:35:40 -0700 Subject: [PATCH 1/8] 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/8] 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 cbca5f19c250ce87a8094cd29a308f9782075018 Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Wed, 12 Jul 2017 10:17:43 -0700 Subject: [PATCH 3/8] updates to TOC, change history, and note for flight releases --- store-for-business/TOC.md | 3 +- store-for-business/add-profile-to-devices.md | 3 ++ ...pps-windows-store-for-business-overview.md | 5 ++- store-for-business/sfb-change-history.md | 37 +++++++++++++++++++ 4 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 store-for-business/sfb-change-history.md diff --git a/store-for-business/TOC.md b/store-for-business/TOC.md index 514ff6cfea..70827bf809 100644 --- a/store-for-business/TOC.md +++ b/store-for-business/TOC.md @@ -14,12 +14,13 @@ ### [Assign apps to employees](assign-apps-to-employees.md) ### [Distribute apps with a management tool](distribute-apps-with-management-tool.md) ### [Distribute offline apps](distribute-offline-apps.md) -## [Manage apps](manage-apps-windows-store-for-business-overview.md) +## [Manage apps and devices](manage-apps-windows-store-for-business-overview.md) ### [App inventory managemement for Microsoft Store for Business and Education](app-inventory-management-windows-store-for-business.md) ### [Manage app orders in Microsoft Store for Business and Education](manage-orders-windows-store-for-business.md) ### [Manage access to private store](manage-access-to-private-store.md) ### [Manage private store settings](manage-private-store-settings.md) ### [Configure MDM provider](configure-mdm-provider-windows-store-for-business.md) +## [Manage Windows device deployment with Windows AutoPilot Deployment](add-profile-to-devices.md) ## [Device Guard signing portal](device-guard-signing-portal.md) ### [Add unsigned app to code integrity policy](add-unsigned-app-to-code-integrity-policy.md) ### [Sign code integrity policy with Device Guard signing](sign-code-integrity-policy-with-device-guard-signing.md) diff --git a/store-for-business/add-profile-to-devices.md b/store-for-business/add-profile-to-devices.md index 2cf678c39f..4bc1451628 100644 --- a/store-for-business/add-profile-to-devices.md +++ b/store-for-business/add-profile-to-devices.md @@ -17,6 +17,9 @@ localizationpriority: high - Windows 10 +> [!IMPORTANT] +> This topic has been updated to reflect the latest functionality, which we are releasing to customers in stages. You may not see all of the options described here until you receive the update. + Windows AutoPilot Deployment Program simplifies device set up for IT Admins. For an overview of benefits, scenarios, and prerequisites, see [Overview of Windows AutoPilot](https://docs.microsoft.com/windows/deployment/windows-10-auto-pilot). ## What is Windows AutoPilot Deployment Program? diff --git a/store-for-business/manage-apps-windows-store-for-business-overview.md b/store-for-business/manage-apps-windows-store-for-business-overview.md index 6757e4eecd..f88cdcd26a 100644 --- a/store-for-business/manage-apps-windows-store-for-business-overview.md +++ b/store-for-business/manage-apps-windows-store-for-business-overview.md @@ -1,5 +1,5 @@ --- -title: Manage apps in Microsoft Store for Business (Windows 10) +title: Manage apps and devices in Microsoft Store for Business (Windows 10) description: Manage settings and access to apps in Microsoft Store for Business. ms.assetid: 2F65D4C3-B02C-41CC-92F0-5D9937228202 ms.prod: w10 @@ -26,4 +26,5 @@ Manage settings and access to apps in Microsoft Store for Business and Microsoft | [Manage access to private store](manage-access-to-private-store.md) | You can manage access to your private store in Store for Business. | | [App inventory managemement for Microsoft Store for Business and Education](app-inventory-management-windows-store-for-business.md) | You can manage all apps that you've acquired on your **Apps & software** page. | | [Manage private store settings](manage-private-store-settings.md) | The private store is a feature in Microsoft Store for Business and Education that organizations receive during the sign up process. When admins add apps to the private store, all employees in the organization can view and download the apps. Only online-licensed apps can be distributed from your private store. | -| [Configure MDM provider](configure-mdm-provider-windows-store-for-business.md) | For companies or organizations using mobile device management (MDM) tools, those tools can synchronize with Microsoft Store for Business inventory to manage apps with offline licenses. Microsoft Store management tool services work with your third-party management tool to manage content. | \ No newline at end of file +| [Configure MDM provider](configure-mdm-provider-windows-store-for-business.md) | For companies or organizations using mobile device management (MDM) tools, those tools can synchronize with Microsoft Store for Business inventory to manage apps with offline licenses. Microsoft Store management tool services work with your third-party management tool to manage content. | +| [Manage Windows device deployment with Windows AutoPilot Deployment](add-profile-to-devices.md) | In Microsoft Store for Business, you can manage devices for your organization and apply an AutoPilot deployment profile to your devices. When people in your organization run the out-of-box experience on the device, the profile configures Windows based on the AutoPilot deployment profile you applied to the device. | \ No newline at end of file diff --git a/store-for-business/sfb-change-history.md b/store-for-business/sfb-change-history.md new file mode 100644 index 0000000000..668514a725 --- /dev/null +++ b/store-for-business/sfb-change-history.md @@ -0,0 +1,37 @@ +--- +title: Change history for Microsoft Store for Business and Education +description: Summary of topic changes for Microsoft Store for Business and Microsoft Store for Education. +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: store +author: TrudyHa +ms.author: TrudyHa +ms.date: 07/12/2107 +localizationpriority: high +--- + +# Change history for Microsoft Store for Business and Microsoft Store for Education + +**Applies to** + +- Windows 10 +- Windows 10 Mobile + +## June 2017 +| New or changed topic | Description | +| -------------------- | ----------- | +| [Get Minecraft: Education Edition with Windows 10 device promotion](https://docs.microsoft.com/education/windows/get-minecraft-device-promotion) | New. Information about redeeming Minecraft: Education Edition licenses with qualifying purchases of Windows 10 devices. | +| [Microsoft Store for Business and Education overview - supported markets](https://docs.microsoft.com/en-us/microsoft-store/windows-store-for-business-overview#supported-markets) | Updates for added market support. | + +## July 2017 +  +| New or changed topic | Description | +| -------------------- | ----------- | +| [Manage Windows device deployment with Windows AutoPilot Deployment](add-profile-to-devices.md) | New. Information about Windows AutoPilot Deployment Program and how it is used in Microsoft Store for Business and Education. | +  + + + + + From cc397a9716d675427c3082cbae6e4c9080380cd1 Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Wed, 12 Jul 2017 10:28:40 -0700 Subject: [PATCH 4/8] update toc link --- education/windows/TOC.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/education/windows/TOC.md b/education/windows/TOC.md index 4a8267528e..48b59392b8 100644 --- a/education/windows/TOC.md +++ b/education/windows/TOC.md @@ -15,7 +15,7 @@ ## [Get Minecraft: Education Edition](get-minecraft-for-education.md) ### [For teachers: get Minecraft Education Edition](teacher-get-minecraft.md) ### [For IT administrators: get Minecraft Education Edition](school-get-minecraft.md) -### [Get Minecraft: Education Edition with Windows 10 device promotion](get-minecraft-for-education.md) +### [Get Minecraft: Education Edition with Windows 10 device promotion](get-minecraft-device-promotion.md) ## [Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md) ## [Deploy Windows 10 in a school district](deploy-windows-10-in-a-school-district.md) ## [Switch to Windows 10 Pro Education from Windows 10 Pro or Windows 10 S](switch-to-pro-education.md) From cda012d2eddd50c8db8121c024ea8d08be5c29c0 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Wed, 12 Jul 2017 17:44:36 +0000 Subject: [PATCH 5/8] 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. From 00a7e5c67779588c0e0bf3c342fa1c72113b9c3b Mon Sep 17 00:00:00 2001 From: LizRoss Date: Wed, 12 Jul 2017 10:48:23 -0700 Subject: [PATCH 6/8] Fixed typo --- .../create-wip-policy-using-intune.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune.md b/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune.md index aecea0b9c0..17cfdf7f54 100644 --- a/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune.md +++ b/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune.md @@ -1,5 +1,5 @@ --- -title: Create a Windows Information Protection (WIP) using the classic console for Microsoft Intune (Windows 10) +title: Create a Windows Information Protection (WIP) policy using the classic console for Microsoft Intune (Windows 10) description: Microsoft Intune helps you create and deploy your Windows Information Protection (WIP) policy, including letting you choose your protected apps, your WIP-protection level, and how to find enterprise data on the network. ms.assetid: 4b307c99-3016-4d6a-9ae7-3bbebd26e721 ms.prod: w10 From 81c643ccd2ee3fa249ddc44b03354d20e1578378 Mon Sep 17 00:00:00 2001 From: intothedarkness Date: Wed, 12 Jul 2017 11:05:24 -0700 Subject: [PATCH 7/8] Update installing-the-ue-v-group-policy-admx-templates.md update the AMDX link --- mdop/uev-v1/installing-the-ue-v-group-policy-admx-templates.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mdop/uev-v1/installing-the-ue-v-group-policy-admx-templates.md b/mdop/uev-v1/installing-the-ue-v-group-policy-admx-templates.md index d6b256689e..51c1b74957 100644 --- a/mdop/uev-v1/installing-the-ue-v-group-policy-admx-templates.md +++ b/mdop/uev-v1/installing-the-ue-v-group-policy-admx-templates.md @@ -27,7 +27,7 @@ ADMX files can be installed and tested locally on any computer that runs the Win **To download the UE-V ADMX templates** -1. Download the UE-V ADMX template files: . +1. Download the UE-V ADMX template files: . 2. For more information about how to deploy the Group Policy templates, see . From 9366c11b4c10af4f5519dd586b50678404304283 Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Wed, 12 Jul 2017 11:39:03 -0700 Subject: [PATCH 8/8] fix TOC entry --- store-for-business/TOC.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store-for-business/TOC.md b/store-for-business/TOC.md index 70827bf809..03cd9ba0ba 100644 --- a/store-for-business/TOC.md +++ b/store-for-business/TOC.md @@ -20,7 +20,7 @@ ### [Manage access to private store](manage-access-to-private-store.md) ### [Manage private store settings](manage-private-store-settings.md) ### [Configure MDM provider](configure-mdm-provider-windows-store-for-business.md) -## [Manage Windows device deployment with Windows AutoPilot Deployment](add-profile-to-devices.md) +### [Manage Windows device deployment with Windows AutoPilot Deployment](add-profile-to-devices.md) ## [Device Guard signing portal](device-guard-signing-portal.md) ### [Add unsigned app to code integrity policy](add-unsigned-app-to-code-integrity-policy.md) ### [Sign code integrity policy with Device Guard signing](sign-code-integrity-policy-with-device-guard-signing.md)