Merge branch 'main' into patch-1

Author: Ruchika-mittal01

.acrolinx-config.edn

@@ -51,10 +51,10 @@ Select the total score link to review all feedback on clarity, consistency, tone
  "
 **More information about Acrolinx**
  
-- [Install Acrolinx locally for VSCode for Magic](https://review.docs.microsoft.com/office-authoring-guide/acrolinx-vscode?branch=main)
+- [Install Acrolinx locally for VSCode for Magic](https://review.learn.microsoft.com/en-us/office-authoring-guide/acrolinx-vscode?branch=main)
 - [False positives or issues](https://aka.ms/acrolinxbug)
 - [Request a new Acrolinx term](https://microsoft.sharepoint.com/teams/M365Dev2/SitePages/M365-terminology.aspx)
-- [Troubleshooting issues with Acrolinx](https://review.docs.microsoft.com/help/contribute/acrolinx-error-messages)
+- [Troubleshooting issues with Acrolinx](https://review.learn.microsoft.com/en-us/help/platform/acrolinx-troubleshoot?branch=main)
 
 "
 }

.github/workflows/AutoPublish.yml

@@ -3,23 +3,25 @@ name: (Scheduled) Publish to live
 permissions:
   contents: write
   pull-requests: write
+  checks: read
 
 on:
   schedule:
-    - cron: "25 5,11,17,22 * * *" # Times are UTC based on Daylight Saving Time. Need to be adjusted for Standard Time. Scheduling at :25 to account for queuing lag.
+    - cron: "25 2,5,8,11,14,17,20,22 * * *" # Times are UTC based on Daylight Saving Time. Need to be adjusted for Standard Time. Scheduling at :25 to account for queuing lag.
 
   workflow_dispatch:
 
 jobs:
 
   auto-publish:
     if: github.repository_owner == 'MicrosoftDocs' && contains(github.event.repository.topics, 'build')
-    uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoPublish.yml@workflows-prod
+    uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoPublishV2.yml@workflows-prod
     with:
         PayloadJson: ${{ toJSON(github) }}
         EnableAutoPublish: true
+        EnableAutoMerge: true
 
     secrets:
         AccessToken: ${{ secrets.GITHUB_TOKEN }}
         PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}
-        ClientId: ${{ secrets.M365_APP_CLIENT_ID }}
+        ClientId: ${{ secrets.M365_APP_CLIENT_ID }}

.openpublishing.redirection.security.json

@@ -9349,6 +9349,11 @@
           "source_path": "Microsoft-365/security/defender/zero-trust-with-microsoft-365-defender.md",
           "redirect_url": "/defender-xdr/zero-trust-with-microsoft-365-defender",
           "redirect_document_id": false
+        },
+        {
+          "source_path": "Microsoft-365/security/microsoft-365-zero-trust.md",
+          "redirect_url": "/security/zero-trust/microsoft-365-zero-trust",
+          "redirect_document_id": false
         }
    ]
  }

copilot/TOC.yml

@@ -32,16 +32,17 @@ items:
       href: microsoft-365-copilot-blueprint-oversharing.md
 - name: Deploy and enable Microsoft 365 Copilot
   items: 
-    - name: Set up and assign licenses
-      href: microsoft-365-copilot-setup.md
-    - name: Requirements and prerequisites
-      href: microsoft-365-copilot-requirements.md
+    - name: Adoption guide and overview
+      href: microsoft-365-copilot-enablement-resources.md
     - name: License options
       href: microsoft-365-copilot-licensing.md
-    - name: Enable users and welcome email
+    - name: App and network requirements
+      href: microsoft-365-copilot-requirements.md
+    - name: Set up Copilot and assign licenses
+      href: microsoft-365-copilot-setup.md
+    - name: Welcome email for users
       href: microsoft-365-copilot-enable-users.md  
-    - name: Adoption resources
-      href: microsoft-365-copilot-enablement-resources.md
+
 - name: Pay-as-you-go for Microsoft 365 Copilot
   items:
     - name: Pay-as-you-go overview
@@ -56,6 +57,14 @@ items:
   items:
     - name: Manage Microsoft 365 Copilot scenarios 
       href: microsoft-365-copilot-page.md
+    - name: Set up the Microsoft 365 Copilot app
+      items:
+        - name: Overview and availability
+          href: microsoft-365-copilot-app-overview.md
+        - name: Admin settings
+          href: microsoft-365-copilot-app-admin-settings.md
+        - name: Set up Organizational Asset Library
+          href: enterprise-brand-manager.md
     - name: Pin Copilot Chat to the navigation bar
       href: pin-copilot.md
     - name: Copilot in Microsoft 365 admin centers
@@ -64,10 +73,33 @@ items:
       href: multiple-account-access.md  
     - name: Manage prompts
       items:
-      - name: Export prompts from Copilot Prompt Gallery
-        href: copilot-prompt-gallery-export-prompts.md
       - name: Scheduled prompts
         href: scheduled-prompts.md
+    - name: People Skills
+      items:
+        - name: Manage skills library
+          items:
+            - name: People Skills Overview
+              href: people-skills-overview.md
+            - name: Setup People Skills
+              href: people-skills-setup.md
+            - name: Manage skills library
+              href: people-skills-manage-skills-library.md
+            - name: People skills data and AI guidelines
+              href: people-skills-data-and-ai-guidelines.md
+            - name: People Skills import and export
+              href: people-skills-import-export-skills.md
+            - name: Privacy and sharing controls
+              href: people-skills-sharing-inferencing-controls.md
+            - name: AI inference engine
+              href: people-skills-ai-inferencing.md
+    - name: Microsoft 365 environment for scheduled prompts
+      href: scheduled-prompts-environment.md
+    - name: Export prompts from Copilot Prompt Gallery
+      href: copilot-prompt-gallery-export-prompts.md
+    - name: Inventory scheduled prompts
+      href: scheduled-prompts-inventory.md     
+
 - name: Microsoft 365 Copilot in Microsoft Teams
   items:
     - name: Overview of AI in Microsoft Teams
@@ -108,6 +140,8 @@ items:
   items:
     - name: Extend Microsoft 365 Copilot
       href: /microsoft-365-copilot/extensibility?toc=%2Fcopilot%2Fmicrosoft-365%2Ftoc.json&bc=%2Fcopilot%2Fmicrosoft-365%2Fbreadcrumb%2Ftoc.json
+    - name: Microsoft 365 Copilot Tuning
+      href: copilot-tuning-overview.md
 - name: Service description and training for Microsoft 365 Copilot
   items:
     - name: Service description