Merge branch 'public' into PollyNincevic-patch-2

.docutune/config/docutune-viva-pr.json

@@ -1,30 +1,28 @@
 {
- "BaseConfiguration": "docutune-default.json",
  "Docsets": [
  {
  "DocsetName": "OfficeDocs-Briefing",
- "BasePath": "/briefing"
+ "BuildSourceFolder": "Briefing"
  },
  {
  "DocsetName": "OfficeDocs-MyAnalytics",
- "BasePath": "/myanalytics"
+ "BuildSourceFolder": "MyAnalytics"
  },
  {
  "DocsetName": "OfficeDocs-Viva",
- "BasePath": "/viva"
+ "BuildSourceFolder": "Viva"
  },
  {
  "DocsetName": "OfficeDocs-WorkplaceAnalytics",
- "BasePath": "/workplace-analytics"
+ "BuildSourceFolder": "WorkplaceAnalytics"
  },
  {
  "DocsetName": "teams-insights",
- "BasePath": "/insights"
+ "BuildSourceFolder": "Teams-insights"
  },
  {
  "DocsetName": "Workplace-Analytics-Insights",
- "BasePath": "/workplace-analytics-insights"
+ "BuildSourceFolder": "workplace-analytics-insights"
  }
- ],
- "MetadataMultilineValues": true
-}
+ ]
+}

.github/workflows/AutoLabelAssign.yml

@@ -0,0 +1,41 @@
+name: Assign and label PR
+
+permissions:
+ pull-requests: write
+ contents: read
+ actions: read
+
+on: 
+ workflow_run:
+ workflows: [Background tasks]
+ types:
+ - completed
+
+jobs:
+ download-payload:
+ name: Download and extract payload artifact
+ uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
+ with:
+ WorkflowId: ${{ github.event.workflow_run.id }}
+ OrgRepo: ${{ github.repository }}
+ secrets:
+ AccessToken: ${{ secrets.GITHUB_TOKEN }}
+
+ label-assign:
+ name: Run assign and label
+ needs: [download-payload]
+ uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelAssign.yml@workflows-prod
+ with:
+ PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
+ AutoAssignUsers: 1
+ AutoLabel: 1
+ ExcludedUserList: '["user1", "user2"]'
+ ExcludedBranchList: '["branch1", "branch2"]'
+ secrets:
+ AccessToken: ${{ secrets.GITHUB_TOKEN }}
+
+
+
+
+
+

.github/workflows/AutoLabelMsftContributor.yml

@@ -0,0 +1,40 @@
+name: Auto label Microsoft contributors
+
+permissions:
+ pull-requests: write
+ contents: read
+ actions: read
+
+on: 
+ workflow_run:
+ workflows: [Background tasks]
+ types:
+ - completed
+
+jobs:
+ download-payload:
+ if: github.repository_visibility == 'public'
+ name: Download and extract payload artifact
+ uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
+ with:
+ WorkflowId: ${{ github.event.workflow_run.id }}
+ OrgRepo: ${{ github.repository }}
+ secrets:
+ AccessToken: ${{ secrets.GITHUB_TOKEN }}
+
+ label-msft:
+ name: Label Microsoft contributors
+ if: github.repository_visibility == 'public'
+ needs: [download-payload]
+ uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelMsftContributor.yml@workflows-prod
+ with:
+ PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
+ secrets:
+ AccessToken: ${{ secrets.GITHUB_TOKEN }}
+ TeamReadAccessToken: ${{ secrets.ORG_READTEAMS_TOKEN }}
+
+
+
+
+
+

.github/workflows/BackgroundTasks.yml

@@ -0,0 +1,26 @@
+name: Background tasks
+
+permissions:
+ pull-requests: write
+ contents: read
+
+on:
+ pull_request_target:
+
+jobs:
+ upload:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Save payload data
+ env:
+ PayloadJson: ${{ toJSON(github) }}
+ AccessToken: ${{ github.token }}
+ run: |
+ mkdir -p ./pr
+ echo $PayloadJson > ./pr/PayloadJson.json
+ sed -i -e "s/$AccessToken/XYZ/g" ./pr/PayloadJson.json
+ - uses: actions/upload-artifact@v4
+ with:
+ name: PayloadJson
+ path: pr/

.github/workflows/LiveMergeCheck.yml

@@ -0,0 +1,22 @@
+name: PR can merge into branch
+
+permissions:
+ pull-requests: write
+ statuses: write
+ contents: read
+
+on: 
+ pull_request_target:
+ types: [opened, reopened, synchronize, edited]
+
+jobs:
+
+ live-merge:
+ uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-LiveMergeCheck.yml@workflows-prod
+ with:
+ PayloadJson: ${{ toJSON(github) }}
+ secrets:
+ AccessToken: ${{ secrets.GITHUB_TOKEN }}
+
+
+

