Skip to content

Commit

Permalink
Merge branch 'public' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
karanmalik-sudo authored Sep 16, 2024
2 parents 02af252 + 763fa6b commit 2408efe
Show file tree
Hide file tree
Showing 49 changed files with 1,000 additions and 113 deletions.
631 changes: 631 additions & 0 deletions .github/workflows/M365Endpoints.yml

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions copilot/TOC.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
- name: Data, Privacy, and Security for Copilot for Microsoft 365
href: microsoft-365-copilot-privacy.md
- name: Zero Trust principles for Microsoft Copilot for Microsoft 365
href: /security/zero-trust/zero-trust-microsoft-365-copilot
href: /security/zero-trust/zero-trust-microsoft-365-copilot?toc=/copilot/microsoft-365/toc.json&bc=/copilot/microsoft-365/breadcrumb/toc.json
- name: Extend Copilot for Microsoft 365
href: /microsoftteams/platform/copilot/how-to-extend-copilot
href: /microsoftteams/platform/copilot/how-to-extend-copilot?toc=/copilot/microsoft-365/toc.json&bc=/copilot/microsoft-365/breadcrumb/toc.json
- name: Enterprise data protection
href: enterprise-data-protection.md
- name: Transparency Note
Expand All @@ -26,18 +26,18 @@
- name: Manage
items:
- name: Copilot for Microsoft 365 usage report
href: /microsoft-365/admin/activity-reports/microsoft-365-copilot-usage
href: /microsoft-365/admin/activity-reports/microsoft-365-copilot-usage?toc=/copilot/microsoft-365/toc.json&bc=/copilot/microsoft-365/breadcrumb/toc.json
- name: Plugins for Copilot in Integrated Apps
href: /microsoft-365/admin/manage/manage-plugins-for-copilot-in-integrated-apps
href: /microsoft-365/admin/manage/manage-plugins-for-copilot-in-integrated-apps?toc=/copilot/microsoft-365/toc.json&bc=/copilot/microsoft-365/breadcrumb/toc.json
- name: Copilot page in the Microsoft 365 admin center
href: microsoft-365-copilot-page.md
- name: Data, privacy, and security for web queries in Copilot for Microsoft 365
href: manage-public-web-access.md
- name: Pin Microsoft Copilot to the navigation bar
href: pin-copilot.md
- name: Manage Copilot for Microsoft Teams meetings and events
href: /MicrosoftTeams/copilot-teams-transcription
href: /MicrosoftTeams/copilot-teams-transcription?toc=/copilot/microsoft-365/toc.json&bc=/copilot/microsoft-365/breadcrumb/toc.json
- name: Connect to the Microsoft Copilot Dashboard
href: /viva/insights/org-team-insights/copilot-dashboard
href: /viva/insights/org-team-insights/copilot-dashboard?toc=/copilot/microsoft-365/toc.json&bc=/copilot/microsoft-365/breadcrumb/toc.json
- name: Provide Copilot feedback to Microsoft
href: provide-feedback.md
22 changes: 20 additions & 2 deletions copilot/breadcrumb/toc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,23 @@
topicHref: /microsoft-365/index
items:
- name: Microsoft 365 Copilot
tocHref: /microsoft-365-copilot/
topicHref: /microsoft-365-copilot/index
tocHref: /copilot/microsoft-365/
topicHref: /copilot/microsoft-365/index
- name: Microsoft 365 Copilot
tocHref: /security/zero-trust/copilots/
topicHref: /copilot/microsoft-365/index
- name: Microsoft 365 Copilot
tocHref: /microsoftteams/platform/copilot/
topicHref: /copilot/microsoft-365/index
- name: Microsoft 365 Copilot
tocHref: /microsoft-365/admin/activity-reports/
topicHref: /copilot/microsoft-365/index
- name: Microsoft 365 Copilot
tocHref: /microsoft-365/admin/manage/
topicHref: /copilot/microsoft-365/index
- name: Microsoft 365 Copilot
tocHref: /MicrosoftTeams/
topicHref: /copilot/microsoft-365/index
- name: Microsoft 365 Copilot
tocHref: /viva/insights/org-team-insights/
topicHref: /copilot/microsoft-365/index
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ To ensure data quality, we perform daily data validation checks for the past thr
| Uses Teams chat | Indicates whether the user has participated in at least one chat using Teams in the past 30 days. |
| Uses Outlook Email | Indicates whether the user has sent at least one email using Outlook in the past 30 days. |
| Uses Office docs | Indicates whether the user has collaborated on at least one document or file using OneDrive or sharepoint in the past 30 days. |
| Suggested candidate for Copilot | These users in your organization are the most likely to use Copilot features based on their Microsoft 365 app activity. |
| Suggested candidate for Copilot | These users are the most likely in your organization to use Copilot features if assigned a license based on their Microsoft 365 app activity. Each week, the top 25% of eligible users in your organization are flagged in this column based on their use of the Microsoft 365 app where Copilot brings value (such as Microsoft Teams and Outlook). In general, users with higher Microsoft 365 app usage intensity will be flagged as suggested candidates. Users not tagged in this column can still benefit from Copilot; this column is simply intended to help organizations prioritize users for license assignment as part of initial Copilot rollout. |

