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

# Conflicts:
#	windows/keep-secure/change-history-for-keep-windows-10-secure.md
This commit is contained in:
jdeckerMS
2016-11-29 12:45:05 -08:00
185 changed files with 6460 additions and 488 deletions

View File

@ -683,6 +683,18 @@
###### [Shut down the system](shut-down-the-system.md)
###### [Synchronize directory service data](synchronize-directory-service-data.md)
###### [Take ownership of files or other objects](take-ownership-of-files-or-other-objects.md)
### [Smart Cards](smart-card-windows-smart-card-technical-reference.md)
#### [How Smart Card Sign-in Works in Windows](smart-card-how-smart-card-sign-in-works-in-windows.md)
##### [Smart Card Architecture](smart-card-architecture.md)
##### [Certificate Requirements and Enumeration](smart-card-certificate-requirements-and-enumeration.md)
##### [Smart Card and Remote Desktop Services](smart-card-and-remote-desktop-services.md)
##### [Smart Cards for Windows Service](smart-card-smart-cards-for-windows-service.md)
##### [Certificate Propagation Service](smart-card-certificate-propagation-service.md)
##### [Smart Card Removal Policy Service](smart-card-removal-policy-service.md)
#### [Smart Card Tools and Settings](smart-card-tools-and-settings.md)
##### [Smart Cards Debugging Information](smart-card-debugging-information.md)
##### [Smart Card Group Policy and Registry Settings](smart-card-group-policy-and-registry-settings.md)
##### [Smart Card Events](smart-card-events.md)
### [Trusted Platform Module](trusted-platform-module-overview.md)
#### [TPM fundamentals](tpm-fundamentals.md)
#### [TPM Group Policy settings](trusted-platform-module-services-group-policy-settings.md)
@ -698,6 +710,13 @@
#### [How User Account Control works](how-user-account-control-works.md)
#### [User Account Control security policy settings](user-account-control-security-policy-settings.md)
#### [User Account Control Group Policy and registry key settings](user-account-control-group-policy-and-registry-key-settings.md)
### [Virtual Smart Cards](virtual-smart-card-overview.md)
#### [Understanding and Evaluating Virtual Smart Cards](virtual-smart-card-understanding-and-evaluating.md)
##### [Get Started with Virtual Smart Cards: Walkthrough Guide](virtual-smart-card-get-started.md)
##### [Use Virtual Smart Cards](virtual-smart-card-use-virtual-smart-cards.md)
##### [Deploy Virtual Smart Cards](virtual-smart-card-deploy-virtual-smart-cards.md)
##### [Evaluate Virtual Smart Card Security](virtual-smart-card-evaluate-security.md)
#### [Tpmvscmgr](virtual-smart-card-tpmvscmgr.md)
### [Windows Defender Advanced Threat Protection](windows-defender-advanced-threat-protection.md)
#### [Minimum requirements](minimum-requirements-windows-defender-advanced-threat-protection.md)
#### [Data storage and privacy](data-storage-privacy-windows-defender-advanced-threat-protection.md)