From dcc1e19a6ce7cb9902cd24535e912c51eff2403b Mon Sep 17 00:00:00 2001 From: Dos Moonen Date: Tue, 28 Nov 2017 21:38:51 +0100 Subject: [PATCH 01/13] Update enterprise-mode-schema-version-2-guidance.md --- .../enterprise-mode-schema-version-2-guidance.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browsers/internet-explorer/ie11-deploy-guide/enterprise-mode-schema-version-2-guidance.md b/browsers/internet-explorer/ie11-deploy-guide/enterprise-mode-schema-version-2-guidance.md index b91676a518..175f5657b4 100644 --- a/browsers/internet-explorer/ie11-deploy-guide/enterprise-mode-schema-version-2-guidance.md +++ b/browsers/internet-explorer/ie11-deploy-guide/enterprise-mode-schema-version-2-guidance.md @@ -31,7 +31,7 @@ Because of the schema changes, you can't combine the old version (v.1) with the - <site-list>. If your schema root node includes this key, you're using the v.2 version of the schema. -You can continue to use the v.1 version of the schema on Windows 10, but you won't have the benefits of the new v.2 version schema updates and new features. Additionally, if you save the v.1 version of the schema in the new Enterprise Mode Site List Manager for Windows 10, it will automatically update the file to use the v.2 version of the schema. +You can continue to use the v.1 version of the schema on Windows 10, but you won't have the benefits of the new v.2 version schema updates and new features. Additionally, if you save the v.1 version of the schema in the new Enterprise Mode Site List Manager (schema v.2), it will automatically update the file to use the v.2 version of the schema. ### Enterprise Mode v.2 schema example The following is an example of the v.2 version of the Enterprise Mode schema. From 5a65f9c56dad0bfd8f1a288c732b68bd8f2c52fd Mon Sep 17 00:00:00 2001 From: Dos Moonen Date: Tue, 28 Nov 2017 22:34:00 +0100 Subject: [PATCH 02/13] Update use-the-enterprise-mode-site-list-manager.md --- .../use-the-enterprise-mode-site-list-manager.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browsers/internet-explorer/ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md b/browsers/internet-explorer/ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md index 35f92c7b1c..63ae7f6c16 100644 --- a/browsers/internet-explorer/ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md +++ b/browsers/internet-explorer/ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md @@ -28,10 +28,10 @@ You can use IE11 and the Enterprise Mode Site List Manager to add individual web ## Enterprise Mode Site List Manager versions There are currently two versions of the Enterprise Site List Manager, both based on your schema and operating system. Download the [Enterprise Mode Site List Manager (schema v.2)](https://go.microsoft.com/fwlink/p/?LinkId=716853) or the [Enterprise Mode Site List Manager (schema v.1)](https://go.microsoft.com/fwlink/p/?LinkID=394378) tool, based on your operating system. -|Operating system |Schema version |Enterprise Site List Manager version | +|Schema version |Operating system |Enterprise Site List Manager version | |-----------------|---------------|------------------------------------| -|Windows 10 |Enterprise Mode schema, version 2 (v.2)

-OR-

Enterprise Mode schema, version 1 (v.1) |Windows 10 supports both versions of the enterprise mode schema. However, the Enterprise Mode Site List Manager (schema v.2) only supports the v.2 version of the schema. If you import a v.1 version schema into the Enterprise Mode Site List Manager (schema v.2), it will save the XML into the v.2 version of the schema.

For more info about the different schema versions, see [Enterprise Mode schema v.2 guidance](enterprise-mode-schema-version-2-guidance.md) | -|Windows 7

-OR-

Windows 8.1 |Enterprise Mode schema v.1 |Uses the Enterprise Mode Site List Manager (schema v.1).