## Make the user-specific data anonymous

Expand Down
4 changes: 2 additions & 2 deletions microsoft-365/admin/misc/add-partner.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ As an admin for Office 365, you can create or edit users, reset user passwords,

1. Go to the <a href="https://go.microsoft.com/fwlink/p/?linkid=2024339" target="_blank">Microsoft 365 admin center</a>.
- If you're using the **Simplified view**, select **Subscriptions**, then select **Add more products.**
- If you're using the **Dashboard view**, go to the **Billing** \> <a href="https://go.microsoft.com/fwlink/p/?linkid=868433" target="_blank">**Purchase services**</a> page.
2. On the **Purchase services** page, select the plan that you want to buy, and then select **Details**.
- If you're using the **Dashboard view**, go to the **Billing** \> <a href="https://go.microsoft.com/fwlink/p/?linkid=868433" target="_blank">**Purchase services**</a> page. For some customers, the page is named **Marketplace**.
2. Select the plan that you want to buy, and then select **Details**.
3. Select the product that you want to buy, and then select **Buy**.
4. To add a new partner, expand **Need help with your order?** and select **Get assistance from a Microsoft Partner**.<br/>
Follow the steps on the providers page to either search for, or to get matched with a partner.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ To make policy changes on your tenant, your Intune admin must:
1. Enable Organizational Messages Policy

