From 54370c60897c498776b572bd72d834898f08c43c Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Mon, 31 Jul 2023 17:12:52 +0200 Subject: [PATCH] Security book alignment --- ...blishing.redirection.windows-security.json | 25 +++++++++++++++++++ .../index.md => introduction.md} | 0 .../certification}/fips-140-validation.md | 0 .../certification/toc.yml | 4 +-- .../windows-platform-common-criteria.md | 0 .../security/security-foundations/index.md | 3 +++ .../msft-security-dev-lifecycle.md | 0 windows/security/security-foundations/toc.yml | 6 +++-- .../zero-trust-windows-device-health.md | 0 windows/security/toc.yml | 12 +++------ 10 files changed, 38 insertions(+), 12 deletions(-) rename windows/security/{introduction/index.md => introduction.md} (100%) rename windows/security/{threat-protection => security-foundations/certification}/fips-140-validation.md (100%) rename windows/security/{threat-protection => security-foundations/certification}/windows-platform-common-criteria.md (100%) rename windows/security/{threat-protection => security-foundations}/msft-security-dev-lifecycle.md (100%) rename windows/security/{ => security-foundations}/zero-trust-windows-device-health.md (100%) diff --git a/.openpublishing.redirection.windows-security.json b/.openpublishing.redirection.windows-security.json index 6e2cc5c911..e4e7a00bfd 100644 --- a/.openpublishing.redirection.windows-security.json +++ b/.openpublishing.redirection.windows-security.json @@ -7234,6 +7234,31 @@ "source_path": "windows/security/hardware.md", "redirect_url": "/windows/security/hardware-security", "redirect_document_id": false + }, + { + "source_path": "windows/security/introduction/index.md", + "redirect_url": "/windows/security/introduction", + "redirect_document_id": false + }, + { + "source_path": "windows/security/threat-protection/windows-platform-common-criteria.md", + "redirect_url": "/windows/security/security-foundations/certification/windows-platform-common-criteria", + "redirect_document_id": false + }, + { + "source_path": "windows/security/threat-protection/fips-140-validation.md", + "redirect_url": "/windows/security/security-foundations/certification/fips-140-validation", + "redirect_document_id": false + }, + { + "source_path": "windows/security/threat-protection/msft-security-dev-lifecycle.md", + "redirect_url": "/windows/security/security-foundations/msft-security-dev-lifecycle", + "redirect_document_id": false + }, + { + "source_path": "windows/security/zero-trust-windows-device-health.md", + "redirect_url": "/windows/security/introduction/zero-trust-windows-device-health", + "redirect_document_id": false } ] } diff --git a/windows/security/introduction/index.md b/windows/security/introduction.md similarity index 100% rename from windows/security/introduction/index.md rename to windows/security/introduction.md diff --git a/windows/security/threat-protection/fips-140-validation.md b/windows/security/security-foundations/certification/fips-140-validation.md similarity index 100% rename from windows/security/threat-protection/fips-140-validation.md rename to windows/security/security-foundations/certification/fips-140-validation.md diff --git a/windows/security/security-foundations/certification/toc.yml b/windows/security/security-foundations/certification/toc.yml index 70d9d800b8..58c9db1958 100644 --- a/windows/security/security-foundations/certification/toc.yml +++ b/windows/security/security-foundations/certification/toc.yml @@ -1,5 +1,5 @@ items: - name: FIPS 140-2 Validation - href: ../../threat-protection/fips-140-validation.md + href: fips-140-validation.md - name: Common Criteria Certifications - href: ../../threat-protection/windows-platform-common-criteria.md \ No newline at end of file + href: windows-platform-common-criteria.md \ No newline at end of file diff --git a/windows/security/threat-protection/windows-platform-common-criteria.md b/windows/security/security-foundations/certification/windows-platform-common-criteria.md similarity index 100% rename from windows/security/threat-protection/windows-platform-common-criteria.md rename to windows/security/security-foundations/certification/windows-platform-common-criteria.md diff --git a/windows/security/security-foundations/index.md b/windows/security/security-foundations/index.md index bf515f96a9..ee3764070e 100644 --- a/windows/security/security-foundations/index.md +++ b/windows/security/security-foundations/index.md @@ -21,3 +21,6 @@ Use the links in the following table to learn more about the security foundation | Common Criteria Certifications | Microsoft supports the Common Criteria certification program, ensures that products incorporate the features and functions required by relevant Common Criteria Protection Profiles, and completes Common Criteria certifications of Microsoft Windows products.

Learn more about [Common Criteria Certifications](../threat-protection/windows-platform-common-criteria.md). | | Microsoft Security Development Lifecycle | The Security Development Lifecycle (SDL) is a security assurance process that is focused on software development. The SDL has played a critical role in embedding security and privacy in software and culture at Microsoft.

Learn more about [Microsoft SDL](../threat-protection/msft-security-dev-lifecycle.md).| | Microsoft Bug Bounty Program | If you find a vulnerability in a Microsoft product, service, or device, we want to hear from you! If your vulnerability report affects a product or service that is within scope of one of our bounty programs below, you could receive a bounty award according to the program descriptions.

Learn more about the [Microsoft Bug Bounty Program](https://www.microsoft.com/en-us/msrc/bounty?rtc=1). | + + +[!INCLUDE [operating-system-security](../includes/sections/security-foundations.md)] diff --git a/windows/security/threat-protection/msft-security-dev-lifecycle.md b/windows/security/security-foundations/msft-security-dev-lifecycle.md similarity index 100% rename from windows/security/threat-protection/msft-security-dev-lifecycle.md rename to windows/security/security-foundations/msft-security-dev-lifecycle.md diff --git a/windows/security/security-foundations/toc.yml b/windows/security/security-foundations/toc.yml index b842d84e0e..9a34209d14 100644 --- a/windows/security/security-foundations/toc.yml +++ b/windows/security/security-foundations/toc.yml @@ -1,7 +1,9 @@ items: - name: Overview href: index.md +- name: Zero Trust and Windows + href: zero-trust-windows-device-health.md - name: Microsoft Security Development Lifecycle - href: ../threat-protection/msft-security-dev-lifecycle.md + href: msft-security-dev-lifecycle.md - name: Certification - href: certification/toc.yml \ No newline at end of file + href: certification/toc.yml diff --git a/windows/security/zero-trust-windows-device-health.md b/windows/security/security-foundations/zero-trust-windows-device-health.md similarity index 100% rename from windows/security/zero-trust-windows-device-health.md rename to windows/security/security-foundations/zero-trust-windows-device-health.md diff --git a/windows/security/toc.yml b/windows/security/toc.yml index 06b59128cd..4beeab15eb 100644 --- a/windows/security/toc.yml +++ b/windows/security/toc.yml @@ -2,14 +2,10 @@ items: - name: Windows security href: index.yml expanded: true -- name: Introduction - items: - - name: Windows security overview - href: introduction/index.md - - name: Zero Trust and Windows - href: zero-trust-windows-device-health.md - - name: Security features licensing and edition requirements - href: licensing-and-edition-requirements.md +- name: Introduction to Windows security + href: introduction.md +- name: Security features licensing and edition requirements + href: licensing-and-edition-requirements.md - name: Hardware security href: hardware-security/toc.yml - name: Operating system security