diff --git a/.gitignore b/.gitignore index 714d719522..55c1d9a504 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,12 @@ _site/ Tools/NuGet/ .optemp/ + .openpublishing.build.mdproj .openpublishing.buildcore.ps1 packages.config windows/keep-secure/index.md + +# User-specific files +.vs/ + diff --git a/browsers/edge/Index.md b/browsers/edge/Index.md index d60f64de73..c15b35774b 100644 --- a/browsers/edge/Index.md +++ b/browsers/edge/Index.md @@ -14,7 +14,6 @@ title: Microsoft Edge - Deployment Guide for IT Pros (Microsoft Edge for IT Pros - Windows 10 - Windows 10 Mobile -- Windows Server 2016 Microsoft Edge is the new, default web browser for Windows 10, helping you to experience modern web standards, better performance, improved security, and increased reliability. Microsoft Edge also introduces new features like Web Note, Reading View, and Cortana that you can use along with your normal web browsing abilities. diff --git a/browsers/edge/available-policies.md b/browsers/edge/available-policies.md index 1b28328f38..3299ef704e 100644 --- a/browsers/edge/available-policies.md +++ b/browsers/edge/available-policies.md @@ -14,7 +14,6 @@ title: Available policies for Microsoft Edge (Microsoft Edge for IT Pros) - Windows 10 - Windows 10 Mobile -- Windows Server 2016 Microsoft Edge works with Group Policy and Microsoft Intune to help you manage your organization's computer settings. Group Policy objects (GPO's) can include registry-based Administrative Template policy settings, security settings, software deployment information, scripts, folder redirection, and preferences. diff --git a/browsers/edge/change-history-for-microsoft-edge.md b/browsers/edge/change-history-for-microsoft-edge.md index 892a85fbe7..61e8ba0de9 100644 --- a/browsers/edge/change-history-for-microsoft-edge.md +++ b/browsers/edge/change-history-for-microsoft-edge.md @@ -14,7 +14,7 @@ For a detailed feature list of what's in the current Microsoft Edge releases, th ## July 2016 |New or changed topic | Description | |----------------------|-------------| -|[Microsoft Edge - Deployment Guide for IT Pros](index.md)| Updated various topics to include support for Windows Server 2016 and a note about the Long Term Servicing Branch (LTSB) | +|[Microsoft Edge requirements and language support](hardware-and-software-requirements.md)| Updated to include a note about the Long Term Servicing Branch (LTSB). | ## July 2016 |New or changed topic | Description | diff --git a/browsers/edge/emie-to-improve-compatibility.md b/browsers/edge/emie-to-improve-compatibility.md index 10698fde4f..8e57223ba4 100644 --- a/browsers/edge/emie-to-improve-compatibility.md +++ b/browsers/edge/emie-to-improve-compatibility.md @@ -14,7 +14,6 @@ title: Use Enterprise Mode to improve compatibility (Microsoft Edge for IT Pros) **Applies to:** - Windows 10 -- Windows Server 2016 If you have specific web sites and apps that you know have compatibility problems with Microsoft Edge, you can use the Enterprise Mode site list so that the web sites will automatically open using Internet Explorer 11. Additionally, if you know that your intranet sites aren't going to work properly with Microsoft Edge, you can set all intranet sites to automatically open using IE11. diff --git a/browsers/edge/hardware-and-software-requirements.md b/browsers/edge/hardware-and-software-requirements.md index ad9c6edfba..169caa75ce 100644 --- a/browsers/edge/hardware-and-software-requirements.md +++ b/browsers/edge/hardware-and-software-requirements.md @@ -15,7 +15,6 @@ title: Microsoft Edge requirements and language support (Microsoft Edge for IT P - Windows 10 - Windows 10 Mobile -- Windows Server 2016 Microsoft Edge is pre-installed on all Windows 10-capable devices that meet the minimum system requirements and are on the supported language list. @@ -29,7 +28,7 @@ Some of the components in this table might also need additional system resources | Item | Minimum requirements | | ------------------ | -------------------------------------------- | | Computer/processor | 1 gigahertz (GHz) or faster (32-bit (x86) or 64-bit (x64)) | -| Operating system |

