Skip to content

Commit 4557055

Browse files
committed
Merge branch 'master' into chrisda
2 parents cf93824 + 5b49370 commit 4557055

File tree

6 files changed

+56
-6
lines changed

6 files changed

+56
-6
lines changed

exchange/exchange-ps/exchange/New-DlpComplianceRule.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2491,7 +2491,9 @@ Accept wildcard characters: False
24912491
```
24922492

24932493
### -UnscannableDocumentExtensionIs
2494-
{{ Fill UnscannableDocumentExtensionIs Description }}
2494+
The UnscannableDocumentExtensionIs parameter specifies a condition for the rule that looks for the specified true file extension when the files are unscannable.
2495+
2496+
You can specify multiple values separated by commas.
24952497

24962498
```yaml
24972499
Type: MultiValuedProperty

exchange/exchange-ps/exchange/Set-DlpComplianceRule.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1247,7 +1247,9 @@ Accept wildcard characters: False
12471247
```
12481248

12491249
### -ExceptIfUnscannableDocumentExtensionIs
1250-
{{ Fill ExceptIfUnscannableDocumentExtensionIs Description }}
1250+
The ExceptIfUnscannableDocumentExtensionIs parameter specifies an exception for the rule that looks for the specified true file extension when the files are unscannable.
1251+
1252+
You can specify multiple values separated by commas.
12511253

12521254
```yaml
12531255
Type: MultiValuedProperty
@@ -2088,7 +2090,9 @@ Accept wildcard characters: False
20882090
```
20892091

20902092
### -UnscannableDocumentExtensionIs
2091-
{{ Fill UnscannableDocumentExtensionIs Description }}
2093+
The UnscannableDocumentExtensionIs parameter specifies a condition for the rule that looks for the specified true file extension when the files are unscannable.
2094+
2095+
You can specify multiple values separated by commas.
20922096

20932097
```yaml
20942098
Type: MultiValuedProperty

sharepoint/sharepoint-ps/sharepoint-online/Set-SPOSite.md

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Set-SPOSite [-Identity] <SpoSitePipeBind> [-AllowSelfServiceUpgrade <Boolean>] [
3535
[-SharingBlockedDomainList <String>] [-SharingDomainRestrictionMode <SharingDomainRestrictionModes>]
3636
[-ShowPeoplePickerSuggestionsForGuestUsers <Boolean>] [-StorageQuotaReset]
3737
[-DefaultSharingLinkType] [-DefaultLinkPermission] [-DefaultLinkToExistingAccess]
38-
[-ConditionalAccessPolicy <SPOConditionalAccessPolicyType>] [-AuthenticationContextName <String>] [-LimitedAccessFileType <SPOLimitedAccessFileType>] [-AllowEditing <Boolean>] [-AnonymousLinkExpirationInDays <Int32>] [-OverrideTenantAnonymousLinkExpirationPolicy <Boolean>] [-SensitivityLabel <String>]
38+
[-ConditionalAccessPolicy <SPOConditionalAccessPolicyType>] [-AuthenticationContextName <String>] [-LimitedAccessFileType <SPOLimitedAccessFileType>] [-AllowEditing <Boolean>] [-AnonymousLinkExpirationInDays <Int32>] [-OverrideTenantAnonymousLinkExpirationPolicy <Boolean>] [-OverrideTenantExternalUserExpirationPolicy <Boolean>] [-ExternalUserExpirationInDays <Int32>] [-SensitivityLabel <String>]
3939
[-RemoveLabel] [<CommonParameters>]
4040
```
4141

@@ -833,6 +833,46 @@ Accept pipeline input: False
833833
Accept wildcard characters: False
834834
```
835835

836+
### -OverrideTenantExternalUserExpirationPolicy
837+
838+
Choose whether to override the external user expiration policy on this site
839+
840+
Possible values:
841+
842+
- None: Respect the organization-level policy for external user expiration.
843+
- False: Respect the organization-level policy for external user expiration.
844+
- True: Override the organization-level policy for external user expiration (can be more or less restrictive).
845+
846+
```yaml
847+
Type: Boolean
848+
Parameter Sets: ParamSet1
849+
Aliases:
850+
Applicable: SharePoint Online
851+
Required: False
852+
Position: Named
853+
Default value: None
854+
Accept pipeline input: False
855+
Accept wildcard characters: False
856+
```
857+
858+
### -ExternalUserExpirationInDays
859+
860+
Specifies all external user expiration which will expire after the set number of days. Only applies if OverrideTenantExternalUserExpirationPolicy is set to true.
861+
862+
To remove the expiration requirement, set the value to zero (0).
863+
864+
```yaml
865+
Type: Int32
866+
Parameter Sets: (All)
867+
Aliases:
868+
Applicable: SharePoint Online
869+
Required: False
870+
Position: Named
871+
Default value: None
872+
Accept pipeline input: False
873+
Accept wildcard characters: False
874+
```
875+
836876
### -ConditionalAccessPolicy
837877

838878
Please read [Control access from unmanaged devices](/sharepoint/control-access-from-unmanaged-devices) documentation here to understand Conditional Access Policy usage in SharePoint Online.

skype/skype-ps/skype/Set-CsTeamsCallingPolicy.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,8 @@ Determines if Spam filtering is enabled.
419419
Possible values:
420420
- Enabled
421421
- Disabled
422-
- EnabledWithoutIVR
422+
- EnabledWithoutIVR (Choosing this value will disable the default spam checking which integrates the Captcha IVR Bot into the flow. The call will not be redirected to the bot for checking against fraudulent calls but will be allowed to go to the original target if the spam score is not high.)
423+
423424
424425
```yaml
425426
Type: String

skype/skype-ps/skype/Set-CsTeamsEmergencyCallingPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Accept wildcard characters: False
7777
```
7878
7979
### -ExternalLocationLookupMode
80-
Enable ExternalLocationLookupMode. This parameter is currently not supported.
80+
Enable ExternalLocationLookupMode.
8181
8282
```yaml
8383
Type: ExternalLocationLookupMode

skype/skype-ps/skype/Set-CsTeamsMeetingPolicy.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -944,6 +944,9 @@ Accept wildcard characters: False
944944
945945
Specifies the number of days before meeting recordings will expire and move to the recycle bin. Value can be from 1 to 99,999 days.
946946
947+
> [!NOTE]
948+
> You may opt to set Meeting Recordings to never expire by entering the value -1.
949+
947950
948951
```yaml
949952
Type: Int32

0 commit comments

Comments
 (0)