Merge branch 'main' into patch-1

Author: michelle-paradis

exchange/exchange-ps/exchange/Get-RetentionCompliancePolicy.md

@@ -165,9 +165,9 @@ Accept wildcard characters: False
 ```
 
 ### -RetentionRuleTypes
-The RetentionRuleTypes switch specifies whether to return the value of the RetentionRuleTypes property in the results. You don't need to specify a value with this switch.
+The RetentionRuleTypes switch specifies whether to return the value of the RetentionRuleTypes and HasRules properties in the results. You don't need to specify a value with this switch.
 
-To see the RetentionRuleTypes property, you need to pipe the command to a formatting cmdlet. For example, `Get-RetentionCompliancePolicy -RetentionRuleTypes | Format-Table -Auto Name,RetentionRuleTypes`. If you don't use the RetentionRuleTypes switch, the value appears blank.
+To see the RetentionRuleTypes property, you need to pipe the command to a formatting cmdlet. For example, `Get-RetentionCompliancePolicy -RetentionRuleTypes | Format-Table -Auto Name,RetentionRuleTypes`. If you don't use the RetentionRuleTypes switch, the values RetentionRuleTypes appears blank and HasRules appears False.
 
 ```yaml
 Type: SwitchParameter

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

@@ -169,7 +169,7 @@ $stringJson = @"
      'EmailAddress': '[email protected]',
      'SiteId': '9b2a8116-b9ec-4e2c-bf31-7eaa83697c4b'
  },
-[{
+{
      'EmailAddress': '[email protected]',
      'SiteId': '4afb7116-b9ec-4b2c-bf31-4abb83697c4b'
 }]

teams/teams-ps/teams/Get-CsTeamsAppPermissionPolicy.md

@@ -6,7 +6,7 @@ title: Get-CsTeamsAppPermissionPolicy
 schema: 2.0.0
 ms.reviewer: mhayrapetyan
 manager: prkosh
-ms.author: guptaashish
+ms.author: prkosh
 author: ashishguptaiitb
 ---
 
@@ -17,6 +17,8 @@ author: ashishguptaiitb
 
 As an admin, you can use app permission policies to allow or block apps for your users. Learn more about the app permission policies at <https://learn.microsoft.com/microsoftteams/teams-app-permission-policies> and about app centric management at <https://learn.microsoft.com/microsoftteams/app-centric-management>.
 
+**This is only applicable for tenants who have not been migrated to ACM or UAM.**
+
 ## SYNTAX
 
 ### Identity (Default)

teams/teams-ps/teams/New-CsTeamsAppPermissionPolicy.md

@@ -6,7 +6,7 @@ title: New-CsTeamsAppPermissionPolicy
 schema: 2.0.0
 ms.reviewer: mhayrapetyan
 manager: prkosh
-ms.author: guptaashish
+ms.author: prkosh
 author: ashishguptaiitb
 ---
 
@@ -18,6 +18,8 @@ author: ashishguptaiitb
 
 As an admin, you can use app permission policies to allow or block apps for your users. Learn more about the app permission policies at <https://learn.microsoft.com/microsoftteams/teams-app-permission-policies> and about app centric management at <https://learn.microsoft.com/microsoftteams/app-centric-management>.
 
+**This is only applicable for tenants who have not been migrated to ACM or UAM.**
+
 ## SYNTAX
 
 ```

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

@@ -1208,9 +1208,13 @@ Accept wildcard characters: False
 ```
 
 ### -ExplicitRecordingConsent
-This setting will enable Tenant Admins to turn on/off Explicit Recording Consent feature.
+Set participant agreement and notification for Recording, Transcript, Copilot in Teams meetings.
 
-Possible Values: Enabled: Turns on the Explicit Recording Consent feature. Disabled: Turns off the Explicit Recording Consent feature.
+Possible Values: 
+
+- Enabled: Explicit consent, requires participant agreement.
+- Disabled: Implicit consent, does not require participant agreement.
+- LegitimateInterest: Legitimate interest, less restrictive consent to meet legitimate interest without requiring explicit agreement from participants.
 
 ```yaml
 Type: String

teams/teams-ps/teams/Set-CsTeamsMeetingPolicy.md

@@ -1264,12 +1264,13 @@ Accept wildcard characters: False
 ```
 
 ### -ExplicitRecordingConsent
+Set participant agreement and notification for Recording, Transcript, Copilot in Teams meetings.
 
-This setting will enable Tenant Admins to turn on/off Explicit Recording Consent feature.
+Possible Values: 
 
-Possible Values:
-Enabled: Turns on the Explicit Recording Consent feature.
-Disabled: Turns off the Explicit Recording Consent feature.
+- Enabled: Explicit consent, requires participant agreement.
+- Disabled: Implicit consent, does not require participant agreement.
+- LegitimateInterest: Legitimate interest, less restrictive consent to meet legitimate interest without requiring explicit agreement from participants.
 
 ```yaml
 Type: String