diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml index 2df32bf045..ab55949d3a 100644 --- a/windows/security/TOC.yml +++ b/windows/security/TOC.yml @@ -18,166 +18,86 @@ href: operating-system-security/toc.yml - name: Operating system security (OLD) items: - - name: Overview - href: operating-system.md - - name: System security + - name: Encryption and data protection + href: encryption-data-protection.md + items: + - name: Encrypted Hard Drive + href: information-protection/encrypted-hard-drive.md + - name: BitLocker + href: information-protection/bitlocker/bitlocker-overview.md 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 - href: threat-protection/windows-defender-security-center/windows-defender-security-center.md + - name: Overview of BitLocker Device Encryption in Windows + href: information-protection/bitlocker/bitlocker-device-encryption-overview-windows-10.md + - name: BitLocker frequently asked questions (FAQ) + href: information-protection/bitlocker/bitlocker-frequently-asked-questions.yml items: - - name: Virus & threat protection - href: threat-protection\windows-defender-security-center\wdsc-virus-threat-protection.md - - name: Account protection - href: threat-protection\windows-defender-security-center\wdsc-account-protection.md - - name: Firewall & network protection - href: threat-protection\windows-defender-security-center\wdsc-firewall-network-protection.md - - name: App & browser control - href: threat-protection\windows-defender-security-center\wdsc-app-browser-control.md - - name: Device security - href: threat-protection\windows-defender-security-center\wdsc-device-security.md - - name: Device performance & health - 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: Virus and threat protection - items: - - name: Overview - href: threat-protection/index.md - - name: Microsoft Defender Antivirus - href: /microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-windows - - name: Attack surface reduction (ASR) - href: /microsoft-365/security/defender-endpoint/attack-surface-reduction - - name: Tamper protection for MDE - href: /microsoft-365/security/defender-endpoint/prevent-changes-to-security-settings-with-tamper-protection - - name: Microsoft Vulnerable Driver Blocklist - href: threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules.md - - name: Controlled folder access - href: /microsoft-365/security/defender-endpoint/controlled-folders - - name: Exploit protection - href: /microsoft-365/security/defender-endpoint/exploit-protection - - name: Microsoft Defender SmartScreen - href: threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview.md - - name: Microsoft Defender for Endpoint - href: /microsoft-365/security/defender-endpoint - - name: Network security - items: - - name: VPN technical guide - href: identity-protection/vpn/vpn-guide.md + - name: Overview and requirements + href: information-protection/bitlocker/bitlocker-overview-and-requirements-faq.yml + - name: Upgrading + href: information-protection/bitlocker/bitlocker-upgrading-faq.yml + - name: Deployment and administration + href: information-protection/bitlocker/bitlocker-deployment-and-administration-faq.yml + - name: Key management + href: information-protection/bitlocker/bitlocker-key-management-faq.yml + - name: BitLocker To Go + href: information-protection/bitlocker/bitlocker-to-go-faq.yml + - name: Active Directory Domain Services + href: information-protection/bitlocker/bitlocker-and-adds-faq.yml + - name: Security + href: information-protection/bitlocker/bitlocker-security-faq.yml + - name: BitLocker Network Unlock + href: information-protection/bitlocker/bitlocker-network-unlock-faq.yml + - name: General + href: information-protection/bitlocker/bitlocker-using-with-other-programs-faq.yml + - name: "Prepare your organization for BitLocker: Planning and policies" + href: information-protection/bitlocker/prepare-your-organization-for-bitlocker-planning-and-policies.md + - name: BitLocker deployment comparison + href: information-protection/bitlocker/bitlocker-deployment-comparison.md + - name: BitLocker basic deployment + href: information-protection/bitlocker/bitlocker-basic-deployment.md + - name: Deploy BitLocker on Windows Server 2012 and later + href: information-protection/bitlocker/bitlocker-how-to-deploy-on-windows-server.md + - name: BitLocker management for enterprises + href: information-protection/bitlocker/bitlocker-management-for-enterprises.md + - name: Enable Network Unlock with BitLocker + href: information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md + - name: Use BitLocker Drive Encryption Tools to manage BitLocker + href: information-protection/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md + - name: Use BitLocker Recovery Password Viewer + href: information-protection/bitlocker/bitlocker-use-bitlocker-recovery-password-viewer.md + - name: BitLocker Group Policy settings + href: information-protection/bitlocker/bitlocker-group-policy-settings.md + - name: BCD settings and BitLocker + href: information-protection/bitlocker/bcd-settings-and-bitlocker.md + - name: BitLocker Recovery Guide + href: information-protection/bitlocker/bitlocker-recovery-guide-plan.md + - name: BitLocker Countermeasures + href: information-protection/bitlocker/bitlocker-countermeasures.md + - name: Protecting cluster shared volumes and storage area networks with BitLocker + href: information-protection/bitlocker/protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md + - name: Troubleshoot BitLocker items: - - name: VPN connection types - href: identity-protection/vpn/vpn-connection-type.md - - name: VPN routing decisions - href: identity-protection/vpn/vpn-routing.md - - name: VPN authentication options - href: identity-protection/vpn/vpn-authentication.md - - name: VPN and conditional access - href: identity-protection/vpn/vpn-conditional-access.md - - name: VPN name resolution - href: identity-protection/vpn/vpn-name-resolution.md - - name: VPN auto-triggered profile options - href: identity-protection/vpn/vpn-auto-trigger-profile.md - - name: VPN security features - href: identity-protection/vpn/vpn-security-features.md - - name: VPN profile options - href: identity-protection/vpn/vpn-profile-options.md - - name: How to configure Diffie Hellman protocol over IKEv2 VPN connections - href: identity-protection/vpn/how-to-configure-diffie-hellman-protocol-over-ikev2-vpn-connections.md - - name: How to use single sign-on (SSO) over VPN and Wi-Fi connections - href: identity-protection/vpn/how-to-use-single-sign-on-sso-over-vpn-and-wi-fi-connections.md - - name: Optimizing Office 365 traffic with the Windows VPN client - href: identity-protection/vpn/vpn-office-365-optimization.md - - name: Windows Defender Firewall - href: threat-protection/windows-firewall/windows-firewall-with-advanced-security.md - - name: Encryption and data protection - href: encryption-data-protection.md - items: - - name: Encrypted Hard Drive - href: information-protection/encrypted-hard-drive.md - - name: BitLocker - href: information-protection/bitlocker/bitlocker-overview.md - items: - - name: Overview of BitLocker Device Encryption in Windows - href: information-protection/bitlocker/bitlocker-device-encryption-overview-windows-10.md - - name: BitLocker frequently asked questions (FAQ) - href: information-protection/bitlocker/bitlocker-frequently-asked-questions.yml - items: - - name: Overview and requirements - href: information-protection/bitlocker/bitlocker-overview-and-requirements-faq.yml - - name: Upgrading - href: information-protection/bitlocker/bitlocker-upgrading-faq.yml - - name: Deployment and administration - href: information-protection/bitlocker/bitlocker-deployment-and-administration-faq.yml - - name: Key management - href: information-protection/bitlocker/bitlocker-key-management-faq.yml - - name: BitLocker To Go - href: information-protection/bitlocker/bitlocker-to-go-faq.yml - - name: Active Directory Domain Services - href: information-protection/bitlocker/bitlocker-and-adds-faq.yml - - name: Security - href: information-protection/bitlocker/bitlocker-security-faq.yml - - name: BitLocker Network Unlock - href: information-protection/bitlocker/bitlocker-network-unlock-faq.yml - - name: General - href: information-protection/bitlocker/bitlocker-using-with-other-programs-faq.yml - - name: "Prepare your organization for BitLocker: Planning and policies" - href: information-protection/bitlocker/prepare-your-organization-for-bitlocker-planning-and-policies.md - - name: BitLocker deployment comparison - href: information-protection/bitlocker/bitlocker-deployment-comparison.md - - name: BitLocker basic deployment - href: information-protection/bitlocker/bitlocker-basic-deployment.md - - name: Deploy BitLocker on Windows Server 2012 and later - href: information-protection/bitlocker/bitlocker-how-to-deploy-on-windows-server.md - - name: BitLocker management for enterprises - href: information-protection/bitlocker/bitlocker-management-for-enterprises.md - - name: Enable Network Unlock with BitLocker - href: information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md - - name: Use BitLocker Drive Encryption Tools to manage BitLocker - href: information-protection/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md - - name: Use BitLocker Recovery Password Viewer - href: information-protection/bitlocker/bitlocker-use-bitlocker-recovery-password-viewer.md - - name: BitLocker Group Policy settings - href: information-protection/bitlocker/bitlocker-group-policy-settings.md - - name: BCD settings and BitLocker - href: information-protection/bitlocker/bcd-settings-and-bitlocker.md - - name: BitLocker Recovery Guide - href: information-protection/bitlocker/bitlocker-recovery-guide-plan.md - - name: BitLocker Countermeasures - href: information-protection/bitlocker/bitlocker-countermeasures.md - - name: Protecting cluster shared volumes and storage area networks with BitLocker - href: information-protection/bitlocker/protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md - - name: Troubleshoot BitLocker - items: - - name: Troubleshoot BitLocker - href: /troubleshoot/windows-client/windows-security/bitlocker-issues-troubleshooting - - name: "BitLocker cannot encrypt a drive: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-issues - - name: "Enforcing BitLocker policies by using Intune: known issues" - href: /troubleshoot/windows-client/windows-security/enforcing-bitlocker-policies-by-using-intune-known-issues - - name: "BitLocker Network Unlock: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-network-unlock-known-issues - - name: "BitLocker recovery: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-recovery-known-issues - - name: "BitLocker configuration: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-configuration-known-issues - - name: Troubleshoot BitLocker and TPM issues - items: - - name: "BitLocker cannot encrypt a drive: known TPM issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-tpm-issues - - name: "BitLocker and TPM: other known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-and-tpm-other-known-issues - - name: Decode Measured Boot logs to track PCR changes - href: /troubleshoot/windows-client/windows-security/decode-measured-boot-logs-to-track-pcr-changes - - name: Personal Data Encryption (PDE) + - name: Troubleshoot BitLocker + href: /troubleshoot/windows-client/windows-security/bitlocker-issues-troubleshooting + - name: "BitLocker cannot encrypt a drive: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-issues + - name: "Enforcing BitLocker policies by using Intune: known issues" + href: /troubleshoot/windows-client/windows-security/enforcing-bitlocker-policies-by-using-intune-known-issues + - name: "BitLocker Network Unlock: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-network-unlock-known-issues + - name: "BitLocker recovery: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-recovery-known-issues + - name: "BitLocker configuration: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-configuration-known-issues + - name: Troubleshoot BitLocker and TPM issues + items: + - name: "BitLocker cannot encrypt a drive: known TPM issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-tpm-issues + - name: "BitLocker and TPM: other known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-and-tpm-other-known-issues + - name: Decode Measured Boot logs to track PCR changes + href: /troubleshoot/windows-client/windows-security/decode-measured-boot-logs-to-track-pcr-changes + - name: Personal Data Encryption (PDE) items: - name: Personal Data Encryption (PDE) overview href: information-protection/personal-data-encryption/overview-pde.md @@ -199,15 +119,15 @@ href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-hibernation.md - name: Disable allowing users to select when a password is required when resuming from connected standby for PDE href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-password-connected-standby.md - - name: Configure S/MIME for Windows + - name: Configure S/MIME for Windows href: identity-protection/configure-s-mime.md - - name: Device management + - 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: Windows security baselines + - name: Windows security baselines href: threat-protection/windows-security-configuration-framework/windows-security-baselines.md items: - name: Security Compliance Toolkit @@ -216,7 +136,7 @@ href: threat-protection/windows-security-configuration-framework/get-support-for-security-baselines.md - name: Guide to removing Microsoft Baseline Security Analyzer (MBSA) href: threat-protection/mbsa-removal-and-guidance.md - - name: More Windows security + - name: More Windows security items: - name: Override Process Mitigation Options to help enforce app-related security policies href: threat-protection/override-mitigation-options-for-app-related-security-policies.md diff --git a/windows/security/operating-system-security/modern-device-management/toc.yml b/windows/security/operating-system-security/device-management/toc.yml similarity index 100% rename from windows/security/operating-system-security/modern-device-management/toc.yml rename to windows/security/operating-system-security/device-management/toc.yml diff --git a/windows/security/operating-system-security/network-security/toc.yml b/windows/security/operating-system-security/network-security/toc.yml index 92a175b806..af372280a4 100644 --- a/windows/security/operating-system-security/network-security/toc.yml +++ b/windows/security/operating-system-security/network-security/toc.yml @@ -1,4 +1,40 @@ items: - - name: Overview - href: ../hardware.md - - name: Hardware root of trust \ No newline at end of file +- name: Transport layer security (TLS) + href: /windows-server/security/tls/tls-ssl-schannel-ssp-overview +- name: WiFi Security + href: https://support.microsoft.com/windows/faster-and-more-secure-wi-fi-in-windows-26177a28-38ed-1a8e-7eca-66f24dc63f09 +- name: Windows Firewall + href: ../../threat-protection/windows-firewall/windows-firewall-with-advanced-security.md +- name: Virtual Private Network (VPN) + href: ../../identity-protection/vpn/vpn-guide.md + items: + - name: VPN connection types + href: ../../identity-protection/vpn/vpn-connection-type.md + - name: VPN routing decisions + href: ../../identity-protection/vpn/vpn-routing.md + - name: VPN authentication options + href: ../../identity-protection/vpn/vpn-authentication.md + - name: VPN and conditional access + href: ../../identity-protection/vpn/vpn-conditional-access.md + - name: VPN name resolution + href: ../../identity-protection/vpn/vpn-name-resolution.md + - name: VPN auto-triggered profile options + href: ../../identity-protection/vpn/vpn-auto-trigger-profile.md + - name: VPN security features + href: ../../identity-protection/vpn/vpn-security-features.md + - name: VPN profile options + href: ../../identity-protection/vpn/vpn-profile-options.md + - name: How to configure Diffie Hellman protocol over IKEv2 VPN connections + href: ../../identity-protection/vpn/how-to-configure-diffie-hellman-protocol-over-ikev2-vpn-connections.md + - name: How to use single sign-on (SSO) over VPN and Wi-Fi connections + href: ../../identity-protection/vpn/how-to-use-single-sign-on-sso-over-vpn-and-wi-fi-connections.md + - name: Optimizing Office 365 traffic with the Windows VPN client + href: ../../identity-protection/vpn/vpn-office-365-optimization.md +- name: Always On VPN + href: /windows-server/remote/remote-access/vpn/always-on-vpn/ +- name: Direct Access + href: /windows-server/remote/remote-access/directaccess/directaccess +- name: Server Message Block (SMB) file service + href: /windows-server/storage/file-server/file-server-smb-overview +- name: Server Message Block Direct (SMB Direct) + href: /windows-server/storage/file-server/smb-direct \ No newline at end of file diff --git a/windows/security/operating-system-security/toc.yml b/windows/security/operating-system-security/toc.yml index 5f56835eeb..d5b5e71a52 100644 --- a/windows/security/operating-system-security/toc.yml +++ b/windows/security/operating-system-security/toc.yml @@ -10,4 +10,4 @@ items: - name: Data protection href: data-protection/toc.yml - name: Modern device management - href: modern-device-management/toc.yml \ No newline at end of file + href: device-management/toc.yml \ No newline at end of file