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

.openpublishing.publish.config.json

@@ -27,8 +27,8 @@
     },
     {
       "docset_name": "itpro-hololens",
-      "build_source_folder": "itpro-hololens",
+      "build_source_folder": "devices/hololens",
-      "build_output_subfolder": "itpro-hololens",
+      "build_output_subfolder": "devices/hololens",
       "locale": "en-us",
       "version": 0,
       "open_to_public_contributors": false,

devices/hololens/docfx.json

@@ -7,7 +7,7 @@
         ],
         "exclude": [
           "**/obj/**",
-          "itpro-hololens/**",
+          "devices/hololens/**",
           "**/includes/**"
         ]
       }
@@ -20,7 +20,7 @@
         ],
         "exclude": [
           "**/obj/**",
-          "itpro-hololens/**",
+          "devices/hololens/**",
           "**/includes/**"
         ]
       }
@@ -32,6 +32,6 @@
     "template": [
       null
     ],
-    "dest": "itpro-hololens"
+    "dest": "devices/hololens"
   }
 }

itpro/hololens/TOC.md

@@ -1 +0,0 @@
-# [Index](index.md)

itpro/hololens/docfx.json

@@ -1,37 +0,0 @@
-{
-  "build": {
-    "content": [
-      {
-        "files": [
-          "**/*.md"
-        ],
-        "exclude": [
-          "**/obj/**",
-          "itpro-hololens/**",
-          "**/includes/**"
-        ]
-      }
-    ],
-    "resource": [
-      {
-        "files": [
-          "**/*.png",
-          "**/*.jpg"
-        ],
-        "exclude": [
-          "**/obj/**",
-          "itpro-hololens/**",
-          "**/includes/**"
-        ]
-      }
-    ],
-    "overwrite": [],
-    "externalReference": [],
-    "globalMetadata": {},
-    "fileMetadata": {},
-    "template": [
-      null
-    ],
-    "dest": "itpro-hololens"
-  }
-}

itpro/hololens/index.md

@@ -1 +0,0 @@
-# Index test file for Open Publishing

windows/keep-secure/credential-guard.md

@@ -115,6 +115,11 @@ The PC must meet the following hardware and software requirements to use Credent
 <td align="left"><p>Virtual machine</p></td>
 <td align="left"><p>For PCs running Windows 10, version 1607, you can run Credential Guard on a Generation 2 virtual machine.</p></td>
 </tr>
+</tr>
+<tr class="even">
+<td align="left"><p>Hypervisor</p></td>
+<td align="left"><p>Only the Windows hypervisor is supported.</p></td>
+</tr>
 </tbody>
 </table>