.github/workflows/PrFileCount.yml

@@ -0,0 +1,22 @@
+name: PR file count less than limit
+
+permissions:
+ pull-requests: write
+ statuses: write
+ contents: read
+
+on: 
+ pull_request_target:
+ types: [opened, reopened, synchronize, labeled, unlabeled, edited]
+
+jobs:
+
+ file-count:
+ uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-PrFileCount.yml@workflows-prod
+ with:
+ PayloadJson: ${{ toJSON(github) }}
+ secrets:
+ AccessToken: ${{ secrets.GITHUB_TOKEN }}
+
+
+

.github/workflows/ProtectedFiles.yml

@@ -0,0 +1,20 @@
+name: PR has no protected files
+
+permissions:
+ pull-requests: write
+ statuses: write
+ contents: read
+
+on: [pull_request_target]
+
+jobs:
+
+ protected-files:
+ uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ProtectedFiles.yml@workflows-prod
+ with:
+ PayloadJson: ${{ toJSON(github) }}
+ secrets:
+ AccessToken: ${{ secrets.GITHUB_TOKEN }}
+
+
+

.openpublishing.publish.config.json

@@ -92,7 +92,8 @@
  "notification_subscribers": [],
  "sync_notification_subscribers": [
  "[email protected]",
- " [email protected]"
+ " [email protected]",
+ " [email protected]"
  ],
  "branches_to_filter": [],
  "git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/viva",

.openpublishing.redirection.json

@@ -315,6 +315,11 @@
  "redirect_url": "/viva/insights/advanced/analyst/partner-integration",
  "redirect_document_id": false
  },
+ {
+ "source_path": "viva/insights/org-team-insights/copilot-dashboard-advanced-features.md",
+ "redirect_url": "/viva/insights/org-team-insights/copilot-dashboard",
+ "redirect_document_id": false
+ },
  {
  "source_path": "viva/insights/use/viva-insights-my-org.md",
  "redirect_url": "/viva/insights/org-team-insights/org-insights",
@@ -2110,6 +2115,26 @@
  "source_path": "Viva/solutions/solutions.yml",
  "redirect_url": "/viva/microsoft-viva-overview",
  "redirect_document_id": false
- }
+ },
+ { 
+ "source_path": "Viva/troubleshoot/connections/cant-find-app-in-teams-mobile.md",
+ "redirect_url": "/viva/connections/viva-connections-overview",
+ "redirect_document_id": true
+ },
+ { 
+ "source_path": "Viva/troubleshoot/connections/cant-update-app.md",
+ "redirect_url": "/viva/connections/viva-connections-overview",
+ "redirect_document_id": false
+ },
+ { 
+ "source_path": "Viva/troubleshoot/connections/cant-upload-package.md",
+ "redirect_url": "/viva/connections/viva-connections-overview",
+ "redirect_document_id": false
+ },
+ { 
+ "source_path": "Viva/troubleshoot/connections/error-accessing-app-from-teams-desktop.md",
+ "redirect_url": "/viva/connections/viva-connections-overview",
+ "redirect_document_id": false
+ },
  ]
 }

.openpublishing.redirection.viva.json

@@ -1041,13 +1041,23 @@
  },
  {
  "source_path": "Viva/engage/eac-get-started.md",
- "redirect_url": "/viva/engage/setup",
+ "redirect_url": "/viva/engage/eac-overview",
  "redirect_document_id": false
  },
  {
  "source_path": "viva/glint/start/customer-cohorts.md",
  "redirect_url": "/viva/glint/start/brochure-summary",
  "redirect_document_id": false
+ },
+ {
+ "source_path": "viva/glint/setup/retro-trend-updates.md",
+ "redirect_url": "/viva/glint/setup/manager-changing-team-role",
+ "redirect_document_id": false
+ }, 
+ {
+ "source_path": "viva/engage/eac-as-access-eac.md",
+ "redirect_url": "/viva/engage/eac-overview",
+ "redirect_document_id": false
  }
  ]
 }

Viva/360-config-cycle-settings.md

@@ -1,5 +1,5 @@
 ---
-title: Configure 360 cycle settings
+title: Configure 360 cycle settings (preview)
 description: There are five areas to set up in a new 360 cycle. Follow this guidance.
 ms.author: JudithWeiner
 author: JudyWeiner
@@ -18,7 +18,7 @@ ms.date: 5/23/2024
 ROBOTS: NOINDEX, NOFOLLOW
 ---
 
-# Configure 360 cycle settings
+# Configure 360 cycle settings (preview)
 
 Although *Manage Subjects* appears first on the cycle page, we recommend setting up **Cycle Settings** first. There are five areas to set up. As you move through them, a filled blue circle confirms their completion.
 

