Resolve syncing conflicts from repo_sync_working_branch to main - #272
Open
learn-build-service-prod[bot] wants to merge 202 commits into
Open
Resolve syncing conflicts from repo_sync_working_branch to main#272learn-build-service-prod[bot] wants to merge 202 commits into
learn-build-service-prod[bot] wants to merge 202 commits into
Conversation
Co-authored-by: learn-build-service-prod-05[bot] <274429479+learn-build-service-prod-05[bot]@users.noreply.github.com>
M365 E3 now gets Defender for Office 365 Plan 1
Auto Publish – main to live - 2026-06-17 17:30 UTC
* ai-pillar-config * toc-update * test-fix * testing * undo
Co-authored-by: cabailey <cabailey@microsoft.com>
Auto Publish – main to live - 2026-06-17 22:30 UTC
* updating graphics and table * updating graphics and table * updating graphics and table * updating graphics and table * updating graphics and table * updating graphics and table * updating graphics and table * updating graphics and table
Auto Publish – main to live - 2026-06-22 07:30 UTC
Auto Publish – main to live - 2026-06-28 07:30 UTC
Auto Publish – main to live - 2026-06-29 22:30 UTC
* new page * fixes * images * move banner * new image * new images * new images * images * updates * buttons * remove TOC entry * Update links Co-authored-by: Courtney Wales <62625502+Court72@users.noreply.github.com> * Update rules link * resolve build suggestion --------- Co-authored-by: Courtney Wales <62625502+Court72@users.noreply.github.com>
* top picks * Update challenge link * revert link update --------- Co-authored-by: Courtney Wales <62625502+Court72@users.noreply.github.com>
Auto Publish – main to live - 2026-07-07 17:30 UTC
* Add Secure Administrative Workstations guidance document This document outlines the importance and implementation of Secure Administrative Workstations (SAWs) for privileged access, detailing the risks associated with privileged accounts and providing guidance for organizations to adopt SAW principles. * Create security education and awareness documentation This document outlines the importance of continuous security education and awareness to reduce human-driven risks. It provides guidance on implementing training, reinforcement, and policy enforcement tailored to user roles and behaviors. * Add governed pipeline templates documentation Introduce governed pipeline templates to standardize CI/CD processes, enhancing security and compliance across engineering teams. * Add Safe Secrets Standard documentation Introduced the Safe Secrets Standard document outlining best practices for eliminating unmanaged service-to-service secrets and implementing identity-based authentication. * Create documentation for Conditional Access tenant protection Added documentation on using Conditional Access to protect tenants and prevent identity-based attacks. * Add document on accelerating vulnerability response This document outlines strategies for accelerating vulnerability response, including improved management, communication, and automation practices. * Create document on combating insider threats Added a new document outlining strategies for combating insider threats using Zero Trust principles, including guidance on identity-centric security, least privilege access, and behavioral monitoring. * Add document on securing source code with GitHub Advanced Security This document outlines how Microsoft secures source code using GitHub Advanced Security, detailing practices for vulnerability detection, secret protection, and risk reduction in the software supply chain. * Add least privilege InnerSource access documentation Document the balance between InnerSource collaboration and least privilege access to enhance security while maintaining productivity. * Add documentation for Teams end-to-end encryption Documented the use of end-to-end encryption in Microsoft Teams for sensitive communications, including implementation guidance and feature trade-offs. * Add documentation for protecting identities with passkeys Document the use of passkeys for identity protection in the Microsoft Secure Future Initiative, highlighting benefits, challenges, and implementation guidance. * Add document on modernizing identity governance with Entra ID This document outlines how to modernize identity governance using Microsoft Entra ID Governance, detailing lifecycle-driven access controls, entitlement management, and cloud-native governance practices. * Add document on operationalizing security remediation This document outlines a framework for operationalizing security remediation across codebases, emphasizing continuous workflows that integrate detection, prioritization, and validated fixes. * Create developer security stories document for Secure by Design Added a new document detailing developer security stories to integrate security requirements into engineering workflows, promoting Secure by Design practices. * Create documentation for tenant protection with Conditional Access Added documentation on using Conditional Access to protect tenants, detailing its role in preventing identity-based attacks and ensuring secure access control. * Revise least-privilege AI agents documentation Updated the document on least-privilege AI agents to include enhanced descriptions, structured sections, and detailed guidance on security practices and implementation steps. * Update least-privilege AI agents documentation Revise content on least-privilege AI agents to enhance clarity and structure, including updates to context, challenges, solutions, and implementation guidance. * Fix PR scope and add SFI TOC entry Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 4e2a53cb-cb25-4e65-af88-c830218a5e04 * Fix AI agent pattern review issues Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 0793ec01-51b8-40b0-865c-e901bba0d92f * Update Microsoft Entra Agent ID links Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 0793ec01-51b8-40b0-865c-e901bba0d92f * Add branded product to article metadata Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 0793ec01-51b8-40b0-865c-e901bba0d92f --------- Co-authored-by: Alicia Marie Damato (Beatty) <v-albeatty@service.microsoft.com>
Auto Publish – main to live - 2026-07-15 07:30 UTC
Integrate the July 2026 SFI progress report (fourth report) into the zero-trust/sfi docset: - whats-new: refresh latest-report links, security innovations table (Azure, Microsoft 365, Windows/Surface, Microsoft Security), and all six pillar objective tables with July 2026 progress and PDF page anchors. Consolidate Protect networks to the report's three objectives (NSP folded into network isolation). - overview: point "latest report" blog and report links at July 2026, move November 2025 to earlier reports. - Bump ms.date on both articles. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 5fcc88a6-3941-459b-8fa6-bf060465fa4d
Auto Publish – main to live - 2026-07-24 17:30 UTC
* Initial creation of the two catalog Includes two new folders with all content nested, and updated TOC to insert link for the introduction files in each of the catalogs * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply copy-edit review findings Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf * Apply suggestion from @learn-build-service-prod-05[bot] Co-authored-by: learn-build-service-prod-05[bot] <274429479+learn-build-service-prod-05[bot]@users.noreply.github.com> * Apply suggestion from @learn-build-service-prod-05[bot] Co-authored-by: learn-build-service-prod-05[bot] <274429479+learn-build-service-prod-05[bot]@users.noreply.github.com> * Apply suggestion from @learn-build-service-prod-05[bot] Co-authored-by: learn-build-service-prod-05[bot] <274429479+learn-build-service-prod-05[bot]@users.noreply.github.com> * Apply suggestions from code review Additional updates for msstyle Co-authored-by: learn-build-service-prod-05[bot] <274429479+learn-build-service-prod-05[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: learn-build-service-prod-05[bot] <274429479+learn-build-service-prod-05[bot]@users.noreply.github.com> * Fix ms.date format: CAAT_Introduction.md * Fix ms.date format: CAAT_1.md * Fix ms.date format: CAAT_2.md * Fix ms.date format: CAAT_3.md * Fix ms.date format: CAAT_4.md * Fix ms.date format: CAAT_5.md * Fix ms.date format: CAAT_6.md * Fix ms.date format: CAAT_7.md * Fix ms.date format: CAAT_8.md * Fix ms.date format: CAAT_9.md * Fix ms.date format: CAAT_10.md * Fix ms.date format: CAAT_11.md * Fix ms.date format: CAAT_12.md * Fix ms.date format and PoliCheck term: CAAT_13.md * Fix ms.date format: CAAT_14.md * Fix ms.date format: AIDT_Introduction.md * Fix ms.date format: AIDT_1.md * Fix ms.date format: AIDT_2.md * Fix ms.date format: AIDT_3.md * Fix ms.date format: AIDT_4.md * Fix ms.date format: AIDT_5.md * Fix ms.date format: AIDT_6.md * Fix ms.date format: AIDT_7.md * Fix ms.date format: AIDT_8.md * Fix ms.date format: AIDT_9.md * Rename: create caat-introduction.md * Rename: create caat-1.md * Rename: create caat-2.md * Rename: create caat-3.md * Rename: create caat-4.md * Rename: create caat-5.md * Rename: create caat-6.md * Rename: create caat-7.md * Rename: create caat-8.md * Rename: create caat-9.md * Rename: create caat-10.md * Rename: create caat-11.md * Rename: create caat-12.md * Rename: create caat-13.md * Rename: create caat-14.md * Rename: create aidt-introduction.md * Rename: create aidt-1.md * Rename: create aidt-2.md * Rename: create aidt-3.md * Rename: create aidt-4.md * Rename: create aidt-5.md * Rename: create aidt-6.md * Rename: create aidt-7.md * Rename: create aidt-8.md * Rename: create aidt-9.md * Rename: delete CAAT_Introduction.md (invalid filename chars) * Rename: delete CAAT_1.md (invalid filename chars) * Rename: delete CAAT_2.md (invalid filename chars) * Rename: delete CAAT_3.md (invalid filename chars) * Rename: delete CAAT_4.md (invalid filename chars) * Rename: delete CAAT_5.md (invalid filename chars) * Rename: delete CAAT_6.md (invalid filename chars) * Rename: delete CAAT_7.md (invalid filename chars) * Rename: delete CAAT_8.md (invalid filename chars) * Rename: delete CAAT_9.md (invalid filename chars) * Rename: delete CAAT_10.md (invalid filename chars) * Rename: delete CAAT_11.md (invalid filename chars) * Rename: delete CAAT_12.md (invalid filename chars) * Rename: delete CAAT_13.md (invalid filename chars) * Rename: delete CAAT_14.md (invalid filename chars) * Rename: delete AIDT_Introduction.md (invalid filename chars) * Rename: delete AIDT_1.md (invalid filename chars) * Rename: delete AIDT_2.md (invalid filename chars) * Rename: delete AIDT_3.md (invalid filename chars) * Rename: delete AIDT_4.md (invalid filename chars) * Rename: delete AIDT_5.md (invalid filename chars) * Rename: delete AIDT_6.md (invalid filename chars) * Rename: delete AIDT_7.md (invalid filename chars) * Rename: delete AIDT_8.md (invalid filename chars) * Rename: delete AIDT_9.md (invalid filename chars) * Rename: update TOC.yml for renamed CAAT/AIDT files * updated naming convention for attack catalog updated file names and mapping * updated file names for defense catalog updated file names and linking to defense capabilities * modifications to URL MITRE ATLAS URL updated --------- Co-authored-by: Laura Williams [MSFT] <32886193+LauraWi@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: learn-build-service-prod-05[bot] <274429479+learn-build-service-prod-05[bot]@users.noreply.github.com> Copilot-Session: 57a23295-bcf1-430f-8d82-e7552b6383bf
Auto Publish – main to live - 2026-08-01 07:30 UTC
* Delete security-docs/trusted-root/Audit-Requirements.md * Add redirect for Audit-Requirements.md * Fix JSON formatting in redirection configuration * Remove Audit requirements from TOC * Fix redirect URL for Audit-Requirements.md
Auto Publish – main to live - 2026-08-03 22:30 UTC
* Delete security-docs/trusted-root/Audit-Requirements.md * Add redirect for Audit-Requirements.md * Fix JSON formatting in redirection configuration * Remove Audit requirements from TOC * Fix redirect URL for Audit-Requirements.md * Remove testing and incident reporting sections Removed outdated sections related to testing procedures and incident reporting from the table of contents. * Delete security-docs/trusted-root/Participants-list.md * Delete security-docs/trusted-root/Incident-Reporting.md * Delete security-docs/trusted-root/Testing.md * Add redirects for security documentation * Delete security-docs/trusted-root/new-ca-application.md * Delete security-docs/trusted-root/Deprecation.md * Add redirection entries for trusted root documents * Update TOC by removing deprecated entries Removed deprecated sections from the table of contents.
Auto Publish – main to live - 2026-08-04 07:30 UTC
* top picks * fix image link * challenge update
Auto Publish – main to live - 2026-08-04 12:30 UTC
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 2761db9d-6976-4b16-b2b1-4cfeba3de58b
…g-assistant-20260805 GA rename: Threat Hunting Assistant
Auto Publish – main to live - 2026-08-06 07:30 UTC
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
14 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Pull request opened by Docs to resolve syncing conflicts from repo_sync_working_branch to main.