From 39f9ab87960fa0995c1a0ff8812b9e09c43b4223 Mon Sep 17 00:00:00 2001 From: Rui Hu <7605757+maggierui@users.noreply.github.com> Date: Fri, 24 Jan 2025 00:13:39 -0500 Subject: [PATCH 1/6] added the comparison table --- .../SharePointOnline/get-started-sharepoint-agents.md | 11 +++++++++++ .../manage-access-agents-in-sharepoint.md | 2 +- .../SharePointOnline/sign-out-inactive-users.md | 8 +++----- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/SharePoint/SharePointOnline/get-started-sharepoint-agents.md b/SharePoint/SharePointOnline/get-started-sharepoint-agents.md index fdb5da2af1..2fefc9ec05 100644 --- a/SharePoint/SharePointOnline/get-started-sharepoint-agents.md +++ b/SharePoint/SharePointOnline/get-started-sharepoint-agents.md @@ -45,3 +45,14 @@ Users can use SharePoint agents after being [assigned a Copilot license](/copilo ## Use agents with pay-as-you-go billing To use pay-as-you-go billing, you need to first set up SharePoint agents as a resource in Azure. That resource is used whenever a user without a Microsoft 365 Copilot license uses a SharePoint agent. For more information, see [Use agents with pay-as-you-go billing](/sharepoint/sharepoint-agents-azure-billing). + +## Comparison of pay-as-you-go billing, Copilot licenses, and the trial promotion + +What does the user get with pay-as-you-go billing vs. a Copilot license vs. the trial promotion? Here is a comparison: +| [Licensed for Microsoft 365 Copilot](/copilot/microsoft-365/microsoft-365-copilot-licensing) | [Pay-as-you-go](/sharepoint/sharepoint-agents-azure-billing) Enabled | [Trial promotion access](/sharepoint/manage-trial-agents-sharepoint-powershell#what-is-the-trial-access-to-sharepoint-agents) opted In | What does the user get? | +|-----------------------------------------|-----------------------|-----------------------------|-------------------------| +| No | No | No | Cannot create or use agents | +| No | Yes | No | All unlicensed users get to create and use agents and are billed per pay-as-you-go billing. | +| No | Yes | Yes | All unlicensed users can create and use agents up to 10,000 queries per month and then pay-as-you-go kicks in once the promo is over. | +| Yes | Yes | Yes | Licensed users can create and use agents without using the trial promotion or pay-as-you-go billing); Unlicensed users can create and use agents up to 10,000 queries per month and then pay-as-you-go kicks in once promo is over. | +| Yes | No | No | Licensed users can create and use agents. Unlicensed users can't create or use agents. | diff --git a/SharePoint/SharePointOnline/manage-access-agents-in-sharepoint.md b/SharePoint/SharePointOnline/manage-access-agents-in-sharepoint.md index 74ab8adf6b..c1e9d722ab 100644 --- a/SharePoint/SharePointOnline/manage-access-agents-in-sharepoint.md +++ b/SharePoint/SharePointOnline/manage-access-agents-in-sharepoint.md @@ -43,7 +43,7 @@ Currently, users with a [Microsoft 365 Copilot license](/copilot/microsoft-365/m 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. This will also disable Copilots on OneDrive and the SharePoint page authoring Copilot for that user.  > [!NOTE] -> From January 6, 2025, to June 30, 2025, enterprise tenants with 50 or more Microsoft 365 Copilot licenses will receive 10,000 free SharePoint agents messages 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. See the terms of trial usage [here](/legal/microsoft-365/in-app-trials-terms-of-service).  +> From January 6, 2025, to June 30, 2025, enterprise tenants with 50 or more Microsoft 365 Copilot licenses will receive 10,000 free SharePoint agents 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. 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 diff --git a/SharePoint/SharePointOnline/sign-out-inactive-users.md b/SharePoint/SharePointOnline/sign-out-inactive-users.md index c6092d351e..52cffe6da3 100644 --- a/SharePoint/SharePointOnline/sign-out-inactive-users.md +++ b/SharePoint/SharePointOnline/sign-out-inactive-users.md @@ -1,5 +1,5 @@ --- -ms.date: 07/11/2018 +ms.date: 01/22/2025 title: "Sign out inactive users" ms.reviewer: samust manager: jtremper @@ -29,10 +29,8 @@ description: "Learn how to set an idle session sign-out policy for SharePoint an This article is for [SharePoint Administrators](/sharepoint/sharepoint-admin-role) or [above](/microsoft-365/admin/add-users/about-admin-roles) in Microsoft 365 who want to control user access to SharePoint and OneDrive data on unmanaged devices. Idle session sign-out lets you specify a time at which users are warned and are later signed out of Microsoft 365 after a period of browser inactivity in SharePoint and OneDrive. > [!NOTE] -> Idle session sign-out applies to the entire organization and can't be set for specific sites or users. To target different settings for different users, use Microsoft Entra Conditional Access policies instead (and see the next important note about the Microsoft Entra ID P1 or P2 requirement). - -> [!IMPORTANT] -> This feature relies on Microsoft Entra Conditional Access policies being available. You will need a Microsoft Entra ID P1 or P2 subscription for this to work. For more info about this, refer to the [announcement in the Microsoft Entra identity Blog](https://techcommunity.microsoft.com/t5/azure-active-directory-identity/conditional-access-8220-limited-access-8221-policies-for/ba-p/245228). +> - Idle session sign-out applies to the entire organization and can't be set for specific sites or users. To target different settings for different users, use Microsoft Entra Conditional Access policies instead (and see the next important note about the Microsoft Entra ID P1 or P2 requirement). +> - This feature relies on Microsoft Entra Conditional Access policies being available. You will need a Microsoft Entra ID P1 or P2 subscription for this to work. For more info about this, refer to the [Microsoft Entra licensing](/entra/fundamentals/licensing). Idle session sign-out is one of a number of policies you can use with SharePoint and OneDrive to balance security and user productivity and help keep your data safe irrespective of where users access the data from, what device they're working on, and how secure their network connection is. For more ways to control access in SharePoint and OneDrive, see [How SharePoint and OneDrive safeguard your data in the cloud](safeguarding-your-data.md). From 391b834e2764ed27a197cebd83d08916e02042c0 Mon Sep 17 00:00:00 2001 From: Rui Hu <7605757+maggierui@users.noreply.github.com> Date: Fri, 24 Jan 2025 00:20:55 -0500 Subject: [PATCH 2/6] sign0out inactive users acrolinx --- .../SharePointOnline/sign-out-inactive-users.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/SharePoint/SharePointOnline/sign-out-inactive-users.md b/SharePoint/SharePointOnline/sign-out-inactive-users.md index 52cffe6da3..72f9a25a11 100644 --- a/SharePoint/SharePointOnline/sign-out-inactive-users.md +++ b/SharePoint/SharePointOnline/sign-out-inactive-users.md @@ -1,5 +1,5 @@ --- -ms.date: 01/22/2025 +ms.date: 01/22/2018 title: "Sign out inactive users" ms.reviewer: samust manager: jtremper @@ -30,9 +30,9 @@ This article is for [SharePoint Administrators](/sharepoint/sharepoint-admin-rol > [!NOTE] > - Idle session sign-out applies to the entire organization and can't be set for specific sites or users. To target different settings for different users, use Microsoft Entra Conditional Access policies instead (and see the next important note about the Microsoft Entra ID P1 or P2 requirement). -> - This feature relies on Microsoft Entra Conditional Access policies being available. You will need a Microsoft Entra ID P1 or P2 subscription for this to work. For more info about this, refer to the [Microsoft Entra licensing](/entra/fundamentals/licensing). +> - This feature relies on Microsoft Entra Conditional Access policies being available. You need a Microsoft Entra ID P1 or P2 subscription for this to work. For more info about this, refer to the [Microsoft Entra licensing](/entra/fundamentals/licensing). -Idle session sign-out is one of a number of policies you can use with SharePoint and OneDrive to balance security and user productivity and help keep your data safe irrespective of where users access the data from, what device they're working on, and how secure their network connection is. For more ways to control access in SharePoint and OneDrive, see [How SharePoint and OneDrive safeguard your data in the cloud](safeguarding-your-data.md). +Idle session sign-out is one of many policies you can use with SharePoint and OneDrive to balance security and user productivity and help keep your data safe irrespective of where users access the data from, what device they're working on, and how secure their network connection is. For more ways to control access in SharePoint and OneDrive, see [How SharePoint and OneDrive safeguard your data in the cloud](safeguarding-your-data.md). ## The idle session sign-out experience @@ -41,17 +41,17 @@ When a user is inactive in SharePoint and OneDrive for the time period you speci ![Inactive Microsoft 365 sign out warning message](media/80c0d10b-df78-4e3c-9df0-b94a923b3871.png) > [!NOTE] -> Activity is counted as requests sent to SharePoint, such as mouse clicks on a UI element like a button, list entry, or a link. Moving the mouse and scrolling are not counted as activity. +> Activity is counted as requests sent to SharePoint, such as mouse clicks on a UI element like a button, list entry, or a link. Moving the mouse and scrolling aren't counted as activity. If users don't select **Continue**, they're automatically signed out, and the following message appears. ![Microsoft 365 signed out due to inactivity message](media/acc48304-dacd-41db-a4b6-8702cb6afa04.png) > [!NOTE] -> If a user is active in another Microsoft 365 service (such as Outlook), but inactive in SharePoint and OneDrive, they're signed out across Microsoft 365. If a user has multiple tabs to OneDrive and SharePoint sites open at the same time, they won't be signed out unless they're inactive on all the sites. Users won't be signed out if they selected to stay signed in when they signed in. For info about hiding this option, see [Add company branding to your sign-in page in Microsoft Entra ID](/azure/active-directory/fundamentals/customize-branding). Users won't be signed out on a managed device (one that is compliant or joined to a domain), unless they're using inPrivate mode or a browser other than Edge or Internet Explorer. If they use Google Chrome, you need to use an extension to pass the device state claim. For more info about device state claims, see [Microsoft Entra Conditional Access settings](/azure/active-directory/conditional-access/concept-conditional-access-conditions). +> If a user is active in another Microsoft 365 service (such as Outlook), but inactive in SharePoint and OneDrive, they're signed out across Microsoft 365. If a user has multiple tabs to OneDrive and SharePoint sites open at the same time, they won't be signed out unless they're inactive on all the sites. Users won't be signed out if they selected to stay signed in when they signed in. For info about hiding this option, see [Add company branding to your sign-in page in Microsoft Entra ID](/azure/active-directory/fundamentals/customize-branding). Users won't be signed out on a managed device (one that is compliant or joined to a domain), unless they're using inPrivate mode or a browser other than Microsoft Edge or Internet Explorer. If they use Google Chrome, you need to use an extension to pass the device state claim. For more info about device state claims, see [Microsoft Entra Conditional Access settings](/azure/active-directory/conditional-access/concept-conditional-access-conditions). > [!IMPORTANT] -> Microsoft 365 apps and services will not support Internet Explorer 11 starting August 17, 2021 (Microsoft Teams will not support Internet Explorer 11 earlier, starting November 30, 2020). [Learn more](https://aka.ms/AA97tsw). Please note that Internet Explorer 11 will remain a supported browser. Internet Explorer 11 is a component of the Windows operating system and [follows the Lifecycle Policy](/lifecycle/faq/internet-explorer-microsoft-edge) for the product on which it is installed. +> Microsoft 365 apps and services won't support Internet Explorer 11 starting August 17, 2021 (Microsoft Teams won't support Internet Explorer 11 earlier, starting November 30, 2020). [Learn more](https://aka.ms/AA97tsw). Please note that Internet Explorer 11 will remain a supported browser. Internet Explorer 11 is a component of the Windows operating system and [follows the Lifecycle Policy](/lifecycle/faq/internet-explorer-microsoft-edge) for the product on which it's installed. ## Specify idle session sign-out settings in the new SharePoint admin center @@ -73,7 +73,7 @@ If users don't select **Continue**, they're automatically signed out, and the fo 1. [Download the latest SharePoint Online Management Shell](https://go.microsoft.com/fwlink/p/?LinkId=255251). > [!NOTE] - > If you installed a previous version of the SharePoint Online Management Shell, go to Add or remove programs and uninstall "SharePoint Online Management Shell."
On the Download Center page, select your language and then click the Download button. You'll be asked to choose between downloading a x64 and x86 .msi file. Download the x64 file if you're running the 64-bit version of Windows or the x86 file if you're running the 32-bit version. If you don't know, see [Which version of Windows operating system am I running?](https://support.microsoft.com/help/13443/windows-which-operating-system) After the file downloads, run it and follow the steps in the Setup Wizard. + > If you installed a previous version of the SharePoint Online Management Shell, go to Add or remove programs and uninstall "SharePoint Online Management Shell."
On the Download Center page, select your language and then select the Download button. You'll be asked to choose between downloading a x64 and x86 .msi file. Download the x64 file if you're running the 64-bit version of Windows or the x86 file if you're running the 32-bit version. If you don't know, see [Which version of Windows operating system am I running?](https://support.microsoft.com/help/13443/windows-which-operating-system) After the file downloads, run it and follow the steps in the Setup Wizard. 2. Connect to SharePoint as a [SharePoint Administrator](/sharepoint/sharepoint-admin-role) or [above](/microsoft-365/admin/add-users/about-admin-roles) in Microsoft 365. To learn how, see [Getting started with SharePoint Online Management Shell](/powershell/sharepoint/sharepoint-online/connect-sharepoint-online). From 2fbd519a2085f83eadf97f4f5c8e927edb738e32 Mon Sep 17 00:00:00 2001 From: Rui Hu <7605757+maggierui@users.noreply.github.com> Date: Fri, 24 Jan 2025 00:26:46 -0500 Subject: [PATCH 3/6] table syntax --- SharePoint/SharePointOnline/get-started-sharepoint-agents.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SharePoint/SharePointOnline/get-started-sharepoint-agents.md b/SharePoint/SharePointOnline/get-started-sharepoint-agents.md index 2fefc9ec05..e657c15c49 100644 --- a/SharePoint/SharePointOnline/get-started-sharepoint-agents.md +++ b/SharePoint/SharePointOnline/get-started-sharepoint-agents.md @@ -49,10 +49,11 @@ To use pay-as-you-go billing, you need to first set up SharePoint agents as a r ## Comparison of pay-as-you-go billing, Copilot licenses, and the trial promotion What does the user get with pay-as-you-go billing vs. a Copilot license vs. the trial promotion? Here is a comparison: + | [Licensed for Microsoft 365 Copilot](/copilot/microsoft-365/microsoft-365-copilot-licensing) | [Pay-as-you-go](/sharepoint/sharepoint-agents-azure-billing) Enabled | [Trial promotion access](/sharepoint/manage-trial-agents-sharepoint-powershell#what-is-the-trial-access-to-sharepoint-agents) opted In | What does the user get? | |-----------------------------------------|-----------------------|-----------------------------|-------------------------| | No | No | No | Cannot create or use agents | | No | Yes | No | All unlicensed users get to create and use agents and are billed per pay-as-you-go billing. | | No | Yes | Yes | All unlicensed users can create and use agents up to 10,000 queries per month and then pay-as-you-go kicks in once the promo is over. | -| Yes | Yes | Yes | Licensed users can create and use agents without using the trial promotion or pay-as-you-go billing); Unlicensed users can create and use agents up to 10,000 queries per month and then pay-as-you-go kicks in once promo is over. | +| Yes | Yes | Yes | Licensed users can create and use agents without using the trial promotion or pay-as-you-go billing. Unlicensed users can create and use agents up to 10,000 queries per month and then pay-as-you-go kicks in once the promo is over. | | Yes | No | No | Licensed users can create and use agents. Unlicensed users can't create or use agents. | From b804cb801254a54e01e43e11fb86b5716f46ddc7 Mon Sep 17 00:00:00 2001 From: Rui Hu <7605757+maggierui@users.noreply.github.com> Date: Fri, 24 Jan 2025 00:33:48 -0500 Subject: [PATCH 4/6] formatting --- .../SharePointOnline/get-started-sharepoint-agents.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SharePoint/SharePointOnline/get-started-sharepoint-agents.md b/SharePoint/SharePointOnline/get-started-sharepoint-agents.md index e657c15c49..5b1bc6a13c 100644 --- a/SharePoint/SharePointOnline/get-started-sharepoint-agents.md +++ b/SharePoint/SharePointOnline/get-started-sharepoint-agents.md @@ -54,6 +54,6 @@ What does the user get with pay-as-you-go billing vs. a Copilot license vs. the |-----------------------------------------|-----------------------|-----------------------------|-------------------------| | No | No | No | Cannot create or use agents | | No | Yes | No | All unlicensed users get to create and use agents and are billed per pay-as-you-go billing. | -| No | Yes | Yes | All unlicensed users can create and use agents up to 10,000 queries per month and then pay-as-you-go kicks in once the promo is over. | -| Yes | Yes | Yes | Licensed users can create and use agents without using the trial promotion or pay-as-you-go billing. Unlicensed users can create and use agents up to 10,000 queries per month and then pay-as-you-go kicks in once the promo is over. | -| Yes | No | No | Licensed users can create and use agents. Unlicensed users can't create or use agents. | +| No | Yes | Yes | All unlicensed users can create and use agents up to 10,000 queries per month and then pay-as-you-go kicks in once the promotion is over. | +| Yes | Yes | Yes | - Licensed users can create and use agents without using the trial promotion or pay-as-you-go billing.
- Unlicensed users can create and use agents up to 10,000 queries per month and then pay-as-you-go kicks in once the promotion is over. | +| Yes | No | No | -Licensed users can create and use agents.
- Unlicensed users can't create or use agents. | From 15be32c42b3e650af83b9f033346b19541aa9776 Mon Sep 17 00:00:00 2001 From: Rui Hu <7605757+maggierui@users.noreply.github.com> Date: Fri, 24 Jan 2025 00:37:59 -0500 Subject: [PATCH 5/6] wording --- SharePoint/SharePointOnline/get-started-sharepoint-agents.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SharePoint/SharePointOnline/get-started-sharepoint-agents.md b/SharePoint/SharePointOnline/get-started-sharepoint-agents.md index 5b1bc6a13c..2a2a29c14b 100644 --- a/SharePoint/SharePointOnline/get-started-sharepoint-agents.md +++ b/SharePoint/SharePointOnline/get-started-sharepoint-agents.md @@ -46,9 +46,9 @@ Users can use SharePoint agents after being [assigned a Copilot license](/copilo To use pay-as-you-go billing, you need to first set up SharePoint agents as a resource in Azure. That resource is used whenever a user without a Microsoft 365 Copilot license uses a SharePoint agent. For more information, see [Use agents with pay-as-you-go billing](/sharepoint/sharepoint-agents-azure-billing). -## Comparison of pay-as-you-go billing, Copilot licenses, and the trial promotion +## Comparison of Copilot licenses, pay-as-you-go billing, and the trial promotion -What does the user get with pay-as-you-go billing vs. a Copilot license vs. the trial promotion? Here is a comparison: +What does the user get with pay-as-you-go billing, a Copilot license and the trial promotion? Here is a comparison: | [Licensed for Microsoft 365 Copilot](/copilot/microsoft-365/microsoft-365-copilot-licensing) | [Pay-as-you-go](/sharepoint/sharepoint-agents-azure-billing) Enabled | [Trial promotion access](/sharepoint/manage-trial-agents-sharepoint-powershell#what-is-the-trial-access-to-sharepoint-agents) opted In | What does the user get? | |-----------------------------------------|-----------------------|-----------------------------|-------------------------| From 876e768fc555fac9c440053f3f263de2ceaca3d6 Mon Sep 17 00:00:00 2001 From: Machelle Tran Date: Fri, 24 Jan 2025 14:39:51 -0500 Subject: [PATCH 6/6] Update get-started-sharepoint-agents.md --- .../SharePointOnline/get-started-sharepoint-agents.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SharePoint/SharePointOnline/get-started-sharepoint-agents.md b/SharePoint/SharePointOnline/get-started-sharepoint-agents.md index 2a2a29c14b..853d72bc65 100644 --- a/SharePoint/SharePointOnline/get-started-sharepoint-agents.md +++ b/SharePoint/SharePointOnline/get-started-sharepoint-agents.md @@ -1,5 +1,5 @@ --- -ms.date: 01/20/2025 +ms.date: 01/24/2025 title: Get started with SharePoint agents ms.reviewer: ms.author: ruihu @@ -54,6 +54,6 @@ What does the user get with pay-as-you-go billing, a Copilot license and the tri |-----------------------------------------|-----------------------|-----------------------------|-------------------------| | No | No | No | Cannot create or use agents | | No | Yes | No | All unlicensed users get to create and use agents and are billed per pay-as-you-go billing. | -| No | Yes | Yes | All unlicensed users can create and use agents up to 10,000 queries per month and then pay-as-you-go kicks in once the promotion is over. | -| Yes | Yes | Yes | - Licensed users can create and use agents without using the trial promotion or pay-as-you-go billing.
- Unlicensed users can create and use agents up to 10,000 queries per month and then pay-as-you-go kicks in once the promotion is over. | -| Yes | No | No | -Licensed users can create and use agents.
- Unlicensed users can't create or use agents. | +| No | Yes | Yes | All unlicensed users can create and use agents up to 10,000 queries per month and then pay-as-you-go kicks in once the user exceeds the 10,000 queries limit for the month; or once the six-month promotion is over. | +| Yes | Yes | Yes | - Licensed users can create and use agents without using the trial promotion or pay-as-you-go billing.
- Unlicensed users can create and use agents up to 10,000 queries per month and then pay-as-you-go kicks in once the user exceeds the 10,000 queries limit for the month; or once the six-month promotion is over. | +| Yes | No | No | - Licensed users can create and use agents.
- Unlicensed users can't create or use agents. |