Skip to content

Commit 2bdd001

Browse files
trent-greentrent-green
authored
Merge branch 'master' into patch-4
2 parents eaae5ae + a581f43 commit 2bdd001

File tree

161 files changed

+439
-338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+439
-338
lines changed

‎exchange/exchange-ps/exchange/encryption-and-certificates/Get-OMEConfiguration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ This example returns a summary list of all OME configurations in the organizatio
3838

3939
### -------------------------- Example 2 --------------------------
4040
```
41-
Get-OMEConfiguration -Identity "OME Configuration" | Format-List
41+
Get-OMEConfiguration | Format-List
4242
```
4343

44-
This example returns detailed information for the default OME configuration named OME Configuration.
44+
This example returns detailed information for all OME configurations in the organization.
4545

4646
## PARAMETERS
4747

‎exchange/exchange-ps/exchange/encryption-and-certificates/New-OMEConfiguration.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ New-OMEConfiguration [-Identity] <OrganizationIdParameter>
2222
[-BackgroundColor <String>]
2323
[-DisclaimerText <String>]
2424
[-EmailText <String>]
25+
[-ExternalMailExpiryInDays <Int32>]
2526
[-Image <Byte[]>]
2627
[-IntroductionText <String>]
2728
[-OTPEnabled <$true | $false>]
@@ -113,6 +114,23 @@ Accept pipeline input: False
113114
Accept wildcard characters: False
114115
```
115116
117+
### -ExternalMailExpiryInDays
118+
This parameter is only available with a Microsoft 365 Advanced Message Encryption subscription.
119+
120+
The ExternalMailExpiryInDays parameter specifies the number of days that the encrypted message is available to external recipients in the Microsoft 365 portal. A valid value is an integer from 0 to 730. The value 0 means the messages will never expire. The default value is 0.
121+
122+
```yaml
123+
Type: String
124+
Parameter Sets: Int32
125+
Aliases:
126+
Applicable: Exchange Online
127+
Required: False
128+
Position: Named
129+
Default value: None
130+
Accept pipeline input: False
131+
Accept wildcard characters: False
132+
```
133+
116134
### -Image
117135
The Image parameter identifies and uploads an image that will be displayed in the email message and in the Office 365 portal.
118136

‎exchange/exchange-ps/exchange/encryption-and-certificates/Set-OMEConfiguration.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Set-OMEConfiguration [-Identity] <OMEConfigurationIdParameter>
2525
[-BackgroundColor <String>]
2626
[-DisclaimerText <String>]
2727
[-EmailText <String>]
28+
[-ExternalMailExpiryInDays <Int32>]
2829
[-Image <Byte[]>]
2930
[-IntroductionText <String>]
3031
[-OTPEnabled <$true | $false>]
@@ -118,6 +119,23 @@ Accept pipeline input: False
118119
Accept wildcard characters: False
119120
```
120121
122+
### -ExternalMailExpiryInDays
123+
This parameter is only available with a Microsoft 365 Advanced Message Encryption subscription.
124+
125+
The ExternalMailExpiryInDays parameter specifies the number of days that the encrypted message is available to external recipients in the Microsoft 365 portal. A valid value is an integer from 0 to 730. The value 0 means the messages will never expire. The default value is 0.
126+
127+
```yaml
128+
Type: String
129+
Parameter Sets: Int32
130+
Aliases:
131+
Applicable: Exchange Online
132+
Required: False
133+
Position: Named
134+
Default value: None
135+
Accept pipeline input: False
136+
Accept wildcard characters: False
137+
```
138+
121139
### -Image
122140
The Image parameter identifies and uploads an image that will be displayed in the email message and in the Office 365 portal.
123141

‎exchange/exchange-ps/exchange/policy-and-compliance-dlp/Remove-DlpComplianceRule.md

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ For information about the parameter sets in the Syntax section below, see Exchan
2121
## SYNTAX
2222

2323
```
24-
Remove-DlpComplianceRule [-Identity] <PolicyIdParameter> [-Confirm] [-ForceDeletion] [-WhatIf]
25-
[<CommonParameters>]
24+
Remove-DlpComplianceRule [-Identity] <PolicyIdParameter>
25+
[-Confirm]
26+
[-WhatIf] [<CommonParameters>]
2627
```
2728

