Merge pull request #27275 from MicrosoftDocs/main

Publish main to live, 01/08, 11:00 AM IST
MicrosoftDocs · Jan 8, 2025 · 68d64dd · 68d64dd
2 parents f95e0c7 + e8fbb9f
commit 68d64dd
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 128 deletions.
diff --git a/microsoft-365/backup/backup-pricing.md b/microsoft-365/backup/backup-pricing.md
@@ -26,7 +26,7 @@ The Microsoft 365 Backup service, offered through the Microsoft 365 admin center
 
 Microsoft 365 Backup charges you based on the size of the following content for 365 days from the time it's added to backup protection:
 
-- Cumulative back up size of the mailboxes, SharePoint sites, and OneDrive accounts being protected. Size of OneDrive accounts and SharePoint sites are the size of the live OneDrive accounts and SharePoint sites as displayed in the live sites’ usage reports. Mailboxes are the size of the user's mailbox plus their online archives plus deleted items held for backup.
+- Cumulative back up size of the mailboxes, SharePoint sites, and OneDrive accounts being protected. Size of OneDrive accounts and SharePoint sites are the size of the live OneDrive accounts and SharePoint sites as displayed in the live sites’ usage reports. Mailboxes are the size of the user's primary mailbox plus their online archives plus deleted items held for backup.
 
 - Deleted content in user’s Recycle Bin and second-stage Recycle Bin (also known as Site Collection Recycle Bin).
 