Viva/TOC.yml

@@ -13,7 +13,12 @@ items:
  - name: Microsoft Viva language support
  href: viva-language-support.md
  - name: Use Organizational Data in Microsoft 365
- href: organizational-data.md 
+ href: organizational-data.md 
+ items:
+ - name: Use organizational data in the Copilot dashboard
+ href: organizational-data-copilot.md 
+ - name: Integrate Viva Glint and Viva Insights to maximize data insight (preview)
+ href: /viva/solutions/glint-insights-integration-overview
  - name: Microsoft Viva privacy, security, and compliance
  items:
  - name: Overview
@@ -30,6 +35,8 @@ items:
  items:
  - name: Introduction to Copilot in Viva
  href: copilot/viva-copilot-overview.md
+ - name: Control access to Copilot in Viva
+ href: copilot/copilot-access-management.md
  - name: Deployment guides for Microsoft Viva
  href: deployment-guides-for-microsoft-viva.md
  - name: Self-help diagnostics for Viva administrators

Viva/amplify/overview-viva-amplify.md

@@ -6,7 +6,7 @@ manager: elizapo
 ms.reviewer: smathurin
 ms.date: 11/28/2023
 audience: admin
-ms.topic: article
+ms.topic: overview
 ms.custom: 
 - intro-overview
 - intro-get-started

Viva/amplify/privacy-security.md

@@ -6,7 +6,7 @@ manager: elizapo
 ms.reviewer: smathurin
 ms.date: 09/13/2023
 audience: admin
-ms.topic: article
+ms.topic: concept-article
 ms.service: viva-amplify
 search.appverid: MET150
 ms.collection:

Viva/amplify/set-up-viva-amplify.md

@@ -8,7 +8,7 @@ manager: elizapo
 audience: Admin
 f1.keywords:
 - NOCSH
-ms.topic: article
+ms.topic: install-set-up-deploy
 ms.service: viva-amplify
 search.appverid: MET150
 ms.collection:
@@ -132,7 +132,7 @@ Viva Amplify approvals are supported by the Approvals app in Teams. You need to
 
 ## Delete campaigns
 
-As a Global admin or SharePoint admin, you can delete a Viva Amplify campaign using the same method you would use to delete a SharePoint site. Deleted campaigns are stored for a set amount of time based on your organization's retention policies. [Learn more about how to delete a campaign](/sharepoint/delete-site-collection).
+As a SharePoint admin, you can delete a Viva Amplify campaign using the same method you would use to delete a SharePoint site. Deleted campaigns are stored for a set amount of time based on your organization's retention policies. [Learn more about how to delete a campaign](/sharepoint/delete-site-collection).
 
 >[!IMPORTANT]
 >Make sure to notify the campaign owner and any subsite owners before you delete a campaign so they can move their data to another location if needed.

Viva/amplify/viva-amplify-roles.md

@@ -8,7 +8,7 @@ manager: elizapo
 audience: Admin
 f1.keywords:
 - NOCSH
-ms.topic: article
+ms.topic: concept-article
 ms.service: viva-amplify
 search.appverid: MET150
 ms.collection:
@@ -25,13 +25,12 @@ You can make sure that everyone in your organization has the right permissions b
 
 ## Admin roles
 
-Users with both SharePoint Admin role and Microsoft 365 Groups Admin role can configure the Viva Amplify experience for their end users from within the Viva Amplify admin experience. This role is assigned to users by a Microsoft 365 Global admin. 
+Users with both SharePoint Admin role and Microsoft 365 Groups Admin role can configure the Viva Amplify experience for their end users from within the Viva Amplify admin experience.
 
 The following roles and permissions are required to set up Viva Amplify.
 
 |Admin role |Permissions |
 |-----------|------------|
-|Microsoft 365 global admin |The Microsoft 365 Global Admin has global access to management features and data across Microsoft 365 online services. For Viva Amplify, the Microsoft 365 Global Admin can install and pin the Viva Amplify app in Microsoft Teams, and manage in-app Viva Amplify settings. |
 |SharePoint admin |Users with this role have global permissions within Microsoft SharePoint Online, when the service is present, and the ability to create and manage all Microsoft 365 groups, manage support tickets, and monitor service health. |
 |Microsoft 365 Groups admin |Users in this role can create/manage groups and its settings like naming and expiration policies. It's important to understand that assigning a user to this role gives them the ability to manage all groups in the organization across various workloads like Viva Amplify campaigns, Teams, SharePoint, Yammer in addition to Outlook. Also, the user is able to manage the various groups settings across various admin portals like Microsoft admin center, Azure portal, and workload specific ones like Teams and SharePoint admin centers.