Skip to content

Commit b451910

Browse files
[Email Security] Updated references to Office 365
1 parent 13cdb8b commit b451910

File tree

6 files changed

+17
-18
lines changed

6 files changed

+17
-18
lines changed

src/content/docs/cloudflare-one/email-security/email-monitoring/search-email.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ To move messages:
172172
* **Inbox**: Move messages to the primary email folder.
173173
* **Junk email**: Move messages to the junk or spam folder.
174174
* **Trash**: Move messages to the trash or deleted items email folder.
175-
* **Soft delete (user recoverable)**: Move messages to the user's Deleted Items folder. This option is for Microsoft O365 only.
175+
* **Soft delete (user recoverable)**: Move messages to the user's Deleted Items folder. This option is for Microsoft 365 only.
176176
* **Hard delete (admin recoverable)**: Delete messages from a user's inbox.
177177
4. Select **Save**.
178178

src/content/docs/cloudflare-one/email-security/outbound-dlp.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ After creating your policy, you can modify or reorder your policies in **Email S
4747

4848
## 2. DLP Assist add-in
4949

50-
The Data Loss Prevention (DLP) Assist add-in allows Microsoft O365 users to deploy a DLP solution for free using Cloudflare's Email Security.
50+
The Data Loss Prevention (DLP) Assist add-in allows Microsoft 365 users to deploy a DLP solution for free using Cloudflare's Email Security.
5151

5252
To set up DLP Assist add-in:
5353

src/content/docs/cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/journaling-setup/manual-add.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ To enable auto-move events, you will have to connect and associate an integratio
5858

5959
1. Go to **Settings** > **Domain management** > **Domains** > Select **View**.
6060
2. On the **Domain management** page, locate your domain, select the three dots, then select **Associate an integration**.
61-
3. Select **Connect an integration**. Follow the steps to [enable the Microsoft Office 365 integration](/cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/journaling-setup/office365-journaling/#integrate-with-microsoft-o365).
61+
3. Select **Connect an integration**. Follow the steps to [enable the Microsoft 365 integration](/cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/journaling-setup/office365-journaling/#integrate-with-microsoft-o365).
6262
4. Select the three dots, then select **Associate an integration**. Select the integration, then select **Associate**.
6363
5. Now that your domain has an associated integration, enable [auto-move events](/cloudflare-one/email-security/auto-moves/) on your domain.

src/content/docs/cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/journaling-setup/office365-journaling.mdx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
2-
title: Office 365 journaling setup
2+
title: Microsoft 365 journaling setup
33
pcx_content_type: how-to
44
sidebar:
55
order: 2
66
---
77

88
import { GlossaryTooltip, Render } from "~/components"
99

10-
When you receive an email, the email lands on your Microsoft O365 inbox, and then Email Security receives a copy of that email. The following email flow shows how this works:
10+
When you receive an email, the email lands on your Microsoft 365 inbox, and then Email Security receives a copy of that email. The following email flow shows how this works:
1111

12-
![Email flow when setting up Office 365 with Email Security.](~/assets/images/email-security/deployment/api-setup/journaling/Email_Security_MS365_Journaling_Diagram.png)
12+
![Email flow when setting up Microsoft 365 with Email Security.](~/assets/images/email-security/deployment/api-setup/journaling/Email_Security_MS365_Journaling_Diagram.png)
1313

1414
To enable Microsoft 365 journaling deployment:
1515

@@ -20,9 +20,9 @@ To enable Microsoft 365 journaling deployment:
2020
5. Select **BCC/Journaling**.
2121
6. Select **Integrate with MS** > **Authorize**.
2222

23-
## Integrate with Microsoft O365
23+
## Integrate with Microsoft 365
2424

25-
To integrate with Microsoft O365:
25+
To integrate with Microsoft 365:
2626

2727
1. **Name integration**: Add your integration name, then select **Continue**.
2828
2. **Authorize integration**:

src/content/docs/cloudflare-one/email-security/setup/pre-delivery-deployment/egress-ips.mdx

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ Setting up egress IPs allows Cloudflare to deliver emails to your inbox.
1111

1212
Refer to this page for reference on what IP subnet mask ranges to use.
1313

14-
:::caution[Additional information for O365]
14+
:::caution[Additional information for Microsoft 365]
1515

16-
Office 365 does not support IPv6 addresses nor the following IPv4 subnet mask ranges:
16+
Microsoft 365 does not support IPv6 addresses nor the following IPv4 subnet mask ranges:
1717

18-
* `104.30.32.0/19`
19-
* `134.195.26.0/23`
20-
21-
If you use Office 365, you will have to use the broken down `/24` subnet mask IP addresses. Refer to [Office 365 `/24` addresses](#office-365-24-addresses) for a list of supported IPv4 addresses.
18+
- `104.30.32.0/19`
19+
- `134.195.26.0/23`
2220

21+
If you use Microsoft 365, you will have to use the broken down `/24` subnet mask IP addresses. Refer to [Microsoft 365 `/24` addresses](#microsoft-365-24-addresses) for a list of supported IPv4 addresses.
2322

2423
:::
2524

@@ -47,9 +46,9 @@ If you use Office 365, you will have to use the broken down `/24` subnet mask IP
4746
35.157.195.63
4847
```
4948

50-
## Office 365 `/24` addresses
49+
## Microsoft 365 `/24` addresses
5150

52-
Use these IPv4 addresses for Office 365, instead of the `/19` and `/23` subnets:
51+
Use these IPv4 addresses for Microsoft 365, instead of the `/19` and `/23` subnets:
5352

5453
```txt
5554
104.30.32.0/24
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Office 365 as MX Record
2+
title: Microsoft 365 as MX Record
33
pcx_content_type: integration-guide
44
sidebar:
55
order: 3
@@ -9,7 +9,7 @@ import { Render, Markdown, GlossaryTooltip } from "~/components"
99

1010
![A schematic showing where Email Security is in the life cycle of an email received](src/assets/email-security/Email_Security_O365_MXInline.png)
1111

12-
In this tutorial, you will learn how to configure Microsoft Office 365 with Email Security as its MX record.
12+
In this tutorial, you will learn how to configure Microsoft 365 with Email Security as its MX record.
1313

1414
<Render file="email-security/deployment/mx-deployment-prereq"/>
1515

0 commit comments

Comments
 (0)