>[!NOTE]
> This policy is required for devices running [Windows 11](https://support.microsoft.com/topic/november-29-2022-kb5020044-os-build-22621-900-preview-43f0bdf9-0b75-4110-bab3-3bd2433d84b3), [version 22H2](https://support.microsoft.com/topic/november-29-2022-kb5020044-os-build-22621-900-preview-43f0bdf9-0b75-4110-bab3-3bd2433d84b3), [build 10.0.22621.900](https://support.microsoft.com/topic/november-29-2022-kb5020044-os-build-22621-900-preview-43f0bdf9-0b75-4110-bab3-3bd2433d84b3) and later. If you don't enable this policy, these devices can't receive organizational messages. The policy isn't required on devices running earlier builds.
> This policy is required for devices running [Windows 11](https://support.microsoft.com/topic/november-29-2022-kb5020044-os-build-22621-900-preview-43f0bdf9-0b75-4110-bab3-3bd2433d84b3), [version 22H2](https://support.microsoft.com/topic/november-29-2022-kb5020044-os-build-22621-900-preview-43f0bdf9-0b75-4110-bab3-3bd2433d84b3), [build 10.0.22621.900](https://support.microsoft.com/topic/november-29-2022-kb5020044-os-build-22621-900-preview-43f0bdf9-0b75-4110-bab3-3bd2433d84b3) and later. If you don't enable this policy, these devices can't receive organizational messages.
1. Go to **Settings catalog** > **Experience** > **Enable delivery of organizational messages (User)**.
1. To enable delivery of organizational messages, switch the toggle to **Enabled**.
Expand Down
19 changes: 14 additions & 5 deletions microsoft-365/archive/archive-faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ author: chuckedmonson
manager: jtremper
audience: admin
ms.reviewer: sreelakshmi
ms.date: 04/30/2024
ms.date: 09/04/2024
ms.topic: conceptual
ms.service: microsoft-365-archive
ms.custom: archive
Expand All @@ -30,21 +30,21 @@ description: Read frequently asked questions about Microsoft 365 Archive.

Microsoft 365 Archive allows you to keep your data in place in SharePoint, providing the following benefits not possible when the data is migrated elsewhere:

- Archiving happens very quickly, usually withing minutes, regardless of the amount or size of content being archived.
- Archiving happens quickly, usually withing minutes, regardless of the amount or size of content being archived.

- No need to manage data in a separate security and compliance domain, thereby allowing your security and compliance tooling to operate seamlessly—including eDiscovery, retention policies, and more.
- No need to manage data in a separate security and compliance domain, therefore allowing your security and compliance tooling to operate seamlessly—including eDiscovery, retention policies, and more.

- Admin search indexes remain intact.

- Sites are archived and rehydrated without loss of metadata, security versioning, and more.

#### Can content in legal hold be archived?

Yes, nearly all Microsoft Purview features will continue to operate as normal.
Yes, nearly all Microsoft Purview features continue to operate as normal.

#### Is content in archived sites searchable?

Admin-level search and Purview-based search will operate like normal. End-user search is not currently supported, but end-user search is on our roadmap.
Admin-level search and Purview-based search operate like normal. End-user search isn't currently supported, but end-user search is on our roadmap.

#### Can I archive at the site-level and file-level?

Expand All @@ -53,3 +53,12 @@ Currently, only full-site archiving and reactivating is possible in this offerin
#### What’s the availability timing of Microsoft 365 Archive for Microsoft Government Community Cloud (GCC) customers?

Standard GCC rollout times apply.

#### If I purchase additional standard storage packs, will I get reimbursed for the cost difference?

No, if you purchase additional storage packs you won't get reimbursed for any unused additional standard storage.

#### If I am under my tenant storage quota for Archive and Standard storage combined, will I be charged?

You will not be charged for monthly storage costs, but you will still pay applicable reactivation fees.

29 changes: 22 additions & 7 deletions microsoft-365/archive/archive-pricing.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ author: chuckedmonson
manager: jtremper
audience: admin
ms.reviewer: sreelakshmi
ms.date: 04/30/2024
ms.date: 09/11/2024
ms.topic: conceptual
ms.service: microsoft-365-archive
ms.custom: archive
Expand All @@ -20,11 +20,11 @@ description: Learn about the pricing model for storage consumption and site reac

Microsoft 365 Archive charges you for storage and reactivation.

- **Storage consumption** that is charged at a per-GB monthly rate. This meter is charged only when archived storage plus active storage in SharePoint exceeds the included or licensed allocated SharePoint storage capacity limit of the tenant. In other words, there's no additional storage cost for archived sites if the tenant hasn't yet consumed its already licensed Storage quota. For more information about storage capacity limits, see [SharePoint limits](/office365/servicedescriptions/sharepoint-online-service-description/sharepoint-online-limits).
- **Storage consumption** that is charged at a per-GB monthly rate. This meter is charged only when archived storage plus active storage in SharePoint exceeds the included or licensed allocated SharePoint storage capacity limit of the tenant. In other words, there's no additional storage cost for archived sites if the tenant has not consumed its already licensed storage quota. For more information about storage capacity limits, see [SharePoint limits](/office365/servicedescriptions/sharepoint-online-service-description/sharepoint-online-limits).

- **Site reactivation** that is charged at a per-GB rate. The reactivation fee is charged regardless of whether a tenant is above or below its SharePoint capacity limit and only if reactivation is executed more than seven days after the site was most recently put into an archive state. This seven-day grace period provides you with the opportunity to reverse an accidental archival without reaction costs.
- **Site reactivation** that is charged at a per-GB rate. The reactivation fee is charged regardless of whether a tenant is over or below its SharePoint capacity limit and only if reactivation is executed more than seven days after the site was most recently put into an archive state. This seven-day grace period provides you with the opportunity to reverse an accidental archival without reaction costs.

Monthly archive usage is calculated as the sum of the usage of all currently archived sites. Each site’s usage is equal to the site storage usage of that site, which can be seen on the site itself or from the Active sites page in the SharePoint admin center. The size of an archived site, and therefore the storage for which it's billed, can only change if the content in the site changes (for example, content naturally expiring in the recycle bin or a retention policy deleting content within the site directly from archive to the recycle bin).
Monthly archive usage is calculated as the sum of the usage of all currently archived sites. Each site’s usage is equal to the site storage usage of that site, which can be seen on the site itself or from the Active sites page in the SharePoint admin center. The size of an archived site, and therefore the storage for which its billed, changes only if the content in the site changes. For example, content naturally expiring in the recycle bin or a retention policy deleting content within the site directly from archive to the recycle bin.

To see the pricing for Microsoft 365 Archive, see [Pay-as-you-go services and pricing for Microsoft Syntex](/microsoft-365/syntex/syntex-pay-as-you-go-services).

Expand All @@ -41,15 +41,15 @@ The Microsoft 365 Archive pricing calculator, when calculating the potential cos

- The active tenant storage quota, measured in terabytes (TB)

- The active storage i.e. volume of standard storage currently in use, in terabytes (TB)
- The active storage—that is, the volume of standard storage currently in use, in terabytes (TB)

- The average archive storage expected to be consumed annually, in terabytes (TB)

- The percentage of archived content expected to be reactivated annually, in percentage (%)

- The annual frequency of reactivations for expected percentage reactivation, expressed as a count (number of times per year)

- The storage, archive and reactivation costs per gigabyte/per gigabyte per month, as applicable
- The storage, archive, and reactivation costs per gigabyte/per gigabyte per month, as applicable

### Using the pricing calculator

Expand All @@ -71,6 +71,21 @@ When using the Microsoft 365 Archive pricing calculator, be aware of the followi

### Cost savings using Microsoft 365 Archive

The following table helps visualize the savings you'll realize by archiving content based on the frequency and percent of all archived content you're restoring. The key takeaway is that if you are not reactivating more than 30% of your data more than twice a year, you'll achieve most of the savings offered by the product.
The following table helps visualize the savings you realize by archiving content based on the frequency and percent of all archived content you're restoring. The key takeaway is that if you aren't reactivating more than 30% of your data more than twice a year, you achieve most of the savings offered by the product.

![Table showing the COGS savings if you archive with Microsoft 365 Archive.](../media/m365-archive/archive-cogs-savings.png)

## Billing scenarios

Your charges for Microsoft 365 Archive depend on your tenant’s Standard storage quota. The following scenarios and diagram can help you compare charges based on excess storage.

|Scenario |Description |Additional costs |
|:---------:|---------|---------|
|**A** |Tenant hasn't archived any data and exceeds the Standard storage quota by 200 GB. |Purchase 200 GB of additional Standard storage packs. |
|**B** |Tenant has archived the 200 GB of data that exceeded their Standard storage quota. |Pay at $0.05/GB/month for 200 GB of Archive storage. |
|**C** |Tenant has archived more storage than exceeded their Standard storage quota. |Pay only for the 200 GB of Archived data that exceeds the Standard storage quota. |
|**D** |Tenant has archived some, but not all, of the data that exceeds their Standard storage quota. |Purchase additional Standard storage packs and pay $0.05/GB/month for approximately 100 GB of Archived data. |
|**E** |Tenant’s total data (Standard + Archive) is less than their Standard storage quota. |No additional costs. |

![Diagram showing comparisons for five archive scenarios.](../media/m365-archive/archive-billing-scenarios-diagram.png)

2 changes: 1 addition & 1 deletion microsoft-365/business-premium/m365bp-secure-copilot.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ author: chrisda
manager: deniseb
audience: Admin
ms.topic: overview
ms.service: microsoft-365-business
ms.service: microsoft-365-business-security
ms.date: 07/11/2024
ms.localizationpriority: medium
ms.reviewer:
Expand Down
4 changes: 2 additions & 2 deletions microsoft-365/commerce/add-storage-space.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ You can buy the Office 365 Extra File Storage add-on in the Microsoft 365 admin

1. Go to the <a href="https://go.microsoft.com/fwlink/p/?linkid=2024339" target="_blank">Microsoft 365 admin center.</a>
- If you’re using the **Simplified view**, select **Billing**, then select **Add more products**.
- If you’re using the **Dashboard view**, go to the **Billing** > <a href="https://go.microsoft.com/fwlink/p/?linkid=868433" target="_blank">Purchase services</a> page.
2. On the **Purchase services** page, under **View by category**, select **Office 365**.
- If you’re using the **Dashboard view**, go to the **Billing** > <a href="https://go.microsoft.com/fwlink/p/?linkid=868433" target="_blank">Purchase services</a> page. For some customers, the page is named **Marketplace**.
2. Under **View by category**, select **Office 365**.
3. Find **Office 365 Extra File Storage**, then select **Details**.
4. Enter the number of gigabytes of storage that you want, select a subscription length and billing frequency, then select **Buy**.
5. In the **Checkout** pane, choose the billing profile that you want to use, or add a new one.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ f1.keywords:
author: cmcatee-MSFT
ms.author: cmcatee
manager: scotv
ms.reviewer: emmasheridan, nicholak
ms.reviewer: smithk, vijayav
audience: Admin
ms.topic: how-to
ms.service: microsoft-365-business
Expand Down
Loading

0 comments on commit 2408efe

Please sign in to comment.