Skip to content

Commit dd36203

Browse files
committed
Merge branch 'main' into Prefs-chrisda
2 parents f965074 + 3a8305c commit dd36203

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

defender-office-365/advanced-delivery-policy-configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ This example modifies the (presumably only) phishing simulation override rule wi
524524
These changes don't affect existing entries in the rule.
525525

526526
```powershell
527-
Get-ExoPhishSimOverrideRule| Set-ExoPhishSimOverrideRule| Set-ExoPhishSimOverrideRule -AddSenderDomainIs blueyonderairlines.com -RemoveSenderIpRanges 192.168.1.55
527+
Get-ExoPhishSimOverrideRule| Set-ExoPhishSimOverrideRule -AddSenderDomainIs blueyonderairlines.com -RemoveSenderIpRanges 192.168.1.55
528528
```
529529

530530
For detailed syntax and parameter information, see [Set-ExoPhishSimOverrideRule](/powershell/module/exchange/set-exophishsimoverriderule).

defender-office-365/email-authentication-spf-configure.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ f1.keywords:
55
ms.author: chrisda
66
author: chrisda
77
manager: deniseb
8-
ms.date: 1/29/2024
8+
ms.date: 04/15/2025
99
audience: ITPro
1010
ms.topic: how-to
1111

@@ -68,7 +68,7 @@ The rest of this article describes the SPF TXT records that you need to create f
6868

6969
SPF TXT records are exhaustively described in [RFC 7208](https://datatracker.ietf.org/doc/html/rfc7208).
7070

71-
The basic syntax of the SPF TX record for a custom domain in Microsoft 365 is:
71+
The basic syntax of the SPF TXT record for a custom domain in Microsoft 365 is:
7272

7373
```txt
7474
v=spf1 <valid mail sources> <enforcement rule>
@@ -181,6 +181,8 @@ Important points to remember:
181181

182182
- **One SPF record per domain or subdomain**: Multiple SPF TXT records for the same domain or subdomain cause a DNS lookup loop that makes SPF fail, so use only one SPF record per domain or subdomain.
183183

184+
- **Time to live (TTL)**: We recommended a minimum TTL value of 3600 seconds (one hour) on SPF TXT records to avoid DNS lookup timeouts.
185+
184186
- **Less than 10 DNS lookups**: When destination email systems query the SPF TXT record for valid sources for the MAIL FROM address domain, the query scans through the IP addresses and `include:` statements in the record until the message source (ultimately, an IP address) matches one of the specified sources. If the number of DNS lookups (which can be different than the number of DNS _queries_) is greater than 10, the message fails SPF with a permanent error (also known as a `permerror`). The destination email system rejects the message in a non-delivery report (also known as an NDR or _bounce message_) with one of the following errors:
185187
- The message exceeded the hop count.
186188
- The message required too many lookups.

defender-office-365/submissions-user-reported-messages-custom-mailbox.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ When **Monitor reported messages in Outlook** is selected and you also select **
190190
For more information, see [Automatic user notifications for user reported phishing results in AIR](air-user-automatic-feedback-response.md).
191191

192192
- **Customize sender and branding** section:
193-
- **Specify a Microsoft 365 mailbox to use ads the From address of email notifications**: Select this option and enter the sender's email address in the box that appears. If you don't select this option, the default sender is `[email protected]`.
193+
- **Specify a Microsoft 365 mailbox to use as the From address of email notifications**: Select this option and enter the sender's email address in the box that appears. If you don't select this option, the default sender is `[email protected]`.
194194
- **Replace the Microsoft logo with my organization's logo across all reporting experiences**: Select this option to replace the default Microsoft logo that's used in notifications. Before you do this step, follow the instructions in [Customize the Microsoft 365 theme for your organization](/microsoft-365/admin/setup/customize-your-organization-theme) to upload your custom logo.
195195

196196
- **Report from quarantine** section \> **Allow reporting for quarantined messages**: Verify that this setting is selected to let users report messages from quarantine as they [release quarantined email messages](quarantine-end-user.md#release-quarantined-email). Otherwise, uncheck this setting.

defender-office-365/zero-hour-auto-purge.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ ZAP actions might be overridden by [Safe sender lists](create-safe-sender-lists-
200200
- The MX record for your Microsoft 365 domain points to another service or device, and you use a mail flow rule to [bypass spam filtering](/exchange/security-and-compliance/mail-flow-rules/use-rules-to-set-scl) (high confidence phishing).
201201
- [Admin submissions of false positives to Microsoft](submissions-admin.md#report-good-email-to-microsoft). By default, allow entries for domains and email addresses, files, and URLs exist for 30 days (malware and high confidence phishing).
202202

203-
It's important for you to carefully consider the implications of bypassing filtering, as it could compromise the security posture of your organizatione.
203+
It's important for you to carefully consider the implications of bypassing filtering, as it could compromise the security posture of your organization.
204204

205205
### What are the licensing requirements for ZAP?
206206

0 commit comments

Comments
 (0)