diff --git a/.gitignore b/.gitignore index 60755bf9e7..604950802e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,6 @@ Tools/NuGet/ .openpublishing.build.mdproj .openpublishing.buildcore.ps1 packages.config -windows/keep-secure/index.md # User-specific files -.vs/ -*.png \ No newline at end of file +.vs/ \ No newline at end of file diff --git a/browsers/internet-explorer/ie11-deploy-guide/images/docmode-decisions-lg.png b/browsers/internet-explorer/ie11-deploy-guide/images/docmode-decisions-lg.png new file mode 100644 index 0000000000..07a182461b Binary files /dev/null and b/browsers/internet-explorer/ie11-deploy-guide/images/docmode-decisions-lg.png differ diff --git a/browsers/internet-explorer/ie11-deploy-guide/images/docmode-decisions-sm.png b/browsers/internet-explorer/ie11-deploy-guide/images/docmode-decisions-sm.png new file mode 100644 index 0000000000..c887d9c193 Binary files /dev/null and b/browsers/internet-explorer/ie11-deploy-guide/images/docmode-decisions-sm.png differ diff --git a/education/windows/images/mcee-add-payment-method.png b/education/windows/images/mcee-add-payment-method.png new file mode 100644 index 0000000000..e583b4eccc Binary files /dev/null and b/education/windows/images/mcee-add-payment-method.png differ diff --git a/education/windows/images/mcee-invoice-bills.PNG b/education/windows/images/mcee-invoice-bills.PNG new file mode 100644 index 0000000000..1a07ac3f01 Binary files /dev/null and b/education/windows/images/mcee-invoice-bills.PNG differ diff --git a/education/windows/images/mcee-invoice-info.png b/education/windows/images/mcee-invoice-info.png new file mode 100644 index 0000000000..f4bf29f8b2 Binary files /dev/null and b/education/windows/images/mcee-invoice-info.png differ diff --git a/education/windows/images/mcee-view-bills.png b/education/windows/images/mcee-view-bills.png new file mode 100644 index 0000000000..5aeff48109 Binary files /dev/null and b/education/windows/images/mcee-view-bills.png differ diff --git a/education/windows/images/win-10-activated-enterprise-subscription-active.png b/education/windows/images/win-10-activated-enterprise-subscription-active.png new file mode 100644 index 0000000000..eb888b23b5 Binary files /dev/null and b/education/windows/images/win-10-activated-enterprise-subscription-active.png differ diff --git a/education/windows/images/win-10-activated-enterprise-subscription-not-active.png b/education/windows/images/win-10-activated-enterprise-subscription-not-active.png new file mode 100644 index 0000000000..e4ac7398be Binary files /dev/null and b/education/windows/images/win-10-activated-enterprise-subscription-not-active.png differ diff --git a/education/windows/images/win-10-not-activated-enterprise-subscription-active.png b/education/windows/images/win-10-not-activated-enterprise-subscription-active.png new file mode 100644 index 0000000000..5fedfe5d06 Binary files /dev/null and b/education/windows/images/win-10-not-activated-enterprise-subscription-active.png differ diff --git a/education/windows/images/win-10-not-activated-enterprise-subscription-not-active.png b/education/windows/images/win-10-not-activated-enterprise-subscription-not-active.png new file mode 100644 index 0000000000..84e39071db Binary files /dev/null and b/education/windows/images/win-10-not-activated-enterprise-subscription-not-active.png differ diff --git a/education/windows/images/win-10-pro-edu-activated-subscription-active.png b/education/windows/images/win-10-pro-edu-activated-subscription-active.png new file mode 100644 index 0000000000..d29fa0e0e5 Binary files /dev/null and b/education/windows/images/win-10-pro-edu-activated-subscription-active.png differ diff --git a/education/windows/images/win-10-pro-edu-not-activated-subscription-active.PNG b/education/windows/images/win-10-pro-edu-not-activated-subscription-active.PNG new file mode 100644 index 0000000000..8e9242c0ba Binary files /dev/null and b/education/windows/images/win-10-pro-edu-not-activated-subscription-active.PNG differ diff --git a/education/windows/images/win10-connect-to-work-or-school.png b/education/windows/images/win10-connect-to-work-or-school.png new file mode 100644 index 0000000000..08afb5b092 Binary files /dev/null and b/education/windows/images/win10-connect-to-work-or-school.png differ diff --git a/education/windows/images/win10-lets-get-2.png b/education/windows/images/win10-lets-get-2.png new file mode 100644 index 0000000000..c2d3c3ba61 Binary files /dev/null and b/education/windows/images/win10-lets-get-2.png differ diff --git a/education/windows/images/win10-set-up-work-or-school.png b/education/windows/images/win10-set-up-work-or-school.png new file mode 100644 index 0000000000..0ca83fb0e1 Binary files /dev/null and b/education/windows/images/win10-set-up-work-or-school.png differ diff --git a/education/windows/images/windows-ad-connect.png b/education/windows/images/windows-ad-connect.png new file mode 100644 index 0000000000..195058f6f6 Binary files /dev/null and b/education/windows/images/windows-ad-connect.png differ diff --git a/education/windows/images/windows-choose-how.png b/education/windows/images/windows-choose-how.png new file mode 100644 index 0000000000..8e84535bfd Binary files /dev/null and b/education/windows/images/windows-choose-how.png differ diff --git a/education/windows/images/windows-connect-to-work-or-school.png b/education/windows/images/windows-connect-to-work-or-school.png new file mode 100644 index 0000000000..90e1b1131f Binary files /dev/null and b/education/windows/images/windows-connect-to-work-or-school.png differ diff --git a/education/windows/images/windows-lets-get-2.png b/education/windows/images/windows-lets-get-2.png new file mode 100644 index 0000000000..ef523d4af8 Binary files /dev/null and b/education/windows/images/windows-lets-get-2.png differ diff --git a/education/windows/images/windows-lets-get.png b/education/windows/images/windows-lets-get.png new file mode 100644 index 0000000000..582da1ab2d Binary files /dev/null and b/education/windows/images/windows-lets-get.png differ diff --git a/education/windows/images/windows-set-up-work-or-school.png b/education/windows/images/windows-set-up-work-or-school.png new file mode 100644 index 0000000000..cebd87cff8 Binary files /dev/null and b/education/windows/images/windows-set-up-work-or-school.png differ diff --git a/education/windows/images/windows-sign-in.png b/education/windows/images/windows-sign-in.png new file mode 100644 index 0000000000..3029d3ef2b Binary files /dev/null and b/education/windows/images/windows-sign-in.png differ diff --git a/education/windows/images/windows-who-owns.png b/education/windows/images/windows-who-owns.png new file mode 100644 index 0000000000..c3008869d2 Binary files /dev/null and b/education/windows/images/windows-who-owns.png differ diff --git a/education/windows/images/windows.png b/education/windows/images/windows.png new file mode 100644 index 0000000000..9b312d7844 Binary files /dev/null and b/education/windows/images/windows.png differ diff --git a/education/windows/images/wsfb_win10_pro_education_enabled_for_org.png b/education/windows/images/wsfb_win10_pro_education_enabled_for_org.png new file mode 100644 index 0000000000..ea3d582d79 Binary files /dev/null and b/education/windows/images/wsfb_win10_pro_education_enabled_for_org.png differ diff --git a/education/windows/images/wsfb_win10_pro_education_launch.png b/education/windows/images/wsfb_win10_pro_education_launch.png new file mode 100644 index 0000000000..4e7b741227 Binary files /dev/null and b/education/windows/images/wsfb_win10_pro_education_launch.png differ diff --git a/education/windows/images/wsfb_win10_pro_education_order_confirmation.png b/education/windows/images/wsfb_win10_pro_education_order_confirmation.png new file mode 100644 index 0000000000..e35bbf64d5 Binary files /dev/null and b/education/windows/images/wsfb_win10_pro_education_order_confirmation.png differ diff --git a/education/windows/images/wsfb_win10_pro_education_order_options.png b/education/windows/images/wsfb_win10_pro_education_order_options.png new file mode 100644 index 0000000000..eaf93ece33 Binary files /dev/null and b/education/windows/images/wsfb_win10_pro_education_order_options.png differ diff --git a/education/windows/images/wsfb_win10_pro_education_refund_confirmation.png b/education/windows/images/wsfb_win10_pro_education_refund_confirmation.png new file mode 100644 index 0000000000..4749dafc44 Binary files /dev/null and b/education/windows/images/wsfb_win10_pro_education_refund_confirmation.png differ diff --git a/education/windows/images/wsfb_win10_pro_education_refund_order.png b/education/windows/images/wsfb_win10_pro_education_refund_order.png new file mode 100644 index 0000000000..813cfce309 Binary files /dev/null and b/education/windows/images/wsfb_win10_pro_education_refund_order.png differ diff --git a/education/windows/images/wsfb_win10_pro_to proedu_upgrade_disable.png b/education/windows/images/wsfb_win10_pro_to proedu_upgrade_disable.png new file mode 100644 index 0000000000..92aeb8ed19 Binary files /dev/null and b/education/windows/images/wsfb_win10_pro_to proedu_upgrade_disable.png differ diff --git a/education/windows/images/wsfb_win10_pro_to proedu_upgrade_eligibility_page.png b/education/windows/images/wsfb_win10_pro_to proedu_upgrade_eligibility_page.png new file mode 100644 index 0000000000..177c6e36df Binary files /dev/null and b/education/windows/images/wsfb_win10_pro_to proedu_upgrade_eligibility_page.png differ diff --git a/education/windows/images/wsfb_win10_pro_to proedu_upgrade_email_global_admins.png b/education/windows/images/wsfb_win10_pro_to proedu_upgrade_email_global_admins.png new file mode 100644 index 0000000000..8044a4cc91 Binary files /dev/null and b/education/windows/images/wsfb_win10_pro_to proedu_upgrade_email_global_admins.png differ diff --git a/education/windows/images/wsfb_win10_pro_to proedu_upgrade_enable.png b/education/windows/images/wsfb_win10_pro_to proedu_upgrade_enable.png new file mode 100644 index 0000000000..420b44513f Binary files /dev/null and b/education/windows/images/wsfb_win10_pro_to proedu_upgrade_enable.png differ diff --git a/education/windows/images/wsfb_win10_pro_to proedu_upgrade_summary.png b/education/windows/images/wsfb_win10_pro_to proedu_upgrade_summary.png new file mode 100644 index 0000000000..a507f56694 Binary files /dev/null and b/education/windows/images/wsfb_win10_pro_to proedu_upgrade_summary.png differ diff --git a/education/windows/images/wsfb_win10_pro_to_proedu_email_upgrade_link.png b/education/windows/images/wsfb_win10_pro_to_proedu_email_upgrade_link.png new file mode 100644 index 0000000000..a30869b8ea Binary files /dev/null and b/education/windows/images/wsfb_win10_pro_to_proedu_email_upgrade_link.png differ diff --git a/windows/deploy/images/ISE.PNG b/windows/deploy/images/ISE.PNG new file mode 100644 index 0000000000..edf53101f4 Binary files /dev/null and b/windows/deploy/images/ISE.PNG differ diff --git a/windows/deploy/images/PoC-big.png b/windows/deploy/images/PoC-big.png new file mode 100644 index 0000000000..de73506071 Binary files /dev/null and b/windows/deploy/images/PoC-big.png differ diff --git a/windows/deploy/images/deploy-finish.PNG b/windows/deploy/images/deploy-finish.PNG new file mode 100644 index 0000000000..4f0d5cb859 Binary files /dev/null and b/windows/deploy/images/deploy-finish.PNG differ diff --git a/windows/deploy/images/disk2vhd-convert.PNG b/windows/deploy/images/disk2vhd-convert.PNG new file mode 100644 index 0000000000..f0614a5ab1 Binary files /dev/null and b/windows/deploy/images/disk2vhd-convert.PNG differ diff --git a/windows/deploy/images/disk2vhd-gen2.PNG b/windows/deploy/images/disk2vhd-gen2.PNG new file mode 100644 index 0000000000..7f8d920f9d Binary files /dev/null and b/windows/deploy/images/disk2vhd-gen2.PNG differ diff --git a/windows/deploy/images/disk2vhd.PNG b/windows/deploy/images/disk2vhd.PNG new file mode 100644 index 0000000000..7b9835f5f6 Binary files /dev/null and b/windows/deploy/images/disk2vhd.PNG differ diff --git a/windows/deploy/images/disk2vhd4.PNG b/windows/deploy/images/disk2vhd4.PNG new file mode 100644 index 0000000000..97f9448441 Binary files /dev/null and b/windows/deploy/images/disk2vhd4.PNG differ diff --git a/windows/deploy/images/five.png b/windows/deploy/images/five.png new file mode 100644 index 0000000000..961f0e15b7 Binary files /dev/null and b/windows/deploy/images/five.png differ diff --git a/windows/deploy/images/four.png b/windows/deploy/images/four.png new file mode 100644 index 0000000000..0fef213b37 Binary files /dev/null and b/windows/deploy/images/four.png differ diff --git a/windows/deploy/images/icd-create-options.PNG b/windows/deploy/images/icd-create-options.PNG new file mode 100644 index 0000000000..e61cdd8fc0 Binary files /dev/null and b/windows/deploy/images/icd-create-options.PNG differ diff --git a/windows/deploy/images/icd-export-menu.png b/windows/deploy/images/icd-export-menu.png new file mode 100644 index 0000000000..20bd5258eb Binary files /dev/null and b/windows/deploy/images/icd-export-menu.png differ diff --git a/windows/deploy/images/icd-install.PNG b/windows/deploy/images/icd-install.PNG new file mode 100644 index 0000000000..a0c80683ff Binary files /dev/null and b/windows/deploy/images/icd-install.PNG differ diff --git a/windows/deploy/images/icd-multi-target-true.png b/windows/deploy/images/icd-multi-target-true.png new file mode 100644 index 0000000000..5fec405fd6 Binary files /dev/null and b/windows/deploy/images/icd-multi-target-true.png differ diff --git a/windows/deploy/images/icd-multi-targetstate-true.png b/windows/deploy/images/icd-multi-targetstate-true.png new file mode 100644 index 0000000000..7733b9c400 Binary files /dev/null and b/windows/deploy/images/icd-multi-targetstate-true.png differ diff --git a/windows/deploy/images/icd-runtime.PNG b/windows/deploy/images/icd-runtime.PNG new file mode 100644 index 0000000000..d63544e206 Binary files /dev/null and b/windows/deploy/images/icd-runtime.PNG differ diff --git a/windows/deploy/images/icd-script1.png b/windows/deploy/images/icd-script1.png new file mode 100644 index 0000000000..6c17f70809 Binary files /dev/null and b/windows/deploy/images/icd-script1.png differ diff --git a/windows/deploy/images/icd-script2.png b/windows/deploy/images/icd-script2.png new file mode 100644 index 0000000000..7da2ae7e59 Binary files /dev/null and b/windows/deploy/images/icd-script2.png differ diff --git a/windows/deploy/images/icd-setting-help.PNG b/windows/deploy/images/icd-setting-help.PNG new file mode 100644 index 0000000000..3f6e5fefa5 Binary files /dev/null and b/windows/deploy/images/icd-setting-help.PNG differ diff --git a/windows/deploy/images/icd-settings.PNG b/windows/deploy/images/icd-settings.PNG new file mode 100644 index 0000000000..8d3ebc3ff6 Binary files /dev/null and b/windows/deploy/images/icd-settings.PNG differ diff --git a/windows/deploy/images/icd-step1.PNG b/windows/deploy/images/icd-step1.PNG new file mode 100644 index 0000000000..d2ad656d35 Binary files /dev/null and b/windows/deploy/images/icd-step1.PNG differ diff --git a/windows/deploy/images/icd-step2.PNG b/windows/deploy/images/icd-step2.PNG new file mode 100644 index 0000000000..54e70d9193 Binary files /dev/null and b/windows/deploy/images/icd-step2.PNG differ diff --git a/windows/deploy/images/icd-step3.PNG b/windows/deploy/images/icd-step3.PNG new file mode 100644 index 0000000000..ecac26f3d6 Binary files /dev/null and b/windows/deploy/images/icd-step3.PNG differ diff --git a/windows/deploy/images/icd-step4.PNG b/windows/deploy/images/icd-step4.PNG new file mode 100644 index 0000000000..8fcfa2863b Binary files /dev/null and b/windows/deploy/images/icd-step4.PNG differ diff --git a/windows/deploy/images/icd-step5.PNG b/windows/deploy/images/icd-step5.PNG new file mode 100644 index 0000000000..9e96edd812 Binary files /dev/null and b/windows/deploy/images/icd-step5.PNG differ diff --git a/windows/deploy/images/icd-switch.PNG b/windows/deploy/images/icd-switch.PNG new file mode 100644 index 0000000000..e46e48a648 Binary files /dev/null and b/windows/deploy/images/icd-switch.PNG differ diff --git a/windows/deploy/images/image.PNG b/windows/deploy/images/image.PNG new file mode 100644 index 0000000000..0bbadcb68f Binary files /dev/null and b/windows/deploy/images/image.PNG differ diff --git a/windows/deploy/images/multi-target.png b/windows/deploy/images/multi-target.png new file mode 100644 index 0000000000..fb6ddd7a2d Binary files /dev/null and b/windows/deploy/images/multi-target.png differ diff --git a/windows/deploy/images/nfc.png b/windows/deploy/images/nfc.png new file mode 100644 index 0000000000..bfee563205 Binary files /dev/null and b/windows/deploy/images/nfc.png differ diff --git a/windows/deploy/images/one.png b/windows/deploy/images/one.png new file mode 100644 index 0000000000..7766e7d470 Binary files /dev/null and b/windows/deploy/images/one.png differ diff --git a/windows/deploy/images/package-trust.png b/windows/deploy/images/package-trust.png new file mode 100644 index 0000000000..4a996f23d5 Binary files /dev/null and b/windows/deploy/images/package-trust.png differ diff --git a/windows/deploy/images/packages-mobile.png b/windows/deploy/images/packages-mobile.png new file mode 100644 index 0000000000..4ce63dde78 Binary files /dev/null and b/windows/deploy/images/packages-mobile.png differ diff --git a/windows/deploy/images/scanos.PNG b/windows/deploy/images/scanos.PNG new file mode 100644 index 0000000000..d53a272018 Binary files /dev/null and b/windows/deploy/images/scanos.PNG differ diff --git a/windows/deploy/images/sccm-asset.PNG b/windows/deploy/images/sccm-asset.PNG new file mode 100644 index 0000000000..4dacaeb565 Binary files /dev/null and b/windows/deploy/images/sccm-asset.PNG differ diff --git a/windows/deploy/images/sccm-assets.PNG b/windows/deploy/images/sccm-assets.PNG new file mode 100644 index 0000000000..2cc50f5758 Binary files /dev/null and b/windows/deploy/images/sccm-assets.PNG differ diff --git a/windows/deploy/images/sccm-client.PNG b/windows/deploy/images/sccm-client.PNG new file mode 100644 index 0000000000..45e0ad8883 Binary files /dev/null and b/windows/deploy/images/sccm-client.PNG differ diff --git a/windows/deploy/images/sccm-collection.PNG b/windows/deploy/images/sccm-collection.PNG new file mode 100644 index 0000000000..01a1cca4a8 Binary files /dev/null and b/windows/deploy/images/sccm-collection.PNG differ diff --git a/windows/deploy/images/sccm-install-os.PNG b/windows/deploy/images/sccm-install-os.PNG new file mode 100644 index 0000000000..53b314b132 Binary files /dev/null and b/windows/deploy/images/sccm-install-os.PNG differ diff --git a/windows/deploy/images/sccm-post-refresh.PNG b/windows/deploy/images/sccm-post-refresh.PNG new file mode 100644 index 0000000000..e116e04312 Binary files /dev/null and b/windows/deploy/images/sccm-post-refresh.PNG differ diff --git a/windows/deploy/images/sccm-pxe.PNG b/windows/deploy/images/sccm-pxe.PNG new file mode 100644 index 0000000000..39cb22c075 Binary files /dev/null and b/windows/deploy/images/sccm-pxe.PNG differ diff --git a/windows/deploy/images/sccm-site.PNG b/windows/deploy/images/sccm-site.PNG new file mode 100644 index 0000000000..92319fdbf7 Binary files /dev/null and b/windows/deploy/images/sccm-site.PNG differ diff --git a/windows/deploy/images/sccm-software-cntr.PNG b/windows/deploy/images/sccm-software-cntr.PNG new file mode 100644 index 0000000000..9c920c6d39 Binary files /dev/null and b/windows/deploy/images/sccm-software-cntr.PNG differ diff --git a/windows/deploy/images/six.png b/windows/deploy/images/six.png new file mode 100644 index 0000000000..8bf761ef20 Binary files /dev/null and b/windows/deploy/images/six.png differ diff --git a/windows/deploy/images/three.png b/windows/deploy/images/three.png new file mode 100644 index 0000000000..887fa270d7 Binary files /dev/null and b/windows/deploy/images/three.png differ diff --git a/windows/deploy/images/two.png b/windows/deploy/images/two.png new file mode 100644 index 0000000000..b8c2d52eaf Binary files /dev/null and b/windows/deploy/images/two.png differ diff --git a/windows/deploy/images/upgrade-analytics-unsubscribe.png b/windows/deploy/images/upgrade-analytics-unsubscribe.png new file mode 100644 index 0000000000..402db94d6f Binary files /dev/null and b/windows/deploy/images/upgrade-analytics-unsubscribe.png differ diff --git a/windows/deploy/images/win10-set-up-work-or-school.png b/windows/deploy/images/win10-set-up-work-or-school.png new file mode 100644 index 0000000000..0ca83fb0e1 Binary files /dev/null and b/windows/deploy/images/win10-set-up-work-or-school.png differ diff --git a/windows/deploy/windows-10-poc.md b/windows/deploy/windows-10-poc.md index fceb199fec..d2d418cbda 100644 --- a/windows/deploy/windows-10-poc.md +++ b/windows/deploy/windows-10-poc.md @@ -850,9 +850,11 @@ The second Windows Server 2012 R2 VHD needs to be expanded in size from 40GB to Copy-VMFile "PC1" –SourcePath "C:\VHD\pc1.ps1" –DestinationPath "C:\pc1.ps1" –CreateFullPath –FileSource Host - >In order for this command to work properly, PC1 must be running the vmicguestinterface (Hyper-V Guest Service Interface) service. If this service is not installed, you can try updating integration services on the VM. This can be done by mounting the Hyper-V Integration Services Setup (vmguest.iso), which is located in C:\Windows\System32 on Windows Server operating systems that are running the Hyper-V role service. + >In order for this command to work properly, PC1 must be running the vmicguestinterface (Hyper-V Guest Service Interface) service. If this service is not installed, you can try updating integration services on the VM by mounting the Hyper-V Integration Services Setup (vmguest.iso), which is located in C:\Windows\System32 on Windows Server 2012 and 2012 R2 operating systems that are running the Hyper-V role service. You can also try running the following command from an elevated Windows PowerShell prompt on the Hyper-V host: + + 
Enable-VMIntegrationService -VMName PC1 -Name "Guest Service Interface"
- If the copy-vmfile command does not work and you cannot properly upgrade integration services on PC1, then create the file c:\pc1.ps1 on the VM by typing the commands into this file manually. The copy-vmfile command is only used in this procedure as a demonstration. After typing the script file manually, be sure to save the file as a Windows PowerShell script file with the .ps1 extension and not as a text (.txt) file. + If the copy-vmfile command does not work and you cannot properly enable or upgrade integration services on PC1, then create the file c:\pc1.ps1 on the VM by typing the commands into this file manually. The copy-vmfile command is only used in this procedure as a demonstration. After typing the script file manually, be sure to save the file as a Windows PowerShell script file with the .ps1 extension and not as a text (.txt) file. 21. On PC1, type the following commands at an elevated Windows PowerShell prompt: diff --git a/windows/keep-secure/choose-the-right-bitlocker-countermeasure.md b/windows/keep-secure/choose-the-right-bitlocker-countermeasure.md index 1c6c64a34a..241eadd7f7 100644 --- a/windows/keep-secure/choose-the-right-bitlocker-countermeasure.md +++ b/windows/keep-secure/choose-the-right-bitlocker-countermeasure.md @@ -64,7 +64,7 @@ Tables 1 and 2 summarize the recommended mitigations for different types of atta -**Table 1.**  How to choose the best countermeasures for Windows 8.1 +**Table 1.**  How to choose the best countermeasures for Windows 8.1

