Merge branch 'main' into main

Author: Jeahenng

teams/teams-ps/teams/New-CsTeamsMessagingPolicy.md

@@ -55,6 +55,7 @@ New-CsTeamsMessagingPolicy [[-Identity] <XdsIdentity>]
  [-InOrganizationChatControl <String>]
  [-ReadReceiptsEnabledType <String>]
  [-Tenant <Guid>]
+ [-UsersCanDeleteBotMessages <Boolean>]
  [<CommonParameters>]
  [-WhatIf]
  ```
@@ -715,6 +716,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -UsersCanDeleteBotMessages
+
+Determines whether a user is allowed to delete messages sent by bots. Set this to TRUE to allow. Set this to FALSE to prohibit.
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -WhatIf
 Shows what would happen if the cmdlet runs.
 The cmdlet is not run.

teams/teams-ps/teams/Set-CsTeamsGuestMessagingConfiguration.md

@@ -21,15 +21,15 @@ TeamsGuestMessagingConfiguration determines the messaging settings for the guest
 ```
 Set-CsTeamsGuestMessagingConfiguration [-Tenant <Guid>] [-AllowUserEditMessage <Boolean>]
  [-AllowImmersiveReader <Boolean>] [-AllowUserDeleteMessage <Boolean>] [-AllowUserChat <Boolean>] [-AllowGiphy <Boolean>]
- [-AllowUserDeleteChat <Boolean>] [-GiphyRatingType <String>] [-AllowMemes <Boolean>] [-AllowStickers <Boolean>] [[-Identity] <XdsIdentity>]
+ [-AllowUserDeleteChat <Boolean>] [-GiphyRatingType <String>] [-AllowMemes <Boolean>] [-AllowStickers <Boolean>] [-UsersCanDeleteBotMessages <Boolean>] [[-Identity] <XdsIdentity>]
  [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### Instance
 ```
 Set-CsTeamsGuestMessagingConfiguration [-Tenant <Guid>] [-AllowUserEditMessage <Boolean>]
  [-AllowImmersiveReader <Boolean>] [-AllowUserDeleteMessage <Boolean>] [-AllowUserChat <Boolean>] [-AllowGiphy <Boolean>]
- [-AllowUserDeleteChat <Boolean>] [-GiphyRatingType <String>] [-AllowMemes <Boolean>] [-AllowStickers <Boolean>] [-Instance <PSObject>] [-Force]
+ [-AllowUserDeleteChat <Boolean>] [-GiphyRatingType <String>] [-AllowMemes <Boolean>] [-AllowStickers <Boolean>] [-UsersCanDeleteBotMessages <Boolean>] [-Instance <PSObject>] [-Force]
  [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -137,6 +137,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -UsersCanDeleteBotMessages
+Determines whether a user is allowed to delete messages sent by bots. Set this to TRUE to allow. Set this to FALSE to prohibit.
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Confirm
 Prompts you for confirmation before running the cmdlet.
 

teams/teams-ps/teams/Set-CsTeamsMessagingPolicy.md

@@ -55,6 +55,7 @@ Set-CsTeamsMessagingPolicy [[-Identity] <XdsIdentity>]
  [-InOrganizationChatControl <String>]
  [-ReadReceiptsEnabledType <String>]
  [-Tenant <Guid>]
+ [-UsersCanDeleteBotMessages <Boolean>]
  [-WhatIf]
  [<CommonParameters>]
 ```
@@ -100,6 +101,7 @@ Set-CsTeamsMessagingPolicy [-Instance <PSObject>]
  [-InOrganizationChatControl <String>]
  [-ReadReceiptsEnabledType <String>]
  [-Tenant <Guid>]
+ [-UsersCanDeleteBotMessages <Boolean>]
  [-WhatIf]
  [<CommonParameters>]
 ```
@@ -769,6 +771,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -UsersCanDeleteBotMessages
+Determines whether a user is allowed to delete messages sent by bots. Set this to TRUE to allow. Set this to FALSE to prohibit.
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -WhatIf
 Shows what would happen if the cmdlet runs.
 The cmdlet is not run.