For more info about the different schema versions, see [Enterprise Mode schema v.1 guidance](enterprise-mode-schema-version-1-guidance.md) | +|Enterprise Mode schema, version 2 (v.2) |[Windows 10 2015 Fall Update](https://blogs.windows.com/msedgedev/2015/11/23/windows-10-1511-enterprise-improvements/)

-OR-

[Windows 8.1 June 2016 Cumulative Update](https://blogs.windows.com/msedgedev/2016/06/14/new-enterprise-improvements-coming-to-ie11-on-windows-7-and-8-1/)

-OR

[Windows 7 2016 June Cumulative Update](https://blogs.windows.com/msedgedev/2016/06/14/new-enterprise-improvements-coming-to-ie11-on-windows-7-and-8-1/) |Both versions of the enterprise mode schema are supported. However, the Enterprise Mode Site List Manager (schema v.2) only supports the v.2 version of the schema. If you import a v.1 version schema into the Enterprise Mode Site List Manager (schema v.2), it will save the XML into the v.2 version of the schema.

For more info about the different schema versions, see [Enterprise Mode schema v.2 guidance](enterprise-mode-schema-version-2-guidance.md) | +|Enterprise Mode schema, version 1 (v.1) |Windows 10

-OR-

Windows 8.1

-OR

Windows 7 |Uses the Enterprise Mode Site List Manager (schema v.1).

For more info about the different schema versions, see [Enterprise Mode schema v.1 guidance](enterprise-mode-schema-version-1-guidance.md) | ## Using the Enterprise Mode Site List Manager The following topics give you more information about the things that you can do with the Enterprise Mode Site List Manager. From 69d7de9a756b730f908154e6f0b539cee57eeeae Mon Sep 17 00:00:00 2001 From: Dos Moonen Date: Tue, 28 Nov 2017 22:37:25 +0100 Subject: [PATCH 03/13] Update use-the-enterprise-mode-site-list-manager.md --- .../use-the-enterprise-mode-site-list-manager.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browsers/internet-explorer/ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md b/browsers/internet-explorer/ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md index 63ae7f6c16..95e3b34ef9 100644 --- a/browsers/internet-explorer/ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md +++ b/browsers/internet-explorer/ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md @@ -30,8 +30,8 @@ There are currently two versions of the Enterprise Site List Manager, both based |Schema version |Operating system |Enterprise Site List Manager version | |-----------------|---------------|------------------------------------| -|Enterprise Mode schema, version 2 (v.2) |[Windows 10 2015 Fall Update](https://blogs.windows.com/msedgedev/2015/11/23/windows-10-1511-enterprise-improvements/)

-OR-

[Windows 8.1 June 2016 Cumulative Update](https://blogs.windows.com/msedgedev/2016/06/14/new-enterprise-improvements-coming-to-ie11-on-windows-7-and-8-1/)

-OR

[Windows 7 2016 June Cumulative Update](https://blogs.windows.com/msedgedev/2016/06/14/new-enterprise-improvements-coming-to-ie11-on-windows-7-and-8-1/) |Both versions of the enterprise mode schema are supported. However, the Enterprise Mode Site List Manager (schema v.2) only supports the v.2 version of the schema. If you import a v.1 version schema into the Enterprise Mode Site List Manager (schema v.2), it will save the XML into the v.2 version of the schema.

For more info about the different schema versions, see [Enterprise Mode schema v.2 guidance](enterprise-mode-schema-version-2-guidance.md) | -|Enterprise Mode schema, version 1 (v.1) |Windows 10

-OR-

Windows 8.1

-OR

Windows 7 |Uses the Enterprise Mode Site List Manager (schema v.1).

For more info about the different schema versions, see [Enterprise Mode schema v.1 guidance](enterprise-mode-schema-version-1-guidance.md) | +|Enterprise Mode schema, version 2 (v.2) |[Windows 10 2015 Fall Update](https://blogs.windows.com/msedgedev/2015/11/23/windows-10-1511-enterprise-improvements/)

-OR-

[Windows 8.1 June 2016 Cumulative Update](https://blogs.windows.com/msedgedev/2016/06/14/new-enterprise-improvements-coming-to-ie11-on-windows-7-and-8-1/)

-OR-

[Windows 7 2016 June Cumulative Update](https://blogs.windows.com/msedgedev/2016/06/14/new-enterprise-improvements-coming-to-ie11-on-windows-7-and-8-1/) |Both versions of the enterprise mode schema are supported. However, the Enterprise Mode Site List Manager (schema v.2) only supports the v.2 version of the schema. If you import a v.1 version schema into the Enterprise Mode Site List Manager (schema v.2), it will save the XML into the v.2 version of the schema.

For more info about the different schema versions, see [Enterprise Mode schema v.2 guidance](enterprise-mode-schema-version-2-guidance.md) | +|Enterprise Mode schema, version 1 (v.1) |Windows 10

-OR-

Windows 8.1

-OR-

Windows 7 |Uses the Enterprise Mode Site List Manager (schema v.1).

For more info about the different schema versions, see [Enterprise Mode schema v.1 guidance](enterprise-mode-schema-version-1-guidance.md) | ## Using the Enterprise Mode Site List Manager The following topics give you more information about the things that you can do with the Enterprise Mode Site List Manager. From ac4088dcccfa5abd4442caf674cb6627f87c6f7f Mon Sep 17 00:00:00 2001 From: Dos Moonen Date: Tue, 28 Nov 2017 22:38:05 +0100 Subject: [PATCH 04/13] Update use-the-enterprise-mode-site-list-manager.md --- .../use-the-enterprise-mode-site-list-manager.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browsers/internet-explorer/ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md b/browsers/internet-explorer/ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md index 95e3b34ef9..c835ab4697 100644 --- a/browsers/internet-explorer/ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md +++ b/browsers/internet-explorer/ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md @@ -30,8 +30,8 @@ There are currently two versions of the Enterprise Site List Manager, both based |Schema version |Operating system |Enterprise Site List Manager version | |-----------------|---------------|------------------------------------| -|Enterprise Mode schema, version 2 (v.2) |[Windows 10 2015 Fall Update](https://blogs.windows.com/msedgedev/2015/11/23/windows-10-1511-enterprise-improvements/)

-OR-

[Windows 8.1 June 2016 Cumulative Update](https://blogs.windows.com/msedgedev/2016/06/14/new-enterprise-improvements-coming-to-ie11-on-windows-7-and-8-1/)

-OR-

[Windows 7 2016 June Cumulative Update](https://blogs.windows.com/msedgedev/2016/06/14/new-enterprise-improvements-coming-to-ie11-on-windows-7-and-8-1/) |Both versions of the enterprise mode schema are supported. However, the Enterprise Mode Site List Manager (schema v.2) only supports the v.2 version of the schema. If you import a v.1 version schema into the Enterprise Mode Site List Manager (schema v.2), it will save the XML into the v.2 version of the schema.

For more info about the different schema versions, see [Enterprise Mode schema v.2 guidance](enterprise-mode-schema-version-2-guidance.md) | -|Enterprise Mode schema, version 1 (v.1) |Windows 10

-OR-

Windows 8.1

-OR-

Windows 7 |Uses the Enterprise Mode Site List Manager (schema v.1).

For more info about the different schema versions, see [Enterprise Mode schema v.1 guidance](enterprise-mode-schema-version-1-guidance.md) | +|Enterprise Mode schema, version 2 (v.2) |

[Windows 10 2015 Fall Update](https://blogs.windows.com/msedgedev/2015/11/23/windows-10-1511-enterprise-improvements/)

-OR-

[Windows 8.1 June 2016 Cumulative Update](https://blogs.windows.com/msedgedev/2016/06/14/new-enterprise-improvements-coming-to-ie11-on-windows-7-and-8-1/)

-OR-

[Windows 7 2016 June Cumulative Update](https://blogs.windows.com/msedgedev/2016/06/14/new-enterprise-improvements-coming-to-ie11-on-windows-7-and-8-1/) |Both versions of the enterprise mode schema are supported. However, the Enterprise Mode Site List Manager (schema v.2) only supports the v.2 version of the schema. If you import a v.1 version schema into the Enterprise Mode Site List Manager (schema v.2), it will save the XML into the v.2 version of the schema.

For more info about the different schema versions, see [Enterprise Mode schema v.2 guidance](enterprise-mode-schema-version-2-guidance.md) | +|Enterprise Mode schema, version 1 (v.1) |

Windows 10

-OR-

Windows 8.1

-OR-

Windows 7 |Uses the Enterprise Mode Site List Manager (schema v.1).

For more info about the different schema versions, see [Enterprise Mode schema v.1 guidance](enterprise-mode-schema-version-1-guidance.md) | ## Using the Enterprise Mode Site List Manager The following topics give you more information about the things that you can do with the Enterprise Mode Site List Manager. From 57ce4ce6e7c100eba30dee8eab379f6f20319a26 Mon Sep 17 00:00:00 2001 From: Dos Moonen Date: Tue, 28 Nov 2017 22:42:26 +0100 Subject: [PATCH 05/13] Update what-is-enterprise-mode.md --- .../ie11-deploy-guide/what-is-enterprise-mode.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browsers/internet-explorer/ie11-deploy-guide/what-is-enterprise-mode.md b/browsers/internet-explorer/ie11-deploy-guide/what-is-enterprise-mode.md index 57ef5c82da..acda0831fc 100644 --- a/browsers/internet-explorer/ie11-deploy-guide/what-is-enterprise-mode.md +++ b/browsers/internet-explorer/ie11-deploy-guide/what-is-enterprise-mode.md @@ -37,7 +37,7 @@ Based on the size of your legacy web app dependency, determined by the data coll For more info about when to use which option, and which option is best for you, see the [Continuing to make it easier for Enterprise customers to upgrade to Internet Explorer 11 — and Windows 10](https://blogs.windows.com/msedgedev/2015/11/23/windows-10-1511-enterprise-improvements) blog. ## What is Enterprise Mode? -Enterprise Mode, a compatibility mode that runs on Internet Explorer 11 on Windows 10 devices, lets websites render using a modified browser configuration that’s designed to emulate either Windows Internet Explorer 7 or Windows Internet Explorer 8, avoiding the common compatibility problems associated with web apps written and tested on older versions of Internet Explorer. +Enterprise Mode, a compatibility mode that runs on Internet Explorer 11 on Windows 10, Windows 8.1 and Windows 7 devices, lets websites render using a modified browser configuration that’s designed to emulate either Windows Internet Explorer 7 or Windows Internet Explorer 8, avoiding the common compatibility problems associated with web apps written and tested on older versions of Internet Explorer. Many customers identify web app compatibility as a significant cost to upgrading because web apps need to be tested and upgraded before adopting a new browser. The improved compatibility provided by Enterprise Mode can help give customers confidence to upgrade to IE11, letting customers benefit from modern web standards, increased performance, improved security, and better reliability. @@ -163,4 +163,4 @@ Because the tool is open-source, the source code is readily available for examin - [Microsoft Services Support](https://www.microsoft.com/en-us/microsoftservices/support.aspx) -- [Find a Microsoft partner on Pinpoint](https://partnercenter.microsoft.com/pcv/search) \ No newline at end of file +- [Find a Microsoft partner on Pinpoint](https://partnercenter.microsoft.com/pcv/search) From 0992c9438c8942b1e9c62c1495fe0a5b0efe0fa7 Mon Sep 17 00:00:00 2001 From: Bill McIlhargey Date: Wed, 29 Nov 2017 22:45:01 -0500 Subject: [PATCH 06/13] Update index.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Corrected broken Mixed Reality link in docs Old link: https://de​veloper.mi​crosoft.co​m/windows/​mixed-real​ity/docume​ntation New link (proposed): https://developer.microsoft.com/windows/mixed-reality/development --- devices/hololens/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devices/hololens/index.md b/devices/hololens/index.md index a400654bbd..138efd9e2b 100644 --- a/devices/hololens/index.md +++ b/devices/hololens/index.md @@ -33,7 +33,7 @@ ms.localizationpriority: medium - [Help for using HoloLens](https://support.microsoft.com/products/hololens) -- [Documentation for Holographic app development](https://developer.microsoft.com/windows/mixed-reality/documentation) +- [Documentation for Holographic app development](https://developer.microsoft.com/windows/mixed-reality/development) - [HoloLens Commercial Suite](https://www.microsoft.com/microsoft-hololens/hololens-commercial) From 9d7db1dfda6f22bb85d9be4235a16f0902831d32 Mon Sep 17 00:00:00 2001 From: RastafarianWarlock <34170850+RastafarianWarlock@users.noreply.github.com> Date: Fri, 1 Dec 2017 15:43:04 -0500 Subject: [PATCH 07/13] Update manage-windows-10-in-your-organization-modern-management.md --- .../manage-windows-10-in-your-organization-modern-management.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/client-management/manage-windows-10-in-your-organization-modern-management.md b/windows/client-management/manage-windows-10-in-your-organization-modern-management.md index 34b1af8c9f..46a64c0237 100644 --- a/windows/client-management/manage-windows-10-in-your-organization-modern-management.md +++ b/windows/client-management/manage-windows-10-in-your-organization-modern-management.md @@ -45,7 +45,7 @@ As indicated in the diagram, Microsoft continues to provide support for deep man With Windows 10, you can continue to use traditional OS deployment, but you can also “manage out of the box.” To transform new devices into fully-configured, fully-managed devices, you can: -- Avoid reimaging by using dynamic provisioning, enabled by a cloud-based device management services like [Microsoft Intune](https://docs.microsoft.com/intune/understand-explore/introduction-to-microsoft-intune). +- Avoid reimaging by using dynamic provisioning, enabled by a cloud-based device management services such as [Microsoft Autopilot (https://docs.microsoft.com/en-us/windows/deployment/windows-10-auto-pilot). - Create self-contained provisioning packages built with the [Windows Configuration Designer](https://technet.microsoft.com/itpro/windows/deploy/provisioning-packages). From 3bbf4f4ea5604eceed04ff8430f14f101de5b324 Mon Sep 17 00:00:00 2001 From: Jeanie Decker Date: Mon, 4 Dec 2017 16:46:50 +0000 Subject: [PATCH 08/13] Merged PR 4779: Add link to Surface Hub topic --- .../surface-hub/prepare-your-environment-for-surface-hub.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/devices/surface-hub/prepare-your-environment-for-surface-hub.md b/devices/surface-hub/prepare-your-environment-for-surface-hub.md index 613ec77311..37027821a8 100644 --- a/devices/surface-hub/prepare-your-environment-for-surface-hub.md +++ b/devices/surface-hub/prepare-your-environment-for-surface-hub.md @@ -117,8 +117,9 @@ When you go through the first-run program for your Surface Hub, there's some inf ## More information -- [Surface Hub and the Skype for Business Trusted Domain List](https://blogs.technet.microsoft.com/y0av/2017/10/25/95/) -- [Surface Hub in a Multi-Domain Environment](https://blogs.technet.microsoft.com/y0av/2017/11/08/11/) +- [Blog post: Surface Hub and the Skype for Business Trusted Domain List](https://blogs.technet.microsoft.com/y0av/2017/10/25/95/) +- [Blog post: Surface Hub in a Multi-Domain Environment](https://blogs.technet.microsoft.com/y0av/2017/11/08/11/) +- [Blog post: Configuring a proxy for your Surface Hub](https://blogs.technet.microsoft.com/y0av/2017/12/03/7/)   From 80247fdf000be5d9000d0b4128a8b89c05469af2 Mon Sep 17 00:00:00 2001 From: Mike Stephens Date: Mon, 4 Dec 2017 09:57:45 -0800 Subject: [PATCH 09/13] Updated FAQ with multifactor unlock. Fixed hyperlinks on the features page --- .../hello-for-business/hello-features.md | 10 +++++----- .../hello-for-business/hello-identity-verification.md | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/windows/access-protection/hello-for-business/hello-features.md b/windows/access-protection/hello-for-business/hello-features.md index af73b147d6..e89b3407a1 100644 --- a/windows/access-protection/hello-for-business/hello-features.md +++ b/windows/access-protection/hello-for-business/hello-features.md @@ -2,7 +2,7 @@ title: Windows Hello for Business Features description: Windows Hello for Business Features ms.assetid: 5BF09642-8CF5-4FBC-AC9A-5CA51E19387E -keywords: identity, PIN, biometric, Hello, passport, WHFB, Windows Hello, PIN Reset, Dynamic Lock, Multifactor Unlock, Forgot PIN, Privileged Workstation +keywords: identity, PIN, biometric, Hello, passport, WHFB, Windows Hello, PIN Reset, Dynamic Lock, Multifactor Unlock, Forgot PIN, Privileged credentials ms.prod: w10 ms.mktglfcycl: deploy ms.sitesec: library @@ -10,7 +10,7 @@ ms.pagetype: security, mobile author: mikestephens-MS ms.author: mstephen localizationpriority: high -ms.date: 10/20/2017 +ms.date: 12/04/2017 --- # Windows Hello for Business Features @@ -18,9 +18,9 @@ Consider these additional features you can use after your organization deploys W * [Conditional access](#conditional-access) * [Dynamic lock](#dynamic-lock) -* [PIN reset](#PIN-reset) -* [Privileged credentials](#Priveleged-crednetials) -* [Mulitfactor Unlock](#Multifactor-unlock) +* [PIN reset](#pin-reset) +* [Privileged credentials](#privileged-credentials) +* [Mulitfactor Unlock](#multifactor-unlock) ## Conditional access diff --git a/windows/access-protection/hello-for-business/hello-identity-verification.md b/windows/access-protection/hello-for-business/hello-identity-verification.md index dbe821c879..71173211b8 100644 --- a/windows/access-protection/hello-for-business/hello-identity-verification.md +++ b/windows/access-protection/hello-for-business/hello-identity-verification.md @@ -10,7 +10,7 @@ ms.pagetype: security, mobile author: mikestephens-MS ms.author: mstephen localizationpriority: high -ms.date: 10/20/2017 +ms.date: 12/04/2017 --- # Windows Hello for Business @@ -104,7 +104,7 @@ There are many deployment options from which to choose. Some of those options re Windows Hello for Business is two-factor authentication based the observed authentication factors of: something you have, something you know, and something part of you. Windows Hello for Business incorporates two of these factors: something you have (the user's private key protected by the device's security module) and something you know (your PIN). With the proper hardware, you can enhance the user experience by introducing biometrics. Using biometrics, you can replace the "something you know" authentication factor with the "something that is part of you" factor, with the assurances that users can fall back to the "something you know factor". ### Can I use PIN and biometrics to unlock my device? -No. Windows Hello for Business provides two-factor authentication. However, we are investigating the ability to unlock the desktop with additional factors. +No. Windows Hello for Business provides two-factor authentication. However, starting in Windows 10, version 1709, you can use multifactor unlock to require the user to provide an additional factor to unlock the device. Authentication remains two-factor, but another factor is required before Windows allows the user to reach the desktop. Read more about [multifactor unlock](https://docs.microsoft.com/en-us/windows/access-protection/hello-for-business/hello-features#multifactor-unlock) in [Windows Hello for Business Features](#hello-features.md) ### What is the difference between Windows Hello and Windows Hello for Business Windows Hello represents the biometric framework provided in Windows 10. Windows Hello enables users to use biometrics to sign into their devices by securely storing their username and password and releasing it for authentication when the user successfully identifies themselves using biometrics. Windows Hello for Business uses asymmetric keys protected by the device's security module that requires a user gesture (PIN or biometrics) to authenticate. From 34c7e7f5583a4e29873d36c43247a04dc03f2cc1 Mon Sep 17 00:00:00 2001 From: Jeanie Decker Date: Mon, 4 Dec 2017 17:59:11 +0000 Subject: [PATCH 10/13] Merged PR 4781: Combine old link with new link from external pull request --- .../manage-windows-10-in-your-organization-modern-management.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/client-management/manage-windows-10-in-your-organization-modern-management.md b/windows/client-management/manage-windows-10-in-your-organization-modern-management.md index 46a64c0237..88ce730964 100644 --- a/windows/client-management/manage-windows-10-in-your-organization-modern-management.md +++ b/windows/client-management/manage-windows-10-in-your-organization-modern-management.md @@ -45,7 +45,7 @@ As indicated in the diagram, Microsoft continues to provide support for deep man With Windows 10, you can continue to use traditional OS deployment, but you can also “manage out of the box.” To transform new devices into fully-configured, fully-managed devices, you can: -- Avoid reimaging by using dynamic provisioning, enabled by a cloud-based device management services such as [Microsoft Autopilot (https://docs.microsoft.com/en-us/windows/deployment/windows-10-auto-pilot). +- Avoid reimaging by using dynamic provisioning, enabled by a cloud-based device management services such as [Microsoft Autopilot] (https://docs.microsoft.com/en-us/windows/deployment/windows-10-auto-pilot) or [Microsoft Intune](https://docs.microsoft.com/intune/understand-explore/introduction-to-microsoft-intune). - Create self-contained provisioning packages built with the [Windows Configuration Designer](https://technet.microsoft.com/itpro/windows/deploy/provisioning-packages). From 27c091765bb73bff1392794229c675ef972c3ac4 Mon Sep 17 00:00:00 2001 From: Elizabeth Ross Date: Mon, 4 Dec 2017 18:20:05 +0000 Subject: [PATCH 11/13] Merged PR 4782: Merge inventory-nov to master Updates for basic level --- ...el-windows-diagnostic-events-and-fields.md | 205 +++++++++++++++++- ...change-history-for-configure-windows-10.md | 1 + 2 files changed, 202 insertions(+), 4 deletions(-) diff --git a/windows/configuration/basic-level-windows-diagnostic-events-and-fields.md b/windows/configuration/basic-level-windows-diagnostic-events-and-fields.md index cb11a4d0d9..6f2e45cc82 100644 --- a/windows/configuration/basic-level-windows-diagnostic-events-and-fields.md +++ b/windows/configuration/basic-level-windows-diagnostic-events-and-fields.md @@ -9,6 +9,7 @@ ms.pagetype: security ms.localizationpriority: high author: eross-msft ms.author: lizross +ms.date: 11/16/2017 --- @@ -16,7 +17,7 @@ ms.author: lizross **Applies to** -- Windows 10, version 1703 and later +- Windows 10, version 1703 The Basic level gathers a limited set of information that is critical for understanding the device and its configuration including: basic device information, quality-related information, app compatibility, and Microsoft Store. When the level is set to Basic, it also includes the Security level information. The Basic level also helps to identify problems that can occur on a particular device hardware or software configuration. For example, it can help determine if crashes are more frequent on devices with a specific amount of memory or that are running a particular driver version. This helps Microsoft fix operating system or app problems. @@ -26,7 +27,7 @@ Use this article to learn about diagnostic events, grouped by event area, and th - [Configure Windows telemetry in your organization](configure-windows-telemetry-in-your-organization.md) >[!Note] ->Updated July 2017 to document new and modified events. We’ve added new fields to several Appraiser events to prepare for upgrades to the next release of Windows and we’ve added a brand-new event, Census.Speech, to collect basic details about speech settings and configuration. +>Updated November 2017 to document new and modified events. We’ve added some new events and also added new fields to existing events to prepare for upgrades to the next release of Windows. ## Common data extensions @@ -592,6 +593,7 @@ The following fields are available: - **NotRegressed** Does the device have a problem code on the source OS that is no better than the one it would have on the target OS? - **SdbDeviceBlockUpgrade** Is there an SDB block on the PNP device that blocks upgrade? - **SdbDriverBlockOverridden** Is there an SDB block on the PNP device that blocks upgrade, but that block was overridden? +- **AssociatedDriverWillNotMigrate** Will the driver associated with this plug-and-play device migrate? ### Microsoft.Windows.Appraiser.General.DecisionDevicePnpRemove @@ -1475,6 +1477,7 @@ The following fields are available: - **IsDERequirementMet** Represents if the device can do device encryption. - **IsEDPEnabled** Represents if Enterprise data protected on the device. - **ContainerType** The type of container, such as process or virtual machine hosted. +- **EnrollmentType** Represents the type of enrollment, such as MDM or Intune, for a particular device. ### Census.Firmware @@ -1538,7 +1541,11 @@ The following fields are available: - **OEMModelBaseBoardVersion** Differentiates between developer and retail devices. - **ActiveMicCount** The number of active microphones attached to the device. - **OEMModelSystemVersion** The system model version set on the device by the OEM. - +- **D3DMaxFeatureLevel** The supported Direct3D version. +- **Gyroscope** Indicates whether the device has a gyroscope. +- **Magnetometer** Indicates whether the device has a magnetometer. +- **NFCProximity** Indicates whether the device supports NFC. +- **TelemetryLevelLimitEnhanced** The telemetry level for Windows Analytics-based solutions. ### Census.Memory @@ -1611,7 +1618,8 @@ The following fields are available: - **OSSubscriptionStatus** Represents the existing status for enterprise subscription feature for PRO machines. - **ServiceMachinePort** Retrieves the port of the KMS host used for anti-piracy. - **DeviceTimeZone** The time zone that is set on the device. Example: Pacific Standard Time -- **DeveloperUnlockStatus** Represents if a device has been developer unlocked by the user or Group Policy. +- **DeveloperUnlockStatus** Represents if a device has been developer unlocked by the user or Group Policy. +- **AssignedAccessStatus** The kiosk configuration mode. ### Census.Processor @@ -1628,6 +1636,7 @@ The following fields are available: - **ProcessorModel** Retrieves the name of the processor model. - **SocketCount** Number of physical CPU sockets of the machine. - **ProcessorIdentifier** The processor identifier of a manufacturer. +- **ProcessorUpdateRevision** The microcode version. ### Census.Speech @@ -1713,6 +1722,8 @@ The following fields are available: - **IOMMUPresent** Represents if an input/output memory management unit (IOMMU) is present. - **IsVirtualDevice** Retrieves that when the Hypervisor is Microsoft's Hyper-V Hypervisor or other Hv#1 Hypervisor, this field will be set to FALSE for the Hyper-V host OS and TRUE for any guest OS's. This field should not be relied upon for non-Hv#1 Hypervisors. - **HyperVisor** Retrieves whether the current OS is running on top of a Hypervisor. +- **CloudService** Indicates which cloud service, if any, that this virtual machine is running within. +- **isVDI** Is the device using Virtual Desktop Infrastructure? ### Census.WU @@ -1738,6 +1749,12 @@ The following fields are available: - **OSRollbackCount** The number of times feature updates have rolled back on the device. - **UninstallActive** A flag that represents when a device has uninstalled a previous upgrade recently. - **AppraiserGatedStatus** Indicates whether a device has been gated for upgrading. +- **OSAssessmentFeatureOutOfDate** How many days has it been since a the last feature update was released but the device did not install it? +- **OSAssessmentForFeatureUpdate** Is the device is on the latest feature update? +- **OSAssessmentForQualityUpdate** Is the device on the latest quality update? +- **OSAssessmentForSecurityUpdate** Is the device on the latest security update? +- **OSAssessmentQualityOutOfDate** How many days has it been since a the last quality update was released but the device did not install it? +- **OSAssessmentReleaseInfoTime** The freshness of release information used to perform an assessment. ### Census.Xbox @@ -1751,6 +1768,17 @@ The following fields are available: - **XboxLiveSandboxId** Retrieves the developer sandbox id if the device is internal to MS. - **XboxConsolePreferredLanguage** Retrieves the preferred language selected by the user on Xbox console. +### Census.Security + +This event provides information on about security settings used to help keep Windows up-to-date and secure. + +- **AvailableSecurityProperties** Enumerates and reports state on the relevant security properties for Device Guard. +- **CGRunning** Is Credential Guard running? +- **DGState** A summary of the Device Guard state. +- **HVCIRunning** Is HVCI running? +- **RequiredSecurityProperties** Describes the required security properties to enable virtualization-based security. +- **SecureBootCapable** Is this device capable of running Secure Boot? +- **VBSState** Is virtualization-based security enabled, disabled, or running? ## Diagnostic data events @@ -2001,7 +2029,24 @@ The following fields are available: - **aeinv** The version of the App inventory component. - **devinv** The file version of the Device inventory component. +### Microsoft.Windows.Inventory.Core.InventoryDeviceUsbHubClassStartSync +This event indicates that a new set of InventoryDeviceUsbHubClassAdd events will be sent + +The following fields are available: + +- **InventoryVersion** The version of the inventory file generating the events +- +### Microsoft.Windows.Inventory.Core.InventoryDeviceUsbHubClassAdd + +This event sends basic metadata about the USB hubs on the device + +The following fields are available: + +- **InventoryVersion** The version of the inventory file generating the events +- **TotalUserConnectablePorts** Total number of connectable USB ports +- **TotalUserConnectableTypeCPorts** Total number of connectable USB Type C ports +- ### Microsoft.Windows.Inventory.Core.InventoryApplicationAdd This event sends basic metadata about an application on the system to help keep Windows up to date. @@ -2120,6 +2165,7 @@ The following fields are available: - **RelativeOrientation** Indicates if a Relative Orientation sensor is found. - **SimpleDeviceOrientation** Indicates if a Simple Device Orientation sensor is found. - **Temperature** Indicates if a Temperature sensor is found. +- **EnergyMeter** Indicates if an Energy sensor is found. ### Microsoft.Windows.Inventory.Core.InventoryDeviceInterfaceStartSync @@ -2282,6 +2328,7 @@ The following fields are available: - **SubmissionId** The HLK submission ID for the driver package. - **PartB_Ms.Device.DeviceInventoryChange** See the Common Data Fields section. - **InventoryVersion** The version of the inventory file generating the events. +- **DriverInBox** Is the driver included with the operating system? ### Microsoft.Windows.Inventory.Core.InventoryDriverPackageRemove @@ -2313,6 +2360,53 @@ The following fields are available: - **ChecksumDictionary** A count of each operating system indicator. - **PCFP** Equivalent to the InventoryId field that is found in other core events. +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeVBAAdd + +This event provides a summary rollup count of conditions encountered while performing a local scan of Office files, analyzing for known VBA programmability compatibility issues between legacy office version and ProPlus, and between 32 and 64-bit versions + +The following fields are available: + +- **Design** Count of files with design issues found +- **Design_x64** Count of files with 64 bit design issues found +- **DuplicateVBA** Count of files with duplicate VBA code +- **HasVBA** Count of files with VBA code +- **Inaccessible** Count of files that were inaccessible for scanning +- **Issues** Count of files with issues detected +- **Issues_x64** Count of files with 64-bit issues detected +- **IssuesNone** Count of files with no issues detected +- **IssuesNone_x64** Count of files with no 64-bit issues detected +- **Locked** Count of files that were locked, preventing scanning +- **NoVBA** Count of files with no VBA inside +- **Protected** Count of files that were password protected, preventing scanning +- **RemLimited** Count of files that require limited remediation changes +- **RemLimited_x64** Count of files that require limited remediation changes for 64-bit issues +- **RemSignificant** Count of files that require significant remediation changes +- **RemSignificant_x64** Count of files that require significant remediation changes for 64-bit issues +- **Score** Overall compatibility score calculated for scanned content +- **Score_x64** Overall 64-bit compatibility score calculated for scanned content +- **Total** Total number of files scanned +- **Validation** Count of files that require additional manual validation +- **Validation_x64** Count of files that require additional manual validation for 64-bit issues + +### Microsoft.Windows.Inventory.Core.InventoryApplicationFrameworkStartSync + +This event indicates that a new set of InventoryApplicationFrameworkAdd events will be sent + +The following fields are available: + +- **InventoryVersion** The version of the inventory file generating the events + +### Microsoft.Windows.Inventory.Core.InventoryApplicationFrameworkAdd + +This event provides the basic metadata about the frameworks an application may depend on + +The following fields are available: + +- **FileId** A hash that uniquely identifies a file +- **Frameworks** The list of frameworks this file depends on +- **InventoryVersion** The version of the inventory file generating the events +- **ProgramId** A hash of the Name, Version, Publisher, and Language of an application used to identify it + ### Microsoft.Windows.Inventory.Indicators.InventoryMiscellaneousUexIndicatorAdd @@ -2323,6 +2417,17 @@ The following fields are available: - **PartB_Ms.Device.DeviceInventoryChange** See the Common Data Fields section. - **IndicatorValue** The indicator value +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeVBARuleViolationsStartSync + +This event indicates that a new sync is being generated for this object type. + +There are no fields in this event. + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeVBAStartSync + +This event indicates that a new sync is being generated for this object type. + +There are no fields in this event. ### Microsoft.Windows.Inventory.Indicators.InventoryMiscellaneousUexIndicatorRemove @@ -2341,6 +2446,98 @@ The following fields are available: - **PartB_Ms.Device.DeviceInventoryChange** See the Common Data Fields section. +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeVBARuleViolationsAdd + +This event provides data on Microsoft Office VBA rule violations, including a rollup count per violation type, giving an indication of remediation requirements for an organization. The event identifier is a unique GUID, associated with the validation rule + +The following fields are available: + +- **Count** Count of total Microsoft Office VBA rule violations + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeAddInAdd + +This event provides data on the installed Office Add-ins. + +- **AddInCLSID** The CLSID key office the Office addin. +- **AddInId** The ID of the Office addin. +- **BinFileTimestamp** The timestamp of the Office addin. +- **BinFileVersion** The version of the Office addin. +- **Description** The description of the Office addin. +- **FileId** The file ID of the Office addin. +- **FriendlyName** The friendly name of the Office addin. +- **FullPath** The full path to the Office addin. +- **LoadBehavior** A Uint32 that describes the load behavior. +- **LoadTime** The load time for the Office addin. +- **OfficeApplication** The OIffice application for this addin. +- **OfficeArchitecture** The architecture of the addin. +- **OfficeVersion** The Office version for this addin. +- **OutlookCrashingAddin** A boolean value that indicates if crashes have been found for this addin. +- **Provider** The provider name for this addin. + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeAddInStartSync + +This event indicates that a new sync is being generated for this object type. + +There are no fields in this event. + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeIdentifiersAdd + +This event provides data on the installed Office identifiers. + +- **OAudienceData** The Office Audience descriptor. +- **OAudienceId** The Office Audience ID. +- **OMID** The Office machine ID. +- **OPlatform** The Office architecture. +- **OVersion** The Office version +- **OTenantId** The Office 365 Tenant GUID. +- **OWowMID** The Office machine ID. + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeIdentifiersStartSync + +This event indicates that a new sync is being generated for this object type. + +There are no fields in this event. + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeIESettingsStartSync + +This event indicates that a new sync is being generated for this object type. + +There are no fields in this event. + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeProductsStartSync + +This event indicates that a new sync is being generated for this object type. + +There are no fields in this event. + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeIESettingsAdd + +This event provides data on the installed Office-related Internet Explorer features. + +- **OIeFeatureAddon** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeMachineLockdown** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeMimeHandling** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeMimeSniffing** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeNoAxInstall** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeNoDownload** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeObjectCaching** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIePasswordDisable** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeSafeBind** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeSecurityBand** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeUncSaveCheck** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeValidateUrl** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeWebOcPopup** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeWinRestrict** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). +- **OIeZoneElevate** For more information, see the Office-related [Internet Feature Control Keys](https://msdn.microsoft.com/en-us/library/ee330720.aspx). + +### Microsoft.Windows.Inventory.General.InventoryMiscellaneousOfficeProductsAdd + +This event describes the Office products that are installed. + +- **OC2rApps** The Office Click-to-Run apps. +- **OC2rSkus** The Office Click-to-Run products. +- **OMsiApps** The Office MSI apps. +- **OProductCodes** The Office MSI product code. ## OneDrive events diff --git a/windows/configuration/change-history-for-configure-windows-10.md b/windows/configuration/change-history-for-configure-windows-10.md index 95fedcd1de..22ca0d610d 100644 --- a/windows/configuration/change-history-for-configure-windows-10.md +++ b/windows/configuration/change-history-for-configure-windows-10.md @@ -19,6 +19,7 @@ This topic lists new and updated topics in the [Configure Windows 10](index.md) New or changed topic | Description --- | --- +|[Windows 10, version 1703 basic level Windows diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields.md)| Added events that were added in November. | [Create a provisioning package with multivariant settings](provisioning-packages/provisioning-multivariant.md) | Add support for desktop to [Conditions](provisioning-packages/provisioning-multivariant.md#conditions) table. ## October 2017 From aaf00adaaf26965e484b2828d9a4888eb7de8eec Mon Sep 17 00:00:00 2001 From: Elizabeth Ross Date: Mon, 4 Dec 2017 18:20:45 +0000 Subject: [PATCH 12/13] Merged PR 4783: Fixed text Fixed text --- .../enterprise-mode-schema-version-2-guidance.md | 2 +- .../use-the-enterprise-mode-site-list-manager.md | 4 ++-- .../ie11-deploy-guide/what-is-enterprise-mode.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browsers/internet-explorer/ie11-deploy-guide/enterprise-mode-schema-version-2-guidance.md b/browsers/internet-explorer/ie11-deploy-guide/enterprise-mode-schema-version-2-guidance.md index 175f5657b4..472e5badc1 100644 --- a/browsers/internet-explorer/ie11-deploy-guide/enterprise-mode-schema-version-2-guidance.md +++ b/browsers/internet-explorer/ie11-deploy-guide/enterprise-mode-schema-version-2-guidance.md @@ -31,7 +31,7 @@ Because of the schema changes, you can't combine the old version (v.1) with the - <site-list>. If your schema root node includes this key, you're using the v.2 version of the schema. -You can continue to use the v.1 version of the schema on Windows 10, but you won't have the benefits of the new v.2 version schema updates and new features. Additionally, if you save the v.1 version of the schema in the new Enterprise Mode Site List Manager (schema v.2), it will automatically update the file to use the v.2 version of the schema. +You can continue to use the v.1 version of the schema on Windows 10, but you won't have the benefits of the new v.2 version schema updates and new features. Additionally, saving the v.1 version of the schema in the new Enterprise Mode Site List Manager (schema v.2) automatically updates the file to use the v.2 version of the schema. ### Enterprise Mode v.2 schema example The following is an example of the v.2 version of the Enterprise Mode schema. diff --git a/browsers/internet-explorer/ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md b/browsers/internet-explorer/ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md index c835ab4697..839239f239 100644 --- a/browsers/internet-explorer/ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md +++ b/browsers/internet-explorer/ie11-deploy-guide/use-the-enterprise-mode-site-list-manager.md @@ -30,8 +30,8 @@ There are currently two versions of the Enterprise Site List Manager, both based |Schema version |Operating system |Enterprise Site List Manager version | |-----------------|---------------|------------------------------------| -|Enterprise Mode schema, version 2 (v.2) |

[Windows 10 2015 Fall Update](https://blogs.windows.com/msedgedev/2015/11/23/windows-10-1511-enterprise-improvements/)

-OR-

[Windows 8.1 June 2016 Cumulative Update](https://blogs.windows.com/msedgedev/2016/06/14/new-enterprise-improvements-coming-to-ie11-on-windows-7-and-8-1/)

-OR-

[Windows 7 2016 June Cumulative Update](https://blogs.windows.com/msedgedev/2016/06/14/new-enterprise-improvements-coming-to-ie11-on-windows-7-and-8-1/) |Both versions of the enterprise mode schema are supported. However, the Enterprise Mode Site List Manager (schema v.2) only supports the v.2 version of the schema. If you import a v.1 version schema into the Enterprise Mode Site List Manager (schema v.2), it will save the XML into the v.2 version of the schema.

For more info about the different schema versions, see [Enterprise Mode schema v.2 guidance](enterprise-mode-schema-version-2-guidance.md) | -|Enterprise Mode schema, version 1 (v.1) |

Windows 10

-OR-

Windows 8.1

-OR-

Windows 7 |Uses the Enterprise Mode Site List Manager (schema v.1).

For more info about the different schema versions, see [Enterprise Mode schema v.1 guidance](enterprise-mode-schema-version-1-guidance.md) | +|Enterprise Mode schema, version 2 (v.2) |Windows 10
-OR-
Windows 8.1
-OR-
Windows 7|Uses the Enterprise Mode Site List Manager (schema v.2) and the v.2 version of the schema. If you import a v.1 version schema into the Enterprise Mode Site List Manager (schema v.2), the XML is saved into the v.2 version of the schema.

For more info about the v.2 version of the schema, see [Enterprise Mode schema v.2 guidance](enterprise-mode-schema-version-2-guidance.md).| +|Enterprise Mode schema, version 1 (v.1) |Windows 10
-OR-
Windows 8.1
-OR-
Windows 7|Uses the Enterprise Mode Site List Manager (schema v.1) and the v.1 version of the schema.

For more info about the v.1 version of the schema, see [Enterprise Mode schema v.1 guidance](enterprise-mode-schema-version-1-guidance.md)| ## Using the Enterprise Mode Site List Manager The following topics give you more information about the things that you can do with the Enterprise Mode Site List Manager. diff --git a/browsers/internet-explorer/ie11-deploy-guide/what-is-enterprise-mode.md b/browsers/internet-explorer/ie11-deploy-guide/what-is-enterprise-mode.md index acda0831fc..d6d34cf194 100644 --- a/browsers/internet-explorer/ie11-deploy-guide/what-is-enterprise-mode.md +++ b/browsers/internet-explorer/ie11-deploy-guide/what-is-enterprise-mode.md @@ -37,7 +37,7 @@ Based on the size of your legacy web app dependency, determined by the data coll For more info about when to use which option, and which option is best for you, see the [Continuing to make it easier for Enterprise customers to upgrade to Internet Explorer 11 — and Windows 10](https://blogs.windows.com/msedgedev/2015/11/23/windows-10-1511-enterprise-improvements) blog. ## What is Enterprise Mode? -Enterprise Mode, a compatibility mode that runs on Internet Explorer 11 on Windows 10, Windows 8.1 and Windows 7 devices, lets websites render using a modified browser configuration that’s designed to emulate either Windows Internet Explorer 7 or Windows Internet Explorer 8, avoiding the common compatibility problems associated with web apps written and tested on older versions of Internet Explorer. +Enterprise Mode, a compatibility mode that runs on Internet Explorer 11 on Windows 10, Windows 8.1, and Windows 7 devices, lets websites render using a modified browser configuration that’s designed to emulate either Windows Internet Explorer 7 or Windows Internet Explorer 8. Running in this mode helps to avoid many of the common compatibility problems associated with web apps written and tested on older versions of Internet Explorer. Many customers identify web app compatibility as a significant cost to upgrading because web apps need to be tested and upgraded before adopting a new browser. The improved compatibility provided by Enterprise Mode can help give customers confidence to upgrade to IE11, letting customers benefit from modern web standards, increased performance, improved security, and better reliability. From 5e074e8fcf8598d2bf5cb8ddbc1c60af0509db64 Mon Sep 17 00:00:00 2001 From: Mike Stephens Date: Mon, 4 Dec 2017 10:21:38 -0800 Subject: [PATCH 13/13] Minor text edit --- .../hello-for-business/hello-identity-verification.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/access-protection/hello-for-business/hello-identity-verification.md b/windows/access-protection/hello-for-business/hello-identity-verification.md index 71173211b8..b0e4a403a4 100644 --- a/windows/access-protection/hello-for-business/hello-identity-verification.md +++ b/windows/access-protection/hello-for-business/hello-identity-verification.md @@ -104,7 +104,7 @@ There are many deployment options from which to choose. Some of those options re Windows Hello for Business is two-factor authentication based the observed authentication factors of: something you have, something you know, and something part of you. Windows Hello for Business incorporates two of these factors: something you have (the user's private key protected by the device's security module) and something you know (your PIN). With the proper hardware, you can enhance the user experience by introducing biometrics. Using biometrics, you can replace the "something you know" authentication factor with the "something that is part of you" factor, with the assurances that users can fall back to the "something you know factor". ### Can I use PIN and biometrics to unlock my device? -No. Windows Hello for Business provides two-factor authentication. However, starting in Windows 10, version 1709, you can use multifactor unlock to require the user to provide an additional factor to unlock the device. Authentication remains two-factor, but another factor is required before Windows allows the user to reach the desktop. Read more about [multifactor unlock](https://docs.microsoft.com/en-us/windows/access-protection/hello-for-business/hello-features#multifactor-unlock) in [Windows Hello for Business Features](#hello-features.md) +Starting in Windows 10, version 1709, you can use multifactor unlock to require the user to provide an additional factor to unlock the device. Authentication remains two-factor, but another factor is required before Windows allows the user to reach the desktop. Read more about [multifactor unlock](https://docs.microsoft.com/en-us/windows/access-protection/hello-for-business/hello-features#multifactor-unlock) in [Windows Hello for Business Features](#hello-features.md) ### What is the difference between Windows Hello and Windows Hello for Business Windows Hello represents the biometric framework provided in Windows 10. Windows Hello enables users to use biometrics to sign into their devices by securely storing their username and password and releasing it for authentication when the user successfully identifies themselves using biometrics. Windows Hello for Business uses asymmetric keys protected by the device's security module that requires a user gesture (PIN or biometrics) to authenticate.