Skip to content

Resolve syncing conflicts from repo_sync_working_branch to public#536

Open
learn-build-service-prod[bot] wants to merge 286 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 286 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 24, 2026 13:15
…l-guywi-ms-06) (#8061)

* fix(COPY-EDIT): editorial

Remediation for COPY-EDIT.
Files affected: 10

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

* Fix bad AIRA edit

Updated section header from 'Next steps' to 'Next step'.

---------

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>
* fix(COPY-EDIT): editorial

Remediation for COPY-EDIT.
Files affected: 4

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

* Fix formatting of ms.custom metadata in document

---------

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>
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>
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>
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>
* Clarify that the Risky IP category is dynamic and can expire

Add a note explaining that the Risky category is assigned automatically
based on threat intelligence and is removed if no further malicious
activity is detected. All other categories are assigned manually.

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

* Apply suggestions from code review

Co-authored-by: AbbyMSFT <88824859+AbbyMSFT@users.noreply.github.com>

* Apply suggestion from @AbbyMSFT

* Apply suggestion from @AbbyMSFT

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Regan Downer <v-rdowner@microsoft.com>
* new onboarding

* updates

* updates

---------

Co-authored-by: Regan Downer <v-rdowner@microsoft.com>
…t8a-mberdugo) (#8077)

* fix(COPY-EDIT): editorial

Remediation for COPY-EDIT.
Files affected: 4

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

* Remove AIRA-duplicated ai-usage metadata

Removed 'ai-usage' line from the document header.

---------

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>
Auto Publish – main to live - 2026-06-24 22:33 UTC
Adds overview and detailed guidance for parameterized notebook jobs.

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

* Fixes
Auto Publish – main to live - 2026-06-25 12:30 UTC
…ons (#8151)

* Transition from grouped to individual recommendations

* Update transition article with end-state classification for deprecated assessments

- Add explanation of 3 end-states (dynamic substitute, static substitute, no substitute)
- Add End-state and New assessment ID columns to all reference tables
- Change 'NA (Static)' to 'Unknown' in Category column for static substitutes (EDR, SQL)
- Mark EDR and SQL rows as static substitutes with [TBD] new assessment IDs
- Fix HostMisconfiguration → HostMisconfigurations per category list
- Mark GitHub security posture management row as [TBD] pending DevOps partner input
- Add placeholder section for Microsoft Defender for Identity (pending partner review)

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

* Add July 31 deprecation date and clarify static substitute guidance

- Add July 31, 2026 as the grouped recommendation deprecation date
- Clarify that static substitute recommendations use 'Unknown' category
  and users should filter by assessment ID, not category filter

Per meeting with Roy Hirsch (June 21, 2026)

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

* Revert "Add July 31 deprecation date and clarify static substitute guidance"

This reverts commit c4f487921093d967d968310ed5e2773e07cf3291.

* Update grouped-to-individual recommendations article per Roy Hirsch review

- Remove IcM routing column from all tables (internal-only, not customer-facing)
- Fix ARG query field: securityCategories -> recommendationCategory
- Fix category name: 'Vulnerabilities' -> 'SoftwareUpdate' recommendation category
- Replace 'assessment key/ID' with 'recommendation ID' throughout
- Replace 'grouped assessment' with 'grouped recommendation' throughout
- Remove 'No substitute' end-state (deprecated items not included in this guide)
- Split each product table into Dynamic substitutes and Static substitutes sections
- Simplify table columns: Dynamic (Recommendation | Recommendation ID | Category),
  Static (Recommendation | Recommendation ID | New recommendation ID)
- Remove IcM routing reference from intro tip and reference section

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

* Rename 'Recommendation category reference' to 'Recommendation transition reference'

Section now covers both dynamic (category-based) and static (recommendation ID-based)
transitions, so 'category reference' was no longer accurate.

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

* Add July 31 deprecation date to transition guides

- Add July 31, 2026 deprecation date in transition-grouped-individual-recommendations.md
  (overview callout, adopting section, what you should do now callout)
- Add July 31, 2026 deprecation date in transition-disable-rules-exemptions.md

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

* Update transition guide with Roy's final feedback

- SQL databases/servers recs: mark as deprecated, replace static substitute table with note and link to full SQL recommendations reference
- Containers: add Azure (c609cf0f) and AWS (682b2595) running container images as dynamic substitutes mapped to SoftwareUpdate
- GitHub security posture mgmt (fd104c01): update [TBD] with link to full DevOps recommendations reference
- Linux secure boot rec (ad50b498): not added (status unknown per Roy)

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

* Fix SQL recommendations link to point to VA rules mapping article

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

* Replace internal substitute terms with plain descriptions

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

* Apply manual edits and re-apply terminology changes

- Remove Secure Score row from comparison table
- Update vulnerability management example description
- Rename old query label and add note before new query
- Remove Secure Score during transition section
- Change EDR recs to deprecated recommendations
- Replace Dynamic/Static substitute terms with plain descriptions

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

* Fix terminology: replace 'Dynamic substitutes' with 'Replaced by individual recommendations' in Containers and DevOps sections; fix garbled text and table in Servers deprecated section

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

* Apply suggestion from @DebLanger

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* fix files moved in error

* fixes
chrisda and others added 28 commits July 7, 2026 13:18
Corrected the date format and updated a link in the troubleshooting document.
* Configure controlled folder access

* CFA overview article rename

* CFA

* CFA Overview

* Removed CFA article from MDB

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

* 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 demos

* CFA/ASR demo updates

* Offending file name renames

Per build report

* Merge conflict updates

* Update defender-endpoint-demonstration-controlled-folder-access-ransomware.md
Auto Publish – main to live - 2026-07-07 22:30 UTC
Added note about file transfer limitations in low-bandwidth environments.
…for-office365 (#8508)

* Create prompt-injection-protection-in-microsoft-defender-for-office365

Page explaining new protections in MDO focused on protecting against AI attacks:

This page should be under Protect and Detect Section

* Copy edit prompt injection article, fix filename, add TOC and links

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

* Shorten article filename to prompt-injection-protection-in-defender-for-office365.md

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

* Rename article filename to prompt-injection-protection-in-defender-for-office-365.md

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

* Fix relative links (add ../) and rename article to prompt-injection-protection-defender-for-office-365.md

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

---------

Co-authored-by: Chris Davis <chris.davis@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Auto Publish – main to live - 2026-07-08 17:30 UTC
Auto Publish – main to live - 2026-07-08 22:30 UTC
Co-authored-by: Derrick Lee <derricklee@microsoft.com>
Auto Publish – main to live - 2026-07-09 07:30 UTC
…g #8447 (#8591)

* Add session start workflow to copilot instructions

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

* Revert "Add session start workflow to copilot instructions"

This reverts commit c138e4f61d733760b1887e526e2f6d485ab25bcd.

* Add session start workflow to copilot instructions

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

* Revert "Add session start workflow to copilot instructions"

This reverts commit c138e4f61d733760b1887e526e2f6d485ab25bcd.

* Add SaaS app support to Password protection page (work item 584112)

- Add SaaS apps (via Defender for Cloud Apps SSPM) as a supported source on the Password Hygiene and Password Policies tabs
- Add Defender for Cloud Apps license and app connector prerequisite
- Broaden intro to mention SaaS apps
- Add July 2026 what's new entry
- Update ms.date

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

* Apply suggestion from @AbbyMSFT

---------

Co-authored-by: AbbyMSFT <88824859+AbbyMSFT@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Sophia Nikolayev <v-snikolayev@microsoft.com>
Enhance getfile operation documentation
Auto Publish – main to live - 2026-07-09 12:30 UTC
Auto Publish – main to live - 2026-07-09 17:30 UTC
… PR#275 (#8630)

* User Story 593173: Clean up legacy defender-docs public repo PRs - OG PR#275

* Fix link
E3 gets MDO P1 + prompt injection protection
Auto Publish – main to live - 2026-07-09 22:30 UTC
* edits

* header size

* header

* test

* remove bullet

* first issue
Co-authored-by: Chris Davis <chris.davis@microsoft.com>
* Update defender-for-office-365-whats-new.md

E3 gets MDO P1 + prompt injection protection

* Update air-user-automatic-feedback-response.md

Added info about the 1115 character limit
Auto Publish – main to live - 2026-07-10 17:31 UTC
@learn-build-service-prod

Copy link
Copy Markdown
Contributor Author

Learn Build status updates of commit da2471d:

❌ 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 da2471da6d0ffadd6527c6638439172482af5ef9 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.