Merge pull request #7039 from MicrosoftDocs/main

Publish main to live, 10:30AM PST, 12/02

SharePoint/SharePointOnline/manage-access-agents-in-sharepoint.md

@@ -32,10 +32,18 @@ Agents in SharePoint, powered by AI, help users quickly find information and ins
 
 ## Manage who can access the agents
 
+### Use file permissions on the agent file
+
+As agents in SharePoint are represented as [.agent files](https://support.microsoft.com/office/create-and-edit-an-agent-d16c6ca1-a8e3-4096-af49-67e1cfdddd42#where-agent-file), permissions on the *.agent* file govern who can access or edit the agent. Only users who are able to create or access files on a SharePoint site can create or access agents.
+
+### Control user access through licensing
+
 Currently, users with a [Microsoft 365 Copilot license](/copilot/microsoft-365/microsoft-365-copilot-licensing) can use the agents. You can use the [Microsoft 365 Copilot setup guide](https://admin.microsoft.com/Adminportal/Home?Q=learndocs#/modernonboarding/microsoft365copilotsetupguide) in the Microsoft 365 admin center to assign the required licenses to users. For more information, see [Assign licenses to users in the Microsoft 365 admin center](/microsoft-365/admin/manage/assign-licenses-to-users) and [Microsoft 365 Copilot requirements](/copilot/microsoft-365/microsoft-365-copilot-requirements).
 
+Admins can choose to edit the service plans under the Copilot license to specifically allow or block users from using Copilot experiences on SharePoint. Under the [license details page for Microsoft 365 Copilot](https://admin.microsoft.com/Adminportal/Home?#/licensedetailpage/639dec6b-bb19-468b-871c-c5c441c4b0cb) on the Microsoft 365 admin center, admins can turn *'Microsoft 365 Copilot for SharePoint'* on or off on a per-user basis. For example, a user could be allowed to use Microsoft 365 Copilot on Teams but not use any agents on SharePoint alone. Note that this will also disable Copilots on OneDrive and the SharePoint page authoring Copilot for that user. 
+
 > [!NOTE]
-> From December 1, 2024, to June 30, 2025, enterprise tenants with 50 or more Microsoft 365 Copilot licenses will receive 10,000 free Agents in SharePoint queries for unlicensed users every month as a trial. Users with a role SharePoint administrators or higher can [check the trial promotion status](/powershell/module/sharepoint-online/get-spocopilotpromooptinstatus) and [set trial promotion](/powershell/module/sharepoint-online/set-spocopilotpromooptinstatus) using PowerShell cmdlets. Please see terms of trial usage [here](/legal/microsoft-365/in-app-trials-terms-of-service). 
+> From December 1, 2024, to June 30, 2025, enterprise tenants with 50 or more Microsoft 365 Copilot licenses will receive 10,000 free Agents in SharePoint queries for unlicensed users every month as a trial. Users with a role of SharePoint administrator or higher can [check the trial promotion status](/powershell/module/sharepoint-online/get-spocopilotpromooptinstatus) and [set trial promotion](/powershell/module/sharepoint-online/set-spocopilotpromooptinstatus) using PowerShell cmdlets. Please see the terms of trial usage [here](/legal/microsoft-365/in-app-trials-terms-of-service). 
 
 ## Manage what information a user can access through the agents
 
@@ -47,7 +55,7 @@ Agents in SharePoint use SharePoint sites, pages, and document libraries as know
 - Control access to a site that isn't associated with a group using [site permissions](/sharepoint/site-permissions).
 - Control access with access governance policies available in the SharePoint admin center and PowerShell.
 
-Learn more about using SharePoint built-in features to control access [here](/sharepoint/sharepoint-copilot-best-practices#step-2---prevent-oversharing-and-control-access-with-sharepoint-and-onedrive).
+Learn more about using SharePoint's built-in features to control access [here](/sharepoint/sharepoint-copilot-best-practices#step-2---prevent-oversharing-and-control-access-with-sharepoint-and-onedrive).
 
 ### With SharePoint Advanced Management
 
@@ -57,12 +65,17 @@ Learn more about more features to prevent oversharing, control access, and enhan
 ### With Microsoft Purview Data Loss Prevention (DLP)
 
 You can prevent selected files from being used by agents by using sensitivity labels along with [Microsoft Purview Data Loss Prevention (DLP)](/purview/dlp-learn-about-dlp). You [do this](/purview/dlp-create-deploy-policy#scenario-2-block-sharing-of-sensitive-items-via-sharepoint-and-onedrive-in-microsoft-365-with-external-users) by creating a DLP custom policy with the **Content contains** > **Sensitivity labels** condition to exclude items from being processed. Identified items are available in the citations of the response, but the content of the item isn't used in the response.
-We don’t yet support adding a sensitivity label directly to the [.agent file](https://support.microsoft.com/office/create-and-edit-an-agent-d16c6ca1-a8e3-4096-af49-67e1cfdddd42#where-agent-file). If you want to govern your *.agent* file with DLP, instead of using the Sensitivity labels as the condition, you can use conditions based on the *.agent* extension. We'll support the ability of adding a sensitivity label directly to a *.agent* file in the future.
+We don’t yet support adding a sensitivity label directly to the [.agent file](https://support.microsoft.com/office/create-and-edit-an-agent-d16c6ca1-a8e3-4096-af49-67e1cfdddd42#where-agent-file). If you want to govern your *.agent* file with DLP, instead of using the sensitivity labels as the condition, you can use conditions based on the *.agent* extension. We'll support the ability of adding a sensitivity label directly to a *.agent* file in the future.
+
+## Manage where agents are available in SharePoint
+
+### Site owner controls
+
+Agents created in SharePoint aren't automatically listed or published anywhere. Users can manually navigate to *.agent* files to use them just like how they would discover or use Word or Excel files. Site owners can choose to designate specific agents from their sites as 'approved' ones. These agents would be guaranteed to show up on the picker for that particular site, and users can differentiate them from the ones that are recommended to them. Learn more [here](https://support.microsoft.com/en-us/office/manage-agents-in-sharepoint-bcab837a-835c-4a1a-8ad4-d53a353c369f).
 
-## Manage where agents are available in SharePoint with restricted content discovery
+### Turn off agents on sites with restricted content discovery
 
-You as a SharePoint Admin can turn off all agent-related features on individual sites with the [restricted content discovery](/sharepoint/restricted-access-control). Once a site is flagged with restricted content discovery, users can't see the Copilot icon on the upper right of the site. Therefore, they don’t have access to use the ready-made agent, create new agents, or add content from that site to any other agents. The restricted content discovery policy leaves site access unchanged but prevents the site's content from being surfaced in Microsoft 365 Copilot or organization-wide Search for all users. 
-You as a SharePoint Admin can turn off all agent-related features on individual sites with the [restricted content discovery](/sharepoint/restricted-access-control). Once a site is flagged with restricted content discovery, users can't see the Copilot icon on the upper right of the site. Therefore, they don’t have access to use the ready-made agent, create new agents, or add content from that site to any other agents. The restricted content discovery policy leaves site access unchanged but prevents the site's content from being surfaced in Microsoft 365 Copilot or organization-wide Search for all users. 
+You as a SharePoint Admin can turn off all agent-related features on individual sites with the [restricted content discovery](/sharepoint/restricted-content-discovery). Once a site is flagged with restricted content discovery, users can't see the Copilot icon on the upper right of the site. Therefore, they don’t have access to use the ready-made agent, create new agents, or add content from that site to any other agents. The restricted content discovery policy leaves site access unchanged but prevents the site's content from being surfaced in Microsoft 365 Copilot or organization-wide search for all users. 
 
 ## More resources
 

SharePoint/SharePointServer/administration/configure-cross-site-publishing.md

@@ -1,10 +1,10 @@
 ---
 title: "Configure cross-site publishing in SharePoint Server"
 ms.reviewer: 
-ms.author: serdars
-author: SerdarSoysal
-manager: serdars
-ms.date: 7/18/2017
+ms.author: ruihu
+author: maggierui
+manager: jtremper
+ms.date: 12/2/2024
 audience: ITPro
 f1.keywords:
 - NOCSH
@@ -104,7 +104,7 @@ For information about how to create site content types and site columns, see the
 
 - [Create a managed metadata column](https://office.microsoft.com/office365-sharepoint-online-enterprise-help/create-a-managed-metadata-column-HA102832524.aspx?CTT=1)
 
-If you have large amounts of data in external business systems — for example, an ERP system — consider importing this data into one or more SharePoint lists. SharePoint Server does not have a solution for importing list content. However, you can develop custom import tools — for example, by using Microsoft PowerShell. For a set of example Microsoft PowerShell scripts that you can use to import list content for cross-site publishing, see [Import list content to Products list for SharePoint 2013 Preview](https://gallery.technet.microsoft.com/Import-list-content-to-f735d7fb). The example scripts import content only to a site collection that was created by using the Product Catalog Site Collection template.
+If you have large amounts of data in external business systems — for example, an ERP system — consider importing this data into one or more SharePoint lists. SharePoint Server does not have a solution for importing list content. However, you can develop custom import tools — for example, by using Microsoft PowerShell. For a set of example Microsoft PowerShell scripts that you can use to import list content for cross-site publishing, see [Import list content into the Product Catalog Site Collection in SharePoint Server](/sharepoint/administration/stage-2-import-list-content-into-the-product-catalog-site-collection). The example scripts import content only to a site collection that was created by using the Product Catalog Site Collection template.
 
 ### Share a library or list as a catalog
 <a name="BKMK_Share_library_list_as_catalog"> </a>
@@ -130,7 +130,7 @@ By default, anonymous access is enabled when you share a library or list as a ca
 
 4. On the **Catalog Settings** page, in the **Catalog Sharing** section, select the **Enable this library as a catalog** check box. 
 
-5. In the **Anonymous Access** section, if you want don't want anonymous users to view and search this content, click **Disable anonymous access**.
+5. In the **Anonymous Access** section, if you don't want anonymous users to view and search this content, click **Disable anonymous access**.
 
 6. In the **Catalog Item URL Fields** section, in the **Available fields** box, select up to five fields that uniquely identify an item in the library or list, and then click **Add**. 
 
@@ -264,4 +264,4 @@ Some actions — for example, doing search schema management to enable refiners
 
 #### Concepts
 
-[Automatically created managed properties in SharePoint Server](../technical-reference/automatically-created-managed-properties-in-sharepoint.md)
+[Automatically created managed properties in SharePoint Server](../technical-reference/automatically-created-managed-properties-in-sharepoint.md)

SharePoint/SharePointServer/administration/configure-sharepoint-server-2013-in-a-three-tier-farm.md

@@ -1,10 +1,10 @@
 ---
 title: "Test Lab Guide Configure SharePoint Server 2013 in a three-tier farm"
 ms.reviewer: 
-ms.author: serdars
-author: SerdarSoysal
-manager: serdars
-ms.date: 7/10/2017
+ms.author: ruihu
+author: maggierui
+manager: jtremper
+ms.date: 12/2/2024
 audience: ITPro
 f1.keywords:
 - NOCSH
@@ -19,9 +19,7 @@ description: "Learn how to install and configure SharePoint Server 2013 on multi
 
 [!INCLUDE[appliesto-2013-xxx-xxx-xxx-xxx-md](../includes/appliesto-2013-xxx-xxx-xxx-xxx-md.md)] 
 
-This document is the [Test Lab Guide](https://go.microsoft.com/fwlink/p/?LinkId=202817) version of the procedures that are described in [Install SharePoint Server 2016 across multiple servers](../install/install-sharepoint-server-2016-across-multiple-servers.md).
-
-This document contains instructions [for](https://go.microsoft.com/fwlink/p/?LinkId=202817) the following:
+This document contains instructions for:
 
 1. Configuring the Base Configuration test lab.
 
@@ -37,7 +35,7 @@ This document contains instructions [for](https://go.microsoft.com/fwlink/p/?Lin
 
 7. Demonstrating the facilities of the default Contoso team site on WFE1.
 
-**Watch the configure SharePoint Server 2013 in a three-tier farm test lab guide overview video**
+**Watch the "Configure SharePoint Server 2013 in a three-tier farm test lab guide overview" video**
 
 > [!VIDEO https://www.microsoft.com/videoplayer/embed/47259e75-5973-4296-8d2a-e86c64efe5a2?autoplay=false]
 
@@ -49,10 +47,11 @@ For information about how to configure this test lab in Hyper-V, see [Hosting th
 
 ## See also
 
-#### Concepts
+### Concepts
 
 [Install SharePoint Server 2016 across multiple servers](../install/install-sharepoint-server-2016-across-multiple-servers.md)
-#### Other Resources
 
-[Test Lab Guides](https://go.microsoft.com/fwlink/p/?LinkId=202817)
+### Other Resources
+
+[Test Lab Guides](/sharepoint/administration/test-lab-guides)
 

SharePoint/SharePointServer/administration/demonstrate-forms-based-claims-authentication.md

@@ -1,10 +1,10 @@
 ---
 title: "Test Lab Guide Demonstrate forms-based claims authentication for SharePoint Server 2013"
 ms.reviewer: 
-ms.author: serdars
-author: SerdarSoysal
-manager: serdars
-ms.date: 7/10/2017
+ms.author: ruihu
+author: maggierui
+manager: jtremper
+ms.date: 12/02/2024
 audience: ITPro
 f1.keywords:
 - NOCSH
@@ -19,9 +19,9 @@ description: "Learn how to configure and demonstrate form-based authentication f
 
 [!INCLUDE[appliesto-2013-xxx-xxx-xxx-xxx-md](../includes/appliesto-2013-xxx-xxx-xxx-xxx-md.md)] 
 
-This document is the [Test Lab Guide](https://go.microsoft.com/fwlink/p/?LinkId=202817) version of the configuration described in [Configure forms-based authentication for a claims-based web application in SharePoint Server](/previous-versions/office/sharepoint-server-2010/ee806890(v=office.14)). 
+This document is the [Test Lab Guide](https://www.microsoft.com/download/details.aspx?id=34684) version of the configuration described in [Configure forms-based authentication for a claims-based web application in SharePoint Server](/previous-versions/office/sharepoint-server-2010/ee806890(v=office.14)). 
 
-This document contains instructions for the following: 
+This document contains instructions for: 
 
 1. Setting up the SharePoint Server 2013 three-tier farm test lab.
 
@@ -42,5 +42,5 @@ This document contains instructions for the following:
 
 [Configure forms-based authentication for a claims-based web application in SharePoint Server](/previous-versions/office/sharepoint-server-2010/ee806890(v=office.14))
 
-[Test Lab Guides](https://go.microsoft.com/fwlink/p/?LinkId=202817)
+[Test Lab Guides](https://www.microsoft.com/download/details.aspx?id=34684)
 

SharePoint/SharePointServer/administration/integrate-multiple-viva-engage-networks-into-sharepoint-server.md

@@ -1,10 +1,10 @@
 ---
 title: "Integrate multiple Viva Engage networks into SharePoint Server"
 ms.reviewer: 
-ms.author: serdars
-author: SerdarSoysal
-manager: serdars
-ms.date: 9/7/2018
+ms.author: ruihu
+author: maggierui
+manager: jtremper
+ms.date: 12/02/2024
 audience: ITPro
 f1.keywords:
 - NOCSH
@@ -22,7 +22,7 @@ description: "Learn how to integrate multiple active Viva Engage networks togeth
 This scenario describes the prerequisites and recommended steps to integrate multiple active Viva Engage networks together with your SharePoint Server environment.
 
 > [!NOTE]
-> Multiple active Viva Engage networks on one account are no longer supported after October 26, 2018. For more info, see [FAQ: Consolidating multiple Viva Engage networks](/viva/engage/configure-your-viva-engage-network/faq-consolidate-multiple-viva-engage-networks).
+> Multiple active Viva Engage networks on one account are no longer supported after October 26, 2018. For more info, see [Network migration - Consolidate multiple Viva Engage networks](/viva/engage/configure-your-viva-engage-network/consolidate-multiple-networks).
   
 ## Scenario prerequisites
 
@@ -38,18 +38,18 @@ For this scenario, we assume that:
 
 When you integrate an email domain that has an existing Viva Engage network into a larger parent network, it's called a network merge. A network merge is a valid option when an organization has multiple business units or subsidiaries that want to take advantage of the collaboration and administrative features of Viva Engage but that don't share a common email domain.
 
-For example, say Contoso.com is an international company with subsidiaries in locations around the world. Each subsidiary has different product lines to serve the unique needs of customers in the area. Employee email addresses reflect the name of their subsidiary, like @contoso-europe.com and @contoso-asia.com. In a network merge, all subsidiary domains merge into the parent Viva Engage network, @contoso.com, and users who have subsidiary email addresses would be routed to the parent Viva Engage network when they sign in.
+For example, say Contoso.com is an international company with subsidiaries in locations around the world. Each subsidiary has different product lines to serve the unique needs of customers in the area. User email addresses reflect the name of their subsidiary, like @contoso-europe.com and @contoso-asia.com. In a network merge, all subsidiary domains merge into the parent Viva Engage network, @contoso.com, and users who have subsidiary email addresses would be routed to the parent Viva Engage network when they sign in.
 
 > [!CAUTION]
 > When you do a network merge, the data in all subsidiary networks is permanently deleted. 
   
-For more information about administering Viva Engage, see [Viva Engage - Admin help](/viva-engage/).
+For more information about administering Viva Engage, see [Viva Engage - Admin help](/viva/engage/overview).
 
 ## Step 1: Merge multiple Viva Engage networks
 
 Merging Viva Engage networks merges the users, but not the data. Before doing the merge, tell users whose networks will be merged with the parent network the date, time, and effects of the merge. Additionally, share the reasons for the merge, highlight the benefits, and provide instructions for archiving private message data, notes, files, and so on. Let users know that all data in the child networks will be permanently deleted.
 
-When you are ready to merge networks:
+When you're ready to merge networks:
 
 - Follow the directions in [Combine multiple Viva Engage networks](/viva/engage/configure-your-viva-engage-network/consolidate-multiple-viva-engage-networks).
 

SharePoint/SharePointServer/administration/performancepoint-services-overview.md

@@ -1,10 +1,10 @@
 ---
-ms.date: 03/19/2018
+ms.date: 12/02/2024
 title: "PerformancePoint Services in SharePoint Server overview"
 ms.reviewer: 
-ms.author: serdars
-author: SerdarSoysal
-manager: serdars
+ms.author: ruihu
+author: maggierui
+manager: jtremper
 audience: ITPro
 f1.keywords:
 - NOCSH
@@ -29,8 +29,6 @@ To configure PerformancePoint Services in SharePoint Server, see [Configure Perf
 To learn about how to use PerformancePoint Services, see the following resources:
 
 - [PerformancePoint Services and Dashboard Designer compiled help file (CHM)](https://www.microsoft.com/download/details.aspx?id=55772).
-
-- [PerformancePoint Services Dashboard Creation SuperFlow](https://go.microsoft.com/fwlink/p/?LinkId=226357)
 
 > [!NOTE]
 > PerformancePoint Services has been removed from SharePoint Server Subscription Edition. We recommend to explore Microsoft [Power BI](https://powerbi.microsoft.com/) as an alternative to PerformancePoint Services.
@@ -40,5 +38,5 @@ To learn about how to use PerformancePoint Services, see the following resources
     
 ## See also
 
-[PerformancePoint Services IT Configuration SuperFlow](https://go.microsoft.com/fwlink/p/?LinkId=226358)
+[Configure PerformancePoint Services](/SharePoint/administration/configure-performancepoint-services)