Skip to content

Commit 36bcbfb

Browse files
authored
Merge pull request MicrosoftDocs#4648 from MicrosoftDocs/chrisda
Chrisda to Master
2 parents 4e70651 + a5b8f4e commit 36bcbfb

34 files changed

+71
-75
lines changed

exchange/exchange-ps/exchange/advanced-threat-protection/Get-UrlTrace.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Get-UrlTrace [-ClickId <Guid>] [-EndDate <DateTime>] [-Expression <Expression>]
2727
```
2828

2929
## DESCRIPTION
30-
Safe Links is a feature in Advanced Threat Protection that checks links in email messages to see if they lead to malicious web sites. When a user clicks a link in a message, the URL is temporarily rewritten and checked against a list of known, malicious web sites. Safe Links includes the URL trace reporting feature to help determine who has clicked through to a malicious web site. For more information about Advanced Threat Protection Safe Links, see [Office 365 ATP Safe Links](https://docs.microsoft.com/office365/securitycompliance/atp-safe-links).
30+
Safe Links is a feature in Advanced Threat Protection that checks links in email messages to see if they lead to malicious web sites. When a user clicks a link in a message, the URL is temporarily rewritten and checked against a list of known, malicious web sites. Safe Links includes the URL trace reporting feature to help determine who has clicked through to a malicious web site. For more information about Advanced Threat Protection Safe Links, see [Office 365 ATP Safe Links](https://docs.microsoft.com/microsoft-365/security/office-365-security/atp-safe-links).
3131

3232
The following list described the values that are returned in the output of this cmdlet:
3333

exchange/exchange-ps/exchange/advanced-threat-protection/Set-AntiPhishPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Use the Set-AntiPhishPolicy cmdlet to modify antiphishing policies in your cloud
1919
For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-server/exchange-cmdlet-syntax).
2020

2121
> [!NOTE]
22-
> Please take into account the [recommended settings](https://docs.microsoft.com/en-us/microsoft-365/security/office-365-security/recommended-settings-for-eop-and-office365-atp) for EOP and Office 365 ATP security.
22+
> Please take into account the [recommended settings](https://docs.microsoft.com/microsoft-365/security/office-365-security/recommended-settings-for-eop-and-office365-atp) for EOP and Office 365 ATP security.
2323
2424
## SYNTAX
2525

exchange/exchange-ps/exchange/antispam-antimalware/New-HostedContentFilterPolicy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ Accept wildcard characters: False
260260
```
261261
262262
### -BulkThreshold
263-
The BulkThreshold parameter specifies the Bulk Complaint Level (BCL) threshold setting. Valid values are from 1 - 9, where 1 marks most bulk email as spam, and 9 allows the most bulk email to be delivered. The default value is 7. For more information, see [Configure your spam filter policies](https://docs.microsoft.com/office365/SecurityCompliance/configure-your-spam-filter-policies).
263+
The BulkThreshold parameter specifies the Bulk Complaint Level (BCL) threshold setting. Valid values are from 1 - 9, where 1 marks most bulk email as spam, and 9 allows the most bulk email to be delivered. The default value is 7. For more information, see [Configure your spam filter policies](https://docs.microsoft.com/microsoft-365/security/office-365-security/configure-your-spam-filter-policies).
264264
265265
```yaml
266266
Type: Int32
@@ -840,7 +840,7 @@ Accept wildcard characters: False
840840
```
841841
842842
### -PhishZapEnabled
843-
The PhishZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/office365/securitycompliance/zero-hour-auto-purge) to detect phish messages in the user's Inbox. Valid values are:
843+
The PhishZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/microsoft-365/security/office-365-security/zero-hour-auto-purge) to detect phish messages in the user's Inbox. Valid values are:
844844
845845
- $true: Phish ZAP is enabled. Phish messages that are detected in the user's Inbox (regardless of read or unread status) are automatically moved to the Junk Email folder. This is the default value.
846846
@@ -942,7 +942,7 @@ Accept wildcard characters: False
942942
```
943943
944944
### -SpamZapEnabled
945-
The SpamZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/office365/securitycompliance/zero-hour-auto-purge) to detect unread spam messages in the user's Inbox. Valid values are:
945+
The SpamZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/microsoft-365/security/office-365-security/zero-hour-auto-purge) to detect unread spam messages in the user's Inbox. Valid values are:
946946
947947
- $true: Spam ZAP is enabled. Unread spam messages that are detected in the user's Inbox are automatically moved to the Junk Email folder. This is the default value.
948948

exchange/exchange-ps/exchange/antispam-antimalware/New-HostedOutboundSpamFilterPolicy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ Accept wildcard characters: False
180180
```
181181
182182
### -RecipientLimitExternalPerHour
183-
The RecipientLimitExternalPerHour parameter specifies the maximum number of external recipients that a user can send to within an hour. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/en-us/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
183+
The RecipientLimitExternalPerHour parameter specifies the maximum number of external recipients that a user can send to within an hour. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
184184
185185
```yaml
186186
Type: UInt32
@@ -196,7 +196,7 @@ Accept wildcard characters: False
196196
```
197197
198198
### -RecipientLimitInternalPerHour
199-
The RecipientLimitInternalPerHour parameter specifies the maximum number of internal recipients that a user can send to within an hour. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/en-us/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
199+
The RecipientLimitInternalPerHour parameter specifies the maximum number of internal recipients that a user can send to within an hour. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
200200
201201
```yaml
202202
Type: UInt32
@@ -212,7 +212,7 @@ Accept wildcard characters: False
212212
```
213213
214214
### -RecipientLimitPerDay
215-
The RecipientLimitInternalPerHour parameter specifies the maximum number of recipients that a user can send to within a day. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/en-us/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
215+
The RecipientLimitInternalPerHour parameter specifies the maximum number of recipients that a user can send to within a day. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
216216
217217
```yaml
218218
Type: UInt32

exchange/exchange-ps/exchange/antispam-antimalware/Set-HostedContentFilterPolicy.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ Accept wildcard characters: False
267267
```
268268
269269
### -BulkThreshold
270-
The BulkThreshold parameter specifies the Bulk Complaint Level (BCL) threshold setting. Valid values are from 1 - 9, where 1 marks most bulk email as spam, and 9 allows the most bulk email to be delivered. The default value is 7. For more information, see [Configure your spam filter policies](https://docs.microsoft.com/office365/SecurityCompliance/configure-your-spam-filter-policies).
270+
The BulkThreshold parameter specifies the Bulk Complaint Level (BCL) threshold setting. Valid values are from 1 - 9, where 1 marks most bulk email as spam, and 9 allows the most bulk email to be delivered. The default value is 7. For more information, see [Configure your spam filter policies](https://docs.microsoft.com/microsoft-365/security/office-365-security/configure-your-spam-filter-policies).
271271
272272
```yaml
273273
Type: Int32
@@ -863,7 +863,7 @@ Accept wildcard characters: False
863863
```
864864
865865
### -PhishZapEnabled
866-
The PhishZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/office365/securitycompliance/zero-hour-auto-purge) to detect phish messages in the user's Inbox. Valid values are:
866+
The PhishZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/microsoft-365/security/office-365-security/zero-hour-auto-purge) to detect phish messages in the user's Inbox. Valid values are:
867867
868868
- $true: Phish ZAP is enabled. Phish messages that are detected in the user's Inbox (regardless of read or unread status) are automatically moved to the Junk Email folder. This is the default value.
869869
@@ -973,7 +973,7 @@ Accept wildcard characters: False
973973
```
974974
975975
### -SpamZapEnabled
976-
The SpamZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/office365/securitycompliance/zero-hour-auto-purge) to detect unread spam messages in the user's Inbox. Valid values are:
976+
The SpamZapEnabled parameter specifies whether to enable [zero-hour auto purge (ZAP)](https://docs.microsoft.com/microsoft-365/security/office-365-security/zero-hour-auto-purge) to detect unread spam messages in the user's Inbox. Valid values are:
977977
978978
- $true: Spam ZAP is enabled. Unread spam messages that are detected in the user's Inbox are automatically moved to the Junk Email folder. This is the default value.
979979
@@ -1092,6 +1092,4 @@ To see the return types, which are also known as output types, that this cmdlet
10921092
10931093
[Online Version](https://docs.microsoft.com/powershell/module/exchange/antispam-antimalware/set-hostedcontentfilterpolicy)
10941094
1095-
[Safe sender and blocked sender lists in Exchange Online](https://docs.microsoft.com/office365/securitycompliance/safe-sender-and-blocked-sender-lists-faq)
1096-
1097-
1095+
[Safe sender and blocked sender lists in Exchange Online](https://docs.microsoft.com/microsoft-365/security/office-365-security/safe-sender-and-blocked-sender-lists-faq)

exchange/exchange-ps/exchange/antispam-antimalware/Set-HostedOutboundSpamFilterPolicy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ Accept wildcard characters: False
211211
```
212212
213213
### -RecipientLimitExternalPerHour
214-
The RecipientLimitExternalPerHour parameter specifies the maximum number of external recipients that a user can send to within an hour. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/en-us/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
214+
The RecipientLimitExternalPerHour parameter specifies the maximum number of external recipients that a user can send to within an hour. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
215215
216216
```yaml
217217
Type: UInt32
@@ -227,7 +227,7 @@ Accept wildcard characters: False
227227
```
228228
229229
### -RecipientLimitInternalPerHour
230-
The RecipientLimitInternalPerHour parameter specifies the maximum number of internal recipients that a user can send to within an hour. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/en-us/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
230+
The RecipientLimitInternalPerHour parameter specifies the maximum number of internal recipients that a user can send to within an hour. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
231231
232232
```yaml
233233
Type: UInt32
@@ -243,7 +243,7 @@ Accept wildcard characters: False
243243
```
244244
245245
### -RecipientLimitPerDay
246-
The RecipientLimitInternalPerHour parameter specifies the maximum number of recipients that a user can send to within a day. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/en-us/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
246+
The RecipientLimitInternalPerHour parameter specifies the maximum number of recipients that a user can send to within a day. A valid value is 0 to 10000. The default value is 0, which means the service defaults are used. For more information, see [Sending limits across Office 365 options](https://docs.microsoft.com/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits#sending-limits-across-office-365-options).
247247
248248
```yaml
249249
Type: UInt32

exchange/exchange-ps/exchange/client-access/Set-OwaMailboxPolicy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2566,10 +2566,10 @@ To see the return types, which are also known as output types, that this cmdlet
25662566
25672567
[Online Version](https://docs.microsoft.com/powershell/module/exchange/client-access/set-owamailboxpolicy)
25682568
2569-
[New-OwaMailboxPolicy](New-OwaMailboxPolicy.md)
2569+
[New-OwaMailboxPolicy](https://docs.microsoft.com/powershell/module/exchange/client-access/new-owamailboxpolicy)
25702570
2571-
[Get-OwaMailboxPolicy](Get-OwaMailboxPolicy.md)
2571+
[Get-OwaMailboxPolicy](https://docs.microsoft.com/powershell/module/exchange/client-access/get-owamailboxpolicy)
25722572
2573-
[Set-CASMailbox](Set-CASMailbox.md)
2573+
[Set-CASMailbox](https://docs.microsoft.com/powershell/module/exchange/client-access/set-casmailbox)
25742574
25752575
[Outlook on the web mailbox policy procedures in Exchange Online](https://docs.microsoft.com/exchange/clients-and-mobile-in-exchange-online/outlook-on-the-web/outlook-web-app-mailbox-policy-procedures)

exchange/exchange-ps/exchange/mailbox-databases-and-servers/Disable-MetaCacheDatabase.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
115115
116116
## RELATED LINKS
117117
118-
[Online Version][Online Version](https://docs.microsoft.com/powershell/module/exchange/mailbox-databases-and-servers/disable-metacachedatabase)
118+
[Online Version](https://docs.microsoft.com/powershell/module/exchange/mailbox-databases-and-servers/disable-metacachedatabase)

exchange/exchange-ps/exchange/mailbox-databases-and-servers/Enable-MetaCacheDatabase.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
115115
116116
## RELATED LINKS
117117
118-
[Online Version][Online Version](https://docs.microsoft.com/powershell/module/exchange/mailbox-databases-and-servers/enable-metacachedatabase)
118+
[Online Version](https://docs.microsoft.com/powershell/module/exchange/mailbox-databases-and-servers/enable-metacachedatabase)

exchange/exchange-ps/exchange/mailboxes/Set-Mailbox.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1722,7 +1722,7 @@ The AuditEnabled parameter specifies whether to enable or disable mailbox audit
17221722
17231723
- $false: Mailbox audit logging is disabled. This is the default value.
17241724
1725-
**Note**: In Exchange Online, mailbox auditing on by default was enabled for all organizations in January, 2019. For more information, see [Manage mailbox auditing](https://docs.microsoft.com/office365/securitycompliance/enable-mailbox-auditing).
1725+
**Note**: In Exchange Online, mailbox auditing on by default was enabled for all organizations in January, 2019. For more information, see [Manage mailbox auditing](https://docs.microsoft.com/microsoft-365/compliance/enable-mailbox-auditing).
17261726
17271727
```yaml
17281728
Type: Boolean
@@ -2336,7 +2336,7 @@ The DefaultAuditSet parameter specifies whether to revert the mailbox operations
23362336
23372337
- Owner: Reverts the mailbox operations to log for mailbox owners back to the default list of operations.
23382338
2339-
With on-by-default mailbox auditing in the cloud-based service, a set of mailbox operations are logged by default for each logon type. This list of operations is managed by Microsoft, who will automatically add new operations to be audited when they are released. If you change the list of mailbox operations for any logon type (by using the AuditAdmin, AuditDelegate, or AuditOwner parameters), any new mailbox operation released by Microsoft will not be audited; you'll need to explicitly add new mailbox operations to the list of operations for a logon type. Use this parameter to revert the mailbox back to the Microsoft-managed list of mailbox operations that are audited for a logon type. For more information about on-by-default mailbox auditing, see [Manage mailbox auditing](https://docs.microsoft.com/office365/securitycompliance/enable-mailbox-auditing).
2339+
With on-by-default mailbox auditing in the cloud-based service, a set of mailbox operations are logged by default for each logon type. This list of operations is managed by Microsoft, who will automatically add new operations to be audited when they are released. If you change the list of mailbox operations for any logon type (by using the AuditAdmin, AuditDelegate, or AuditOwner parameters), any new mailbox operation released by Microsoft will not be audited; you'll need to explicitly add new mailbox operations to the list of operations for a logon type. Use this parameter to revert the mailbox back to the Microsoft-managed list of mailbox operations that are audited for a logon type. For more information about on-by-default mailbox auditing, see [Manage mailbox auditing](https://docs.microsoft.com/microsoft-365/compliance/enable-mailbox-auditing).
23402340
23412341
```yaml
23422342
Type: MultiValuedProperty

exchange/exchange-ps/exchange/policy-and-compliance-content-search/New-ComplianceSearchAction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ Notes:
459459
460460
- A maximum of 10 items per mailbox can be removed at one time. Because the capability to search for and remove messages is intended to be an incident-response tool, this limit helps ensure that messages are quickly removed from mailboxes. This action isn't intended to clean up user mailboxes.
461461
462-
- You can remove items from a maximum of 50,000 mailboxes using a single content search. To remove items from more than 50,000 mailboxes, you'll have to create separate content searches. For more information, see [Search for and delete email messages in your Office 365 organization](https://docs.microsoft.com/office365/securitycompliance/search-for-and-delete-messages-in-your-organization).
462+
- You can remove items from a maximum of 50,000 mailboxes using a single content search. To remove items from more than 50,000 mailboxes, you'll have to create separate content searches. For more information, see [Search for and delete email messages in your Office 365 organization](hhttps://docs.microsoft.com/microsoft-365/compliance/search-for-and-delete-messages-in-your-organization).
463463
464464
- Unindexed items aren't removed from mailboxes when you use this switch.
465465

exchange/exchange-ps/exchange/policy-and-compliance-dlp/Get-DlpEdmSchema.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
8282
8383
[Online Version](https://docs.microsoft.com/powershell/module/exchange/policy-and-compliance-dlp/Get-DlpEdmSchema)
8484
85-
[Create custom sensitive information types with Exact Data Match based classification](https://docs.microsoft.com/office365/securitycompliance/create-custom-sensitive-info-type-edm)
85+
[Create custom sensitive information types with Exact Data Match based classification](https://docs.microsoft.com/microsoft-365/compliance/create-custom-sensitive-information-types-with-exact-data-match-based-classification)

0 commit comments

Comments
 (0)