diff --git a/windows/keep-secure/credential-guard.md b/windows/keep-secure/credential-guard.md index 27813be3bc..c038a4d588 100644 --- a/windows/keep-secure/credential-guard.md +++ b/windows/keep-secure/credential-guard.md @@ -48,7 +48,7 @@ The following tables provide more information about the hardware, firmware, and > [!NOTE] > For new computers running Windows 10, Trusted Platform Module (TPM 2.0) must be enabled by default. This requirement is not restated in the tables that follow.
-> If you are an OEM, see the requirements information at [PC OEM requirements for Device Guard and Credential Guard](https://msdn.microsoft.com/library/windows/hardware/mt767514(v=vs.85).aspx).
+> If you are an OEM, see the requirements information at [PC OEM requirements for Device Guard and Credential Guard](https://msdn.microsoft.com/library/windows/hardware/mt767514.aspx).
> Starting in Widows 10, 1607, TPM 2.0 is required. @@ -61,7 +61,7 @@ The following tables provide more information about the hardware, firmware, and | Hardware: **Trusted Platform Module (TPM)** | **Requirement**: TPM 1.2 or TPM 2.0, either discrete or firmware.

**Security benefits**: A TPM provides protection for VBS encryption keys that are stored in the firmware. This helps protect against attacks involving a physically present user with BIOS access. | | Firmware: **UEFI firmware version 2.3.1.c or higher with UEFI Secure Boot** | **Requirements**: See the following Windows Hardware Compatibility Program requirement: [System.Fundamentals.Firmware.UEFISecureBoot](http://msdn.microsoft.com/library/windows/hardware/dn932805.aspx#system-fundamentals-firmware-uefisecureboot)

**Security benefits**: UEFI Secure Boot helps ensure that the device boots only authorized code. This can prevent boot kits and root kits from installing and persisting across reboots. | | Firmware: **Secure firmware update process** | **Requirements**: UEFI firmware must support secure firmware update found under the following Windows Hardware Compatibility Program requirement: [System.Fundamentals.Firmware.UEFISecureBoot](http://msdn.microsoft.com/library/windows/hardware/dn932805.aspx#system-fundamentals-firmware-uefisecureboot).

**Security benefits**: UEFI firmware just like software can have security vulnerabilities that, when found, need to be patched through firmware updates. Patching helps prevent root kits from getting installed. | -| Software: Qualified **Windows operating system** | **Requirement**: Windows 10 Enterprise, Windows 10 Education, Windows 2016 Server, or Windows Enterprise IoT

Important:
Windows Server 2016 running as a domain controller does not support Credential Guard. Only Device Guard is supported in this configuration.


**Security benefits**: Support for VBS and for management features that simplify configuration of Credential Guard. | +| Software: Qualified **Windows operating system** | **Requirement**: Windows 10 Enterprise, Windows 10 Education, Windows 2016 Server, or Windows Enterprise IoT

Important:
Windows Server 2016 running as a domain controller does not support Credential Guard. Only Device Guard is supported in this configuration.


**Security benefits**: Support for VBS and for management features that simplify configuration of Credential Guard. | > [!IMPORTANT] > The preceding table lists requirements for baseline protections. The following tables list requirements for improved security. You can use Credential Guard with hardware, firmware, and software that support baseline protections, even if they do not support protections for improved security. However, we strongly recommend meeting the requirements for improved security, to significantly strengthen the level of security that Credential Guard can provide. diff --git a/windows/keep-secure/images/atp-add-intune-policy.png b/windows/keep-secure/images/atp-add-intune-policy.png new file mode 100644 index 0000000000..61a47e9f37 Binary files /dev/null and b/windows/keep-secure/images/atp-add-intune-policy.png differ diff --git a/windows/keep-secure/images/atp-disableantispyware-regkey.png b/windows/keep-secure/images/atp-disableantispyware-regkey.png new file mode 100644 index 0000000000..ae3d800c69 Binary files /dev/null and b/windows/keep-secure/images/atp-disableantispyware-regkey.png differ diff --git a/windows/keep-secure/images/atp-intune-add-policy.png b/windows/keep-secure/images/atp-intune-add-policy.png new file mode 100644 index 0000000000..570ab0a688 Binary files /dev/null and b/windows/keep-secure/images/atp-intune-add-policy.png differ diff --git a/windows/keep-secure/images/atp-mdm-onboarding-package.png b/windows/keep-secure/images/atp-mdm-onboarding-package.png new file mode 100644 index 0000000000..23b9c49490 Binary files /dev/null and b/windows/keep-secure/images/atp-mdm-onboarding-package.png differ diff --git a/windows/keep-secure/images/atp-refresh-token.png b/windows/keep-secure/images/atp-refresh-token.png new file mode 100644 index 0000000000..3f7e8c7c69 Binary files /dev/null and b/windows/keep-secure/images/atp-refresh-token.png differ diff --git a/windows/keep-secure/images/security-stages.png b/windows/keep-secure/images/security-stages.png new file mode 100644 index 0000000000..249ced9d4b Binary files /dev/null and b/windows/keep-secure/images/security-stages.png differ diff --git a/windows/keep-secure/images/wip-select-column.png b/windows/keep-secure/images/wip-select-column.png new file mode 100644 index 0000000000..d4e8a9e7a0 Binary files /dev/null and b/windows/keep-secure/images/wip-select-column.png differ diff --git a/windows/keep-secure/images/wip-taskmgr.png b/windows/keep-secure/images/wip-taskmgr.png new file mode 100644 index 0000000000..d69e829d65 Binary files /dev/null and b/windows/keep-secure/images/wip-taskmgr.png differ diff --git a/windows/keep-secure/requirements-and-deployment-planning-guidelines-for-device-guard.md b/windows/keep-secure/requirements-and-deployment-planning-guidelines-for-device-guard.md index 5de3da4f21..fad266b5ee 100644 --- a/windows/keep-secure/requirements-and-deployment-planning-guidelines-for-device-guard.md +++ b/windows/keep-secure/requirements-and-deployment-planning-guidelines-for-device-guard.md @@ -54,7 +54,7 @@ The following tables provide more information about the hardware, firmware, and | Firmware: **UEFI firmware version 2.3.1.c or higher with UEFI Secure Boot** | **Requirements**: See the following Windows Hardware Compatibility Program requirement: [System.Fundamentals.Firmware.UEFISecureBoot](http://msdn.microsoft.com/library/windows/hardware/dn932805.aspx#system-fundamentals-firmware-uefisecureboot)

**Security benefits**: UEFI Secure Boot helps ensure that the device boots only authorized code. This can prevent boot kits and root kits from installing and persisting across reboots. | | Firmware: **Secure firmware update process** | **Requirements**: UEFI firmware must support secure firmware update found under the following Windows Hardware Compatibility Program requirement: [System.Fundamentals.Firmware.UEFISecureBoot](http://msdn.microsoft.com/library/windows/hardware/dn932805.aspx#system-fundamentals-firmware-uefisecureboot).

**Security benefits**: UEFI firmware just like software can have security vulnerabilities that, when found, need to be patched through firmware updates. Patching helps prevent root kits from getting installed. | | Software: **HVCI compatible drivers** | **Requirements**: See the Windows Hardware Compatibility Program requirements under [Filter.Driver.DeviceGuard.DriverCompatibility](https://msdn.microsoft.com/library/windows/hardware/mt589732(v=vs.85).aspx).

**Security benefits**: [HVCI Compatible](https://blogs.msdn.microsoft.com/windows_hardware_certification/2015/05/22/driver-compatibility-with-device-guard-in-windows-10/) drivers help ensure that VBS can maintain appropriate memory permissions. This increases resistance to bypassing vulnerable kernel drivers and helps ensure that malware cannot run in kernel. Only code verified through code integrity can run in kernel mode. | -| Software: Qualified **Windows operating system** | **Requirement**: Windows 10 Enterprise, Windows 10 Education, Windows 2016 Server, or Windows Enterprise IoT

Important:
Windows Server 2016 running as a domain controller does not support Credential Guard. Only Device Guard is supported in this configuration.


**Security benefits**: Support for VBS and for management features that simplify configuration of Device Guard. | +| Software: Qualified **Windows operating system** | **Requirement**: Windows 10 Enterprise, Windows 10 Education, Windows 2016 Server, or Windows Enterprise IoT

Important:
Windows Server 2016 running as a domain controller does not support Credential Guard. Only Device Guard is supported in this configuration.


**Security benefits**: Support for VBS and for management features that simplify configuration of Device Guard. | > **Important**  The preceding table lists requirements for baseline protections. The following tables list requirements for improved security. You can use Device Guard with hardware, firmware, and software that support baseline protections, even if they do not support protections for improved security. However, we strongly recommend meeting the requirements for improved security, to significantly strengthen the level of security that Device Guard can provide. diff --git a/windows/manage/images/cortana-about-me.png b/windows/manage/images/cortana-about-me.png new file mode 100644 index 0000000000..32c1ccefab Binary files /dev/null and b/windows/manage/images/cortana-about-me.png differ diff --git a/windows/manage/images/cortana-add-reminder.png b/windows/manage/images/cortana-add-reminder.png new file mode 100644 index 0000000000..3f03528e11 Binary files /dev/null and b/windows/manage/images/cortana-add-reminder.png differ diff --git a/windows/manage/images/cortana-chicago-weather.png b/windows/manage/images/cortana-chicago-weather.png new file mode 100644 index 0000000000..9273bf201b Binary files /dev/null and b/windows/manage/images/cortana-chicago-weather.png differ diff --git a/windows/manage/images/cortana-complete-send-email-coworker-mic.png b/windows/manage/images/cortana-complete-send-email-coworker-mic.png new file mode 100644 index 0000000000..3238c8d31d Binary files /dev/null and b/windows/manage/images/cortana-complete-send-email-coworker-mic.png differ diff --git a/windows/manage/images/cortana-connect-crm.png b/windows/manage/images/cortana-connect-crm.png new file mode 100644 index 0000000000..c70c42f75e Binary files /dev/null and b/windows/manage/images/cortana-connect-crm.png differ diff --git a/windows/manage/images/cortana-connect-o365.png b/windows/manage/images/cortana-connect-o365.png new file mode 100644 index 0000000000..df1ffa449b Binary files /dev/null and b/windows/manage/images/cortana-connect-o365.png differ diff --git a/windows/manage/images/cortana-connect-uber.png b/windows/manage/images/cortana-connect-uber.png new file mode 100644 index 0000000000..724fecb5b5 Binary files /dev/null and b/windows/manage/images/cortana-connect-uber.png differ diff --git a/windows/manage/images/cortana-crm-screen.png b/windows/manage/images/cortana-crm-screen.png new file mode 100644 index 0000000000..ded5d80a59 Binary files /dev/null and b/windows/manage/images/cortana-crm-screen.png differ diff --git a/windows/manage/images/cortana-feedback.png b/windows/manage/images/cortana-feedback.png new file mode 100644 index 0000000000..6e14018c98 Binary files /dev/null and b/windows/manage/images/cortana-feedback.png differ diff --git a/windows/manage/images/cortana-final-reminder.png b/windows/manage/images/cortana-final-reminder.png new file mode 100644 index 0000000000..f114e058e5 Binary files /dev/null and b/windows/manage/images/cortana-final-reminder.png differ diff --git a/windows/manage/images/cortana-meeting-specific-time.png b/windows/manage/images/cortana-meeting-specific-time.png new file mode 100644 index 0000000000..a108355133 Binary files /dev/null and b/windows/manage/images/cortana-meeting-specific-time.png differ diff --git a/windows/manage/images/cortana-meeting-tomorrow.png b/windows/manage/images/cortana-meeting-tomorrow.png new file mode 100644 index 0000000000..13273b6600 Binary files /dev/null and b/windows/manage/images/cortana-meeting-tomorrow.png differ diff --git a/windows/manage/images/cortana-newyork-weather.png b/windows/manage/images/cortana-newyork-weather.png new file mode 100644 index 0000000000..b3879737be Binary files /dev/null and b/windows/manage/images/cortana-newyork-weather.png differ diff --git a/windows/manage/images/cortana-o365-screen.png b/windows/manage/images/cortana-o365-screen.png new file mode 100644 index 0000000000..ba06dd6de5 Binary files /dev/null and b/windows/manage/images/cortana-o365-screen.png differ diff --git a/windows/manage/images/cortana-place-reminder.png b/windows/manage/images/cortana-place-reminder.png new file mode 100644 index 0000000000..89ccdab3e3 Binary files /dev/null and b/windows/manage/images/cortana-place-reminder.png differ diff --git a/windows/manage/images/cortana-powerbi-create-report.png b/windows/manage/images/cortana-powerbi-create-report.png new file mode 100644 index 0000000000..a22789d72a Binary files /dev/null and b/windows/manage/images/cortana-powerbi-create-report.png differ diff --git a/windows/manage/images/cortana-powerbi-expand-nav.png b/windows/manage/images/cortana-powerbi-expand-nav.png new file mode 100644 index 0000000000..c8b47943f9 Binary files /dev/null and b/windows/manage/images/cortana-powerbi-expand-nav.png differ diff --git a/windows/manage/images/cortana-powerbi-field-selection.png b/windows/manage/images/cortana-powerbi-field-selection.png new file mode 100644 index 0000000000..8aef58c23a Binary files /dev/null and b/windows/manage/images/cortana-powerbi-field-selection.png differ diff --git a/windows/manage/images/cortana-powerbi-getdata-samples.png b/windows/manage/images/cortana-powerbi-getdata-samples.png new file mode 100644 index 0000000000..3bfa4792df Binary files /dev/null and b/windows/manage/images/cortana-powerbi-getdata-samples.png differ diff --git a/windows/manage/images/cortana-powerbi-getdata.png b/windows/manage/images/cortana-powerbi-getdata.png new file mode 100644 index 0000000000..55b7b61589 Binary files /dev/null and b/windows/manage/images/cortana-powerbi-getdata.png differ diff --git a/windows/manage/images/cortana-powerbi-myreport.png b/windows/manage/images/cortana-powerbi-myreport.png new file mode 100644 index 0000000000..cc04d9c6f0 Binary files /dev/null and b/windows/manage/images/cortana-powerbi-myreport.png differ diff --git a/windows/manage/images/cortana-powerbi-pagesize.png b/windows/manage/images/cortana-powerbi-pagesize.png new file mode 100644 index 0000000000..fd1c1ef917 Binary files /dev/null and b/windows/manage/images/cortana-powerbi-pagesize.png differ diff --git a/windows/manage/images/cortana-powerbi-report-qna.png b/windows/manage/images/cortana-powerbi-report-qna.png new file mode 100644 index 0000000000..d17949aa8a Binary files /dev/null and b/windows/manage/images/cortana-powerbi-report-qna.png differ diff --git a/windows/manage/images/cortana-powerbi-retail-analysis-dashboard.png b/windows/manage/images/cortana-powerbi-retail-analysis-dashboard.png new file mode 100644 index 0000000000..5b94a2e2fc Binary files /dev/null and b/windows/manage/images/cortana-powerbi-retail-analysis-dashboard.png differ diff --git a/windows/manage/images/cortana-powerbi-retail-analysis-dataset.png b/windows/manage/images/cortana-powerbi-retail-analysis-dataset.png new file mode 100644 index 0000000000..b2ffec3b70 Binary files /dev/null and b/windows/manage/images/cortana-powerbi-retail-analysis-dataset.png differ diff --git a/windows/manage/images/cortana-powerbi-retail-analysis-sample.png b/windows/manage/images/cortana-powerbi-retail-analysis-sample.png new file mode 100644 index 0000000000..e3b61dcaa2 Binary files /dev/null and b/windows/manage/images/cortana-powerbi-retail-analysis-sample.png differ diff --git a/windows/manage/images/cortana-powerbi-search.png b/windows/manage/images/cortana-powerbi-search.png new file mode 100644 index 0000000000..88a8b40296 Binary files /dev/null and b/windows/manage/images/cortana-powerbi-search.png differ diff --git a/windows/manage/images/cortana-powerbi-settings.png b/windows/manage/images/cortana-powerbi-settings.png new file mode 100644 index 0000000000..0f51229895 Binary files /dev/null and b/windows/manage/images/cortana-powerbi-settings.png differ diff --git a/windows/manage/images/cortana-redmond-weather.png b/windows/manage/images/cortana-redmond-weather.png new file mode 100644 index 0000000000..7e8adc1929 Binary files /dev/null and b/windows/manage/images/cortana-redmond-weather.png differ diff --git a/windows/manage/images/cortana-reminder-edit.png b/windows/manage/images/cortana-reminder-edit.png new file mode 100644 index 0000000000..79cc280947 Binary files /dev/null and b/windows/manage/images/cortana-reminder-edit.png differ diff --git a/windows/manage/images/cortana-reminder-list.png b/windows/manage/images/cortana-reminder-list.png new file mode 100644 index 0000000000..1f57fc0f05 Binary files /dev/null and b/windows/manage/images/cortana-reminder-list.png differ diff --git a/windows/manage/images/cortana-reminder-mic.png b/windows/manage/images/cortana-reminder-mic.png new file mode 100644 index 0000000000..46a18e8e0b Binary files /dev/null and b/windows/manage/images/cortana-reminder-mic.png differ diff --git a/windows/manage/images/cortana-reminder-pending-mic.png b/windows/manage/images/cortana-reminder-pending-mic.png new file mode 100644 index 0000000000..159d408e0a Binary files /dev/null and b/windows/manage/images/cortana-reminder-pending-mic.png differ diff --git a/windows/manage/images/cortana-reminder-pending.png b/windows/manage/images/cortana-reminder-pending.png new file mode 100644 index 0000000000..a6b64b5621 Binary files /dev/null and b/windows/manage/images/cortana-reminder-pending.png differ diff --git a/windows/manage/images/cortana-send-email-coworker-mic.png b/windows/manage/images/cortana-send-email-coworker-mic.png new file mode 100644 index 0000000000..0cfa8fb731 Binary files /dev/null and b/windows/manage/images/cortana-send-email-coworker-mic.png differ diff --git a/windows/manage/images/cortana-send-email-coworker.png b/windows/manage/images/cortana-send-email-coworker.png new file mode 100644 index 0000000000..40ce18bdca Binary files /dev/null and b/windows/manage/images/cortana-send-email-coworker.png differ diff --git a/windows/manage/images/cortana-weather-multipanel.png b/windows/manage/images/cortana-weather-multipanel.png new file mode 100644 index 0000000000..e8db031744 Binary files /dev/null and b/windows/manage/images/cortana-weather-multipanel.png differ diff --git a/windows/manage/images/mobile-start-layout.png b/windows/manage/images/mobile-start-layout.png new file mode 100644 index 0000000000..d1055d6c87 Binary files /dev/null and b/windows/manage/images/mobile-start-layout.png differ