Skip to content

Resolve syncing conflicts from repo_sync_working_branch to public#536

Open
learn-build-service-prod[bot] wants to merge 334 commits into
publicfrom
repo_sync_working_branch
Open

Resolve syncing conflicts from repo_sync_working_branch to public#536
learn-build-service-prod[bot] wants to merge 334 commits into
publicfrom
repo_sync_working_branch

Conversation

@learn-build-service-prod

Copy link
Copy Markdown
Contributor

Pull request opened by Docs to resolve syncing conflicts from repo_sync_working_branch to public.

msec-docs-bot Bot and others added 30 commits June 25, 2026 12:09
Remediation for COPY-EDIT.
Files affected: 10

Applied by AI Readiness Remediation Tool v1.0.0
Assessment source: assessment.csv

Co-authored-by: msec-docs-bot[bot] <258613010+msec-docs-bot[bot]@users.noreply.github.com>
Co-authored-by: Shawn Kupfer <60445862+ShawnKupfer@users.noreply.github.com>
* Configure controlled folder access

* Added Windows Security app procedures

And removed them elsewhere

* CFA overview article rename

* CFA

* CFA Overview

* Delete customize-controlled-folders.md

* Removed CFA article from MDB

And also cleaned up ASR/ASR rule references and links, including any Intune procedure links.

* Link and link title updates for CFA

* Update address-unwanted-behaviors-mde.md

* New monitor CFA article

Remnants of the old evaluate CFA article + Windows event viewer steps/info from the CFA overview article.

* Copy and Technical edits

* CFA demonstrations

* CFA demos

* Update defender-endpoint-demonstration-attack-surface-reduction-rules.md

* CFA/ASR demo updates

* Update defender-endpoint-demonstration-attack-surface-reduction-rules.md

* Final edits

* Offending file name renames

Per build report
Auto Publish – main to live - 2026-06-25 17:30 UTC
…8082)

* fix(COPY-EDIT): editorial

Remediation for COPY-EDIT.
Files affected: 10

Applied by AI Readiness Remediation Tool v1.0.0
Assessment source: assessment.csv

* Update address-compromised-users-quickly.md

* Fix formatting of ms.custom metadata in markdown

* Fix formatting of custom metadata in markdown file

* Correct 'ms.custom' formatting in documentation

Fixed formatting of the 'ms.custom' metadata entry.

* Update custom metadata in mdo-portal-permissions.md

---------

Co-authored-by: msec-docs-bot[bot] <258613010+msec-docs-bot[bot]@users.noreply.github.com>
Co-authored-by: Shawn Kupfer <60445862+ShawnKupfer@users.noreply.github.com>
Remediation for COPY-EDIT.
Files affected: 10

Applied by AI Readiness Remediation Tool v1.0.0
Assessment source: assessment.csv

