Skip to content

Commit 77bd175

Browse files
committed
Fixed merge conflicts
1 parent c8efbcf commit 77bd175

File tree

4 files changed

+127
-60
lines changed

4 files changed

+127
-60
lines changed
Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,50 @@
11
---
22
external help file: Microsoft.Teams.Policy.Administration.Cmdlets.Core.dll-Help.xml
33
Module Name: MicrosoftTeams
4-
online version:
4+
online version: https://learn.microsoft.com/powershell/module/teams/Get-CsTeamsMessagingConfiguration
5+
title: Get-CsTeamsMessagingConfiguration
56
schema: 2.0.0
67
---
78

89
# Get-CsTeamsMessagingConfiguration
910

1011
## SYNOPSIS
11-
{{ Fill in the Synopsis }}
12+
13+
TeamsMessagingConfiguration determines the messaging settings for users. This cmdlet returns your organization's current settings.
1214

1315
## SYNTAX
1416

1517
### Identity (Default)
16-
```
17-
Get-CsTeamsMessagingConfiguration [[-Identity] <String>] [-ProgressAction <ActionPreference>]
18-
[<CommonParameters>]
18+
19+
```powershell
20+
Get-CsTeamsMessagingConfiguration [[-Identity] <String>] [<CommonParameters>]
1921
```
2022

2123
### Filter
22-
```
23-
Get-CsTeamsMessagingConfiguration [-Filter <String>] [-ProgressAction <ActionPreference>] [<CommonParameters>]
24+
25+
```powershell
26+
Get-CsTeamsMessagingConfiguration [-Filter <String>] [<CommonParameters>]
2427
```
2528

2629
## DESCRIPTION
27-
{{ Fill in the Description }}
30+
31+
TeamsMessagingConfiguration determines the messaging settings for users.
2832

2933
## EXAMPLES
3034

3135
### Example 1
36+
3237
```powershell
33-
PS C:\> {{ Add example code here }}
38+
PS C:\> Get-CsTeamsMessagingConfiguration
3439
```
3540

36-
{{ Add example description here }}
41+
The command shown in Example 1 returns teams messaging configuration information for the current tenant.
3742

3843
## PARAMETERS
3944

4045
### -Filter
41-
{{ Fill Filter Description }}
46+
47+
Enables you to use wildcard characters in order to return a collection of tenant messaging configuration settings. Because each tenant is limited to a single, global collection of the messaging configuration settings there is no need to use the Filter parameter.
4248

