Skip to content

Commit 69e4cab

Browse files
authored
Merge branch 'master' into FixRefInUnassignedNumbers
2 parents fd0ced9 + 854c293 commit 69e4cab

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Set-CsTeamsMeetingPolicy [-Tenant <Guid>] [-Description <String>]
3535
[-AllowUserToJoinExternalMeeting <String>] [-EnrollUserOverride <String>] [-StreamingAttendeeMode <String]
3636
[-AllowBreakoutRooms <Boolean>] [-TeamsCameraFarEndPTZMode <String>] [-AllowMeetingReactions <Boolean>]
3737
[-AllowMeetingRegistration <Boolean>] [-AllowScreenContentDigitization <Boolean>] [-AllowTrackingInReport <Boolean>] [-RoomAttributeUserOverride <String>]
38-
[-SpeakerAttributionMode <String>] [-WhoCanRegister <String>] [-ChannelRecordingDownload <String>] [-MeetingRecordingExpirationDays <Int32>]
38+
[-SpeakerAttributionMode <String>] [-WhoCanRegister <String>] [-ChannelRecordingDownload <String>] [-NewMeetingRecordingExpirationDays <Int32>]
3939
[-MeetingInviteLanguages <String>]
4040
[-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
4141
```
@@ -56,7 +56,7 @@ Set-CsTeamsMeetingPolicy [-Tenant <Guid>] [-Description <String>]
5656
[-VideoFiltersMode <String>] [-AllowEngagementReport <String>] [-AllowNDIStreaming <Boolean>]
5757
[-DesignatedPresenterRoleMode <String>] [-AllowIPAudio <Boolean>] [-AllowOrganizersToOverrideLobbySettings <Boolean>]
5858
[-AllowUserToJoinExternalMeeting <String>] [-EnrollUserOverride <String>] [-StreamingAttendeeMode <String]
59-
[-MeetingRecordingExpirationDays <Int32>]
59+
[-NewMeetingRecordingExpirationDays <Int32>]
6060
[-AllowBreakoutRooms <Boolean>] [-TeamsCameraFarEndPTZMode <String>] [-AllowMeetingReactions <Boolean>]
6161
[-AllowMeetingRegistration <Boolean>] [-AllowScreenContentDigitization <Boolean>] [-AllowTrackingInReport <Boolean>] [-RoomAttributeUserOverride <String>]
6262
[-SpeakerAttributionMode <String>] [-WhoCanRegister <String>] [-ChannelRecordingDownload <String>]
@@ -952,10 +952,12 @@ Accept pipeline input: False
952952
Accept wildcard characters: False
953953
```
954954
955-
### -MeetingRecordingExpirationDays
955+
### -NewMeetingRecordingExpirationDays
956956
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. Value can also be -1 to set meeting recordings to never expire.
957957
958-
Note: This parameter isn't yet available to be set. We'll publish an updated message center post when the setting is available for modification. For more information about its delivery date, see the [roadmap (Feature ID: 84580)](https://www.microsoft.com/microsoft-365/roadmap?searchterms=82057&filters=&searchterms=84580).
958+
NOTE: You may opt to set Meeting Recordings to never expire by entering the value -1.
959+
960+
NOTE: This parameter is available to be set, but will not be effective until this feature gets general availability. Please refer to the [roadmap (Feature ID: 84580)](https://www.microsoft.com/microsoft-365/roadmap?filters=&searchterms=84580) for more information on its delivery date.
959961
960962
```yaml
961963
Type: Int32

skype/skype-ps/skype/Set-CsTenantNetworkSite.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
external help file: Microsoft.Rtc.Management.Hosted.dll-help.xml
33
online version: https://docs.microsoft.com/powershell/module/skype/set-cstenantnetworksite
4-
applicable: Skype for Business Online
4+
applicable: Microsoft Teams, Skype for Business Online
55
title: Set-CsTenantNetworkSite
66
schema: 2.0.0
77
manager: bulenteg
@@ -49,10 +49,10 @@ The network region 'RegionRedmond' is created beforehand and 'MicrosoftSite1' wi
4949

5050
###-------------------------- Example 2 --------------------------
5151
```powershell
52-
PS C:\> Set-CsTenantNetworkSite -Identity "site2" -Description "site 2" -NetworkRegionID "RedmondRegion" -LocationPolicy "TestLocationPolicy" -EnableLocationBasedRouting $true
52+
PS C:\> Set-CsTenantNetworkSite -Identity "site2" -Description "site 2" -NetworkRegionID "RedmondRegion" -EnableLocationBasedRouting $true
5353
```
5454

55-
The command shown in Example 2 sets the network site 'site2' with description 'site 2'. This site is enabled for LBR. The example associates the site with network region 'RedmondRegion' and with location policy 'TestLocationPolicy'.
55+
The command shown in Example 2 sets the network site 'site2' with description 'site 2'. This site is enabled for LBR. The example associates the site with network region 'RedmondRegion'.
5656

5757
###-------------------------- Example 3 --------------------------
5858
```powershell
@@ -155,7 +155,7 @@ Accept wildcard characters: False
155155
```
156156

157157
### -LocationPolicy
158-
LocationPolicy is the identifier for the location policy which the current network site is associating to.
158+
This parameter is reserved for internal Microsoft use.
159159

160160
```yaml
161161
Type: String

0 commit comments

Comments
 (0)