Co-authored-by: msec-docs-bot[bot] <258613010+msec-docs-bot[bot]@users.noreply.github.com>
Co-authored-by: Shawn Kupfer <60445862+ShawnKupfer@users.noreply.github.com>
Add steps for defining notebook parameters, refreshing job parameters, and overriding values when running a notebook job manually.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Auto Publish – main to live - 2026-06-25 22:30 UTC
…GNORE BATCH NUMBER (#7939)

* Docs: soft rebrand Defender XDR to Defender (batch 11)

Replace 'Defender XDR' and 'Microsoft Defender XDR' with 'Defender' and
'Microsoft Defender' in body text of 20 advanced hunting schema and
feature articles, per Microsoft Defender branding guidelines.

Preserved unchanged:
- appliesto metadata fields
- [!INCLUDE references
- ms.service and other metadata fields
- Link display text referencing external page titles
- URL paths and fragments

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Roll back changes.

* Roll back change.

Updated description to specify Microsoft Defender XDR.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Paul Oliveria <pauloliveria@microsoft.com>
* Docs: soft rebrand Defender XDR → Defender (batch 612-2)

Update 18 advanced hunting files to replace 'Defender XDR' and
'Microsoft Defender XDR' with 'Defender' and 'Microsoft Defender'
in body text per branding guidelines. Protected references
(metadata, includes, API names, historical records, plugin names)
are left unchanged.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Roll back change.

* Roll back change.

* Roll back change.

Updated the description to include 'XDR' in the title.

* Roll back change.

* Roll back changes.

Updated references to Microsoft Defender XDR in the document.

* Roll back changes.

Updated references from Microsoft Defender for Endpoint to Microsoft Defender XDR in the migration guide.

* Roll back changes.

* Roll back changes.

Updated title and references to reflect Microsoft Defender XDR.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Paul Oliveria <pauloliveria@microsoft.com>
* Docs: soft rebrand Defender XDR → Defender (batch 612-9)

Replace 'Microsoft Defender XDR' with 'Microsoft Defender' and 'Defender XDR' with 'Defender' in body text, titles, descriptions, headings, and link display text across 10 files. 1 file had no eligible changes (all XDR refs were protected product names).

Protected references preserved: metadata fields, [!INCLUDE] lines, image alt text, historical changelog entries in whats-new.md, API endpoint names, external blog post titles, 'Defender Experts for XDR' product name, XDR capability descriptions (XDR solution, XDR tools, XDR/SIEM).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Roll back changes.

* Roll back changes.

* Roll back changes.

Updated the document to reflect the rebranding of Microsoft Defender to Microsoft Defender XDR, including changes to titles and descriptions throughout the content.

* Roll back changes.

* Roll back changes.

* Roll back changes.

* Fix typo in Microsoft Defender XDR description

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Paul Oliveria <pauloliveria@microsoft.com>
Auto Publish – main to live - 2026-06-26 12:30 UTC
Command errors caused by folder structure or incorrect quotation/space within a zip file.
Auto Publish – main to live - 2026-06-26 17:30 UTC
…ed RBAC state (#8276)

Split the Prerequisites section into Device and Identity exclusion
permissions, showing the required roles when Unified RBAC is enabled
versus disabled. Cross-link to Unified RBAC activation and custom
permissions docs.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- Shorten TOC entry from 'Attack disruption with Microsoft Sentinel' to 'Attack disruption'
- Remove redundant '(through Microsoft Sentinel integration)' from Okta and AWS IAM identity service names
- Move Microsoft Sentinel mention to Okta link text for clarity

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Auto Publish – main to live - 2026-06-28 07:30 UTC
* Update value-data-connectors.md with onboarding notes

Added note about device onboarding requirements and limitations.

* Apply suggestion from @DebLanger
Updated the date and permissions section in the API documentation.
Auto Publish – main to live - 2026-06-28 12:30 UTC
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Auto Publish – main to live - 2026-06-28 17:30 UTC
…obs-20260625

docs(sentinel): add parameterized notebook jobs
… (#8354)

* DisruptionAndResponseEvents table in the advanced hunting schema - GA

* Updating what's new

* Removing preview note
* Docs: soft rebrand Defender XDR → Defender (batch 2)

Replace 'Microsoft Defender XDR' with 'Microsoft Defender' and 'Defender XDR'
with 'Defender' in eligible locations per branding guidelines.

Files updated:
- critical-asset-management.md (1 replacement)
- get-started-exposure-management.md (4 replacements)
- prerequisites.md (3 replacements)
- whats-new.md (0 - all references in historical What's New entries)

Preserved XDR references in:
- Bold UI navigation paths (prerequisites.md line 67)
- Historical What's New entries (whats-new.md lines 179, 310)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Roll back changes.

* Roll back changes.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* docs: soft rebrand Defender XDR → Defender (batch 13)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* roll back change.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Auto Publish – main to live - 2026-06-29 12:30 UTC
…der for Containers (#8350)

* Document Security findings (Preview) Azure Policy limitation in Defender for Containers

- Add limitation note to Security findings (Preview) component in AKS, EKS, and GKE tabs
  stating it cannot be enabled through Azure Policy and must be toggled in plan Settings
- Rename 'Security findings' to 'Security findings (Preview)' for accuracy
- Remove 'This article explains' from opening line per style guide

Addresses US585115 / IcM 662676555 / CxE WI 19929

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Apply suggestion from @DebLanger

* Apply suggestion from @DebLanger

* Apply suggestion from @DebLanger

* Apply suggestion from @DebLanger

* Apply suggestions from code review

Co-authored-by: Deborah Langer <169067075+DebLanger@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…(#8351)

* Add identity assessment key mappings to transition reference article

Replace placeholder in Microsoft Defender for Identity section with
assessment key mapping table for 5 guest/disabled account assessments.
Uses 'assessment' terminology per Roy's guidance.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Apply suggestion from @DebLanger

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 11f20e7:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File Status Preview URL Details
❌Error Details

  • [Error: CannotMergeCommit] Cannot merge commit 11f20e77c2c8805995cba077cb30dbb9d7456768 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/defender-docs into branch public (commit d78ab417d19855045c8514f06fc2cb8d7a93a314). Please follow this documentation: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ to use git.exe to resolve you content conflicts locally and then push to remote.

For more details, please refer to the build report.

Note: Your PR may contain errors or warnings or suggestions unrelated to the files you changed. This happens when external dependencies like GitHub alias, Microsoft alias, cross repo links are updated. Please use these instructions to resolve them.

@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit df20267:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File Status Preview URL Details
❌Error Details

  • [Error: CannotMergeCommit] Cannot merge commit df2026749eb294317e78369946f226084f03dcad in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/defender-docs into branch public (commit d78ab417d19855045c8514f06fc2cb8d7a93a314). Please follow this documentation: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ to use git.exe to resolve you content conflicts locally and then push to remote.

For more details, please refer to the build report.

Note: Your PR may contain errors or warnings or suggestions unrelated to the files you changed. This happens when external dependencies like GitHub alias, Microsoft alias, cross repo links are updated. Please use these instructions to resolve them.

CESANU and others added 10 commits July 14, 2026 15:51
…ity-assess-1784033481

Update sql-azure-vulnerability-assessment-find.md
…… (#8623)

* Updating the docs to reflect the changes related to URBAC as default for new tenants. Also updating the permission mapping

* Update July 2026 section with new features

* Copy edit and technical review of URBAC-as-default updates

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: e89ca05b-243b-47a8-9a3b-44d8af32cc1c

---------

Co-authored-by: Chris Davis <chris.davis@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Learn Editor: Update microsoft-defender-endpoint-releases.md

* Learn Editor: Update microsoft-defender-endpoint-releases.md
Auto Publish – main to live - 2026-07-14 17:30 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit 10a9f5b:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File Status Preview URL Details
❌Error Details

  • [Error: CannotMergeCommit] Cannot merge commit 10a9f5b454a90dfd183187c666ee0e6dad5ec8f3 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/defender-docs into branch public (commit d78ab417d19855045c8514f06fc2cb8d7a93a314). Please follow this documentation: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ to use git.exe to resolve you content conflicts locally and then push to remote.

For more details, please refer to the build report.

Note: Your PR may contain errors or warnings or suggestions unrelated to the files you changed. This happens when external dependencies like GitHub alias, Microsoft alias, cross repo links are updated. Please use these instructions to resolve them.

ShawnKupfer and others added 8 commits July 14, 2026 14:06
* Update OS version requirements for device health

Change "2016 R2" to "2016": The reference to R2 is inappropriate.

Add "2025": Based on validation in our internal environment, it has been determined that although the information is outdated, it is still within the supported scope.

* Clarify OS requirements for device health reports

Updated OS compatibility requirements for Microsoft Defender Antivirus device health reports.

---------

Co-authored-by: Chris Davis <chris.davis@microsoft.com>
Remediation for COPY-EDIT.
Files affected: 1

Applied by AI Readiness Remediation Tool v1.0.0
Assessment source: assessment.csv

Co-authored-by: msec-docs-bot[bot] <258613010+msec-docs-bot[bot]@users.noreply.github.com>
Remediation for COPY-EDIT.
Files affected: 10

Applied by AI Readiness Remediation Tool v1.0.0
Assessment source: assessment.csv

Co-authored-by: msec-docs-bot[bot] <258613010+msec-docs-bot[bot]@users.noreply.github.com>
Remediation for COPY-EDIT.
Files affected: 10

Applied by AI Readiness Remediation Tool v1.0.0
Assessment source: assessment.csv

Co-authored-by: msec-docs-bot[bot] <258613010+msec-docs-bot[bot]@users.noreply.github.com>
Remediation for COPY-EDIT.
Files affected: 6

Applied by AI Readiness Remediation Tool v1.0.0
Assessment source: assessment.csv

Co-authored-by: msec-docs-bot[bot] <258613010+msec-docs-bot[bot]@users.noreply.github.com>
Co-authored-by: Chris Davis <chris.davis@microsoft.com>
…-endpoint-02) (#8480)

* fix(COPY-EDIT): editorial

Remediation for COPY-EDIT.
Files affected: 10

Applied by AI Readiness Remediation Tool v1.0.0
Assessment source: assessment.csv

* Update configure-block-at-first-sight-microsoft-defender-antivirus.md

* Update configure-block-at-first-sight-microsoft-defender-antivirus.md

---------

Co-authored-by: msec-docs-bot[bot] <258613010+msec-docs-bot[bot]@users.noreply.github.com>
Co-authored-by: Chris Davis <chris.davis@microsoft.com>
Auto Publish – main to live - 2026-07-14 22:30 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit c0078fb:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File Status Preview URL Details
❌Error Details

  • [Error: CannotMergeCommit] Cannot merge commit c0078fb82a2f1b5d3684dd6912068dcdcd05d136 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/defender-docs into branch public (commit d78ab417d19855045c8514f06fc2cb8d7a93a314). Please follow this documentation: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ to use git.exe to resolve you content conflicts locally and then push to remote.

For more details, please refer to the build report.

Note: Your PR may contain errors or warnings or suggestions unrelated to the files you changed. This happens when external dependencies like GitHub alias, Microsoft alias, cross repo links are updated. Please use these instructions to resolve them.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.