Skip to content

Commit a2f45fb

Browse files
authored
Merge branch 'main' into main
2 parents f5d225f + edd0642 commit a2f45fb

8 files changed

+234
-14
lines changed

exchange/exchange-ps/exchange/Set-AppRetentionCompliancePolicy.md

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,34 @@ Set-AppRetentionCompliancePolicy -Identity "Regulation 563 Marketing" -Applicati
119119

120120
This example adds a new user to the existing static scope retention policy named Regulation 563 Marketing that's set up for Teams private channels messages.
121121

122+
### Example 2
123+
```powershell
124+
$stringJson = @"
125+
[{
126+
'EmailAddress': 'SalesUser@contoso.onmicrosoft.com'
127+
}]
128+
"@
129+
Set-AppRetentionCompliancePolicy -Identity "Teams Private Channel Retention Policy" -AddExchangeLocationException "SalesUser@contoso.onmicrosoft.com" -DeletedResources $stringJson
130+
```
131+
This example excludes the specified soft-deleted mailbox or mail user from the retention policy configured for Teams private channel messages. You can identify the deleted resources using the mailbox or mail user's email address.
132+
133+
Policy exclusions must remain within the supported limits for retention policies. For more information, see [Limits for Microsoft 365 retention policies and retention label policies](https://learn.microsoft.com/purview/retention-limits#maximum-number-of-items-per-policy).
134+
135+
### Example 3
136+
```powershell
137+
$stringJson = @"
138+
[{
139+
'EmailAddress': 'SalesUser1@contoso.onmicrosoft.com'
140+
},
141+
{
142+
'EmailAddress': 'SalesUser2@contoso.onmicrosoft.com'
143+
}]
144+
"@
145+
Set-AppRetentionCompliancePolicy -Identity "Teams Private Chat Retention Policy" -AddExchangeLocationException "SalesUser1@contoso.onmicrosoft.com", "SalesUser2@contoso.onmicrosoft.com" -DeletedResources $stringJson
146+
```
147+
148+
This example is similar to Example 2, except multiple deleted resources are specified.
149+
122150
## PARAMETERS
123151

124152
### -Identity
@@ -347,7 +375,11 @@ Accept wildcard characters: False
347375
```
348376

349377
### -DeletedResources
350-
{{ Fill DeletedResources Description }}
378+
The DeletedResources parameter specifies the deleted mailbox or mail user to add as an exclusion to the respective location list. Use this parameter with the AddTeamsChatLocationException parameter for deleted mailboxes or mail users that needs to be excluded from a Teams only retention policy.
379+
380+
A valid value is a JSON string. Refer to the Examples section for syntax and usage examples of this parameter.
381+
382+
For information on the inactive mailbox scenario, see [Learn about inactive mailboxes](https://learn.microsoft.com/purview/inactive-mailboxes-in-office-365).
351383

352384
```yaml
353385
Type: String

exchange/exchange-ps/exchange/Set-RetentionCompliancePolicy.md

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,36 @@ Set-RetentionCompliancePolicy -Identity "Sales Policy" -RemoveModernGroupLocatio
180180

181181
This example is similar to Example 2, except multiple deleted resources are specified.
182182

183+
### Example 5
184+
```powershell
185+
$stringJson = @"
186+
[{
187+
'EmailAddress': 'SalesUser@contoso.onmicrosoft.com'
188+
}]
189+
"@
190+
191+
Set-RetentionCompliancePolicy -Identity "Teams Chat Retention Policy" -AddTeamsChatLocationException "SalesUser@contoso.onmicrosoft.com" -DeletedResources $stringJson
192+
```
193+
194+
This example excludes the specified soft-deleted mailbox or mail user from the mentioned Teams Retention Policy. You can identify the deleted resources using the mailbox or mail user's email address.
195+
Policy exclusions must remain within the supported limits for retention policies: [Limits for Microsoft 365 retention policies and retention label policies](https://learn.microsoft.com/purview/retention-limits#maximum-number-of-items-per-policy)
196+
197+
### Example 6
198+
```powershell
199+
$stringJson = @"
200+
[{
201+
'EmailAddress': 'SalesUser1@contoso.onmicrosoft.com'
202+
},
203+
{
204+
'EmailAddress': 'SalesUser2@contoso.onmicrosoft.com'
205+
}]
206+
"@
207+
208+
Set-RetentionCompliancePolicy -Identity "Teams Chat Retention Policy" -AddTeamsChatLocationException "SalesUser1@contoso.onmicrosoft.com", "SalesUser2@contoso.onmicrosoft.com" -DeletedResources $stringJson
209+
```
210+
211+
This example is similar to Example 5, except multiple deleted resources are specified.
212+
183213
## PARAMETERS
184214

185215
### -Identity
@@ -629,11 +659,13 @@ Accept wildcard characters: False
629659
```
630660

631661
### -DeletedResources
632-
The DeletedResources parameter specifies the Sharepoint sites to be removed from the list of included sites or excluded from a tenant level policy when the associated group has been deleted. You use this parameter with the AddModernGroupLocationException and RemoveModernGroupLocation parameters.
662+
The DeletedResources parameter specifies the deleted Microsoft 365 Group, mailbox, or mail user to be removed or added as an exclusion to the respective location list. Use this parameter with the AddModernGroupLocationException and RemoveModernGroupLocation parameters for deleted Microsoft 365 Groups, or with the AddTeamsChatLocationException parameter for deleted mailboxes or mail users.
663+
664+
A valid value is a JSON string. Refer to the Examples section for syntax and usage examples of this parameter.
633665

634-
A valid value is a JSON String. See the Examples section for syntax and examples using this parameter.
666+
For more information on the deleted Microsoft 365 Group scenario, see [Learn more about modern group deletion under retention hold](https://learn.microsoft.com/purview/retention-settings#what-happens-if-a-microsoft-365-group-is-deleted-after-a-policy-is-applied).
635667

636-
For more information about this scenario, see [Learn more about modern group deletion under retention hold](https://learn.microsoft.com/purview/retention-settings#what-happens-if-a-microsoft-365-group-is-deleted-after-a-policy-is-applied).
668+
For more information on the inactive mailbox scenario, see [Learn about inactive mailboxes](https://learn.microsoft.com/purview/inactive-mailboxes-in-office-365).
637669

638670
```yaml
639671
Type: String

teams/teams-ps/teams/New-CsTeamsCallingPolicy.md

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ schema: 2.0.0
88
manager: bulenteg
99
author: serdarsoysal
1010
ms.author: serdars
11-
ms.reviewer:
11+
ms.reviewer: alejandramu
1212
---
1313

1414
# New-CsTeamsCallingPolicy
@@ -52,6 +52,7 @@ New-CsTeamsCallingPolicy [-Identity] <string>
5252
[-PreventTollBypass <boolean>]
5353
[-SpamFilteringEnabledType <string>]
5454
[-VoiceSimulationInInterpreter <string>]
55+
[-RealTimeText <string>]
5556
[-WhatIf]
5657
[<CommonParameters>]
5758
```
@@ -669,6 +670,25 @@ Accept pipeline input: False
669670
Accept wildcard characters: False
670671
```
671672

673+
### -RealTimeText
674+
Allows users to use real time text during a meeting, allowing them to communicate by typing their messages in real time.
675+
676+
Possible Values:
677+
- Enabled: User is allowed to turn on real time text.
678+
- Disabled: User is not allowed to turn on real time text.
679+
680+
```yaml
681+
Type: String
682+
Parameter Sets: (All)
683+
Aliases:
684+
685+
Required: False
686+
Position: Named
687+
Default value: Enabled
688+
Accept pipeline input: False
689+
Accept wildcard characters: False
690+
```
691+
672692
### -WhatIf
673693
Shows what would happen if the cmdlet runs.
674694
The cmdlet is not run.

teams/teams-ps/teams/New-CsTeamsEventsPolicy.md

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Module Name: MicrosoftTeams
44
online version: https://learn.microsoft.com/powershell/module/teams/new-csteamseventspolicy
55
title: New-CsTeamsEventsPolicy
66
schema: 2.0.0
7-
ms.date: 11/12/2024
7+
ms.date: 02/26/2025
88
---
99

1010
# New-CsTeamsEventsPolicy
@@ -16,7 +16,7 @@ This cmdlet allows you to create a new TeamsEventsPolicy instance and set its pr
1616

1717
```powershell
1818
New-CsTeamsEventsPolicy [-Identity] <String> [-AllowWebinars <String>] [-AllowTownhalls <String>] [-AllowEmailEditing <String>] [-Description <String>]
19-
[-RecordingForTownhall <String>] [-RecordingForWebinar <String>]
19+
[-TownhallEventAttendeeAccess <String>] [-RecordingForTownhall <String>] [-RecordingForWebinar <String>]
2020
[-TranscriptionForTownhall <String>] [-TranscriptionForWebinar <String>] [-AllowEventIntegrations <Boolean>] [-TownhallChatExperience <String>]
2121
[-UseMicrosoftECDN <String>] [-EventAccessType <String>] [-WhatIf] [-Confirm] [<CommonParameters>]
2222
[-ImmersiveEvents <String>]
@@ -94,6 +94,24 @@ Accept pipeline input: False
9494
Accept wildcard characters: False
9595
```
9696
97+
### -TownhallEventAttendeeAccess
98+
This setting governs what identity types may attend a Town hall that is scheduled by a particular person or group that is assigned this policy.
99+
Possible values are:
100+
- **Everyone**: Anyone with the join link may enter the event.
101+
- **EveryoneInOrganizationAndGuests**: Only those who are Guests to the tenant, MTO users, and internal AAD users may enter the event.
102+
103+
```yaml
104+
Type: String
105+
Parameter Sets: (All)
106+
Aliases:
107+
108+
Required: False
109+
Position: Named
110+
Default value: Everyone
111+
Accept pipeline input: False
112+
Accept wildcard characters: False
113+
```
114+
97115
### -AllowEmailEditing
98116
This setting governs if a user is allowed to edit the communication emails in Teams Town Hall or Teams Webinar events.
99117
Possible values are:

teams/teams-ps/teams/New-CsTeamsMeetingPolicy.md

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ applicable: Microsoft Teams
66
title: New-CsTeamsMeetingPolicy
77
schema: 2.0.0
88
manager: bulenteg
9-
ms.reviewer: wblocker
10-
ms.date: 11/12/2024
9+
ms.reviewer: alejandramu
10+
ms.date: 2/26/2025
1111
---
1212

1313
# New-CsTeamsMeetingPolicy
@@ -119,6 +119,8 @@ New-CsTeamsMeetingPolicy [-Identity] <XdsIdentity>
119119
[-WatermarkForCameraVideoPattern <String>]
120120
[-WatermarkForScreenSharingOpacity <Int64>]
121121
[-WatermarkForScreenSharingPattern <String>]
122+
[-AllowedUsersForMeetingDetails <String>]
123+
[-RealTimeText <String>]
122124
[-WhatIf]
123125
[-WhoCanRegister <Object>]
124126
[<CommonParameters>]
@@ -1868,6 +1870,44 @@ Accept pipeline input: False
18681870
Accept wildcard characters: False
18691871
```
18701872

1873+
### -AllowedUsersForMeetingDetails
1874+
Controls which users should have ability to see the meeting info details on join screen. 'None' option should disable the feature completely.
1875+
1876+
Possible Values:
1877+
- UsersAllowedToByPassTheLobby: Users who are able to bypass lobby can see the meeting info details.
1878+
- Everyone: All meeting participants can see the meeting info details.
1879+
1880+
```yaml
1881+
Type: String
1882+
Parameter Sets: (All)
1883+
Aliases:
1884+
1885+
Required: False
1886+
Position: Named
1887+
Default value: UsersAllowedToByPassTheLobby
1888+
Accept pipeline input: False
1889+
Accept wildcard characters: False
1890+
```
1891+
1892+
### -RealTimeText
1893+
Allows users to use real time text during a meeting, allowing them to communicate by typing their messages in real time.
1894+
1895+
Possible Values:
1896+
- Enabled: User is allowed to turn on real time text.
1897+
- Disabled: User is not allowed to turn on real time text.
1898+
1899+
```yaml
1900+
Type: String
1901+
Parameter Sets: (All)
1902+
Aliases:
1903+
1904+
Required: False
1905+
Position: Named
1906+
Default value: Enabled
1907+
Accept pipeline input: False
1908+
Accept wildcard characters: False
1909+
```
1910+
18711911
### -WhatIf
18721912
Shows what would happen if the cmdlet runs.
18731913
The cmdlet is not run.

teams/teams-ps/teams/Set-CsTeamsCallingPolicy.md

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ schema: 2.0.0
88
manager: bulenteg
99
author: serdarsoysal
1010
ms.author: serdars
11-
ms.reviewer:
11+
ms.reviewer: alejandramu
1212
---
1313

1414
# Set-CsTeamsCallingPolicy
@@ -51,6 +51,7 @@ Set-CsTeamsCallingPolicy [-Identity] <string>
5151
[-PreventTollBypass <boolean>]
5252
[-SpamFilteringEnabledType <string>]
5353
[-VoiceSimulationInInterpreter <string>]
54+
[-RealTimeText <string>]
5455
[-WhatIf]
5556
[<CommonParameters>]
5657
```
@@ -673,6 +674,25 @@ Accept pipeline input: False
673674
Accept wildcard characters: False
674675
```
675676

677+
### -RealTimeText
678+
Allows users to use real time text during a meeting, allowing them to communicate by typing their messages in real time.
679+
680+
Possible Values:
681+
- Enabled: User is allowed to turn on real time text.
682+
- Disabled: User is not allowed to turn on real time text.
683+
684+
```yaml
685+
Type: String
686+
Parameter Sets: (All)
687+
Aliases:
688+
689+
Required: False
690+
Position: Named
691+
Default value: Enabled
692+
Accept pipeline input: False
693+
Accept wildcard characters: False
694+
```
695+
676696
### -WhatIf
677697
Shows what would happen if the cmdlet runs.
678698
The cmdlet is not run.

teams/teams-ps/teams/Set-CsTeamsEventsPolicy.md

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Module Name: MicrosoftTeams
44
online version: https://learn.microsoft.com/powershell/module/teams/set-csteamseventspolicy
55
title: Set-CsTeamsEventsPolicy
66
schema: 2.0.0
7-
ms.date: 11/12/2024
7+
ms.date: 02/26/2025
88
---
99

1010
# Set-CsTeamsEventsPolicy
@@ -16,7 +16,7 @@ This cmdlet allows you to configure options for customizing Teams events experie
1616

1717
```
1818
Set-CsTeamsEventsPolicy [-AllowWebinars <String>] [-EventAccessType <String>] [-AllowTownhalls <String>]
19-
[-AllowEmailEditing <String>] [-AllowedQuestionTypesInRegistrationForm <String>]
19+
[-TownhallEventAttendeeAccess <String>] [-AllowEmailEditing <String>] [-AllowedQuestionTypesInRegistrationForm <String>]
2020
[-AllowEventIntegrations <Boolean>] [-AllowedWebinarTypesForRecordingPublish <String>]
2121
[-AllowedTownhallTypesForRecordingPublish <String>] [-TownhallChatExperience <String>] [-Description <String>]
2222
[-RecordingForTownhall <String>] [-RecordingForWebinar <String>]
@@ -106,6 +106,24 @@ Accept pipeline input: False
106106
Accept wildcard characters: False
107107
```
108108
109+
### -TownhallEventAttendeeAccess
110+
This setting governs what identity types may attend a Town hall that is scheduled by a particular person or group that is assigned this policy.
111+
Possible values are:
112+
- **Everyone**: Anyone with the join link may enter the event.
113+
- **EveryoneInOrganizationAndGuests**: Only those who are Guests to the tenant, MTO users, and internal AAD users may enter the event.
114+
115+
```yaml
116+
Type: String
117+
Parameter Sets: (All)
118+
Aliases:
119+
120+
Required: False
121+
Position: Named
122+
Default value: Everyone
123+
Accept pipeline input: False
124+
Accept wildcard characters: False
125+
```
126+
109127
### -Description
110128
Enables administrators to provide explanatory text to accompany a Teams Events policy.
111129

0 commit comments

Comments
 (0)