Merge branch 'master' into patch-323

Kateyanne · web-flow · commit 596ab1eb835a · 2021-02-24T13:41:27.000-08:00
diff --git a/exchange/exchange-ps/exchange/Set-TransportConfig.md b/exchange/exchange-ps/exchange/Set-TransportConfig.md
@@ -48,6 +48,7 @@ Set-TransportConfig [[-Identity] <OrganizationIdParameter>]
  [-InternalDsnReportingAuthority <SmtpDomain>]
  [-InternalDsnSendHtml <Boolean>]
  [-InternalSMTPServers <MultiValuedProperty>]
+ [-JournalMessageExpirationDays <Int32>]
  [-JournalingReportNdrTo <SmtpAddress>]
  [-LegacyJournalingMigrationEnabled <Boolean>]
  [-MaxAllowedAgentGeneratedMessageDepth <UInt32>]
@@ -106,13 +107,15 @@ To avoid journaling issues, we recommend that you set JournalingReportNdrTo to a
 ## PARAMETERS
 
 ### -Identity
+This parameter is available only in on-premises Exchange.
+
 This parameter is reserved for internal Microsoft use.
 
 ```yaml
 Type: OrganizationIdParameter
 Parameter Sets: (All)
 Aliases:
-Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
+Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
 
 Required: False
 Position: 1
@@ -397,8 +400,8 @@ Accept wildcard characters: False
 ### -ExternalDsnSendHtml
 The ExternalDsnSendHtml parameter specifies whether external DSN messages should be HTML or plain text. Valid values are:
 
-- $true: DSNs are HTML. This is the default value.
-- $false: DSNs are plain text.
+- $true: External DSNs are HTML. This is the default value.
+- $false: External DSNs are plain text.
 
 ```yaml
 Type: Boolean
@@ -608,8 +611,8 @@ Accept wildcard characters: False
 ### -InternalDsnSendHtml
 The InternalDsnSendHtml parameter specifies whether internal DSN messages should be HTML or plain text. Valid values are:
 
-- $true: DSNs are HTML. This is the default value.
-- $false: DSNs are plain text.
+- $true: Internal DSNs are HTML. This is the default value.
+- $false: Internal DSNs are plain text.
 
 ```yaml
 Type: Boolean
@@ -646,8 +649,26 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -JournalMessageExpirationDays
+This parameter is available only in the cloud-based service.
+
+The JournalMessageExpirationDays parameter extends the number of days that undeliverable journal reports are queued before they expire. A valid value is an integer from 0 to 7. The default value is 0, which means undeliverable journal reports are treated like regular undeliverable messages.
+
+```yaml
+Type: Int32
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -JournalingReportNdrTo
-The JournalingReportNdrTo parameter specifies the email address to which journal reports are sent if the journaling mailbox is unavailable. By default, if this parameter is left empty, Exchange continues to try to deliver the journal report to the journaling mailbox. We recommended that you use a dedicated (non-user) mailbox as the argument to JournalingReportNdrTo.
+The JournalingReportNdrTo parameter specifies the email address to which journal reports are sent if the journaling mailbox is unavailable. By default, if this parameter is left empty, Exchange continues to try to deliver the journal report to the journaling mailbox. We recommended that you use a dedicated (non-user) mailbox as the value for this parameter.
 
 ```yaml
 Type: SmtpAddress
diff --git a/skype/skype-ps/skype/Grant-CsTeamsUpgradePolicy.md b/skype/skype-ps/skype/Grant-CsTeamsUpgradePolicy.md
@@ -66,6 +66,8 @@ The `Grant-CsTeamsUpgradePolicy` cmdlet checks the configuration of the correspo
 
 `WARNING: The user 'user1@contoso.com' currently has enabled values for: AllowUserChat, AllowPrivateCalling, AllowPrivateMeetingScheduling, AllowChannelMeetingScheduling, however these values will be ignored. This is because you are granting this user TeamsUpgradePolicy with mode=SfBWithTeamsCollab, which causes the Teams client to behave as if they are disabled.`
 
+Please note: These warning messages are not affected by the -WarningAction parameter.
+
 ## EXAMPLES
 
 ### Example 1: Grant Policy to an individual user
diff --git a/skype/skype-ps/skype/New-CsTeamsFeedbackPolicy.md b/skype/skype-ps/skype/New-CsTeamsFeedbackPolicy.md
@@ -19,6 +19,7 @@ Use this cmdlet to control whether users in your organization can send feedback
 
 ```
 New-CsTeamsFeedbackPolicy [-WhatIf] [-Confirm] [[-Identity] <Object>] [-Tenant <Object>] [-InMemory]
+[-AllowEmailCollection <Boolean>] [-AllowLogCollection <Boolean>] [-AllowScreenshotCollection <Boolean>]
  [-UserInitiatedMode <String>] [-ReceiveSurveysMode <String>] [-Force]
 ```
 
@@ -151,6 +152,48 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -AllowEmailCollection
+Set this to TRUE to enable Email collection.
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -AllowLogCollection
+Set this to TRUE to enable log collection.
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -AllowScreenshotCollection
+Set this to TRUE to enable Screenshot collection.
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -WhatIf
 Shows what would happen if the cmdlet runs.
 The cmdlet is not run.
diff --git a/skype/skype-ps/skype/Set-CsTeamsFeedbackPolicy.md b/skype/skype-ps/skype/Set-CsTeamsFeedbackPolicy.md
@@ -20,7 +20,9 @@ Use this cmdlet to modify a Teams feedback policy.
 
 ```
 Set-CsTeamsFeedbackPolicy [-WhatIf] [-Confirm] [[-Identity] <Object>] [-Tenant <Object>]
- [-ReceiveSurveysMode <String>] [-UserInitiatedMode <String>] [-Force] [-Instance <Object>]
+ [-ReceiveSurveysMode <String>] [-UserInitiatedMode <String>] [-AllowEmailCollection <Boolean>]
+ [-AllowLogCollection <Boolean>] [-AllowScreenshotCollection <Boolean>]
+ [-Force] [-Instance <Object>]
 ```
 
 ## DESCRIPTION
@@ -99,10 +101,12 @@ Accept wildcard characters: False
 
 ### -ReceiveSurveysMode
 Set the receiveSurveysMode parameter to enabled to allow users who are assigned the policy to receive the survey.
+Set it to EnabledUserOverride to have users receive the survey and allow them to opt out.
 
 Possible values:
  - Enabled
  - Disabled
+ - EnabledUserOverride
 
 ```yaml
 Type: String
@@ -151,6 +155,51 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -AllowEmailCollection
+Set this to TRUE to enable Email collection.
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -AllowLogCollection
+Set this to TRUE to enable log collection.
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -AllowScreenshotCollection
+Set this to TRUE to enable Screenshot collection.
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -WhatIf
 Shows what would happen if the cmdlet runs.
 The cmdlet is not run.
diff --git a/teams/teams-ps/teams/New-Team.md b/teams/teams-ps/teams/New-Team.md
@@ -169,6 +169,7 @@ Accept wildcard characters: False
 An admin who is allowed to create on behalf of another user should use this flag to specify the desired owner of the group. 
 This user will be added as both a member and an owner of the group. 
 If not specified, the user who creates the team will be added as both a member and an owner.
+Please note: This parameter is mandatory, if connected using Certificate Based Authentication.
 
 ```yaml
 Type: String
