Skip to content

Commit 9a04644

Browse files
Maddy-Cloudflaresdnts
authored andcommitted
[Email Security] Updated references to Office 365 (cloudflare#23186)
* [Email Security] Updated references to Office 365 * Fix redirect * Fix links * Delete redirect + updates * Fix links * Add redirect * Fix links * Fix links
1 parent 7d8aebc commit 9a04644

File tree

13 files changed

+34
-32
lines changed

13 files changed

+34
-32
lines changed

public/__redirects

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,9 @@
496496
/cloudflare-one/email-security/directories/manage-ms-directories/manage-groups-directory/ /cloudflare-one/email-security/directories/manage-integrated-directories/manage-groups-directory/ 301
497497
/cloudflare-one/email-security/directories/manage-ms-directories/manage-users-directory/ /cloudflare-one/email-security/directories/manage-integrated-directories/manage-users-directory/ 301
498498
/cloudflare-one/email-security/setup/partner-domain-tls/ /cloudflare-one/email-security/setup/pre-delivery-deployment/partner-domain-tls/ 301
499+
/cloudflare-one/email-security/setup/pre-delivery-deployment/prerequisites/office365-email-security-mx/ /cloudflare-one/email-security/setup/pre-delivery-deployment/prerequisites/microsoft365-email-security-mx/ 301
500+
/cloudflare-one/email-security/setup/post-delivery-deployment/api/office365-api/ /cloudflare-one/email-security/setup/post-delivery-deployment/api/m365-api/ 301
501+
/cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/journaling-setup/office365-journaling/ /cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/journaling-setup/m365-journaling/ 301
499502

500503
# firewall
501504
/firewall/api/cf-lists/ /waf/tools/lists/lists-api/ 301

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ sidebar:
77

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

10-
Once you have chosen a [domain to scan](/cloudflare-one/email-security/setup/post-delivery-deployment/api/office365-api/#connect-your-domains), Email Security allows you to monitor the traffic scanned from your email inboxes.
10+
Once you have chosen a domain to scan, Email Security allows you to monitor the traffic scanned from your email inboxes.
1111

1212
:::note
1313
With Email Security, you can enable logs to send detection data to an endpoint of your choice. Refer to [Enable Email Security logs](/cloudflare-one/insights/logs/enable-logs/) for more information.

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/retro-scan.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ To start a free scan:
1616
1. Log in to [Zero Trust](https://one.dash.cloudflare.com/).
1717
2. Select **Email Security** > **Overview**.
1818
3. Select **Start a free scan** > **Generate report**.
19-
4. Enable your [Microsoft integration](/cloudflare-one/email-security/setup/post-delivery-deployment/api/office365-api/#enable-microsoft-integration).
19+
4. Enable your [Microsoft integration](/cloudflare-one/email-security/setup/post-delivery-deployment/api/m365-api/#enable-microsoft-integration).
2020
5. Generate Retro Scan report:
2121
- **Connect domains**: Select at least one domain from your integration.
2222
- **Select current solution**: Select the email security tool you are currently using.

src/content/docs/cloudflare-one/email-security/setup/index.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Before you start the onboarding process, you will have to:
2222

2323
When you choose post-delivery deployment, Cloudflare scans emails **after** they reach a users' inbox.
2424

25-
If you are a Microsoft 365 user, this is done via [Microsoft's Graph API](/cloudflare-one/email-security/setup/post-delivery-deployment/api/office365-api/) or [journaling](/cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/journaling-setup/office365-journaling/).
25+
If you are a Microsoft 365 user, this is done via [Microsoft's Graph API](/cloudflare-one/email-security/setup/post-delivery-deployment/api/m365-api/) or [journaling](/cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/journaling-setup/m365-journaling/).
2626

2727
If you are a [Google Workspace](/cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/bcc-setup/gmail-bcc-setup/gmail-bcc-setup/) or [Microsoft Exchange](/cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/bcc-setup/bcc-microsoft-exchange/) user, this is done via BCC.
2828

@@ -106,7 +106,7 @@ Follow the below checklist to ensure your email environment is set up correctly:
106106

107107
| Step | Post-delivery | Pre-delivery |
108108
|---------------------------------------------------------------------------------------------------------|---------------|--------------|
109-
| Authorize integration ([Graph API](/cloudflare-one/email-security/setup/post-delivery-deployment/api/office365-api/#enable-microsoft-integration) or [Google Workspace](/cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/bcc-setup/gmail-bcc-setup/enable-gmail-integration/)) | Required[^1] | Required [^2] |
109+
| Authorize integration ([Graph API](/cloudflare-one/email-security/setup/post-delivery-deployment/api/m365-api/#enable-microsoft-integration) or [Google Workspace](/cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/bcc-setup/gmail-bcc-setup/enable-gmail-integration/)) | Required[^1] | Required [^2] |
110110
| Associate an integration with an MX/Inline domain | | Required |
111111
| Add/verify domains | Required | Required |
112112
| [Update MX records/connector](/cloudflare-one/email-security/setup/pre-delivery-deployment/mx-inline-deployment-setup/), then allow Cloudflare [egress IPs](/cloudflare-one/email-security/setup/pre-delivery-deployment/egress-ips/) on downstream mail server | | Required |
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ sidebar:
77

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

10-
This guide will instruct you through setting up Microsoft Office 365 with Email Security via the Cloudflare dashboard.
10+
This guide will instruct you through setting up Microsoft 365 with Email Security via the Cloudflare dashboard.
1111

1212
## Prerequisites
1313

@@ -24,10 +24,10 @@ To use Email Security, you will need to have:
2424
- If you have not associated any integration:
2525
- Select **Set up**.
2626
- Choose **MS Graph API** > **Authorize**.
27-
- Refer to [Enable Microsoft integration](/cloudflare-one/email-security/setup/post-delivery-deployment/api/office365-api/#enable-microsoft-integration) to continue the onboarding process.
27+
- Refer to [Enable Microsoft integration](#enable-microsoft-integration) to continue the onboarding process.
2828
- If you have associated an integration, but have not connected a domain:
2929
- Select **Connect a domain**.
30-
- Choose **MS Graph API**. Refer to [Connect your domains](/cloudflare-one/email-security/setup/post-delivery-deployment/api/office365-api/#connect-your-domains) to connect your domain(s).
30+
- Choose **MS Graph API**. Refer to [Connect your domains](#connect-your-domains) to connect your domain(s).
3131

3232
### Enable Microsoft integration
3333

@@ -42,7 +42,7 @@ To enable Microsoft integration:
4242
- Select **Complete Email Security set up** where you will be able to connect your domains and configure auto-moves.
4343
- Select **Continue to Email Security**.
4444

45-
Continue with [Connect your domains](/cloudflare-one/email-security/setup/post-delivery-deployment/api/office365-api/#connect-your-domains) for the next steps.
45+
Continue with [Connect your domains](#connect-your-domains) for the next steps.
4646

4747
### Connect your domains
4848

Lines changed: 6 additions & 6 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**:
@@ -33,7 +33,7 @@ To integrate with Microsoft O365:
3333
- Select **Complete Email Security set up** where you will be able to connect your domains and configure auto-moves.
3434
- Select **Continue to Email Security**.
3535

36-
Continue with [**Connect your domains**](/cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/journaling-setup/office365-journaling/#connect-your-domains) for the next steps.
36+
Continue with [Connect your domains](#connect-your-domains) for the next steps.
3737

3838
### Connect your domains
3939

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ On the **Set up Email Security** page:
3535

3636
If you do not have domains with Cloudflare, the dashboard will display two options:
3737

38-
* Add a domain to Cloudflare.
39-
* Enter domain manually.
38+
- Add a domain to Cloudflare.
39+
- Enter domain manually.
4040

4141
### Add a domain to Cloudflare
4242

@@ -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/api/m365-api/#enable-microsoft-integration).
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/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

0 commit comments

Comments
 (0)