Skip to content

Commit 9fbc4f6

Browse files
Merge pull request #27420 from MicrosoftDocs/main
Publish main to live, 01/27/25, 10:30 AM PT
2 parents 8cf80d6 + 571a958 commit 9fbc4f6

11 files changed

Lines changed: 81 additions & 8 deletions

microsoft-365/archive/archive-compliance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The affect of Microsoft 365 Archive on compliance offerings includes the followi
3535

3636
- **Data lifecycle management and records management** – Archived sites still honor the retention and deletion periods from any retention policies or retention labels. For more information, see [How retention works with Microsoft 365 Archive](/purview/retention-policies-sharepoint#how-retention-works-with-microsoft-365-archive).
3737

38-
- **eDiscovery** – eDiscovery still finds all content even if archived. However, eDiscovery won't be able to directly reactivate located files. Before exporting or viewing content of an eDiscovery case, the SharePoint admin has to reactivate the relevant sites.
38+
- **eDiscovery** – eDiscovery still finds all content even if archived. eDiscovery will also be able to export directly from archived content but may take longer to export.
3939

4040
- **Bring your own key (BYOK)** – All archived content will comply with the BYOK promises, for any tenant who already uses the BYOK feature or enables it after archiving sites.
4141

microsoft-365/enterprise/microsoft-365-vpn-stream-and-live-events.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ For the **Commercial** cloud:
6262
**\*.media.azure.net**, **\*.bmc.cdn.office.net** and **\*.ml.cdn.office.net** are used for Teams Town hall events.
6363

6464
> [!NOTE]
65-
> Some of these endpoints are shared with other elements outside of Teams events. We don't recommend just using these namespaces to configure VPN offload even if technically possible in your VPN solution (for example, if it works with the namespace rather than IP).
65+
> Some of these endpoints are shared with other elements outside of Teams events.
6666
6767
For the **Government** clouds **(GCC, GCC High, DoD)**:
6868
- \*.cdn.ml.gcc.teams.microsoft.com
@@ -75,7 +75,6 @@ For the **Government** clouds **(GCC, GCC High, DoD)**:
7575

7676
**\*.cdn.ml.dod.teams.microsoft.us** is used for Teams Town hall events in the Microsoft 365 U.S. Government DoD Cloud (DoD).
7777

78-
FQDNs aren't required in the VPN configuration, they're purely for use in PAC files in combination with the IPs to send the relevant traffic direct.
7978

8079
## 2. Implement PAC file changes (where required)
8180

@@ -85,14 +84,12 @@ To solve this, we can provide the following IPs and use them in combination with
8584

8685
### Gathering the current lists of CDN Endpoints
8786

88-
For the Commercial cloud, Teams events use multiple CDN providers to stream to customers, to provide the best coverage, quality, and resiliency. Currently, both Azure CDN from Microsoft and Akamai are used. Over time this could be changed due to situations such as regional availability. This article provides the required namespaces for Teams events and guidance for the corresponding IP address ranges used (where available). For the Microsoft 365 U.S. Government clouds (GCC, GCC High and DoD) only Azure CDN from Microsoft is used.
87+
For the Commercial cloud and Microsoft 365 U.S. Government clouds (GCC, GCC High and DoD) Teams events use Azure CDN from Microsoft. Over time this could be changed due to situations such as regional availability. This article provides the required namespaces for Teams events and guidance for the corresponding IP address ranges used (where available).
8988

9089
For the **Commercial** cloud:
9190

9291
- For Azure CDN from Microsoft, you can download the list from [Download Azure IP Ranges and Service Tags – Public Cloud from Official Microsoft Download Center](https://www.microsoft.com/download/details.aspx?id=56519) - you'll need to look specifically for the service tag `AzureFrontdoor.Frontend` in the JSON; _addressPrefixes_ will show the IPv4/IPv6 subnets. Over time the IPs can change, but the service tag list is always updated before they're put in use.
9392

94-
- Akamai currently doesn't provide a comprehensive list due to the dynamic nature of their network. Akamai endpoints would be covered under the *.ml.cdn.office.net namespace.
95-
9693
For the **Government** clouds **(GCC, GCC High and DoD)**:
9794

9895
- For Azure CDN from Microsoft, you can download the list from [Download Azure IP Ranges and Service Tags – US Government Cloud from Official Microsoft Download Center](https://www.microsoft.com/download/details.aspx?id=57063) - you'll need to look specifically for the service tag `AzureFrontdoor.Frontend` in the JSON; _addressPrefixes_ will show the IPv4/IPv6 subnets. Over time the IPs can change, but the service tag list is always updated before they're put in use.
@@ -110,7 +107,7 @@ Here's an example of how to generate the PAC file for the Commercial cloud:
110107
.\Get-EventsPacFile.ps1 -Instance Worldwide -Type OptimizeAndAllow -FilePath .\Commercial.pac
111108
```
112109

113-
1. The Commercial.pac file will contain all the namespaces and IPs (IPv4/IPv6) available for Teams Events attendee traffic. While the namespaces are present, there won't be any IP address information related to Akamai.
110+
1. The Commercial.pac file will contain all the namespaces and IPs (IPv4/IPv6) available for Teams Events attendee traffic.
114111

115112
#### Example PAC file generation for the Microsoft 365 U.S. Government Community Cloud (GCC)
116113

52.1 KB
Loading
34.2 KB
Loading
162 KB
Loading
18.3 KB
Loading
42.7 KB
Loading
46.9 KB
Loading
58.6 KB
Loading
17 KB
Loading

0 commit comments

Comments
 (0)