4349
```yaml
4450
Type: String
@@ -53,7 +59,8 @@ Accept wildcard characters: False
5359
```
5460
5561
### -Identity
56-
{{ Fill Identity Description }}
62+
63+
Specifies the collection of tenant messaging configuration settings to be returned. Because each tenant is limited to a single, global collection of messaging settings there is no need include this parameter when calling the cmdlet. If you do choose to use the Identity parameter you must also include the Tenant parameter.
5764
5865
```yaml
5966
Type: String
@@ -67,22 +74,8 @@ Accept pipeline input: False
6774
Accept wildcard characters: False
6875
```
6976
70-
### -ProgressAction
71-
{{ Fill ProgressAction Description }}
72-
73-
```yaml
74-
Type: ActionPreference
75-
Parameter Sets: (All)
76-
Aliases: proga
77-
78-
Required: False
79-
Position: Named
80-
Default value: None
81-
Accept pipeline input: False
82-
Accept wildcard characters: False
83-
```
84-
8577
### CommonParameters
78+
8679
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
8780
8881
## INPUTS
@@ -96,3 +89,5 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
9689
## NOTES
9790
9891
## RELATED LINKS
92+
93+
[Set-CsTeamsMessagingConfiguration](https://learn.microsoft.com/powershell/module/teams/set-csteamsmessagingconfiguration)

teams/teams-ps/teams/Set-CsTeamsMessagingConfiguration.md

Lines changed: 101 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,67 @@
11
---
22
external help file: Microsoft.Teams.Policy.Administration.Cmdlets.Core.dll-Help.xml
33
Module Name: MicrosoftTeams
4-
online version:
4+
online version: https://learn.microsoft.com/powershell/module/teams/Set-CsTeamsMessagingConfiguration
5+
title: Set-CsTeamsMessagingConfiguration
56
schema: 2.0.0
67
---
78

89
# Set-CsTeamsMessagingConfiguration
910

1011
## SYNOPSIS
11-
{{ Fill in the Synopsis }}
12+
13+
The TeamsMessagingConfiguration determines the messaging settings for users in your tenant.
1214

1315
## SYNTAX
1416

15-
```
16-
Set-CsTeamsMessagingConfiguration [-EnableVideoMessageCaptions <Boolean>]
17-
[-EnableInOrganizationChatControl <Boolean>] [-CustomEmojis <Boolean>] [-Identity] <String> [-Force]
18-
[-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
17+
```powershell
18+
Set-CsTeamsMessagingConfiguration [-Identity] <String>
19+
[-Confirm]
20+
[-CustomEmojis <Boolean>]
21+
[-EnableInOrganizationChatControl <Boolean>]
22+
[-EnableVideoMessageCaptions <Boolean>]
23+
[-FileTypeCheck <string>]
24+
[-Force]
25+
[-MessagingNotes <String>]
26+
[-UrlReputationCheck <string>]
27+
[-WhatIf]
28+
[<CommonParameters>]
1929
```
2030

2131
## DESCRIPTION
22-
{{ Fill in the Description }}
32+
33+
TeamsMessagingConfiguration determines the messaging settings for the users in your tenant. This cmdlet lets you update the user messaging options you'd like to enable in your organization.
2334

2435
## EXAMPLES
2536

2637
### Example 1
38+
2739
```powershell
28-
PS C:\> {{ Add example code here }}
40+
PS C:\> Set-CsTeamsMessagingConfiguration -CustomEmojis $False
2941
```
3042

31-
{{ Add example description here }}
43+
The command shown in example 1 disables custom emojis within Teams.
3244

3345
## PARAMETERS
3446

47+
### -Identity
48+
49+
Specifies the collection of tenant messaging configuration settings to be returned. Because each tenant is limited to a single, global collection of messaging settings there is no need include this parameter when calling the cmdlet. If you do choose to use the Identity parameter you must also include the Tenant parameter.
50+
51+
```yaml
52+
Type: String
53+
Parameter Sets: (All)
54+
Aliases:
55+
56+
Required: True
57+
Position: 1
58+
Default value: None
59+
Accept pipeline input: False
60+
Accept wildcard characters: False
61+
```
62+
3563
### -Confirm
64+
3665
Prompts you for confirmation before running the cmdlet.
3766
3867
```yaml
@@ -48,7 +77,9 @@ Accept wildcard characters: False
4877
```
4978
5079
### -CustomEmojis
51-
{{ Fill CustomEmojis Description }}
80+
81+
This setting enables/disables the use of custom emojis and reactions across the whole tenant. Upon enablement, admins and/or users can define a user group that is allowed.
82+
Possible Values: True, False
5283
5384
```yaml
5485
Type: Boolean
@@ -63,7 +94,9 @@ Accept wildcard characters: False
6394
```
6495
6596
### -EnableInOrganizationChatControl
66-
{{ Fill EnableInOrganizationChatControl Description }}
97+
98+
This setting determines if chat regulation for internal communication in tenant is allowed.
99+
Possible Values: True, False
67100
68101
```yaml
69102
Type: Boolean
@@ -78,7 +111,9 @@ Accept wildcard characters: False
78111
```
79112
80113
### -EnableVideoMessageCaptions
81-
{{ Fill EnableVideoMessageCaptions Description }}
114+
115+
This setting determines if closed captions will be displayed, for Teams Video Clips, during playback.
116+
Possible values: True, False
82117
83118
```yaml
84119
Type: Boolean
@@ -92,8 +127,32 @@ Accept pipeline input: False
92127
Accept wildcard characters: False
93128
```
94129
130+
### -FileTypeCheck
131+
132+
>[!NOTE]
133+
>This feature has not been released yet and will have no changes if it is enabled or disabled.
134+
135+
This setting determines if FileType check in teams messaging across the whole tenant
136+
137+
Possible Values:
138+
- Enabled
139+
- Disabled
140+
141+
```yaml
142+
Type: String
143+
Parameter Sets: (All)
144+
Aliases:
145+
146+
Required: False
147+
Position: Named
148+
Default value: Enabled
149+
Accept pipeline input: False
150+
Accept wildcard characters: False
151+
```
152+
95153
### -Force
96-
{{ Fill Force Description }}
154+
155+
The Force switch specifies whether to suppress warning and confirmation messages. It can be useful in scripting to suppress interactive prompts. If the Force switch isn't provided in the command, you're prompted for administrative input if required.
97156
98157
```yaml
99158
Type: SwitchParameter
@@ -107,44 +166,54 @@ Accept pipeline input: False
107166
Accept wildcard characters: False
108167
```
109168
110-
### -Identity
111-
{{ Fill Identity Description }}
169+
### -MessagingNotes
170+
171+
This setting enables/disables MessagingNotes integration across the whole tenant. Possible Values: Disabled, Enabled
112172
113173
```yaml
114174
Type: String
115175
Parameter Sets: (All)
116176
Aliases:
117177

118-
Required: True
119-
Position: 1
120-
Default value: None
178+
Required: False
179+
Position: Named
180+
Default value: Enabled
121181
Accept pipeline input: False
122182
Accept wildcard characters: False
123183
```
124184
125-
### -WhatIf
126-
Shows what would happen if the cmdlet runs.
127-
The cmdlet is not run.
185+
### -UrlReputationCheck
186+
187+
>[!NOTE]
188+
>This feature has not been released yet and will have no changes if it is enabled or disabled.
189+
190+
This setting determines if UrlReputationCheck check in teams messaging across the whole tenant
191+
192+
Possible Values:
193+
- Enabled
194+
- Disabled
128195
129196
```yaml
130-
Type: SwitchParameter
197+
Type: String
131198
Parameter Sets: (All)
132-
Aliases: wi
199+
Aliases:
133200

134201
Required: False
135202
Position: Named
136-
Default value: None
203+
Default value: Enabled
137204
Accept pipeline input: False
138205
Accept wildcard characters: False
139206
```
140207
141-
### -ProgressAction
142-
{{ Fill ProgressAction Description }}
208+
### -WhatIf
209+
210+
Shows what would happen if the cmdlet runs.
211+
The cmdlet is not run.
143212
144213
```yaml
145-
Type: ActionPreference
214+
Type: SwitchParameter
146215
Parameter Sets: (All)
147-
Aliases: proga
216+
Aliases: wi
148217

149218
Required: False
150219
Position: Named
@@ -154,11 +223,12 @@ Accept wildcard characters: False
154223
```
155224
156225
### CommonParameters
226+
157227
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
158228
159229
## INPUTS
160230
161-
### None
231+
### System.Management.Automation.PSObject
162232
163233
## OUTPUTS
164234
@@ -167,3 +237,5 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
167237
## NOTES
168238
169239
## RELATED LINKS
240+
241+
[Get-CsTeamsMessagingConfiguration](https://learn.microsoft.com/powershell/module/teams/get-csteamsmessagingconfiguration)

teams/teams-ps/teams/get-csteamsmessagingconfiguration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
8484
8585
## OUTPUTS
8686
87-
### System.Object
87+
### TeamsMessagingConfiguration.Cmdlets.TeamsMessagingConfiguration
8888
8989
## NOTES
9090
9191
## RELATED LINKS
9292
93-
[Set-CsTeamsMessagingConfiguration](set-csteamsmessagingconfiguration.md)
93+
[Set-CsTeamsMessagingConfiguration](https://learn.microsoft.com/powershell/module/teams/set-csteamsmessagingconfiguration)

teams/teams-ps/teams/set-csteamsmessagingconfiguration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,10 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
232232
233233
## OUTPUTS
234234
235-
### System.Object
235+
### System.Void
236236
237237
## NOTES
238238
239239
## RELATED LINKS
240240
241-
[Get-CsTeamsMessagingConfiguration](get-csteamsmessagingconfiguration.md)
241+
[Get-CsTeamsMessagingConfiguration](https://learn.microsoft.com/powershell/module/teams/get-csteamsmessagingconfiguration)

0 commit comments

Comments
 (0)