Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7332923

.openpublishing.publish.config.json

@@ -61,6 +61,16 @@
             "type_mapping": {
                 "Conceptual": "Content"
             }
+        },
+        {
+            "docset_name": "education",
+            "build_output_subfolder": "education",
+            "locale": "en-us",
+            "version": 0,
+            "open_to_public_contributors": "false",
+            "type_mapping": {
+                "Conceptual": "Content"
+            }
         }
     ],
     "notification_subscribers": ["brianlic@microsoft.com"],

browsers/internet-explorer/ie11-deploy-guide/out-of-date-activex-control-blocking.md

@@ -87,7 +87,7 @@ IE opens the app’s website.
 IE uses Microsoft’s versionlist.xml or versionlistWin7.xml file to determine whether an ActiveX control should be stopped from loading. These files are updated with newly-discovered out-of-date ActiveX controls, which IE automatically downloads to your local copy of the file.
 
 You can see your copy of the file here `%LOCALAPPDATA%\Microsoft\Internet Explorer\VersionManager\versionlist.xml` or you can view Microsoft’s version, based on your operating system and version of IE, here:
-- [Internet Explorer 11 on Windows 7 SP1 or Windows Server 2008 R2](http://go.microsoft.com/fwlink/p/?LinkId=403864)
+- [Internet Explorer 11 on Windows 7 SP1 or Windows Server 2008 R2](http://go.microsoft.com/fwlink/p/?LinkId=798230)
 - [All other configurations](https://go.microsoft.com/fwlink/p/?LinkId=403864)
 
 **Security Note:**<br>Although we strongly recommend against it, if you don’t want your computer to automatically download the updated version list from Microsoft, run the following command from a command prompt:

education/docfx.json

@@ -0,0 +1,24 @@
+{
+  "build": {
+    "content":
+      [
+        {
+          "files": ["**/**.md"],
+          "exclude": ["**/obj/**"]
+        }
+      ],
+    "resource": [
+        {
+          "files": ["**/images/**", "**/*.json"],
+          "exclude": ["**/obj/**"]
+        }
+    ],
+    "globalMetadata": {
+        "ROBOTS": "INDEX, FOLLOW"
+    },
+    "externalReference": [
+    ],
+    "template": "op.html",
+    "dest": "education"
+  }
+}

education/index.md

@@ -0,0 +1 @@
+#OP Testing file

windows/keep-secure/microsoft-passport-guide.md

@@ -4,6 +4,7 @@ description: This guide describes the new Windows Hello and Microsoft Passport t
 ms.assetid: 11EA7826-DA6B-4E5C-99FB-142CC6BD9E84
 keywords: ["security", "credential", "password", "authentication"]
 ms.prod: W10
+ms.pagetype: security
 ms.mktglfcycl: plan
 ms.sitesec: library
 author: challum
@@ -405,7 +406,7 @@ Table 1. Deployment requirements for Microsoft Passport
 
  
 
-Note that the current release of Windows 10 supports the Azure AD–only scenarios. Microsoft provides the forward-looking guidance in Table 1 to help organizations prepare their environments for planned future releases of Microsoft Passport for Work capabilities.
+Note that the current release of Windows 10 supports the Azure AD–only (RTM) and hybrid scenarios (RTM + November Update). Microsoft provides the forward-looking guidance in Table 1 to help organizations prepare their environments for planned future releases of Microsoft Passport for Work capabilities.
 
 **Select policy settings**
 
@@ -465,16 +466,18 @@ In the Windows 10 initial release, Microsoft supports the following Microsoft P
 
 -   Microsoft Passport for Work support for organizations that have cloud-only Azure AD deployments
 
--   Group Policy settings to control Microsoft Passport PIN length and complexity
+-   Group Policy and MDM settings to control Microsoft Passport PIN length and complexity
 
-In future releases of Windows 10, we plan to add support for additional features:
-
--   Additional biometric identifier types, including iris recognition
+In the November 2015 release, Microsoft supports the following Microsoft Passport and Windows Hello features:
 
 - Key-based Microsoft Passport for Work credentials for on-premises Azure AD deployments and hybrid on-premises/Azure AD deployments
 
 - Microsoft Passport for Work certificates issued by a trusted PKI, including smart card and virtual smart card certificates
 
+In future releases of Windows 10, we plan to add support for additional features:
+
+- Key-based and certificate-based Microsoft Passport for Work credentials for on-premises AD deployments
+ 
 - TPM attestation to protect keys so that a malicious user or program can’t create keys in software (because those keys won’t be TPM attested and can thus be identified as fake)
 
 In the longer term, Microsoft will continue to improve on and expand the features of both Microsoft Passport and Windows Hello to cover additional customer requirements for manageability and security. We also are working with the FIDO Alliance and a variety of third parties to encourage adoption of Microsoft Passport by both web and LOB application developers.