diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml index 695f89defa..bc8331d8e0 100644 --- a/windows/security/TOC.yml +++ b/windows/security/TOC.yml @@ -13,66 +13,7 @@ - name: Security features licensing requirements href: introduction/security-features-licensing-requirements.md - name: Hardware security - items: - - name: Overview - href: hardware.md - - name: Hardware root of trust - items: - - name: Windows Defender System Guard - href: threat-protection/windows-defender-system-guard/how-hardware-based-root-of-trust-helps-protect-windows.md - - name: Trusted Platform Module - href: information-protection/tpm/trusted-platform-module-top-node.md - items: - - name: Trusted Platform Module overview - href: information-protection/tpm/trusted-platform-module-overview.md - - name: TPM fundamentals - href: information-protection/tpm/tpm-fundamentals.md - - name: How Windows uses the TPM - href: information-protection/tpm/how-windows-uses-the-tpm.md - - name: Manage TPM commands - href: information-protection/tpm/manage-tpm-commands.md - - name: Manager TPM Lockout - href: information-protection/tpm/manage-tpm-lockout.md - - name: Change the TPM password - href: information-protection/tpm/change-the-tpm-owner-password.md - - name: TPM Group Policy settings - href: information-protection/tpm/trusted-platform-module-services-group-policy-settings.md - - name: Back up the TPM recovery information to AD DS - href: information-protection/tpm/backup-tpm-recovery-information-to-ad-ds.md - - name: View status, clear, or troubleshoot the TPM - href: information-protection/tpm/initialize-and-configure-ownership-of-the-tpm.md - - name: Understanding PCR banks on TPM 2.0 devices - href: information-protection/tpm/switch-pcr-banks-on-tpm-2-0-devices.md - - name: TPM recommendations - href: information-protection/tpm/tpm-recommendations.md - - name: Microsoft Pluton security processor - items: - - name: Microsoft Pluton overview - href: information-protection/pluton/microsoft-pluton-security-processor.md - - name: Microsoft Pluton as TPM - href: information-protection/pluton/pluton-as-tpm.md - - name: Silicon assisted security - items: - - name: Virtualization-based security (VBS) - href: /windows-hardware/design/device-experiences/oem-vbs - - name: Memory integrity (HVCI) - href: threat-protection/device-guard/enable-virtualization-based-protection-of-code-integrity.md - - name: Memory integrity and VBS enablement - href: /windows-hardware/design/device-experiences/oem-hvci-enablement - - name: Hardware-enforced stack protection - href: https://techcommunity.microsoft.com/t5/windows-os-platform-blog/understanding-hardware-enforced-stack-protection/ba-p/1247815 - - name: Secured-core PC - href: /windows-hardware/design/device-experiences/oem-highly-secure-11 - - name: Kernel Direct Memory Access (DMA) protection - href: information-protection/kernel-dma-protection-for-thunderbolt.md - - name: Secure Boot and Trusted Boot - href: trusted-boot.md - - name: Measured Boot - href: /windows/compatibility/measured-boot - - name: Device health attestation service - href: threat-protection/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md - - name: System Guard Secure Launch - href: threat-protection/windows-defender-system-guard/system-guard-secure-launch-and-smm-protection.md + href: hardware-security/toc.yml - name: Operating system security items: - name: Overview @@ -81,6 +22,12 @@ items: - name: Secure the Windows boot process href: information-protection/secure-the-windows-10-boot-process.md + - name: Secure Boot and Trusted Boot + href: trusted-boot.md + - name: Measured Boot + href: /windows/compatibility/measured-boot + - name: Device health attestation service + href: threat-protection/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md - name: Cryptography and certificate management href: cryptography-certificate-mgmt.md - name: The Windows Security app @@ -100,10 +47,8 @@ href: threat-protection\windows-defender-security-center\wdsc-device-performance-health.md - name: Family options href: threat-protection\windows-defender-security-center\wdsc-family-options.md - - name: Security policy settings - href: threat-protection/security-policy-settings/security-policy-settings.md - - name: Security auditing - href: threat-protection/auditing/security-auditing-overview.md + - name: Virus and threat protection + items: - name: Encryption and data protection href: encryption-data-protection.md items: @@ -207,6 +152,12 @@ href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-password-connected-standby.md - name: Configure S/MIME for Windows href: identity-protection/configure-s-mime.md + - name: Device management + items: + - name: Security policy settings + href: threat-protection/security-policy-settings/security-policy-settings.md + - name: Security auditing + href: threat-protection/auditing/security-auditing-overview.md - name: Network security items: - name: VPN technical guide diff --git a/windows/security/hardware-security/toc.yml b/windows/security/hardware-security/toc.yml new file mode 100644 index 0000000000..ea8046d653 --- /dev/null +++ b/windows/security/hardware-security/toc.yml @@ -0,0 +1,54 @@ +items: + - name: Overview + href: ../hardware.md + - name: Hardware root of trust + items: + - name: Windows Defender System Guard + href: ../threat-protection/windows-defender-system-guard/how-hardware-based-root-of-trust-helps-protect-windows.md + - name: Trusted Platform Module + href: ../information-protection/tpm/trusted-platform-module-top-node.md + items: + - name: Trusted Platform Module overview + href: ../information-protection/tpm/trusted-platform-module-overview.md + - name: TPM fundamentals + href: ../information-protection/tpm/tpm-fundamentals.md + - name: How Windows uses the TPM + href: ../information-protection/tpm/how-windows-uses-the-tpm.md + - name: Manage TPM commands + href: ../information-protection/tpm/manage-tpm-commands.md + - name: Manager TPM Lockout + href: ../information-protection/tpm/manage-tpm-lockout.md + - name: Change the TPM password + href: ../information-protection/tpm/change-the-tpm-owner-password.md + - name: TPM Group Policy settings + href: ../information-protection/tpm/trusted-platform-module-services-group-policy-settings.md + - name: Back up the TPM recovery information to AD DS + href: ../information-protection/tpm/backup-tpm-recovery-information-to-ad-ds.md + - name: View status, clear, or troubleshoot the TPM + href: ../information-protection/tpm/initialize-and-configure-ownership-of-the-tpm.md + - name: Understanding PCR banks on TPM 2.0 devices + href: ../information-protection/tpm/switch-pcr-banks-on-tpm-2-0-devices.md + - name: TPM recommendations + href: ../information-protection/tpm/tpm-recommendations.md + - name: Microsoft Pluton security processor + items: + - name: Microsoft Pluton overview + href: ../information-protection/pluton/microsoft-pluton-security-processor.md + - name: Microsoft Pluton as TPM + href: ../information-protection/pluton/pluton-as-tpm.md + - name: Silicon assisted security + items: + - name: Virtualization-based security (VBS) + href: /windows-hardware/design/device-experiences/oem-vbs + - name: Memory integrity (HVCI) + href: ../threat-protection/device-guard/enable-virtualization-based-protection-of-code-integrity.md + - name: Memory integrity and VBS enablement + href: /windows-hardware/design/device-experiences/oem-hvci-enablement + - name: Hardware-enforced stack protection + href: https://techcommunity.microsoft.com/t5/windows-os-platform-blog/understanding-hardware-enforced-stack-protection/ba-p/1247815 + - name: Secured-core PC + href: /windows-hardware/design/device-experiences/oem-highly-secure-11 + - name: Kernel Direct Memory Access (DMA) protection + href: ../information-protection/kernel-dma-protection-for-thunderbolt.md + - name: System Guard Secure Launch + href: ../threat-protection/windows-defender-system-guard/system-guard-secure-launch-and-smm-protection.md \ No newline at end of file