Skip to content

Commit 782eca7

Browse files
authored
Merge branch 'main' into patch-5
2 parents f0ebe43 + 65ea411 commit 782eca7

20 files changed

+270
-391
lines changed

exchange/exchange-ps/exchange/New-RetentionComplianceRule.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,17 @@ To use this cmdlet in Security & Compliance Center PowerShell, you need to be as
6767

6868
### Example 1
6969
```powershell
70-
New-RetentionComplianceRule -Name SeptOneYear -Policy "Internal Company Policy" -RetentionDuration Unlimited
70+
New-RetentionComplianceRule -Name InternalCompanyRule -Policy "Internal Company Policy" -RetentionDuration Unlimited
7171
```
7272

73-
This example creates a new retention rule named SeptOneYear and adds it to the existing retention policy named "Internal Company Policy". Content will be held indefinitely.
73+
This example creates a new case hold rule named InternalCompanyRule and adds it to the existing case hold policy named "Internal Company Policy". Content will be held indefinitely.
74+
75+
### Example 2
76+
```powershell
77+
New-RetentionComplianceRule -Name SeptOneYear -Policy "Internal Company Policy" -RetentionDuration 365 -RetentionComplianceAction KeepAndDelete -ExpirationDateOption ModificationAgeInDays
78+
```
79+
80+
This example creates a new retention rule named SeptOneYear and adds it to the existing retention policy named "Internal Company Policy". Content will be held for one year from the day content was last modified before it is deleted.
7481

7582
## PARAMETERS
7683

exchange/exchange-ps/exchange/Search-UnifiedAuditLog.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,11 +306,9 @@ Accept wildcard characters: False
306306
```
307307

308308
### -SiteIds
309-
The SiteIds parameter filters the log entries by the SharePoint site URL.
309+
The SiteIds parameter filters the log entries by the SharePoint SiteId (GUID). You can enter multiple values separated by commas: `Value1, Value2,…ValueN`.
310310

311-
You can enter multiple values separated by commas. If the values contain spaces or otherwise require quotation marks, use the following syntax: `"Value1","Value2",..."ValueN"`.
312-
313-
If the site URL contains a dash (-), escape the dash character with another dash. For example, for the site `https://contoso.sharepoint.com/sites/hr-project`, use the value `"https://contoso.sharepoint.com/sites/hr--project"`.
311+
To obtain the the SiteId for a SharePoint site, append `/_api/site/id` to the URL of the site collection you want to specify. For example, change the URL `https://contoso.sharepoint.com/sites/hr-project` to `https://contoso.sharepoint.com/sites/hr-project/_api/site/id`. An XML payload is returned and the SiteId for the site collection is displayed in the Edm.Guid property; for example: `<d:Id xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.Guid">14ab81b6-f23d-476a-8cac-ad5dbd2910f7</d:Id>`.
314312

315313
```yaml
316314
Type: String[]

exchange/exchange-ps/exchange/Set-OrganizationConfig.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1479,7 +1479,7 @@ The DisablePlusAddressInRecipients parameter specifies whether to enable or disa
14791479
- $true: Plus addressing is enabled. You can no longer use the plus sign in regular email addresses. The plus sign is only available for plus addressing.
14801480
- $false: Plus addressing is disabled. You can use the plus sign in regular email addresses.
14811481

1482-
For more information about plus addressing, see [Plus addressing in Exchange Online](https://docs.microsoft.com/eexchange/recipients-in-exchange-online/plus-addressing-in-exchange-online).
1482+
For more information about plus addressing, see [Plus addressing in Exchange Online](https://docs.microsoft.com/exchange/recipients-in-exchange-online/plus-addressing-in-exchange-online).
14831483

14841484
```yaml
14851485
Type: Boolean

exchange/exchange-ps/exchange/Test-Message.md

Lines changed: 0 additions & 348 deletions
This file was deleted.

0 commit comments

Comments
 (0)