2829
## DESCRIPTION
@@ -81,21 +82,6 @@ Accept pipeline input: False
8182
Accept wildcard characters: False
8283
```
8384
84-
### -ForceDeletion
85-
The ForceDeletion switch forces the removal of the rule. You don't need to specify a value with this switch.
86-
87-
```yaml
88-
Type: SwitchParameter
89-
Parameter Sets: (All)
90-
Aliases:
91-
Applicable: Office 365 Security & Compliance Center
92-
Required: False
93-
Position: Named
94-
Default value: None
95-
Accept pipeline input: False
96-
Accept wildcard characters: False
97-
```
98-
9985
### -WhatIf
10086
The WhatIf switch doesn't work in the Office 365 Security & Compliance Center.
10187

‎exchange/exchange-ps/exchange/policy-and-compliance-retention/Get-RetentionPolicyTag.md

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,29 @@ Accept wildcard characters: False
129129
```
130130
131131
### -Mailbox
132-
The Mailbox parameter isn't available in this release.
132+
The Mailbox parameter returns the retention tags that are assigned to the retention policy that's applied to the specified mailbox. You can use any value that uniquely identifies the mailbox. For example:
133+
134+
- Name
135+
136+
- Alias
137+
138+
- Distinguished name (DN)
139+
140+
- Canonical DN
141+
142+
- \<domain name\>\\\<account name\>
143+
144+
- Email address
145+
146+
- GUID
147+
148+
- LegacyExchangeDN
149+
150+
- SamAccountName
151+
152+
- User ID or user principal name (UPN)
153+
154+
This parameter only returns default policy tags (DPTs) and personal tags; it doesn't return retention policy tags.
133155
134156
```yaml
135157
Type: MailboxIdParameter
@@ -144,7 +166,9 @@ Accept wildcard characters: False
144166
```
145167
146168
### -OptionalInMailbox
147-
The OptionalInMailbox parameter isn't available in this release.
169+
The OptionalInMailbox parameter is used with the Mailbox parameter to return any opt-in retention tags that are assigned to the specified mailbox. You don't need to specify a value with this switch.
170+
171+
An opt-in retention tag is a personal tag that was explicitly assigned to the mailbox with the Set-RetentionPolicyTag -Mailbox -OptionalInMailbox command.
148172
149173
```yaml
150174
Type: SwitchParameter

‎exchange/exchange-ps/exchange/policy-and-compliance-retention/Set-RetentionPolicyTag.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ Accept wildcard characters: False
385385
```
386386
387387
### -OptionalInMailbox
388-
The OptionalInMailbox parameter is used with the Mailbox parameter to specify opt-in retention tags available to the mailbox.
388+
The OptionalInMailbox parameter is used with the Mailbox parameter to assign personal tags to the mailbox. You can use this parameter to make available to a user a personal tag that isn't assigned to the retention policy applied to the specified mailbox. You can specify multiple personal tags separated by commas.
389389
390390
```yaml
391391
Type: RetentionPolicyTagIdParameter[]

‎exchange/exchange-ps/exchange/policy-and-compliance/Set-ProtectionAlert.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ Use the Set-ProtectionAlert cmdlet to modify alert policies in the Security & Co
1818

1919
For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
2020

21+
> [!NOTE]
22+
> You cannot use this cmdlet to edit default alert policies. You can only modify alerts you have created using New-ProtectionAlert cmdlet.
23+
2124
## SYNTAX
2225

2326
```

‎exchange/exchange-ps/exchange/users-and-groups/Set-User.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ The Identity parameter specifies the user that you want to modify. You can use a
117117

118118
- GUID
119119

