Merge remote-tracking branch 'refs/remotes/origin/master' into dh-whfb-sandbox

windows/device-security/device-guard/deploy-device-guard-deploy-code-integrity-policies.md

@@ -20,6 +20,7 @@ This section includes the following topics:
 - [Deploy code integrity policies: policy rules and file rules](deploy-code-integrity-policies-policy-rules-and-file-rules.md)
 - [Deploy code integrity policies: steps](deploy-code-integrity-policies-steps.md)
 - [Deploy catalog files to support code integrity policies](deploy-catalog-files-to-support-code-integrity-policies.md)
+- [Deploy Managed Installer for Device Guard](deploy-managed-installer-for-device-guard.md)
 
 To increase the protection for devices that meet certain hardware requirements, you can use virtualization-based security (VBS) with your code integrity policies.
 - For requirements, see [Hardware, firmware, and software requirements for Device Guard](requirements-and-deployment-planning-guidelines-for-device-guard.md#hardware-firmware-and-software-requirements-for-device-guard) in "Requirements and deployment planning guidelines for Device Guard."

windows/device-security/docfx.json

@@ -0,0 +1,41 @@
+{
+  "build": {
+    "content": [
+      {
+        "files": [
+          "**/*.md"
+        ],
+        "exclude": [
+          "**/obj/**",
+          "**/includes/**",
+          "README.md",
+          "LICENSE",
+          "LICENSE-CODE",
+          "ThirdPartyNotices"
+        ]
+      }
+    ],
+    "resource": [
+      {
+        "files": [
+          "**/*.png",
+          "**/*.jpg",
+		  "**/*.gif"
+        ],
+        "exclude": [
+          "**/obj/**",
+          "**/includes/**"
+        ]
+      }
+    ],
+    "overwrite": [],
+    "externalReference": [],
+    "globalMetadata": {
+		"uhfHeaderId": "MSDocsHeader-WindowsIT", 
+		"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json"
+	},
+    "fileMetadata": {},
+    "template": [],
+    "dest": "win-device-security"
+  }
+}

windows/device-security/index.md

@@ -24,5 +24,3 @@ Learn more about how to help secure your Windows 10 and Windows 10 Mobile devi
 | [Trusted Platform Module](tpm/trusted-platform-module-top-node.md)| Provides links to information about the Trusted Platform Module (TPM), which is a secure crypto-processor that helps you with actions such as generating, storing, and limiting the use of cryptographic keys. |
 | [Windows 10 Mobile security guide](windows-10-mobile-security-guide.md) | Learn more about securing your Windows 10 Mobile devices. |
 | [Windows security baselines](windows-security-baselines.md) | Learn why you should use security baselines in your organization. |
- 
-