diff --git a/browsers/edge/TOC.md b/browsers/edge/TOC.md index 1e0b12897e..df9d4246da 100644 --- a/browsers/edge/TOC.md +++ b/browsers/edge/TOC.md @@ -1,5 +1,5 @@ #[Microsoft Edge - Deployment Guide for IT Pros](index.md) -##[Change History for Microsoft Edge](change-history-for-microsoft-edge.md) +##[Change history for Microsoft Edge](change-history-for-microsoft-edge.md) ##[Microsoft Edge requirements and language support](hardware-and-software-requirements.md) ##[Available policies for Microsoft Edge](available-policies.md) ##[Use Enterprise Mode to improve compatibility](emie-to-improve-compatibility.md) diff --git a/windows/deploy/TOC.md b/windows/deploy/TOC.md index b6c4d77abb..a6d2e9d108 100644 --- a/windows/deploy/TOC.md +++ b/windows/deploy/TOC.md @@ -1,5 +1,4 @@ # [Deploy Windows 10](index.md) -## [Deploy Windows 10 in a test lab](windows-10-poc.md) ## [Windows 10 deployment scenarios](windows-10-deployment-scenarios.md) ## [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md) ### [Get started with the Microsoft Deployment Toolkit (MDT)](get-started-with-the-microsoft-deployment-toolkit.md) diff --git a/windows/deploy/index.md b/windows/deploy/index.md index a67f501d11..d4254111b1 100644 --- a/windows/deploy/index.md +++ b/windows/deploy/index.md @@ -16,7 +16,6 @@ Learn about deploying Windows 10 for IT professionals. |Topic |Description | |------|------------| |[Change history for Deploy Windows 10](change-history-for-deploy-windows-10.md) |This topic lists new and updated topics in the Deploy Windows 10 documentation for [Windows 10 and Windows 10 Mobile](../index.md). | -|[Deploy Windows 10 in a test lab](windows-10-poc.md) |This guide provides instructions for setting up a proof of concept (PoC) lab using Hyper-V and a minimum amount of resources. | |[Windows 10 deployment scenarios](windows-10-deployment-scenarios.md) |To successfully deploy the Windows 10 operating system in your organization, it is important to understand the different ways that it can be deployed, especially now that there are new scenarios to consider. Choosing among these scenarios, and understanding the key capabilities and limitations of each, is a key task. | |[Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md) |This guide will walk you through the process of deploying Windows 10 in an enterprise environment using the Microsoft Deployment Toolkit (MDT), and MDT 2013 Update 2 specifically. | |[Deploy Windows 10 with System Center 2012 R2 Configuration Manager](deploy-windows-10-with-system-center-2012-r2-configuration-manager.md) |If you have Microsoft System Center 2012 R2 Configuration Manager in your environment, you will most likely want to use it to deploy Windows 10. This topic will show you how to set up Configuration Manager for operating system deployment and how to integrate Configuration Manager with the Microsoft Deployment Toolkit (MDT) or, more specifically, MDT 2013 Update 2. | diff --git a/windows/deploy/windows-10-poc.md b/windows/deploy/windows-10-poc.md deleted file mode 100644 index c24209c3e2..0000000000 --- a/windows/deploy/windows-10-poc.md +++ /dev/null @@ -1,193 +0,0 @@ ---- -title: Deploy Windows 10 in a test lab (Windows 10) -description: Concepts and procedures for deploying Windows 10 in a proof of concept lab environment. -ms.prod: w10 -ms.mktglfcycl: deploy -ms.sitesec: library -ms.pagetype: deploy -author: greg-lindsay ---- - -# Step by step guide: Demonstrate Windows 10 deployment in a test lab - -**Applies to** - -- Windows 10 - -## In this guide - -This guide provides instructions for configuring a test lab to be used as a proof of concept (PoC) environment where you can deploy Windows 10. The PoC enviroment is configured using Hyper-V and a minimum amount of resources. Additional guides leverage the PoC environment and provide detailed steps for deploying Windows 10 under common scenarios with current deployment tools. The following topics are available in this guide: - - - - - - - - - - - - - - - - - - - - - - -
TopicDescription
[Hardware and software requirements](#hardware-and-software-requirements)Prerequisites to configure the PoC environment.
[Lab setup](#lab-setup)A summary of the PoC environment.
[Configure the PoC environment](#configure-the-poc-environment)Step by step instructions to configure the PoC environment.
[Step by step: Deploy Windows 10](#windows-10-poc-guides)Child topics that provide step by step instructions to deploy Windows 10 using the PoC environment.
- -## Hardware and software requirements - -Two computers are required to complete this guide: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
**Computer 1****Computer 2**
RoleHyper-V hostClient
DescriptionThis computer will run Hyper-V, the Hyper-V management tools, and the Hyper-V Windows PowerShell module.This computer is a test system on your corporate network that will be converted to a VHD.
OSWindows 8/8.1/10 or Windows Server 2012/2012 R2/2016Windows 7 or a later
EditionEnterprise, Professional, or EducationAny
Architecture64-bitAny*
RAM8 GB RAM (16 GB recommended)Any
Disk50 GB available hard disk space (100 GB recommended)Any
CPUSLAT-Capable CPUAny
NetworkInternet connectionAny
- ->*Retaining applications and settings during the upgrade process requires that architecture (32 or 64-bit) is the same before and after the upgrade. - -## Lab setup - -The Hyper-V host computer is configured to host four VMs on a private, proof of concept network. Links are provided to download trial versions of Windows Server 2012 and all deployment tools necessary to complete the lab. -- Two VMs are running Windows Server 2012 R2 with required network services and tools installed. -- Two VMs are client systems: One VM is intended to mirror a host on your corporate network and one VM is running Windows 10 to demonstrate the hardware replacement scenario. - -See the following diagram: - -![PoC](images/poc.png) - -**Note**: ->If you have an existing Hyper-V host, you can use this host if desired and skip the Hyper-V installation section in this guide. If your Hyper-V host is running Windows Server 2008 R2, you must enable PowerShell functionality to complete the steps in this guide. - ->The two Windows Server VMs can be combined into a single VM to conserve RAM and disk space if required. However, instructions in this guide assume two server systems are used. Using two servers enables Active Directory Domain Services and DHCP to be installed on a server that is not directly connected to the corporate network. This mitigates the risk of clients on the corporate network receiving DHCP leases from the PoC network (i.e. "rogue" DHCP), and limits NETBIOS service broadcasts to the corporate network. - -## Configure the PoC environment - -### In this section - -[Install Hyper-V](#install-hyper-v)
-[Download VHDs](#download-vhds)
-[Configure Hyper-V](#configure-hyper-v)
-[Configure VHDs](#configure-vhds)
-[Verify the configuration](#verify-the-configuration) - -### Install Hyper-V - -Use one of the following procedures to install Hyper-V on the Hyper-V host computer: - -- [Install Hyper-V on a computer running Windows 8/8.1/10](#to-install-hyper-v-on-a-computer-running-windows-8-8-1-10)
-- [Install Hyper-V on a computer running Windows Server 2012/2012 R2/2016](#to-install-hyper-v-on-a-computer-running-windows-server-2012-2012-r2-2016) - -####To install Hyper-V on a computer running Windows 8/8.1/10 - -1. Verify that the computer supports Hyper-V. - - Starting with Windows 8, the host computer’s microprocessor must support second level address translation (SLAT) to install Hyper-V. See [Hyper-V: List of SLAT-Capable CPUs for Hosts](http://social.technet.microsoft.com/wiki/contents/articles/1401.hyper-v-list-of-slat-capable-cpus-for-hosts.aspx) for more information. To verify your computer supports SLAT, open an administrator command prompt, type systeminfo, press ENTER, and review the section displayed at the bottom of the output, next to Hyper-V Requirements. - - See the following example: - - ``` - C:\>systeminfo - ... - Hyper-V Requirements: VM Monitor Mode Extensions: Yes - Virtualization Enabled In Firmware: Yes - Second Level Address Translation: Yes - Data Execution Prevention Available: Yes - ``` - In this example, the computer supports SLAT and Hyper-V. - - If one or more requirements are evaluated as "No" then the computer does not support installing Hyper-V. However, if only the virtualization setting is incompatible, you might be able to enable virtualization in the BIOS and change the "Virtualization Enabled In Firmware" setting from "No" to "Yes." The location of this setting will depend on the manufacturer and BIOS version, but is typically found associated with the BIOS security settings. - - Note: A 64-bit operating system is requried to run Hyper-V. - -2. Enable Hyper-V. - - The Hyper-V feature is not installed by default. To get it, open an elevated Windows PowerShell window and type the following command: - - ``` - Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V –All - ``` - When you are prompted to restart the computer, choose Yes. The computer might restart more than once. - - You can also install Hyper-V using the Control Panel in Windows, under Turn Windows features on or off, as shown below: - - ![hyper-v feature](images/hyper-v-feature.png) - -####To install Hyper-V on a computer running Windows Server 2012/2012 R2/2016 - -### Download VHDs - -### Configure Hyper-V - -### Configure VHDs - -## Windows 10 PoC guides - -- [Step by step: Deploy Windows 10 PoC with System Center Configuration Manager](windows-10-poc-sccm.md) -- [Step by step: Deploy Windows 10 PoC with the Microsoft Deployment Toolkit](windows-10-poc-mdt.md) - -## Related Topics - -[Windows 10 deployment scenarios](windows-10-deployment-scenarios.md) -  - -  - - - - - diff --git a/windows/manage/manage-corporate-devices.md b/windows/manage/manage-corporate-devices.md index 901a3beb11..dbc5ed0c8a 100644 --- a/windows/manage/manage-corporate-devices.md +++ b/windows/manage/manage-corporate-devices.md @@ -97,7 +97,7 @@ For more information about the MDM protocols, see [Mobile device management](htt [How to bulk-enroll devices with On-premises Mobile Device Management in System Center Configuration Manager](https://technet.microsoft.com/en-us/library/mt627898.aspx) -[Windows 10, Azure AD and Microsoft Intune: Automatic MDM Enrollment](http://go.microsoft.com/fwlink/p/?LinkId=623321) +[Azure AD, Microsoft Intune and Windows 10 - Using the cloud to modernize enterprise mobility](https://blogs.technet.microsoft.com/enterprisemobility/2015/06/12/azure-ad-microsoft-intune-and-windows-10-using-the-cloud-to-modernize-enterprise-mobility/) [Microsoft Intune End User Enrollment Guide](http://go.microsoft.com/fwlink/p/?LinkID=617169) diff --git a/windows/plan/windows-10-servicing-options.md b/windows/plan/windows-10-servicing-options.md index df404e912e..8a2347918c 100644 --- a/windows/plan/windows-10-servicing-options.md +++ b/windows/plan/windows-10-servicing-options.md @@ -34,13 +34,13 @@ This new model uses simpler deployment methods, reducing the overall amount of e The concept of branching goes back many years, and represents how Windows has traditionally been written and serviced. Each release of Windows was from a particular branch of the Windows code, and updates would be made to that release for the lifecycle of that release. This concept still applies now with Windows 10, but is much more visible because it is incorporated directly into the servicing model. -During the development of Windows 10, Microsoft implemented the following new servicing options: +With Windows 10, Microsoft has implemented the following new servicing options: ![branches](images/branch.png) -**Windows Insider Program**: To see new features before they are released, to provide feedback on those new features, and to initially validate compatibility with existing applications and hardware, a small number of PCs can leverage the Windows Insider Program branch. These are typically dedicated lab machines used for IT testing, secondary PCs used by IT administrators, and other non-critical devices. -**Current Branch (CB)**: For early adopters, IT teams, and other broader piloting groups, the Current Branch (CB) can be used to further validate application compatibility and newly-released features. -**Current Branch for Business (CBB)**. For the majority of people in an organization, the Current Branch for Business (CBB) allows for a staged deployment of new features over a longer period of time. +**Windows Insider Program**: To see new features before they are released, to provide feedback on those new features, and to initially validate compatibility with existing applications and hardware, a small number of PCs can leverage the Windows Insider Program branch. These are typically dedicated lab machines used for IT testing, secondary PCs used by IT administrators, and other non-critical devices.
+**Current Branch (CB)**: For early adopters, IT teams, and other broader piloting groups, the Current Branch (CB) can be used to further validate application compatibility and newly-released features.
+**Current Branch for Business (CBB)**. For the majority of people in an organization, the Current Branch for Business (CBB) allows for a staged deployment of new features over a longer period of time.
**Long-Term Servicing Branch (LTSB)**: For critical or specialized devices (for example, operation of factory floor machinery, point-of-sale systems, automated teller machines), the Long-Term Servicing Branch (LTSB) provides a version of Windows 10 Enterprise that receives no new features, while continuing to be supported with security and other updates for a long time. (Note that the Long-Term Servicing Branch is a separate Windows 10 Enterprise image, with many in-box apps, including Microsoft Edge, Cortana, and Windows Store, removed.)
These servicing options provide pragmatic solutions to keep more devices more current in enterprise environments than was previously possible. Most organizations will leverage all of these choices, with the mix determined by how individual PCs are used. Some examples are shown in the table below: diff --git a/windows/whats-new/credential-guard.md b/windows/whats-new/credential-guard.md index 5bd63a42af..48f7a4f853 100644 --- a/windows/whats-new/credential-guard.md +++ b/windows/whats-new/credential-guard.md @@ -13,6 +13,7 @@ author: brianlic-msft **Applies to** - Windows 10 +- Windows Server 2016 Credential Guard uses virtualization-based security to isolate secrets so that only privileged system software can access them. diff --git a/windows/whats-new/device-guard-overview.md b/windows/whats-new/device-guard-overview.md index ed8847ee60..c96f390c98 100644 --- a/windows/whats-new/device-guard-overview.md +++ b/windows/whats-new/device-guard-overview.md @@ -15,6 +15,7 @@ author: brianlic-msft **Applies to** - Windows 10 - Windows 10 Mobile +- Windows Server 2016 Device Guard is a combination of enterprise-related hardware and software security features that, when configured together, will lock a device down so that it can only run trusted applications. If the app isn’t trusted it can’t run, period. It also means that even if an attacker manages to get control of the Windows kernel, he or she will be much less likely to be able to run malicious executable code after the computer restarts because of how decisions are made about what can run and when. Device Guard uses the new virtualization-based security in Windows 10 Enterprise to isolate the Code Integrity service from the Microsoft Windows kernel itself, letting the service use signatures defined by your enterprise-controlled policy to help determine what is trustworthy. In effect, the Code Integrity service runs alongside the kernel in a Windows hypervisor-protected container. diff --git a/windows/whats-new/security-auditing.md b/windows/whats-new/security-auditing.md index 15350dc9c4..13c6a7e5b8 100644 --- a/windows/whats-new/security-auditing.md +++ b/windows/whats-new/security-auditing.md @@ -10,9 +10,11 @@ ms.pagetype: security, mobile --- # What's new in security auditing? + **Applies to** - Windows 10 - Windows 10 Mobile +- Windows Server 2016 Security auditing is one of the most powerful tools that you can use to maintain the integrity of your system. As part of your overall security strategy, you should determine the level of auditing that is appropriate for your environment. Auditing should identify attacks (successful or not) that pose a threat to your network, and attacks against resources that you have determined to be valuable in your risk assessment. diff --git a/windows/whats-new/trusted-platform-module.md b/windows/whats-new/trusted-platform-module.md index 9937fada56..18a325aa7f 100644 --- a/windows/whats-new/trusted-platform-module.md +++ b/windows/whats-new/trusted-platform-module.md @@ -14,6 +14,7 @@ author: brianlic-msft **Applies to** - Windows 10 - Windows 10 Mobile +- Windows Server 2016 This topic for the IT professional describes new features for the Trusted Platform Module (TPM) in Windows 10.