Resolve syncing conflicts from repo_sync_working_branch to main by learn-build-service-prod[bot] · Pull Request #8151 · MicrosoftDocs/windowsserverdocs

learn-build-service-prod · 2026-10-30T22:34:45Z

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

Co-authored-by: learn-build-service-prod-03[bot] <274428581+learn-build-service-prod-03[bot]@users.noreply.github.com>

…ats-new.md Co-authored-by: learn-build-service-prod-03[bot] <274428581+learn-build-service-prod-03[bot]@users.noreply.github.com>

Removed a bullet point about security updates and fixed a bug related to sign-in and sign-out issues in non-English locales.

…ats-new-1793161029 Update web-client-whats-new.md

…s:https://github.com/MicrosoftDocs/windowsserverdocs (branch main) (#8512) * Remove applies-to tags from ReFS boot preview article (#8148) * Remove applies-to tags from ReFS boot preview Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: ced28bf9-a93f-477c-81c5-f28df95b5461 * Configure ReFS boot preview applies-to badge centrally Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: robinharwood <19212983+robinharwood@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: ced28bf9-a93f-477c-81c5-f28df95b5461 * Clarify security group descriptions and risks (#8144) esp. update the "safe to delegate" row, as it was too open on several groups. * Apply batched suggestions from code review Co-authored-by: learn-build-service-prod-01[bot] <274427437+learn-build-service-prod-01[bot]@users.noreply.github.com> --------- Co-authored-by: learn-build-service-prod[bot] <113403604+learn-build-service-prod[bot]@users.noreply.github.com> Co-authored-by: Christina Curlette <35821371+chcurlet-msft@users.noreply.github.com> Co-authored-by: robinharwood <19212983+robinharwood@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Learn Build Service GitHub App <Learn Build Service LearnBuild@microsoft.com> Co-authored-by: Herbert Mauerer <41573578+HerbertMauerer@users.noreply.github.com> Co-authored-by: learn-build-service-prod-01[bot] <274427437+learn-build-service-prod-01[bot]@users.noreply.github.com> Copilot-Session: ced28bf9-a93f-477c-81c5-f28df95b5461

Auto Publish – main to live - 2026-10-30 22:30 UTC

prmerger-automator · 2026-10-30T22:34:55Z

@learn-build-service-prod[bot] : Thanks for your contribution! The author(s) and reviewer(s) have been notified to review your proposed change.

prmerger-automator · 2026-10-30T22:34:57Z

@learn-build-service-prod[bot] : Thanks for your contribution! The author(s) and reviewer(s) have been notified to review your proposed change.

learn-build-service-prod · 2026-10-30T22:35:17Z

Learn Build status updates of commit 6876a2f:

❌ 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 6876a2f37b23513eab6418970aac7aaab1891fd9 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/windowsserverdocs into branch main (commit 2205ce8e55001a9b5e8e0de43981baa8ad782562). Please follow this documentation: https://github.com/proxy/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.

* Add NDES configuration for SID information in requests This article explains how to configure NDES to accept certificate requests containing SID information, addressing security considerations and prerequisites. * Revise NDES SID certificate request configuration Updated the instructions for configuring NDES to allow SID information in certificate enrollment requests, including changes to warning and registry configuration details. * Include NDES SID guidance in publishing and enrollment navigation Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: beba4517-97c1-4a7e-a20c-45a290956306 * Apply NDES authoring feedback and clarify Windows Server title Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: beba4517-97c1-4a7e-a20c-45a290956306 --------- Co-authored-by: John Kennedy <jken@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: beba4517-97c1-4a7e-a20c-45a290956306

Publish the reviewed NDES SID certificate request article and its enrollment-services TOC entry from main to live. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: beba4517-97c1-4a7e-a20c-45a290956306

learn-build-service-prod · 2026-11-06T21:52:15Z

Learn Build status updates of commit d90640f:

❌ 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 d90640fd059e673230073c52b8d198d2a910d252 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/windowsserverdocs into branch main (commit 2205ce8e55001a9b5e8e0de43981baa8ad782562). Please follow this documentation: https://github.com/proxy/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.

Updated the NDES configuration article to include details about the changes introduced in the October 2026 Windows Server security updates related to CVE-2026-69802, enhancing the explanation of how to handle SID information in certificate requests.

Clarify NDES SID handling and security updates

Update Avenues-to-Compromise.md

* Add RD Web Access XSLT migration guidance Document how to migrate RD Web Access customizations from browser-side XSLT to the server-side renderer, including configuration, compatibility, validation, and troubleshooting guidance. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 857f93ff-685e-4764-a0aa-e12cb1f77ced * Address authoring assistant feedback Apply the three requested wording updates for sentence flow, present tense, and conciseness. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 857f93ff-685e-4764-a0aa-e12cb1f77ced * Resolve RD Web Access SME review feedback Confirm supported release applicability, browser-independent server-side rendering, administrator permissions, and functional browser validation. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 857f93ff-685e-4764-a0aa-e12cb1f77ced --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 857f93ff-685e-4764-a0aa-e12cb1f77ced

Auto Publish – main to live - 2026-11-10 18:30 UTC

learn-build-service-prod · 2026-11-10T18:36:23Z

Learn Build status updates of commit 9235957:

❌ 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 9235957b120d186cdafb80bc89b5262f73ab04e4 in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/windowsserverdocs into branch main (commit 2205ce8e55001a9b5e8e0de43981baa8ad782562). Please follow this documentation: https://github.com/proxy/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.