120+
- UserPrincipalName
121+
120122
```yaml
121123
Type: UserIdParameter
122124
Parameter Sets: (All)

‎sharepoint/sharepoint-ps/sharepoint-online/Add-SPOGeoAdministrator.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ external help file: sharepointonline.xml
33
applicable: SharePoint Online
44
title: Add-SPOGeoAdministrator
55
schema: 2.0.0
6-
author: vesajuvonen
7-
ms.author: vesaj
6+
author: trent-green
7+
ms.author: trgreen
88
ms.reviewer:
99
---
1010

‎sharepoint/sharepoint-ps/sharepoint-online/Add-SPOHubSiteAssociation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ external help file: sharepointonline.xml
33
applicable: SharePoint Online
44
title: Add-SPOHubSiteAssociation
55
schema: 2.0.0
6-
author: vesajuvonen
7-
ms.author: vesaj
6+
author: trent-green
7+
ms.author: trgreen
88
ms.reviewer:
99
---
1010

‎sharepoint/sharepoint-ps/sharepoint-online/Add-SPOSiteDesign.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ external help file: sharepointonline.xml
33
applicable: SharePoint Online
44
title: Add-SPOSiteDesign
55
schema: 2.0.0
6-
author: vesajuvonen
7-
ms.author: vesaj
6+
author: trent-green
7+
ms.author: trgreen
88
ms.reviewer:
99
---
1010

@@ -111,7 +111,7 @@ Accept wildcard characters: False
111111
```
112112
113113
### -PreviewImageUrl
114-
The URL of a preview image. If none is specified, SharePoint uses a generic image.
114+
The URL of a preview image. If none is specified, SharePoint uses a generic image. Recommended size is 400 x 421 pixels.
115115
116116
```yaml
117117
Type: String

‎sharepoint/sharepoint-ps/sharepoint-online/Add-SPOSiteDesignTask.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ external help file: sharepointonline.xml
33
applicable: SharePoint Online
44
title: Add-SPOSiteDesignTask
55
schema: 2.0.0
6-
author: vesajuvonen
7-
ms.author: vesaj
6+
author: trent-green
7+
ms.author: trgreen
88
ms.reviewer:
99
---
1010

‎sharepoint/sharepoint-ps/sharepoint-online/Add-SPOSiteScript.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ external help file: sharepointonline.xml
33
applicable: SharePoint Online
44
title: Add-SPOSiteScript
55
schema: 2.0.0
6-
author: vesajuvonen
7-
ms.author: vesaj
6+
author: trent-green
7+
ms.author: trgreen
88
ms.reviewer:
99
---
1010

‎sharepoint/sharepoint-ps/sharepoint-online/Add-SPOTenantCdnOrigin.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ external help file: sharepointonline.xml
33
applicable: SharePoint Online
44
title: Add-SPOTenantCdnOrigin
55
schema: 2.0.0
6-
author: vesajuvonen
7-
ms.author: vesaj
6+
author: trent-green
7+
ms.author: trgreen
88
ms.reviewer:
99
---
1010

‎sharepoint/sharepoint-ps/sharepoint-online/Add-SPOTheme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ external help file: sharepointonline.xml
33
applicable: SharePoint Online
44
title: Add-SPOTheme
55
schema: 2.0.0
6-
author: vesajuvonen
7-
ms.author: vesaj
6+
author: trent-green
7+
ms.author: trgreen
88
ms.reviewer:
99
---
1010

‎sharepoint/sharepoint-ps/sharepoint-online/Add-SPOUser.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ external help file: sharepointonline.xml
33
applicable: SharePoint Online
44
title: Add-SPOUser
55
schema: 2.0.0
6-
author: vesajuvonen
7-
ms.author: vesaj
6+
author: trent-green
7+
ms.author: trgreen
88
ms.reviewer:
99
---
1010

‎sharepoint/sharepoint-ps/sharepoint-online/Approve-SPOTenantServicePrincipalPermissionGrant.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
external help file:
33
applicable: SharePoint Online
44
schema: 2.0.0
5-
author: vesajuvonen
6-
ms.author: vesaj
5+
author: trent-green
6+
ms.author: trgreen
77
ms.reviewer:
88
---
99

‎sharepoint/sharepoint-ps/sharepoint-online/Approve-SPOTenantServicePrincipalPermissionRequest.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
external help file: sharepointonline.xml
33
applicable: SharePoint Online
44
schema: 2.0.0
5-
author: vesajuvonen
6-
ms.author: vesaj
5+
author: trent-green
6+
ms.author: trgreen
77
ms.reviewer:
88
---
99

‎sharepoint/sharepoint-ps/sharepoint-online/Connect-SPOService.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ external help file: sharepointonline.xml
33
applicable: SharePoint Online
44
title: Connect-SPOService
55
schema: 2.0.0
6-
author: vesajuvonen
7-
ms.author: vesaj
6+
author: trent-green
7+
ms.author: trgreen
88
ms.reviewer:
99
---
1010

‎sharepoint/sharepoint-ps/sharepoint-online/ConvertTo-SPOMigrationEncryptedPackage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ external help file: sharepointonline.xml
33
applicable: SharePoint Online
44
title: ConvertTo-SPOMigrationEncryptedPackage
55
schema: 2.0.0
6-
author: vesajuvonen
7-
ms.author: vesaj
6+
author: trent-green
7+
ms.author: trgreen
88
ms.reviewer:
99
---
1010

‎sharepoint/sharepoint-ps/sharepoint-online/ConvertTo-SPOMigrationTargetedPackage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ external help file: sharepointonline.xml
33
applicable: SharePoint Online
44
title: ConvertTo-SPOMigrationTargetedPackage
55
schema: 2.0.0
6-
author: vesajuvonen
7-
ms.author: vesaj
6+
author: trent-green
7+
ms.author: trgreen
88
ms.reviewer:
99
---
1010

‎sharepoint/sharepoint-ps/sharepoint-online/Deny-SPOTenantServicePrincipalPermissionRequest.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
external help file: sharepointonline.xml
33
applicable: SharePoint Online
44
schema: 2.0.0
5-
author: vesajuvonen
6-
ms.author: vesaj
5+
author: trent-green
6+
ms.author: trgreen
77
ms.reviewer:
88
---
99

‎sharepoint/sharepoint-ps/sharepoint-online/Disable-SPOTenantServicePrincipal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
external help file: sharepointonline.xml
33
applicable: SharePoint Online
44
schema: 2.0.0
5-
author: vesajuvonen
6-
ms.author: vesaj
5+
author: trent-green
6+
ms.author: trgreen
77
ms.reviewer:
88
---
99

‎sharepoint/sharepoint-ps/sharepoint-online/Disconnect-SPOService.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ external help file: sharepointonline.xml
33
applicable: SharePoint Online
44
title: Disconnect-SPOService
55
schema: 2.0.0
6-
author: vesajuvonen
7-
ms.author: vesaj
6+
author: trent-green
7+
ms.author: trgreen
88
ms.reviewer:
99
---
1010

‎sharepoint/sharepoint-ps/sharepoint-online/Enable-SPOCommSite.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ external help file: sharepointonline.xml
33
applicable: SharePoint Online
44
title: Enable-SPOCommSite
55
schema: 2.0.0
6-
author: divyachapan
7-
ms.author: dipadur
6+
author: trent-green
7+
ms.author: trgreen
88
ms.reviewer:
99
---
1010

@@ -26,7 +26,7 @@ Use this cmdlet to enable the modern communication site experience at the classi
2626

2727
**Current limitations**
2828

29-
1. This cmdlet can only be run on the root site of a tenant. Typically the root site url is https://<tenantname>.sharepoint.com
29+
1. This cmdlet can only be run on the root site of a tenant. Typically the root site url is https://\<tenantname\>.sharepoint.com
3030
2. The root site should not currently have the classic publishing feature enabled (at the site or web level). [What is classic publishing feature?](https://support.office.com/article/enable-publishing-features-479677a6-8b33-4ac7-907d-071c1c7e4518)
3131
3. The root site **should not have had** the classic publishing feature enabled in the past (at the site or web level)
3232
4. The site must have quick launch site navigation enabled. [How do I do this?](https://support.office.com/article/customize-site-navigation-c040f014-acbb-4c98-8174-48428cf02b25#bm1a)
@@ -66,8 +66,8 @@ Enable-SPOCommSite -SiteUrl $rootSiteURL
6666

6767
1. Install latest SharePoint Online Management Shell (version 8715.1200 or greater) from [here] (https://www.microsoft.com/en-us/download/details.aspx?id=35588). If you have an older version installed, please uninstall it from Windows Add/Remove programs and then install the latest version. Alternatively, if you have used Install-Module Microsoft.Online.SharePoint.PowerShell to install the SharePoint Online Management Shell, you can run Update-Module Microsoft.Online.SharePoint.PowerShell to update the PowerShell module to the latest available version.
6868
2. Make sure you have the SharePoint admin credentials for the tenant
69-
3. Make sure you have the correct root site URL. Typically its https://<tenantname>.sharepoint.com
70-
4. Copy this block of PowerShell commands into a notepad and fill in the missing details denoted by <>
69+
3. Make sure you have the correct root site URL. Typically its https://\<tenantname\>.sharepoint.com
70+
4. Copy the above PowerShell command(s) into a notepad and fill in the missing details denoted by <>
7171
5. Open SharePoint Online Management Shell from your computer
7272
6. Execute the PowerShell commands from your notepad
7373

0 commit comments

Comments
 (0)