**Note**
For specific Windows 10 Mobile requirements, see the [Minimum hardware requirements for Windows 10 Mobile](http://go.microsoft.com/fwlink/p/?LinkID=699266) topic. | +| Operating system |

**Note**
For specific Windows 10 Mobile requirements, see the [Minimum hardware requirements for Windows 10 Mobile](http://go.microsoft.com/fwlink/p/?LinkID=699266) topic. | | Memory |

| | Hard drive space | | | DVD drive | DVD-ROM drive (if installing from a DVD-ROM) | diff --git a/browsers/edge/security-enhancements-microsoft-edge.md b/browsers/edge/security-enhancements-microsoft-edge.md index b5911b3f4c..32fdd307ff 100644 --- a/browsers/edge/security-enhancements-microsoft-edge.md +++ b/browsers/edge/security-enhancements-microsoft-edge.md @@ -13,7 +13,6 @@ title: Security enhancements for Microsoft Edge (Microsoft Edge for IT Pros) - Windows 10 - Windows 10 Mobile -- Windows Server 2016 Microsoft Edge is designed with significant security improvements, helping to defend people from increasingly sophisticated and prevalent web-based attacks against Windows. diff --git a/devices/surface-hub/create-and-test-a-device-account-surface-hub.md b/devices/surface-hub/create-and-test-a-device-account-surface-hub.md index aeb2e566ac..25c3cadb31 100644 --- a/devices/surface-hub/create-and-test-a-device-account-surface-hub.md +++ b/devices/surface-hub/create-and-test-a-device-account-surface-hub.md @@ -116,8 +116,6 @@ You can check online for updated versions at [Surface Hub device account scripts Your infrastructure will likely fall into one of three configurations. Which configuration you have will affect how you prepare for device setup. -![Image showing deployment options: online, on-premises, or hybrid.](images/deploymentoptions-01.png) - - [Online deployment (Office 365)](online-deployment-surface-hub-device-accounts.md): Your organization’s environment is deployed entirely on Office 365. - [On-premises deployment](on-premises-deployment-surface-hub-device-accounts.md): Your organization has servers that it controls, where Active Directory, Exchange, and Skype for Business (or Lync) are hosted. - [Hybrid deployment](hybrid-deployment-surface-hub-device-accounts.md): Your organization has a mix of services, with some hosted on-premises and some hosted online through Office 365. diff --git a/education/windows/chromebook-migration-guide.md b/education/windows/chromebook-migration-guide.md index c28f4e3105..428efd3e77 100644 --- a/education/windows/chromebook-migration-guide.md +++ b/education/windows/chromebook-migration-guide.md @@ -8,7 +8,6 @@ ms.mktglfcycl: plan ms.sitesec: library ms.pagetype: edu, devices author: craigash -localizationpriority: medium --- # Chromebook migration guide diff --git a/education/windows/deploy-windows-10-in-a-school-district.md b/education/windows/deploy-windows-10-in-a-school-district.md index 1f9fee58e3..dcfe03beba 100644 --- a/education/windows/deploy-windows-10-in-a-school-district.md +++ b/education/windows/deploy-windows-10-in-a-school-district.md @@ -7,7 +7,6 @@ ms.mktglfcycl: plan ms.pagetype: edu ms.sitesec: library author: craigash -localizationpriority: medium --- # Deploy Windows 10 in a school district diff --git a/education/windows/deploy-windows-10-in-a-school.md b/education/windows/deploy-windows-10-in-a-school.md index 5babf46fd3..53a866f3b8 100644 --- a/education/windows/deploy-windows-10-in-a-school.md +++ b/education/windows/deploy-windows-10-in-a-school.md @@ -7,7 +7,6 @@ ms.mktglfcycl: plan ms.pagetype: edu ms.sitesec: library author: craigash -localizationpriority: medium --- # Deploy Windows 10 in a school diff --git a/education/windows/edu-deployment-recommendations.md b/education/windows/edu-deployment-recommendations.md index 53394b2c6e..28792bb055 100644 --- a/education/windows/edu-deployment-recommendations.md +++ b/education/windows/edu-deployment-recommendations.md @@ -5,7 +5,6 @@ keywords: ["Windows 10 deployment", "recommendations", "privacy settings", "scho ms.mktglfcycl: plan ms.sitesec: library author: CelesteDG -localizationpriority: medium --- # Deployment recommendations for school IT administrators diff --git a/education/windows/get-minecraft-for-education.md b/education/windows/get-minecraft-for-education.md index 7031f0406f..2fedf96bda 100644 --- a/education/windows/get-minecraft-for-education.md +++ b/education/windows/get-minecraft-for-education.md @@ -6,7 +6,6 @@ ms.prod: W10 ms.mktglfcycl: plan ms.sitesec: library author: jdeckerMS -localizationpriority: medium --- # Get Minecraft Education Edition diff --git a/education/windows/index.md b/education/windows/index.md index d2f37104dc..6e20c83aae 100644 --- a/education/windows/index.md +++ b/education/windows/index.md @@ -6,7 +6,6 @@ ms.mktglfcycl: deploy ms.sitesec: library ms.pagetype: edu author: jdeckerMS -localizationpriority: medium --- # Windows 10 for Education diff --git a/education/windows/school-get-minecraft.md b/education/windows/school-get-minecraft.md index 664c8d9d4d..5c18b9e201 100644 --- a/education/windows/school-get-minecraft.md +++ b/education/windows/school-get-minecraft.md @@ -6,7 +6,6 @@ ms.prod: W10 ms.mktglfcycl: plan ms.sitesec: library author: jdeckerMS -localizationpriority: medium --- # For IT administrators: get Minecraft Education Edition diff --git a/education/windows/set-up-school-pcs-technical.md b/education/windows/set-up-school-pcs-technical.md index 0df16c651d..6fdf7e3da3 100644 --- a/education/windows/set-up-school-pcs-technical.md +++ b/education/windows/set-up-school-pcs-technical.md @@ -7,7 +7,6 @@ ms.mktglfcycl: plan ms.sitesec: library ms.pagetype: edu author: jdeckerMS -localizationpriority: medium --- # Technical reference for the Set up School PCs app diff --git a/education/windows/set-up-students-pcs-to-join-domain.md b/education/windows/set-up-students-pcs-to-join-domain.md index 28034a9097..90829321ad 100644 --- a/education/windows/set-up-students-pcs-to-join-domain.md +++ b/education/windows/set-up-students-pcs-to-join-domain.md @@ -6,7 +6,6 @@ ms.prod: W10 ms.mktglfcycl: plan ms.sitesec: library author: jdeckerMS -localizationpriority: medium --- # Set up student PCs to join domain @@ -72,7 +71,7 @@ If your school uses Active Directory, use the Windows Imaging and Configuration ![The first screen to set up a new PC](images/oobe.jpg) -2. Insert the USB drive and press the Windows key five times. Windows Setup will recognize the drive and ask if you want to set up the device. Select **Set up**. +2. Insert the USB drive. Windows Setup will recognize the drive and ask if you want to set up the device. Select **Set up**. ![Set up device?](images/setupmsg.jpg) @@ -88,23 +87,7 @@ If your school uses Active Directory, use the Windows Imaging and Configuration ![Do you trust this package?](images/trust-package.png) -6. Read and accept the Microsoft Software License Terms. - - ![Sign in](images/license-terms.png) - -7. Select **Use Express settings**. - - ![Get going fast](images/express-settings.png) - -8. If the PC doesn't use a volume license, you'll see the **Who owns this PC?** screen. Select **My work or school owns it** and tap **Next**. - - ![Who owns this PC?](images/who-owns-pc.png) - -9. On the **Choose how you'll connect** screen, select **Join a domain** and tap **Next**. - - ![Connect to Azure AD](images/connect-ad.png) - -10. Sign in with your domain account and password. When you see the progress ring, you can remove the USB drive. +When you see the progress ring, you can remove the USB drive. diff --git a/education/windows/set-up-students-pcs-with-apps.md b/education/windows/set-up-students-pcs-with-apps.md index a586e71b08..9d3f8be882 100644 --- a/education/windows/set-up-students-pcs-with-apps.md +++ b/education/windows/set-up-students-pcs-with-apps.md @@ -6,7 +6,6 @@ ms.prod: W10 ms.mktglfcycl: plan ms.sitesec: library author: jdeckerMS -localizationpriority: medium --- # Provision student PCs with apps @@ -160,7 +159,7 @@ If your build is successful, the name of the provisioning package, output direct ![The first screen to set up a new PC](images/oobe.jpg) -2. Insert the USB drive and press the Windows key five times. Windows Setup will recognize the drive and ask if you want to set up the device. Select **Set up**. +2. Insert the USB drive. Windows Setup will recognize the drive and ask if you want to set up the device. Select **Set up**. ![Set up device?](images/setupmsg.jpg) diff --git a/education/windows/set-up-windows-10.md b/education/windows/set-up-windows-10.md index ba036c6d77..fe7767a997 100644 --- a/education/windows/set-up-windows-10.md +++ b/education/windows/set-up-windows-10.md @@ -7,7 +7,6 @@ ms.mktglfcycl: plan ms.sitesec: library ms.pagetype: edu author: jdeckerMS -localizationpriority: medium --- # Provisioning options for Windows 10 diff --git a/education/windows/take-a-test-app-technical.md b/education/windows/take-a-test-app-technical.md index ec9ea350cc..7e3ed9ca0b 100644 --- a/education/windows/take-a-test-app-technical.md +++ b/education/windows/take-a-test-app-technical.md @@ -7,7 +7,6 @@ ms.mktglfcycl: plan ms.sitesec: library ms.pagetype: edu author: jdeckerMS -localizationpriority: medium --- # Take a Test app technical reference diff --git a/education/windows/take-a-test-multiple-pcs.md b/education/windows/take-a-test-multiple-pcs.md index 09d68b6302..0110e7d52c 100644 --- a/education/windows/take-a-test-multiple-pcs.md +++ b/education/windows/take-a-test-multiple-pcs.md @@ -7,7 +7,6 @@ ms.mktglfcycl: plan ms.sitesec: library ms.pagetype: edu author: jdeckerMS -localizationpriority: medium --- # Set up Take a Test on multiple PCs diff --git a/education/windows/take-a-test-single-pc.md b/education/windows/take-a-test-single-pc.md index 9093337da9..7c05de544c 100644 --- a/education/windows/take-a-test-single-pc.md +++ b/education/windows/take-a-test-single-pc.md @@ -7,7 +7,6 @@ ms.mktglfcycl: plan ms.sitesec: library ms.pagetype: edu author: jdeckerMS -localizationpriority: medium --- # Set up Take a Test on a single PC diff --git a/education/windows/take-tests-in-windows-10.md b/education/windows/take-tests-in-windows-10.md index 24a6d7a65e..6bf51bf7b2 100644 --- a/education/windows/take-tests-in-windows-10.md +++ b/education/windows/take-tests-in-windows-10.md @@ -7,7 +7,6 @@ ms.mktglfcycl: plan ms.sitesec: library ms.pagetype: edu author: jdeckerMS -localizationpriority: medium --- # Take tests in Windows 10 diff --git a/education/windows/teacher-get-minecraft.md b/education/windows/teacher-get-minecraft.md index 599083ca43..c9c386545b 100644 --- a/education/windows/teacher-get-minecraft.md +++ b/education/windows/teacher-get-minecraft.md @@ -6,7 +6,6 @@ ms.prod: W10 ms.mktglfcycl: plan ms.sitesec: library author: jdeckerMS -localizationpriority: medium --- # For teachers: get Minecraft Education Edition diff --git a/education/windows/use-set-up-school-pcs-app.md b/education/windows/use-set-up-school-pcs-app.md index 325a7d3fc5..788c6dd819 100644 --- a/education/windows/use-set-up-school-pcs-app.md +++ b/education/windows/use-set-up-school-pcs-app.md @@ -7,7 +7,6 @@ ms.mktglfcycl: plan ms.sitesec: library ms.pagetype: edu author: jdeckerMS -localizationpriority: medium --- # Use the Set up School PCs app diff --git a/education/windows/windows-editions-for-education-customers.md b/education/windows/windows-editions-for-education-customers.md index 8c69690ec1..9eccc9be96 100644 --- a/education/windows/windows-editions-for-education-customers.md +++ b/education/windows/windows-editions-for-education-customers.md @@ -7,7 +7,6 @@ ms.mktglfcycl: plan ms.sitesec: library ms.pagetype: edu author: CelesteDG -localizationpriority: medium --- # Windows 10 editions for education customers diff --git a/windows/deploy/images/adk-install.png b/windows/deploy/images/adk-install.png new file mode 100644 index 0000000000..c087d3bae5 Binary files /dev/null and b/windows/deploy/images/adk-install.png differ diff --git a/windows/deploy/provision-pcs-for-initial-deployment.md b/windows/deploy/provision-pcs-for-initial-deployment.md index 7cafb0ca22..d3692b2073 100644 --- a/windows/deploy/provision-pcs-for-initial-deployment.md +++ b/windows/deploy/provision-pcs-for-initial-deployment.md @@ -44,13 +44,14 @@ In a simple provisioning package, you can configure: Provisioning packages can include management instructions and policies, installation of specific apps, customization of network connections and policies, and more. To learn about provisioning packages that include more than the settings in a simple provisioning package, see [Provision PCs with apps and certificates](provision-pcs-with-apps-and-certificates.md). -> **Tip!** Use simple provisioning to create a package with the common settings, then switch to the advanced editor to add other settings, apps, policies, etc. +> [!TIP] +> Use simple provisioning to create a package with the common settings, then switch to the advanced editor to add other settings, apps, policies, etc. ![open advanced editor](images/icd-simple-edit.png) ## Create the provisioning package -Use the Windows Imaging and Configuration Designer (ICD) tool included in the Windows Assessment and Deployment Kit (ADK) for Windows 10 to create a provisioning package. [Install the ADK.](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit) +Use the Windows Imaging and Configuration Designer (ICD) tool included in the Windows Assessment and Deployment Kit (ADK) for Windows 10 to create a provisioning package. [Install the ADK and select **Configuration Designer**.](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit) 1. Open Windows ICD (by default, %windir%\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Imaging and Configuration Designer\x86\ICD.exe). @@ -64,7 +65,7 @@ Use the Windows Imaging and Configuration Designer (ICD) tool included in the Wi 4. In the **Set up device** step, enter a unique 15-character name for the device. For help generating a unique name, you can use %SERIAL%, which includes a hardware-specific serial number, or you can use %RAND:x%, which generates random characters of x length. -5. (Optional) You can upgrade the following editions of Windows 10 by providing a product key for the edition to upgrade to. +5. (*Optional*) You can upgrade the following editions of Windows 10 by providing a product key for the edition to upgrade to. - Pro to Education - Pro to Enterprise - Enterprise to Education @@ -75,7 +76,7 @@ Use the Windows Imaging and Configuration Designer (ICD) tool included in the Wi 8. Click **Enroll into Active Directory**. -9. Toggle **Yes** or **No** for Active Directory enrollment. If you select **Yes**, enter the credentials for an account with permissions to enroll the device. (Optional) Enter a user name and password to create a local administrator account. +9. Toggle **Yes** or **No** for Active Directory enrollment. If you select **Yes**, enter the credentials for an account with permissions to enroll the device. (*Optional*) Enter a user name and password to create a local administrator account. > **Warning**: If you don't create a local administrator account and the device fails to enroll in Active Directory for any reason, you will have to reimage the device and start over. As a best practice, we recommend: - Use a least-privileged domain account to join the device to the domain. @@ -88,7 +89,8 @@ Use the Windows Imaging and Configuration Designer (ICD) tool included in the Wi 12. Click **Create**. -> **Important** When you build a provisioning package, you may include sensitive information in the project files and in the provisioning package (.ppkg) file. Although you have the option to encrypt the .ppkg file, project files are not encrypted. You should store the project files in a secure location and delete the project files when they are no longer needed. +> [!IMPORTANT] +> When you build a provisioning package, you may include sensitive information in the project files and in the provisioning package (.ppkg) file. Although you have the option to encrypt the .ppkg file, project files are not encrypted. You should store the project files in a secure location and delete the project files when they are no longer needed. ## Apply package @@ -96,7 +98,7 @@ Use the Windows Imaging and Configuration Designer (ICD) tool included in the Wi ![The first screen to set up a new PC](images/oobe.jpg) -2. Insert the USB drive and press the Windows key five times. Windows Setup will recognize the drive and ask if you want to set up the device. Select **Set up**. +2. Insert the USB drive. Windows Setup will recognize the drive and ask if you want to set up the device. Select **Set up**. ![Set up device?](images/setupmsg.jpg) @@ -112,25 +114,7 @@ Use the Windows Imaging and Configuration Designer (ICD) tool included in the Wi ![Do you trust this package?](images/trust-package.png) -6. Read and accept the Microsoft Software License Terms. - ![Sign in](images/license-terms.png) - -7. Select **Use Express settings**. - - ![Get going fast](images/express-settings.png) - -8. If the PC doesn't use a volume license, you'll see the **Who owns this PC?** screen. Select **My work or school owns it** and tap **Next**. - - ![Who owns this PC?](images/who-owns-pc.png) - -9. On the **Choose how you'll connect** screen, select **Join Azure AD** or **Join a domain** and tap **Next**. - - ![Connect to Azure AD](images/connect-aad.png) - -10. Sign in with your domain, Azure AD, or Office 365 account and password. When you see the progress ring, you can remove the USB drive. - - ![Sign in](images/sign-in-prov.png) ## Learn more - [Build and apply a provisioning package]( http://go.microsoft.com/fwlink/p/?LinkId=629651) diff --git a/windows/deploy/provision-pcs-with-apps-and-certificates.md b/windows/deploy/provision-pcs-with-apps-and-certificates.md index dfeb124757..936f1b6f73 100644 --- a/windows/deploy/provision-pcs-with-apps-and-certificates.md +++ b/windows/deploy/provision-pcs-with-apps-and-certificates.md @@ -15,7 +15,8 @@ localizationpriority: medium **Applies to** -- Windows 10 +- Windows 10 + This topic explains how to create and apply a provisioning package that contains apps and certificates to a device running all desktop editions of Windows 10 except Windows 10 Home. Provisioning packages can include management instructions and policies, installation of specific apps, customization of network connections and policies, and more. @@ -34,7 +35,7 @@ You can apply a provisioning package on a USB drive to off-the-shelf devices dur ## Create the provisioning package -Use the Windows Imaging and Configuration Designer (ICD) tool included in the Windows Assessment and Deployment Kit (ADK) for Windows 10 to create a provisioning package. [Install the ADK.](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit) +Use the Windows Imaging and Configuration Designer (ICD) tool included in the Windows Assessment and Deployment Kit (ADK) for Windows 10 to create a provisioning package. [Install the ADK and select **Configuration Designer**.](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit) 1. Open Windows ICD (by default, %windir%\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Imaging and Configuration Designer\x86\ICD.exe). @@ -55,7 +56,8 @@ Use the Windows Imaging and Configuration Designer (ICD) tool included in the Wi 3. Go to **Runtime settings** > **ProvisioningCommands** > **DeviceContext** > **CommandLine** and specify the command line that needs to be executed to install the app. This is a single command line (such as a script, executable, or msi) that triggers a silent install of your CommandFiles. Note that the install must execute silently (without displaying any UI). For MSI installers use, the `msiexec /quiet` option. -> **Note**: If you are installing more than one app, then use CommandLine to invoke the script or batch file that orchestrates installation of the files. For more information, see [Install a Win32 app using a provisioning package](https://msdn.microsoft.com/library/windows/hardware/mt703295%28v=vs.85%29.aspx). +> [!NOTE] +> If you are installing more than one app, then use CommandLine to invoke the script or batch file that orchestrates installation of the files. For more information, see [Install a Win32 app using a provisioning package](https://msdn.microsoft.com/library/windows/hardware/mt703295%28v=vs.85%29.aspx). ### Add a universal app to your package @@ -80,7 +82,8 @@ Universal apps that you can distribute in the provisioning package can be line-o [Learn more about distributing offline apps from the Windows Store for Business.](../manage/distribute-offline-apps.md) -> **Note:** Removing a provisioning package will not remove any apps installed by device context in that provisioning package. +> [!NOTE] +> Removing a provisioning package will not remove any apps installed by device context in that provisioning package. @@ -116,8 +119,8 @@ For details about the settings you can customize in provisioning packages, see [ 10. Set a value for **Package Version**. - **Tip**   - You can make changes to existing packages and change the version number to update previously applied packages. + > [!TIP]   + > You can make changes to existing packages and change the version number to update previously applied packages. 11. Optional. In the **Provisioning package security** window, you can choose to encrypt the package and enable package signing. @@ -161,13 +164,13 @@ If your build is successful, the name of the provisioning package, output direct ## Apply package -**During initial setup, from a USB drive** +### During initial setup, from a USB drive 1. Start with a computer on the first-run setup screen. If the PC has gone past this screen, reset the PC to start over. To reset the PC, go to **Settings** > **Update & security** > **Recovery** > **Reset this PC**. ![The first screen to set up a new PC](images/oobe.jpg) -2. Insert the USB drive and press the Windows key five times. Windows Setup will recognize the drive and ask if you want to set up the device. Select **Set up**. +2. Insert the USB drive. Windows Setup will recognize the drive and ask if you want to set up the device. Select **Set up**. ![Set up device?](images/setupmsg.jpg) @@ -204,7 +207,7 @@ If your build is successful, the name of the provisioning package, output direct ![Sign in](images/sign-in-prov.png) -**After setup, from a USB drive, network folder, or SharePoint site** +### After setup, from a USB drive, network folder, or SharePoint site On a desktop computer, navigate to **Settings** > **Accounts** > **Work access** > **Add or remove a management package** > **Add a package**, and select the package to install. diff --git a/windows/deploy/provisioning-packages.md b/windows/deploy/provisioning-packages.md index 0b06a2d745..4630340ba6 100644 --- a/windows/deploy/provisioning-packages.md +++ b/windows/deploy/provisioning-packages.md @@ -46,7 +46,8 @@ Windows ICD in Windows 10, Version 1607, supports the following scenarios for IT * Mobile Iron (password-string based enrollment) * Other MDMs (cert-based enrollment) -> **Note:** Windows ICD in Windows 10, Version 1607, also provides a wizard to create provisioning packages for school PCs. To learn more, see [Set up students' PCs to join domain](https://technet.microsoft.com/edu/windows/index). +> [!NOTE] +> Windows ICD in Windows 10, Version 1607, also provides a wizard to create provisioning packages for school PCs. To learn more, see [Set up students' PCs to join domain](https://technet.microsoft.com/edu/windows/index). ## Benefits of provisioning packages @@ -95,11 +96,14 @@ For details about the settings you can customize in provisioning packages, see [ With Windows 10, you can use the Windows Imaging and Configuration Designer (ICD) tool to create provisioning packages. To install Windows ICD and create provisioning packages, you must [install the Windows Assessment and Deployment Kit (ADK) for Windows 10](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit). -While running ADKsetup.exe for Windows 10, version 1607, select the following feature from the **Select the features you want to install** dialog box: +When you run ADKsetup.exe for Windows 10, version 1607, select the following feature from the **Select the features you want to install** dialog box: -- Configuration Designer +- **Configuration Designer** -> **Note:** In previous versions of the Windows 10 ADK, you had to install additional features for Windows ICD to run. Starting in version 1607, you can install Windows ICD without other ADK features. +![Choose Configuration Designer](images/adk-install.png) + +> [!NOTE] +> In previous versions of the Windows 10 ADK, you had to install additional features for Windows ICD to run. Starting in version 1607, you can install Windows ICD without other ADK features. After you install Windows ICD, you can use it to create a provisioning package. For detailed instructions on how to create a provisioning package, see [Build and apply a provisioning package](http://go.microsoft.com/fwlink/p/?LinkID=629651). diff --git a/windows/keep-secure/TOC.md b/windows/keep-secure/TOC.md index 4ce806bdc2..4c473b04b3 100644 --- a/windows/keep-secure/TOC.md +++ b/windows/keep-secure/TOC.md @@ -25,6 +25,7 @@ #### [Create and deploy a Windows Information Protection (WIP) policy using System Center Configuration Manager](create-wip-policy-using-sccm.md) #### [Create and verify an Encrypting File System (EFS) Data Recovery Agent (DRA) certificate](create-and-verify-an-efs-dra-certificate.md) ### [General guidance and best practices for Windows Information Protection (WIP)](guidance-and-best-practices-wip.md) +#### [Windows Information Protection (WIP) overview](wip-enterprise-overview.md) #### [Mandatory tasks and settings required to turn on Windows Information Protection (WIP)](mandatory-settings-for-wip.md) #### [Enlightened apps for use with Windows Information Protection (WIP)](enlightened-microsoft-apps-and-wip.md) #### [Testing scenarios for Windows Information Protection (WIP)](testing-scenarios-for-wip.md) @@ -708,7 +709,12 @@ ### [Windows Defender in Windows 10](windows-defender-in-windows-10.md) #### [Update and manage Windows Defender in Windows 10](get-started-with-windows-defender-for-windows-10.md) #### [Configure Windows Defender in Windows 10](configure-windows-defender-in-windows-10.md) +#### [Windows Defender Offline in Windows 10](windows-defender-offline.md) #### [Use PowerShell cmdlets for Windows Defender](use-powershell-cmdlets-windows-defender-for-windows-10.md) +#### [Enable the Block at First Sight feature in Windows 10](windows-defender-block-at-first-sight.md) +#### [Configure enhanced notifications for Windows Defender in Windows 10](windows-defender-enhanced-notifications.md) +#### [Run a Windows Defender scan from the command line](run-cmd-scan-windows-defender-for-windows-10.md) +#### [Detect and block Potentially Unwanted Applications with Windows Defender](enable-pua-windows-defender-for-windows-10.md) #### [Troubleshoot Windows Defender in Windows 10](troubleshoot-windows-defender-in-windows-10.md) ### [Windows Firewall with Advanced Security](windows-firewall-with-advanced-security.md) #### [Isolating Windows Store Apps on Your Network](isolating-apps-on-your-network.md) diff --git a/windows/keep-secure/change-history-for-keep-windows-10-secure.md b/windows/keep-secure/change-history-for-keep-windows-10-secure.md index 29866faca7..62c0c22e26 100644 --- a/windows/keep-secure/change-history-for-keep-windows-10-secure.md +++ b/windows/keep-secure/change-history-for-keep-windows-10-secure.md @@ -18,6 +18,13 @@ The topics in this library have been updated for Windows 10, version 1607 (also - [Enable phone sign-in to PC or VPN](enable-phone-signin-to-pc-and-vpn.md) - [Remote Credential Guard](remote-credential-guard.md) +- [Windows Defender Offline in Windows 10](windows-defender-offline.md) +- [Use PowerShell cmdlets for Windows Defender](use-powershell-cmdlets-windows-defender-for-windows-10.md) +- [Enable the Block at First Sight feature in Windows 10](windows-defender-block-at-first-sight.md) +- [Configure enhanced notifications for Windows Defender in Windows 10](windows-defender-enhanced-notifications.md) +- [Run a Windows Defender scan from the command line](run-cmd-scan-windows-defender-for-windows-10.md) +- [Detect and block Potentially Unwanted Applications](enable-pua-windows-defender-for-windows-10.md) + ## July 2016 diff --git a/windows/keep-secure/configure-windows-defender-in-windows-10.md b/windows/keep-secure/configure-windows-defender-in-windows-10.md index b52b5f6c57..71ec31b565 100644 --- a/windows/keep-secure/configure-windows-defender-in-windows-10.md +++ b/windows/keep-secure/configure-windows-defender-in-windows-10.md @@ -1,5 +1,5 @@ --- -title: Configure Windows Defender in Windows 10 (Windows 10) +title: Configure and use Windows Defender in Windows 10 description: IT professionals can configure definition updates and cloud-based protection in Windows Defender in Windows 10 through Microsoft Active Directory and Windows Server Update Services (WSUS). ms.assetid: 22649663-AC7A-40D8-B1F7-5CAD9E49653D ms.prod: w10 @@ -14,7 +14,9 @@ author: jasesso **Applies to** - Windows 10 -IT professionals can configure definition updates and cloud-based protection in Windows Defender in Windows 10 through Microsoft Active Directory and Windows Server Update Services (WSUS). +You can configure definition updates and cloud-based protection in Windows Defender in Windows 10 through Microsoft Active Directory and Windows Server Update Services (WSUS). + +You can also enable and configure the Microsoft Active Protection Service to ensure endpoints are protected by cloud-based protection technologies. ## Configure definition updates diff --git a/windows/keep-secure/credential-guard.md b/windows/keep-secure/credential-guard.md index 94996dab65..c8f96612a3 100644 --- a/windows/keep-secure/credential-guard.md +++ b/windows/keep-secure/credential-guard.md @@ -143,7 +143,8 @@ If you would like to add Credential Guard to an image, you can do this by adding ### Add the virtualization-based security features First, you must add the virtualization-based security features. You can do this by using either the Control Panel or the Deployment Image Servicing and Management tool (DISM). -> **Note:**  If you enable Credential Guard by using Group Policy, these steps are not required. Group Policy will install the features for you. +> [!NOTE] +> If you enable Credential Guard by using Group Policy, these steps are not required. Group Policy will install the features for you.   **Add the virtualization-based security features by using Programs and Features** 1. Open the Programs and Features control panel. @@ -157,7 +158,8 @@ First, you must add the virtualization-based security features. You can do this ``` syntax dism /image: /Enable-Feature /FeatureName:Microsoft-Hyper-V-Hypervisor /all ``` -> **Note:**  You can also add these features to an online image by using either DISM or Configuration Manager. +> [!NOTE] +> You can also add these features to an online image by using either DISM or Configuration Manager. In Windows 10, version 1607, Isolated User Mode is included with Hyper-V and does not need to be installed separately. If you're running a version of Windows 10 that's earlier than Windows 10, version 1607, you can run the following command to install Isolated User Mode: @@ -181,14 +183,30 @@ If you don't use Group Policy, you can enable Credential Guard by using the regi - Add a new DWORD value named **LsaCfgFlags**. Set the value of this registry setting to 1 to enable Credential Guard with UEFI lock, set it to 2 to enable Credential Guard without lock, and set it to 0 to disable it. 4. Close Registry Editor. -> **Note:**  You can also turn on Credential Guard by setting the registry entries in the [FirstLogonCommands](http://msdn.microsoft.com/library/windows/hardware/dn922797.aspx) unattend setting. +> [!NOTE] +> You can also turn on Credential Guard by setting the registry entries in the [FirstLogonCommands](http://msdn.microsoft.com/library/windows/hardware/dn922797.aspx) unattend setting. + +**Turn on Credential Guard by using the Device Guard and Credential Guard hardware readiness tool** + +You can also enable Credential Guard by using the [Device Guard and Credential Guard hardware readiness tool](https://www.microsoft.com/download/details.aspx?id=53337). + +``` +DG_Readiness_Tool_v2.0.ps1 -Enable -AutoReboot +```   ### Remove Credential Guard If you have to remove Credential Guard on a PC, you need to do the following: 1. If you used Group Policy, disable the Group Policy setting that you used to enable Credential Guard (**Computer Configuration** -> **Administrative Templates** -> **System** -> **Device Guard** -> **Turn on Virtualization Based Security**). -2. Delete the following registry setting: HKEY\_LOCAL\_MACHINE\\Software\\Policies\\Microsoft\\Windows\\DeviceGuard\\LsaCfgFlags +2. Delete the following registry settings: + - HKEY\_LOCAL\_MACHINE\\System\\CurrentControlSet\\Control\\LSA\LsaCfgFlags + - HKEY\_LOCAL\_MACHINE\\Software\\Policies\\Microsoft\\Windows\\DeviceGuard\\EnableVirtualizationBasedSecurity + - HKEY\_LOCAL\_MACHINE\\Software\\Policies\\Microsoft\\Windows\\DeviceGuard\\RequirePlatformSecurityFeatures + + > [!IMPORTANT] + > If you manually remove these registry settings, make sure to delete them all. If you don't remove them all, the device might go into BitLocker recovery. + 3. Delete the Credential Guard EFI variables by using bcdedit. **Delete the Credential Guard EFI variables** @@ -208,9 +226,18 @@ If you have to remove Credential Guard on a PC, you need to do the following: 3. Accept the prompt to disable Credential Guard. 4. Alternatively, you can disable the virtualization-based security features to turn off Credential Guard. -> **Note:** The PC must have one-time access to a domain controller to decrypt content, such as files that were encrypted with EFS. If you want to turn off both Credential Guard and virtualization-based security, run the following bcdedit command after turning off all virtualization-based security Group Policy and registry settings: bcdedit /set {0cb3b571-2f2e-4343-a879-d86a476d7215} loadoptions DISABLE-LSA-ISO,DISABLE-VBS +> [!NOTE] +> The PC must have one-time access to a domain controller to decrypt content, such as files that were encrypted with EFS. If you want to turn off both Credential Guard and virtualization-based security, run the following bcdedit command after turning off all virtualization-based security Group Policy and registry settings: bcdedit /set {0cb3b571-2f2e-4343-a879-d86a476d7215} loadoptions DISABLE-LSA-ISO,DISABLE-VBS For more info on virtualization-based security and Device Guard, see [Device Guard deployment guide](device-guard-deployment-guide.md). + +**Turn off Credential Guard by using the Device Guard and Credential Guard hardware readiness tool** + +You can also enable Credential Guard by using the [Device Guard and Credential Guard hardware readiness tool](https://www.microsoft.com/download/details.aspx?id=53337). + +``` +DG_Readiness_Tool_v2.0.ps1 -Disable -AutoReboot +```   ### Check that Credential Guard is running @@ -223,6 +250,12 @@ You can use System Information to ensure that Credential Guard is running on a P Here's an example: ![System Information](images/credguard-msinfo32.png) + +You can also check that Credential Guard is running by using the [Device Guard and Credential Guard hardware readiness tool](https://www.microsoft.com/download/details.aspx?id=53337). + +``` +DG_Readiness_Tool_v2.0.ps1 -Ready +``` ## Considerations when using Credential Guard @@ -245,6 +278,7 @@ You can use System Information to ensure that Credential Guard is running on a P - Credentials saved by Remote Desktop Services cannot be used to remotely connect to another machine without supplying the password. Attempts to use saved credentials will fail, displaying the error message "Logon attempt failed". - Applications that extract derived domain credentials from Credential Manager will no longer be able to use those credentials. - You cannot restore credentials using the Credential Manager control panel if the credentials were backed up from a PC that has Credential Guard turned on. If you need to back up your credentials, you must do this before you enable Credential Guard. Otherwise, you won't be able to restore those credentials. + - Credential Guard uses hardware security so some features, such as Windows To Go, are not supported. ### Kerberos Considerations @@ -314,7 +348,8 @@ On devices that are running Credential Guard, enroll the devices using the machi ``` syntax CertReq -EnrollCredGuardCert MachineAuthentication ``` -> **Note:**  You must restart the device after enrolling the machine authentication certificate. +> [!NOTE] +> You must restart the device after enrolling the machine authentication certificate.   ### Link the issuance policies to a group @@ -353,7 +388,8 @@ Now you can set up an authentication policy to use Credential Guard. 14. Click **OK** to create the authentication policy. 15. Close Active Directory Administrative Center. -> **Note:**  When authentication policies in enforcement mode are deployed with Credential Guard, users will not be able to sign in using devices that do not have the machine authentication certificate provisioned. This applies to both local and remote sign in scenarios. +> [!NOTE] +> When authentication policies in enforcement mode are deployed with Credential Guard, users will not be able to sign in using devices that do not have the machine authentication certificate provisioned. This applies to both local and remote sign in scenarios.   ### Appendix: Scripts @@ -547,7 +583,8 @@ write-host "There are no issuance policies which are not mapped to groups" } } ``` -> **Note:**  If you're having trouble running this script, try replacing the single quote after the ConvertFrom-StringData parameter. +> [!NOTE] +> If you're having trouble running this script, try replacing the single quote after the ConvertFrom-StringData parameter.   #### Link an issuance policy to a group @@ -828,7 +865,8 @@ write-host $tmp -Foreground Red } ``` -> **Note:**  If you're having trouble running this script, try replacing the single quote after the ConvertFrom-StringData parameter. +> [!NOTE] +> If you're having trouble running this script, try replacing the single quote after the ConvertFrom-StringData parameter.   ## Related topics diff --git a/windows/keep-secure/enable-pua-windows-defender-for-windows-10.md b/windows/keep-secure/enable-pua-windows-defender-for-windows-10.md new file mode 100644 index 0000000000..322d36d515 --- /dev/null +++ b/windows/keep-secure/enable-pua-windows-defender-for-windows-10.md @@ -0,0 +1,110 @@ +--- +title: Detect and block Potentially Unwanted Application with Windows Defender +description: In Windows 10, you can enable the Potentially Unwanted Application (PUA) feature in Managed Windows Defender to identify and block unwanted software during download and install time. +keywords: pua, enable, detect pua, block pua, windows defender and pua +search.product: eADQiWindows 10XVcnh +ms.pagetype: security +ms.prod: w10 +ms.mktglfcycl: detect +ms.sitesec: library +ms.pagetype: security +author: dulcemv +--- + +# Detect and block Potentially Unwanted Application in Windows 10 + +**Applies to:** + +- Windows 10 + +You can enable the Potentially Unwanted Application (PUA) feature in Managed Windows Defender to identify and block unwanted software during download and install time. + +Potentially Unwanted Application (PUA) refers to applications that are not considered viruses, malware, or other types of threats, but might perform actions on your computer that adversely affect your computing experience. It also refers to applications considered to have a poor reputation. + +Typical examples of PUA behavior include: +* Various types of software bundling +* Ad-injection into your browsers +* Driver and registry optimizers that detect issues, request payment to fix them, and persist + +These applications can increase the risk of your network being infected with malware, cause malware infections to be harder to identify among the noise, and can waste helpdesk, IT, and user time in cleaning up the applications. + +Since the stakes are higher in an enterprise environment, the potential disaster and potential productivity and performance disruptions that PUA brings can be a cause of concern. Hence, it is important to deliver trusted protection in this field. + +**Enable PUA protection in SCCM and Intune** + +The PUA feature is available for enterprise users who are running System Center Configuration Manager (SCCM) or Microsoft Intune in their infrastructure. + +***Configure PUA in SCCM*** + +For SCCM users, PUA is enabled by default. See the following topics for configuration details: + +If you are using these versions | See these topics +:---|:--- +System Center Configuration Manager (current branch) version 1606 | [Create a new antimalware policy](https://technet.microsoft.com/en-US/library/mt613199.aspx#To-create-a-new-antimalware-policy)
[Real-time Protection Settings](https://technet.microsoft.com/en-US/library/mt613199.aspx#Real-time-Protection-Settings) +System Center 2012 R2 Endpoint Protection
System Center 2012 Configuration Manager
System Center 2012 Configuration Manager SP1
System Center 2012 Configuration Manager SP2
System Center 2012 R2 Configuration Manager
System Center 2012 Endpoint Protection SP1
System Center 2012 Endpoint Protection
System Center 2012 R2 Configuration Manager SP1| [How to Deploy Potentially Unwanted Application Protection Policy for Endpoint Protection in Configuration Manager](https://technet.microsoft.com/library/hh508770.aspx#BKMK_PUA) + + +***Use PUA audit mode in SCCM*** + +You can use PowerShell to detect PUA without blocking them. In fact, you can run audit mode on individual machines. This feature is useful if your company is conducting an internal software security compliance check and you’d like to avoid any false positives. + +1. Open PowerShell as Administrator
+ + a. Click **Start**, type **powershell**, and press **Enter**. + + b. Click **Windows PowerShell** to open the interface. + + > [!NOTE] + > You may need to open an administrator-level version of PowerShell. Right-click the item in the Start menu, click **Run as administrator** and click **Yes** at the permissions prompt. + +2. Enter the PowerShell command: + + ```text + et-mpPreference -puaprotection 2 + ``` +> [!NOTE] +> PUA events are reported in the Windows Event Viewer and not in SCCM. + + +***Configure PUA in Intune*** + + PUA is not enabled by default. You need to [Create and deploy a PUA configuration policy to use it](https://docs.microsoft.com/en-us/intune/deploy-use/manage-settings-and-features-on-your-devices-with-microsoft-intune-policies). See the [Potentially Unwanted Application Detection policy setting](https://docs.microsoft.com/en-us/intune/deploy-use/windows-10-policy-settings-in-microsoft-intune) for details. + + + ***Use PUA audit mode in Intune*** + + You can detect PUA without blocking them from your client. Gain insights into what can be blocked. + +**View PUA events** + +PUA events are reported in the Windows Event Viewer and not in SCCM or Intune. To view PUA events: + +1. Open **Event Viewer**. +2. In the console tree, expand **Applications and Services Logs**, then **Microsoft**, then **Windows**, then **Windows Defender**. +3. Double-click on **Operational**. +4. In the details pane, view the list of individual events to find your event. PUA events are under Event ID 1160 along with detection details. + +You can find a complete list of the Microsoft antimalware event IDs, the symbol, and the description of each ID in [Windows Server Antimalware Events TechNet](https://technet.microsoft.com/library/dn913615.aspx). + + +**What PUA notifications look like** + +When a detection occurs, end users who enabled the PUA detection feature will see the following notification:
+ +![Image showing the potentally unwanted application detection](images/pua1.png) + +To see historical PUA detections that occurred on a PC, users can go to History, then **Quarantined items** or **All detected items**.
+ +![Image showing the potentally unwanted application detection history](images/pua2.png) + +**PUA threat file-naming convention** + +When enabled, potentially unwanted applications are identified with threat names that start with “PUA:”, such as, PUA:Win32/Creprote. + +**PUA blocking conditions** + +PUA protection quarantines the file so they won’t run. PUA will be blocked only at download or install-time. A file will be included for blocking if it has been identified as PUA and meets one of the following conditions: +* The file is being scanned from the browser +* The file has [Mark of the Web](https://msdn.microsoft.com/en-us/library/ms537628%28v=vs.85%29.aspx) set +* The file is in the %downloads% folder +* Or if the file in the %temp% folder diff --git a/windows/keep-secure/encrypted-hard-drive.md b/windows/keep-secure/encrypted-hard-drive.md index 7de2f367e0..3bae653290 100644 --- a/windows/keep-secure/encrypted-hard-drive.md +++ b/windows/keep-secure/encrypted-hard-drive.md @@ -12,7 +12,8 @@ author: brianlic-msft # Encrypted Hard Drive **Applies to** -- Windows 10 +- Windows 10 +- Windows Server 2016 Encrypted Hard Drive uses the rapid encryption that is provided by BitLocker Drive Encryption to enhance data security and management. diff --git a/windows/keep-secure/get-started-with-windows-defender-for-windows-10.md b/windows/keep-secure/get-started-with-windows-defender-for-windows-10.md index 1a19780713..fe5431ac69 100644 --- a/windows/keep-secure/get-started-with-windows-defender-for-windows-10.md +++ b/windows/keep-secure/get-started-with-windows-defender-for-windows-10.md @@ -183,7 +183,7 @@ In Endpoint Protection, you can use the advanced scanning options to configure a ## Related topics -[Configure Windows Defender in Windows 10](configure-windows-defender-in-windows-10.md) -[Troubleshoot Windows Defender in Windows 10](troubleshoot-windows-defender-in-windows-10.md) +- [Configure Windows Defender in Windows 10](configure-windows-defender-in-windows-10.md) +- [Troubleshoot Windows Defender in Windows 10](troubleshoot-windows-defender-in-windows-10.md)     diff --git a/windows/keep-secure/images/defender/client.png b/windows/keep-secure/images/defender/client.png new file mode 100644 index 0000000000..4f2118206e Binary files /dev/null and b/windows/keep-secure/images/defender/client.png differ diff --git a/windows/keep-secure/images/defender/detection-source.png b/windows/keep-secure/images/defender/detection-source.png new file mode 100644 index 0000000000..7d471dc22d Binary files /dev/null and b/windows/keep-secure/images/defender/detection-source.png differ diff --git a/windows/keep-secure/images/defender/download-wdo.png b/windows/keep-secure/images/defender/download-wdo.png new file mode 100644 index 0000000000..50d2fc3152 Binary files /dev/null and b/windows/keep-secure/images/defender/download-wdo.png differ diff --git a/windows/keep-secure/images/defender/enhanced-notifications.png b/windows/keep-secure/images/defender/enhanced-notifications.png new file mode 100644 index 0000000000..8317458416 Binary files /dev/null and b/windows/keep-secure/images/defender/enhanced-notifications.png differ diff --git a/windows/keep-secure/images/defender/gp.png b/windows/keep-secure/images/defender/gp.png new file mode 100644 index 0000000000..8b57c7b45c Binary files /dev/null and b/windows/keep-secure/images/defender/gp.png differ diff --git a/windows/keep-secure/images/defender/notification.png b/windows/keep-secure/images/defender/notification.png new file mode 100644 index 0000000000..cad9f162e9 Binary files /dev/null and b/windows/keep-secure/images/defender/notification.png differ diff --git a/windows/keep-secure/images/defender/sccm-wdo.png b/windows/keep-secure/images/defender/sccm-wdo.png new file mode 100644 index 0000000000..8f504b94e1 Binary files /dev/null and b/windows/keep-secure/images/defender/sccm-wdo.png differ diff --git a/windows/keep-secure/images/defender/settings-wdo.png b/windows/keep-secure/images/defender/settings-wdo.png new file mode 100644 index 0000000000..23412856b0 Binary files /dev/null and b/windows/keep-secure/images/defender/settings-wdo.png differ diff --git a/windows/keep-secure/images/defender/ux-config-key.png b/windows/keep-secure/images/defender/ux-config-key.png new file mode 100644 index 0000000000..3e2d966342 Binary files /dev/null and b/windows/keep-secure/images/defender/ux-config-key.png differ diff --git a/windows/keep-secure/images/defender/ux-uilockdown-key.png b/windows/keep-secure/images/defender/ux-uilockdown-key.png new file mode 100644 index 0000000000..86d1b4b249 Binary files /dev/null and b/windows/keep-secure/images/defender/ux-uilockdown-key.png differ diff --git a/windows/keep-secure/images/detection-source.png b/windows/keep-secure/images/detection-source.png new file mode 100644 index 0000000000..7d471dc22d Binary files /dev/null and b/windows/keep-secure/images/detection-source.png differ diff --git a/windows/keep-secure/images/hellosettings.png b/windows/keep-secure/images/hellosettings.png index 77a8753b5c..9b897a136e 100644 Binary files a/windows/keep-secure/images/hellosettings.png and b/windows/keep-secure/images/hellosettings.png differ diff --git a/windows/keep-secure/images/pinerror.png b/windows/keep-secure/images/pinerror.png index 188b981299..28a759f2fc 100644 Binary files a/windows/keep-secure/images/pinerror.png and b/windows/keep-secure/images/pinerror.png differ diff --git a/windows/keep-secure/images/pua1.png b/windows/keep-secure/images/pua1.png new file mode 100644 index 0000000000..f3d96a245a Binary files /dev/null and b/windows/keep-secure/images/pua1.png differ diff --git a/windows/keep-secure/images/pua2.png b/windows/keep-secure/images/pua2.png new file mode 100644 index 0000000000..72ffa10aa5 Binary files /dev/null and b/windows/keep-secure/images/pua2.png differ diff --git a/windows/keep-secure/implement-microsoft-passport-in-your-organization.md b/windows/keep-secure/implement-microsoft-passport-in-your-organization.md index 4f2de5952b..813a67705d 100644 --- a/windows/keep-secure/implement-microsoft-passport-in-your-organization.md +++ b/windows/keep-secure/implement-microsoft-passport-in-your-organization.md @@ -312,7 +312,7 @@ You’ll need this software to set Windows Hello for Business policies in your e Azure AD subscription