Added guidance on preventing unexpected outbound DNS and CLDAP traffic from AD FS username and password requests, including enabling Extranet Smart Lockout and restricting outbound CLDAP traffic.

Updated FAQ entry regarding unexpected outbound DNS and CLDAP traffic from AD FS username and password requests.

Update AD-FS-FAQ with DNS and CLDAP traffic mitigation

Auto Publish – main to live - 2026-11-11 23:30 UTC

learn-build-service-prod · 2026-11-11T23:34:00Z

Learn Build status updates of commit 84058e2:

❌ 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 84058e2b707bae24c9d88f5ef677d6fa58bc1faa in branch repo_sync_working_branch of repository https://github.com/MicrosoftDocs/windowsserverdocs into branch main (commit 2205ce8e55001a9b5e8e0de43981baa8ad782562). Please follow this documentation: https://github.com/proxy/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.

Bowen Yang (Albertyang0) and others added 9 commits October 26, 2026 14:03

Update Avenues-to-Compromise.md

e7fb53c

Learn Editor: Update web-client-whats-new.md

372cf1d

Learn Editor: Update web-client-whats-new.md

55530e7

Apply suggestion from @learn-build-service-prod-03[bot]

528f4a4

Co-authored-by: learn-build-service-prod-03[bot] <274428581+learn-build-service-prod-03[bot]@users.noreply.github.com>

Update WindowsServerDocs/remote/remote-desktop-services/web-client-wh…

114239b

…ats-new.md Co-authored-by: learn-build-service-prod-03[bot] <274428581+learn-build-service-prod-03[bot]@users.noreply.github.com>

Update web client what's new documentation

b11caad

Removed a bullet point about security updates and fixed a bug related to sign-in and sign-out issues in non-English locales.

Merge pull request #8510 from alex-fromm-ms/docs-editor/web-client-wh…

fe750e2

…ats-new-1793161029 Update web-client-whats-new.md

Merge pull request #8513 from MicrosoftDocs/main

6876a2f

Auto Publish – main to live - 2026-10-30 22:30 UTC

learn-build-service-prod Bot requested a review from a team as a code owner October 30, 2026 22:34

prmerger-automator Bot added the do-not-merge label Oct 30, 2026

learn-build-service-prod Bot requested review from Robin Harwood (robinharwood) and removed request for a team October 30, 2026 22:34

prmerger-automator Bot added Change sent to author remote-desktop-services/subsvc windows-server/svc labels Oct 30, 2026

Tanya Jha (TanyaJha31) and others added 2 commits November 6, 2026 13:28

Tanya Jha (TanyaJha31) and others added 8 commits November 9, 2026 17:57

Merge pull request #8713 from TanyaJha31/patch-4

2953f8d

Clarify NDES SID handling and security updates

Update VDDK download link in migration guide (#8507)

771b3f8

Update F5 BIG-IP Access Policy Manager link (#8506)

ec316b0

Merge pull request #8504 from MicrosoftDocs/Albertyang0-patch-1

5b564fd

Update Avenues-to-Compromise.md

Update CBT troubleshooting links in documentation (#8508)

6930954

Merge pull request #8727 from MicrosoftDocs/main

9235957

Auto Publish – main to live - 2026-11-10 18:30 UTC

Tanya Jha (TanyaJha31) and others added 5 commits November 11, 2026 10:03

Update AD-FS-FAQ with DNS and CLDAP traffic mitigation

736342b

Added guidance on preventing unexpected outbound DNS and CLDAP traffic from AD FS username and password requests, including enabling Extranet Smart Lockout and restricting outbound CLDAP traffic.

Modify FAQ on AD FS outbound traffic mitigation

5475f8a

Updated FAQ entry regarding unexpected outbound DNS and CLDAP traffic from AD FS username and password requests.

Fix indentation in AD FS FAQ answer

b362755

Merge pull request #8739 from TanyaJha31/patch-5

dba93a5

Update AD-FS-FAQ with DNS and CLDAP traffic mitigation

Merge pull request #8740 from MicrosoftDocs/main

84058e2

Auto Publish – main to live - 2026-11-11 23:30 UTC

Navigation Menu

Repository navigation

Resolve syncing conflicts from repo_sync_working_branch to main - #8151

Resolve syncing conflicts from repo_sync_working_branch to main#8151
learn-build-service-prod[bot] wants to merge 24 commits into
mainfrom
repo_sync_working_branch

learn-build-service-prod Bot commented Oct 30, 2026

Uh oh!

prmerger-automator Bot commented Oct 30, 2026

Uh oh!

prmerger-automator Bot commented Oct 30, 2026

Uh oh!

learn-build-service-prod Bot commented Oct 30, 2026

Uh oh!

learn-build-service-prod Bot commented Nov 6, 2026

Uh oh!

learn-build-service-prod Bot commented Nov 10, 2026

Uh oh!

learn-build-service-prod Bot commented Nov 11, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

learn-build-service-prod Bot commented Oct 30, 2026

Uh oh!

prmerger-automator Bot commented Oct 30, 2026

Uh oh!

prmerger-automator Bot commented Oct 30, 2026

Uh oh!

learn-build-service-prod Bot commented Oct 30, 2026

❌ Validation status: errors

Uh oh!

learn-build-service-prod Bot commented Nov 6, 2026

❌ Validation status: errors

Uh oh!

learn-build-service-prod Bot commented Nov 10, 2026

❌ Validation status: errors

Uh oh!

learn-build-service-prod Bot commented Nov 11, 2026

❌ Validation status: errors

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants