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

.openpublishing.publish.config.json

@@ -1,6 +1,22 @@
 {
   "build_entry_point": "",
   "docsets_to_publish": [
+    {
+      "docset_name": "bcs-vsts",
+      "build_source_folder": "bcs",
+      "build_output_subfolder": "bcs-vsts",
+      "locale": "en-us",
+      "monikers": [],
+      "moniker_ranges": [],
+      "open_to_public_contributors": false,
+      "type_mapping": {
+        "Conceptual": "Content",
+        "ManagedReference": "Content",
+        "RestApi": "Content"
+      },
+      "build_entry_point": "docs",
+      "template_folder": "_themes"
+    },
     {
       "docset_name": "education-VSTS",
       "build_source_folder": "education",
@@ -126,7 +142,7 @@
       "locale": "en-us",
       "monikers": [],
       "moniker_ranges": [],
-      "open_to_public_contributors": false,
+      "open_to_public_contributors": true,
       "type_mapping": {
         "Conceptual": "Content",
         "ManagedReference": "Content",

bcs/TOC.md

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

bcs/breadcrumb/toc.yml

@@ -0,0 +1,3 @@
+- name: Docs
+  tocHref: /
+  topicHref: /

bcs/docfx.json

@@ -0,0 +1,45 @@
+{
+  "build": {
+    "content": [
+      {
+        "files": [
+          "**/*.md",
+          "**/*.yml"
+        ],
+        "exclude": [
+          "**/obj/**",
+          "**/includes/**",
+          "_themes/**",
+          "_themes.pdf/**",
+          "README.md",
+          "LICENSE",
+          "LICENSE-CODE",
+          "ThirdPartyNotices"
+        ]
+      }
+    ],
+    "resource": [
+      {
+        "files": [
+          "**/*.png",
+          "**/*.jpg"
+        ],
+        "exclude": [
+          "**/obj/**",
+          "**/includes/**",
+          "_themes/**",
+          "_themes.pdf/**"
+        ]
+      }
+    ],
+    "overwrite": [],
+    "externalReference": [],
+    "globalMetadata": {
+      "breadcrumb_path": "/microsoft-365/business/breadcrumb/toc.json",
+      "extendBreadcrumb": true
+    },
+    "fileMetadata": {},
+    "template": [],
+    "dest": "bcs-vsts"
+  }
+}

bcs/index.md

@@ -0,0 +1,3 @@
+---
+redirect_url: https://docs.microsoft.com/microsoft-365/business/index
+---

bcs/support/microsoft-365-business-faqs.md

@@ -0,0 +1,3 @@
+---
+redirect_url: https://docs.microsoft.com/microsoft-365/business/support/microsoft-365-business-faqs
+---

bcs/support/transition-csp-subscription.md

@@ -0,0 +1,3 @@
+---
+redirect_url: https://docs.microsoft.com/microsoft-365/business/support/transition-csp-subscription
+---

windows/access-protection/index.md

@@ -1,29 +1,3 @@
 ---
-title: Access protection (Windows 10)
+redirect_url: https://docs.microsoft.com/windows/security/identity-protection/
-description: Learn more about access protection technologies in Windows 10 and Windows 10 Mobile.
-ms.prod: w10
-ms.mktglfcycl: deploy
-ms.sitesec: library
-ms.pagetype: security
-author: brianlic-msft
-ms.date: 04/24/2017
 ---
-
-# Access protection
-
-Learn more about access protection technologies in Windows 10 and Windows 10 Mobile.
-
-| Section | Description |
-|-|-|
-| [Access control](access-control/access-control.md) | Describes access control in Windows, which is the process of authorizing users, groups, and computers to access objects on the network or computer. Key concepts that make up access control are permissions, ownership of objects, inheritance of permissions, user rights, and object auditing. |
-| [Configure S/MIME for Windows 10 and Windows 10 Mobile](configure-s-mime.md) | In Windows 10, S/MIME lets users encrypt outgoing messages and attachments so that only intended recipients who have a digital identification (ID), also known as a certificate, can read them. Users can digitally sign a message, which provides the recipients with a way to verify the identity of the sender and that the message hasn't been tampered with. |
-| [Install digital certificates on Windows 10 Mobile](installing-digital-certificates-on-windows-10-mobile.md) | Digital certificates bind the identity of a user or computer to a pair of keys that can be used to encrypt and sign digital information. Certificates are issued by a certification authority (CA) that vouches for the identity of the certificate holder, and they enable secure client communications with websites and services. |
-| [Protect derived domain credentials with Credential Guard](credential-guard/credential-guard.md) | Introduced in Windows 10 Enterprise, Credential Guard uses virtualization-based security to isolate secrets so that only privileged system software can access them. Unauthorized access to these secrets can lead to credential theft attacks, such as Pass-the-Hash or Pass-The-Ticket. Credential Guard helps prevent these attacks by protecting NTLM password hashes and Kerberos Ticket Granting Tickets. |
-| [Protect Remote Desktop credentials with Remote Credential Guard](remote-credential-guard.md) | Remote Credential Guard helps you protect your credentials over a Remote Desktop connection by redirecting the Kerberos requests back to the device that's requesting the connection. |
-| [User Account Control](user-account-control/user-account-control-overview.md)| Provides information about User Account Control (UAC), which helps prevent malware from damaging a PC and helps organizations deploy a better-managed desktop. UAC can help block the automatic installation of unauthorized apps and prevent inadvertent changes to system settings.|
-| [Virtual Smart Cards](virtual-smart-cards/virtual-smart-card-overview.md) | Provides information about deploying and managing virtual smart cards, which are functionally similar to physical smart cards and appear in Windows as smart cards that are always-inserted. Virtual smart cards use the Trusted Platform Module (TPM) chip that is available on computers in many organizations, rather than requiring the use of a separate physical smart card and reader. |
-| [VPN technical guide](vpn/vpn-guide.md) | Virtual private networks (VPN) let you give your users secure remote access to your company network. Windows 10 adds useful new VPN profile options to help you manage how users connect. |
-| [Smart Cards](smart-cards/smart-card-windows-smart-card-technical-reference.md) | Provides a collection of references topics about smart cards, which are tamper-resistant portable storage devices that can enhance the security of tasks such as authenticating clients, signing code, securing e-mail, and signing in with a Windows domain account. |
-| [Windows Hello for Business](hello-for-business/hello-identity-verification.md) | In Windows 10, Windows Hello replaces passwords with strong two-factor authentication on PCs and mobile devices. This authentication consists of a new type of user credential that is tied to a device and a biometric or PIN. |
-| [Windows Firewall with Advanced Security](windows-firewall/windows-firewall-with-advanced-security.md) | Provides information about Windows Firewall with Advanced Security, which is an important part of a layered security model. By providing host-based, two-way network traffic filtering for a device, Windows Firewall with Advanced Security blocks unauthorized network traffic flowing into or out of the local device. |
-| [Windows 10 Credential Theft Mitigation Guide Abstract](windows-credential-theft-mitigation-guide-abstract.md) | Learn more about credential theft mitigation in Windows 10. |

windows/device-security/change-history-for-device-security.md

@@ -1,52 +0,0 @@
----
-title: Change history for device security (Windows 10)
-description: This topic lists new and updated topics in the Windows 10 device security documentation for Windows 10 and Windows 10 Mobile.
-ms.prod: w10
-ms.mktglfcycl: deploy
-ms.sitesec: library
-ms.pagetype: security
-author: brianlic-msft
-ms.date: 11/27/2017
----
-
-# Change history for device security
-This topic lists new and updated topics in the [Device security](index.md) documentation.
-
-## November 2017
-|New or changed topic |Description |
-|---------------------|------------|
-| [How to enable virtualization-based protection of code integrity](enable-virtualization-based-protection-of-code-integrity.md)| New. Explains how to enable HVCI.  |
-
-## October 2017
-|New or changed topic |Description |
-|---------------------|------------|
-| [TPM fundamentals](tpm/tpm-fundamentals.md)<br>[BitLocker Group Policy settings](bitlocker/bitlocker-group-policy-settings.md) | Explained the change to allow reducing the maximum PIN length from 6 characters to 4. |
-| [Windows security baselines](windows-security-baselines.md) | New. Security baselines added for Windows 10, versions 1703 and 1709. |
-| [Security Compliance Toolkit](security-compliance-toolkit-10.md) | New. Includes a link to tools for managing security baselines. |
-| [Get support for security baselines](get-support-for-security-baselines.md) | New. Explains supported versions for security baselines and other support questions.  |
-
-
-
-## August 2017
-|New or changed topic |Description |
-|---------------------|------------|
-| [BitLocker: Management recommendations for enterprises](bitlocker/bitlocker-management-for-enterprises.md) | New BitLocker security topic. |
-| [Accounts: Block Microsoft accounts](security-policy-settings/accounts-block-microsoft-accounts.md) | Revised description |
-
-
-## July 2017
-|New or changed topic |Description |
-|---------------------|------------|
-| [How Windows 10 uses the Trusted Platform Module](tpm/how-windows-uses-the-tpm.md) | New TPM security topic. |
-
-
-## May 2017
-|New or changed topic |Description |
-|---------------------|------------|
-| [BitLocker Group Policy settings](bitlocker/bitlocker-group-policy-settings.md) | Changed startup PIN minimun length from 4 to 6. |
-| [Network access: Restrict clients allowed to make remote calls to SAM](security-policy-settings/network-access-restrict-clients-allowed-to-make-remote-sam-calls.md) | New security policy setting. |
-
-## March 2017
-|New or changed topic |Description |
-|---------------------|------------|
-|[Requirements and deployment planning guidelines for Device Guard](device-guard/requirements-and-deployment-planning-guidelines-for-device-guard.md) | Updated to include additional security qualifications starting with Windows 10, version 1703.|

windows/device-security/index.md

@@ -1,27 +1,3 @@
 ---
-title: Device Security (Windows 10)
+redirect_url: https://docs.microsoft.com/windows/security/threat-protection/
-description: Learn more about how to help secure your Windows 10 and Windows 10 Mobile devices.
-ms.prod: w10
-ms.mktglfcycl: deploy
-ms.sitesec: library
-ms.pagetype: security
-author: brianlic-msft
-ms.date: 04/24/2017
 ---
-
-# Device Security
-
-Learn more about how to help secure your Windows 10 and Windows 10 Mobile devices.
-
-| Section | Description |
-|-|-|
-| [AppLocker](applocker/applocker-overview.md)| Describes AppLocker, and can help you decide if your organization can benefit from deploying AppLocker application control policies. AppLocker helps you control which apps and files users can run. These include executable files, scripts, Windows Installer files, dynamic-link libraries (DLLs), packaged apps, and packaged app installers.|
-| [BitLocker](bitlocker/bitlocker-overview.md)| Provides information about BitLocker, which is a data protection feature that integrates with the operating system and addresses the threats of data theft or exposure from lost, stolen, or inappropriately decommissioned computers. |
-| [Control the health of Windows 10-based devices](protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md) | Learn more about protecting high-value assets. |
-| [Device Guard deployment guide](device-guard/device-guard-deployment-guide.md) | Device Guard is a combination of hardware and software security features that, when configured together, will lock a device down so that it can only run trusted applications. If the app isn’t trusted it can’t run, period. It also means that even if an attacker manages to get control of the Windows kernel, he or she will be much less likely to be able to run malicious executable code after the computer restarts because of how decisions are made about what can run and when. |
-| [Encrypted Hard Drive](encrypted-hard-drive.md) | Provides information about Encrypted Hard Drive, which uses the rapid encryption that is provided by BitLocker Drive Encryption to enhance data security and management.|
-| [Security auditing](auditing/security-auditing-overview.md)| Describes how the IT professional can use the security auditing features in Windows, and how organizations can benefit from using these technologies, to enhance the security and manageability of networks.|
-| [Security policy settings](security-policy-settings/security-policy-settings.md)| Provides a collection of reference topics that describe the common scenarios, architecture, and processes for security settings.|
-| [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. |

windows/hub/TOC.md

@@ -5,8 +5,8 @@
 ## [Configuration](/windows/configuration)
 ## [Client management](/windows/client-management)
 ## [Application management](/windows/application-management)
-## [Access protection](/windows/access-protection)
+## [Identity and access management](/windows/security/identity-protection)
-## [Device security](/windows/device-security)
+## [Information protection](/windows/security/information-protection)
-## [Threat protection](/windows/threat-protection)
+## [Threat protection](/windows/security/threat-protection)
 ## [Troubleshooting](/windows/client-management/windows-10-support-solutions)
 ## [Other Windows client versions](https://docs.microsoft.com/previous-versions/windows)

windows/hub/breadcrumb/toc.yml

@@ -6,31 +6,42 @@
       tocHref: /windows
       topicHref: /windows/windows-10
       items:
-      - name: What's new
+        - name: What's new
-        tocHref: /windows/whats-new/
+          tocHref: /windows/whats-new/
-        topicHref: /windows/whats-new/index
+          topicHref: /windows/whats-new/index
-      - name: Configuration
+        - name: Configuration
-        tocHref: /windows/configuration/
+          tocHref: /windows/configuration/
-        topicHref: /windows/configuration/index
+          topicHref: /windows/configuration/index
-      - name: Deployment
+        - name: Deployment
-        tocHref: /windows/deployment/
+          tocHref: /windows/deployment/
-        topicHref: /windows/deployment/index
+          topicHref: /windows/deployment/index
-      - name: Application management
+        - name: Application management
-        tocHref: /windows/application-management/
+          tocHref: /windows/application-management/
-        topicHref: /windows/application-management/index
+          topicHref: /windows/application-management/index
-      - name: Client management
+        - name: Client management
-        tocHref: /windows/client-management/
+          tocHref: /windows/client-management/
-        topicHref: /windows/client-management/index
+          topicHref: /windows/client-management/index
-        items:
+          items:
-        - name: Mobile Device Management
+            - name: Mobile Device Management
-          tocHref: /windows/client-management/mdm
+              tocHref: /windows/client-management/mdm/
-          topicHref: /windows/client-management/mdm/index
+              topicHref: /windows/client-management/mdm/index
-      - name: Access protection
+        - name: Security
-        tocHref: /windows/access-protection/
+          tocHref: /windows/security/
-        topicHref: /windows/access-protection/index
+          topicHref: /windows/security/index
-      - name: Device security
+          items:
-        tocHref: /windows/device-security/
+            - name: Identity and access protection
-        topicHref: /windows/device-security/index
+              tocHref: /windows/security/identity-protection/
-      - name: Threat protection
+              topicHref: /windows/security/identity-protection/index
-        tocHref: /windows/threat-protection/
+              items:
-        topicHref: /windows/threat-protection/index
+                - name: Windows Hello for Business
+                  tocHref: /windows/security/identity-protection/hello-for-business
+                  topicHref: /windows/security/identity-protection/hello-for-business/hello-identity-verification
+            - name: Threat protection
+              tocHref: /windows/security/threat-protection/
+              topicHref: /windows/security/threat-protection/index
+            - name: Information protection
+              tocHref: /windows/security/information-protection/
+              topicHref: /windows/security/information-protection/index
+            - name: Hardware-based protection
+              tocHref: /windows/security/hardware-protection/
+              topicHref: /windows/security/hardware-protection/index

windows/security/TOC.md

@@ -1 +1,5 @@
-# [Index](index.md)
+# [Security](index.yml)
+## [Identity and access management](identity-protection/index.md)
+## [Threat protection](threat-protection/index.md)
+## [Information protection](information-protection/index.md)
+## [Hardware-based protection](hardware-protection/index.md)

windows/security/docfx.json

@@ -20,7 +20,8 @@
       {
         "files": [
           "**/*.png",
-          "**/*.jpg"
+          "**/*.jpg",
+           "**/*.gif"
         ],
         "exclude": [
           "**/obj/**",
@@ -35,8 +36,7 @@
 	  "breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
 	  "ms.technology": "windows",
 	  "ms.topic": "article",
-	  "ms.author": "justinha",
+	  "ms.author": "justinha"
-      "extendBreadcrumb": true
     },
     "fileMetadata": {},
     "template": [],

windows/security/hardware-protection/TOC.md

@@ -0,0 +1,21 @@
+# [Hardware-based protection](index.md)
+
+## [Encrypted Hard Drive](encrypted-hard-drive.md)
+
+## [How hardware-based containers help protect Windows 10](how-hardware-based-containers-help-protect-windows.md)
+
+## [Secure the Windows 10 boot process](secure-the-windows-10-boot-process.md)
+
+## [Trusted Platform Module](tpm/trusted-platform-module-top-node.md)
+### [Trusted Platform Module Overview](tpm/trusted-platform-module-overview.md)
+### [TPM fundamentals](tpm/tpm-fundamentals.md)
+### [How Windows 10 uses the TPM](tpm/how-windows-uses-the-tpm.md)
+### [TPM Group Policy settings](tpm/trusted-platform-module-services-group-policy-settings.md)
+### [Back up the TPM recovery information to AD DS](tpm/backup-tpm-recovery-information-to-ad-ds.md)
+### [Manage TPM commands](tpm/manage-tpm-commands.md)
+### [Manage TPM lockout](tpm/manage-tpm-lockout.md)
+### [Change the TPM owner password](tpm/change-the-tpm-owner-password.md)
+### [View status, clear, or troubleshoot the TPM](tpm/initialize-and-configure-ownership-of-the-tpm.md)
+### [Understanding PCR banks on TPM 2.0 devices](tpm/switch-pcr-banks-on-tpm-2-0-devices.md)
+### [TPM recommendations](tpm/tpm-recommendations.md)
+

windows/security/hardware-protection/index.md

@@ -0,0 +1,21 @@
+---
+title: Hardware-based Protection (Windows 10)
+description: Learn more about how to help protect against threats in Windows 10 and Windows 10 Mobile.
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.pagetype: security
+author: brianlic-msft
+ms.date: 02/05/2018
+---
+
+# Hardware-based protection
+
+Windows 10 leverages these hardware-based security features to protect and maintain system integrity.
+
+| Section | Description |
+|-|-|
+| [Encrypted Hard Drive](encrypted-hard-drive.md) | Provides information about Encrypted Hard Drive, which uses the rapid encryption that is provided by BitLocker Drive Encryption to enhance data security and management.|
+|[How hardware-based containers help protect Windows 10](how-hardware-based-containers-help-protect-windows.md) |Learn about how hardware-based containers can isolate sensitive system services and data, enabling them to remain secure even when the operating system has been compromised.|
+|[Secure the Windows 10 boot process](secure-the-windows-10-boot-process.md) |Learn about the Windows 10 security features that help to protect your PC from malware, including rootkits and other applications.|
+| [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/security/identity-protection/TOC.md

@@ -1,4 +1,4 @@
-# [Access protection](access-control/access-control.md)
+# [Identity and access management](index.md)
 
 ## [Access Control Overview](access-control/access-control.md)
 ### [Dynamic Access Control Overview](access-control/dynamic-access-control.md)
@@ -17,6 +17,8 @@
 
 ## [Install digital certificates on Windows 10 Mobile](installing-digital-certificates-on-windows-10-mobile.md)
 
+## [How hardware-based containers help protect Windows 10](how-hardware-based-containers-help-protect-windows.md)
+
 ## [Protect derived domain credentials with Credential Guard](credential-guard/credential-guard.md)
 ### [How Credential Guard works](credential-guard/credential-guard-how-it-works.md)
 ### [Credential Guard Requirements](credential-guard/credential-guard-requirements.md)

windows/security/identity-protection/change-history-for-access-protection.md

@@ -17,6 +17,12 @@ This topic lists new and updated topics in the [Access protection](index.md) doc
 |---------------------|------------|
 |[Microsoft accounts](access-control/microsoft-accounts.md) |Revised to cover new Group Policy setting in Windows 10, version 1703, named **Block all consumer Microsoft account user authentication**.|
 
+## June 2017
+|New or changed topic |Description |
+|---------------------|------------|
+|[How hardware-based containers help protect Windows 10](how-hardware-based-containers-help-protect-windows.md) | New | 
+
+
 ## March 2017
 |New or changed topic |Description |
 |---------------------|------------|