@@ -61,21 +61,22 @@ To use the Microsoft 365 Backup pricing calculator, you need to perform the foll
 
 1. Download the latest version of the [Microsoft 365 Backup pricing calculator tool](https://aka.ms/M365BackupCalculator).
 
-2. Review your [Microsoft 365 usage reports](https://admin.microsoft.com/Adminportal/Home#/reportsUsage) to get historical information about your current usage. Heuristics from the usage reports will be used to populate the inputs (orange boxes) in the pricing calculator tool. Content in the OneDrive and SharePoint recycle bins and data in a mailbox's online archives won't be reflected in these reports, but do affect the backup costs as previously described.
+2. Review your [Microsoft 365 usage reports](https://admin.microsoft.com/Adminportal/Home#/reportsUsage) to get historical information about your current usage. Heuristics from the usage reports will be used to populate the inputs (orange boxes) in the pricing calculator tool. Content in the OneDrive and SharePoint recycle bins and data in archive maiboxes won't be reflected in these reports, but do affect the backup costs as previously described.
 
 3. Open the Excel spreadsheet and select the **High-Level Estimates** worksheet. This sheet produces the simplest default model based on linear data growth assumptions.
 
 4. Enter the information recorded from the usage reports into the **High-Level Estimates** worksheet.
 
 5. If you know your tenant has non-organic or non-linear usage changes, then for each of the service types, optionally override the estimated number of protection units or storage for a month in any or all of the service-specific tabs in the pricing calculator tool.
 
-6. An estimate of the Microsoft 365 Backup costs for the next 24 months, not including data currently in your OneDrive and SharePoint recycle bins or mailbox online archive folders, will then be generated.
+6. An estimate of the Microsoft 365 Backup costs for the next 24 months, not including data currently in your OneDrive and SharePoint recycle bins or archive mailboxes, will then be generated.
 
-    The size of your recycle bins can be roughly estimated as the amount of data you delete every three months in OneDrive and SharePoint. Your Mailbox online archives can be estimated by running the following Exchange Online PowerShell command:
+    The size of your recycle bins can be roughly estimated as the amount of data you delete every three months in OneDrive and SharePoint. The size of a single user's archive mailbox can be queried by running the following Exchange Online PowerShell command:
 
     ```powershell
     Get-MailboxStatistics -Identity "[email protected]" -Archive | Select DisplayName, TotalItemSize, ItemCount
     ``` 
+    You can estimate the total size of archive mailboxes in your tenant by taking a representative sample set of users, getting their archive mailbox usage, then scaling the result to the total size of your tenant.
 
 ### Use the Microsoft 365 usage reports as source data for the pricing calculator
 

diff --git a/microsoft-365/includes/office-365-operated-by-21vianet-endpoints.md b/microsoft-365/includes/office-365-operated-by-21vianet-endpoints.md
@@ -1,35 +1,35 @@
 <!--THIS FILE IS AUTOMATICALLY GENERATED. MANUAL CHANGES WILL BE OVERWRITTEN.-->
 <!--Please contact the Office 365 Endpoints team with any questions.-->
 <!--China endpoints version 2024120200-->
-<!--File generated 2024-12-02 06:04:41.5271-->
+<!--File generated 2025-01-07 06:04:48.8744-->
 
 ## Exchange Online
 
-| ID | Category | ER | Addresses | Ports |
-| -- | -------------------- | -- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------ |
+ID | Category | ER | Addresses | Ports
+-- | -------------------- | -- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------
 1 | Optimize<BR>Required | No | `partner.outlook.cn`<BR>`40.73.132.0/24, 40.73.164.128/25, 40.73.165.0/26, 42.159.40.0/24, 42.159.44.0/22, 42.159.163.128/25, 42.159.165.0/24, 42.159.172.0/22, 2406:e500:4010::/48, 2406:e500:4030::/53, 2406:e500:4030:800::/54, 2406:e500:4040::/53, 2406:e500:4040:800::/54, 2406:e500:4040:1000::/54, 2406:e500:4040:1400::/54, 2406:e500:4110::/48, 2406:e500:4210::/48, 2406:e500:4310::/48` | **TCP:** 443, 80
 2 | Allow<BR>Required | No | `*.protection.partner.outlook.cn`<BR>`42.159.33.192/27, 42.159.36.0/24, 42.159.161.192/27, 42.159.164.0/24, 139.219.16.0/27, 139.219.17.0/24, 139.219.24.0/22, 139.219.145.0/27, 139.219.146.0/24, 139.219.156.0/22, 2406:e500:4420::/43, 2406:e500:4440::/43, 2406:e500:c020::/44, 2406:e500:c120::/44` | **TCP:** 25, 443, 53, 80
 12 | Default<BR>Required | No | `*.partner.outlook.cn, attachments.office365-net.cn` | **TCP:** 443, 80
 20 | Allow<BR>Required | No | `*.partner.outlook.cn`<BR>`40.73.132.0/24, 40.73.164.128/25, 40.73.165.0/26, 42.159.40.0/24, 42.159.44.0/22, 42.159.163.128/25, 42.159.165.0/24, 42.159.172.0/22, 2406:e500:4010::/48, 2406:e500:4030::/53, 2406:e500:4030:800::/54, 2406:e500:4040::/53, 2406:e500:4040:800::/54, 2406:e500:4040:1000::/54, 2406:e500:4040:1400::/54, 2406:e500:4110::/48, 2406:e500:4210::/48, 2406:e500:4310::/48` | **TCP:** 587, 993, 995
 
 ## SharePoint Online and OneDrive for Business
 
-ID | Category | ER | Addresses | Ports |
-| -- | ------------------- | -- | ------------------------------------------------------------------------------------------ | ---------------- |
+ID | Category | ER | Addresses | Ports
+-- | ------------------- | -- | ------------------------------------------------------------------------------------------ | ----------------
 4 | Allow<BR>Required | No | `*.sharepoint.cn`<BR>`40.73.129.0/24, 40.73.161.0/24, 42.159.38.0/23, 2406:e500:4600::/39` | **TCP:** 443, 80
 21 | Default<BR>Required | No | `*.wns.windows.com` | **TCP:** 443, 80
 
 ## Microsoft Teams
 
-| ID | Category | ER | Addresses | Ports |
-| -- | -------------------- | -- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------|
+ID | Category | ER | Addresses | Ports
+-- | -------------------- | -- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------
 3 | Optimize<BR>Required | No | `42.159.34.32/27, 42.159.34.64/27, 42.159.34.96/28, 42.159.162.32/27, 42.159.162.64/27, 42.159.162.96/28, 159.27.160.0/21, 2406:e500:4a00::/39` | **UDP:**  3479,  3480,  3481, 3478
 19 | Allow<BR>Required | No | `*.partner.lync.cn, *.teams.microsoftonline.cn, teams.microsoftonline.cn`<BR>`40.72.124.128/28, 42.159.34.32/27, 42.159.34.64/27, 42.159.34.96/28, 42.159.162.32/27, 42.159.162.64/27, 42.159.162.96/28, 159.27.160.0/21, 2406:e500:4a00::/39` | **TCP:** 443, 80
 
 ## Microsoft 365 Common and Office Online
 
-| ID | Category | ER | Addresses | Ports |
-| -- | ------------------------------------------------------------------------------------------------------------------------------ | -- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------- |
+ID | Category | ER | Addresses | Ports
+-- | ------------------------------------------------------------------------------------------------------------------------------ | -- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------
 7 | Allow<BR>Required | No | `*.azure-mobile.cn, *.chinacloud-mobile.cn, *.chinacloudapi.cn, *.chinacloudapp.cn, *.chinacloudsites.cn, *.partner.microsoftonline-m-i.net.cn, *.partner.microsoftonline-m.net.cn, *.partner.microsoftonline-p.net.cn, *.partner.officewebapps.cn, *.windowsazure.cn, portal.partner.microsoftonline.cdnsvc.com, r4.partner.outlook.cn`<BR>`23.236.126.0/24, 40.73.240.0/24, 40.73.242.0/24, 58.68.168.0/24, 112.25.33.0/24, 123.150.49.0/24, 125.65.247.0/24, 171.107.84.0/24, 180.210.232.0/24, 180.210.234.0/24, 209.177.86.0/24, 209.177.90.0/24, 209.177.94.0/24, 222.161.226.0/24, 2406:e500:4900::/48` | **TCP:** 443, 80
 8 | Allow<BR>Required | No | `*.onmschina.cn, *.partner.microsoftonline-i.net.cn, *.partner.microsoftonline.net.cn`<BR>`101.28.252.0/24, 115.231.150.0/24, 123.235.32.0/24, 171.111.154.0/24, 175.6.10.0/24, 180.210.229.0/24, 211.90.28.0/24` | **TCP:** 443, 80
 9 | Allow<BR>Required | No | `*.partner.microsoftonline-p.cn`<BR>`182.50.87.0/24` | **TCP:** 443, 80

diff --git a/microsoft-365/includes/office-365-u.s.-government-dod-endpoints.md b/microsoft-365/includes/office-365-u.s.-government-dod-endpoints.md
@@ -1,7 +1,7 @@
 <!--THIS FILE IS AUTOMATICALLY GENERATED. MANUAL CHANGES WILL BE OVERWRITTEN.-->
 <!--Please contact the Office 365 Endpoints team with any questions.-->
 <!--USGovDoD endpoints version 2024093000-->
-<!--File generated 2024-09-30 06:04:23.1217-->
+<!--File generated 2025-01-07 06:04:51.6030-->
 
 ## Exchange Online
 

diff --git a/microsoft-365/includes/office-365-u.s.-government-gcc-high-endpoints.md b/microsoft-365/includes/office-365-u.s.-government-gcc-high-endpoints.md
@@ -1,7 +1,7 @@
 <!--THIS FILE IS AUTOMATICALLY GENERATED. MANUAL CHANGES WILL BE OVERWRITTEN.-->
 <!--Please contact the Office 365 Endpoints team with any questions.-->
 <!--USGovGCCHigh endpoints version 2024093000-->
-<!--File generated 2024-09-30 06:04:19.2942-->
+<!--File generated 2025-01-07 06:04:46.4507-->
 
 ## Exchange Online
 

diff --git a/microsoft-365/includes/office-365-worldwide-endpoints.md b/microsoft-365/includes/office-365-worldwide-endpoints.md
@@ -1,7 +1,7 @@
 <!--THIS FILE IS AUTOMATICALLY GENERATED. MANUAL CHANGES WILL BE OVERWRITTEN.-->
 <!--Please contact the Office 365 Endpoints team with any questions.-->
 <!--Worldwide endpoints version 2024103100-->
-<!--File generated 2024-11-01 00:13:30.6133-->
+<!--File generated 2025-01-07 06:04:50.1585-->
 
 ## Exchange Online
 
@@ -13,7 +13,7 @@ ID | Category | ER | Addresses | Ports
 9 | Allow<BR>Required | Yes | `*.protection.outlook.com`<BR>`40.92.0.0/15, 40.107.0.0/16, 52.100.0.0/14, 52.238.78.88/32, 104.47.0.0/17, 2a01:111:f400::/48, 2a01:111:f403::/48` | **TCP:** 443
 10 | Allow<BR>Required | Yes | `*.mail.protection.outlook.com, *.mx.microsoft`<BR>`40.92.0.0/15, 40.107.0.0/16, 52.100.0.0/14, 104.47.0.0/17, 2a01:111:f400::/48, 2a01:111:f403::/48` | **TCP:** 25
 
-## SharePoint and OneDrive
+## SharePoint Online and OneDrive for Business
 
 ID | Category | ER | Addresses | Ports
 -- | -------------------------------------------------------------------------------------------------------------------------------------- | --- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------

diff --git a/microsoft-365/loop/loop-compliance-summary.md b/microsoft-365/loop/loop-compliance-summary.md
@@ -47,7 +47,7 @@ As a Compliance Manager or IT administrator, it's crucial to stay up-to-date on
 |Loop workspaces  |n/a|See [Available](#available-admin-capabilities) and [Admin Management not yet available](#admin-management-not-yet-available).|
 |Recycle bin  |End user Recycle bin for deleted content is available.|End user Recycle bin for deleted content is available in each Loop workspace.  <br><br>**Not Yet Available**:  <br>End user Recycle bin for deleted Loop workspaces.|
 |Version history  |**Version History** [export in Purview](/purview/ediscovery-export-search-results#step-1-prepare-search-results-for-export) or via [Graph API](/graph/api/driveitem-get-content-format) is available. Loop files in OneDrive or SharePoint follow the same file versioning settings as other files.|**Version History** [export in Purview](/purview/ediscovery-export-search-results#step-1-prepare-search-results-for-export) or via [Graph API](/graph/api/driveitem-get-content-format) is available. Loop files in SharePoint Embedded are configured at 50 versions and no admin setting is available to change this.|
-|Quota  |Loop files in their OneDrive and SharePoint locations follow the quotas of those storage containers.  |One Loop workspace corresponds to one SharePoint Embedded container. Loop SharePoint Embedded containers have a default quota of 1TB. There is no admin setting available to change this.|
+|Quota  |Loop files in their OneDrive and SharePoint locations follow the quotas of those storage containers.  |One Loop workspace corresponds to one SharePoint Embedded container. Loop SharePoint Embedded containers have no default storage limit, they accrue to the overall storage limits for SharePoint storage quota in the tenant. See [storage quota](/microsoft-365/loop/loop-workspaces-storage-permission#loop-apps-usage-of-organizations-storage-quota) for more information. There is no admin setting available to set storage quotas per SharePoint Embedded container.|
 |Audit logs and events  |**Audit** logs for all events: search and export Microsoft 365 service events for security and compliance investigations  <ol><li>Use the [Microsoft Purview portal](https://purview.microsoft.com/auditlogsearch)<li>Search audit logs for "loop" or "loot" or "fluid"<li>Further filter exported results by "SourceFileExtension":"loop" or "SourceFileExtension":"loot" (templates) or "SourceFileExtension":"fluid" (deprecated)|**Audit** logs for all events: search and export Microsoft 365 service events for security and compliance investigations <ol><li>Use the [Microsoft Purview portal](https://purview.microsoft.com/auditlogsearch)<li>Search audit logs for Loop Web Application ID `a187e399-0c36-4b98-8f04-1edc167a0996` and Loop Mobile Application ID `0922ef46-e1b9-4f7e-9134-9ad00547eb41`</ol>Note: Loop workspaces create and update .pod files to manage content in the workspace.|
 |Audit log access  |**Audit** logs are retained, can be exported, and can be streamed to third party tools|**Audit** logs are retained, can be exported, and can be streamed to third party tools|
 |***eDiscovery***|---|---|

diff --git a/microsoft-365/syntex/content-processing-translate.md b/microsoft-365/syntex/content-processing-translate.md
@@ -4,7 +4,7 @@ ms.author: chucked
 author: chuckedmonson
 manager: jtremper
 ms.reviewer: ssquires
-ms.date: 08/06/2024
+ms.date: 01/07/2025
 audience: admin
 ms.topic: conceptual
 ms.service: microsoft-syntex
@@ -20,6 +20,9 @@ description: Learn how to create a rule to automatically translate a document wh
 
 You can create a rule to automatically translate a document [when a new file is added](#translate-a-document-when-a-new-file-is-added) or [when data in a column changes](#translate-a-document-when-data-in-a-column-changes) in a SharePoint document library with Microsoft Syntex.
 
+> [!NOTE]
+> To use a rule to translate a document, you must have the [document translation service](syntex-pay-as-you-go-services.md) enabled.
+
 ## Translate a document when a new file is added
 
 To create a rule to translate documents automatically when a document is created, follow these steps: