Merge branch 'master' into ExShuffle-chrisda

Author: chrisda

exchange/exchange-ps/exchange/Get-UnifiedAuditLogRetentionPolicy.md

@@ -201,8 +201,6 @@ The RecordType parameter filters the results by the record types that are define
 
 - SkypeForBusinessUsersBlocked
 
-- Sway
-
 - SyntheticProbe
 
 - TeamsHealthcare

exchange/exchange-ps/exchange/New-ActivityAlert.md

@@ -443,8 +443,6 @@ The RecordType parameter specifies a record type label for the activity alert. V
 
 - SkypeForBusinessUsersBlocked
 
-- Sway
-
 - ThreatIntelligence
 
 - ThreatIntelligenceAtpContent

exchange/exchange-ps/exchange/New-ComplianceSearchAction.md

@@ -236,13 +236,13 @@ This parameter requires the Export role in the Security & Compliance Center. By
 
 The ExchangeArchiveFormat parameter specifies how to export Exchange search results. Valid values are:
 
-- PerUserPst: One PST file for each mailbox. This is the default value.
+- PerUserPst: One PST file for each mailbox.
 
 - SinglePst: One PST file that contains all exported messages.
 
 - SingleFolderPst: One PST file with a single root folder for the entire export.
 
-- IndividualMessage: Export each message as an .msg message file.
+- IndividualMessage: Export each message as an .msg message file. This is the default value.
 
 - PerUserZip: One ZIP file for each mailbox. Each ZIP file contains the exported .msg message files from the mailbox. This value corresponds to the "export files in a compressed folder" checkbox in the Security & Compliance Center.
 

exchange/exchange-ps/exchange/New-UnifiedAuditLogRetentionPolicy.md

@@ -304,8 +304,6 @@ The RecordTypes parameter specifies the audit logs of a specific record type tha
 
 - SkypeForBusinessUsersBlocked
 
-- Sway
-
 - SyntheticProbe
 
 - TeamsHealthcare

exchange/exchange-ps/exchange/Search-UnifiedAuditLog.md

@@ -15,7 +15,7 @@ monikerRange: "exchonline-ps"
 ## SYNOPSIS
 This cmdlet is available only in the cloud-based service.
 
-Use the Search-UnifiedAuditLog cmdlet to search the unified audit log. This log contains events from Exchange Online, SharePoint Online, OneDrive for Business, Azure Active Directory, Microsoft Teams, Power BI, Sway, and other Microsoft 365 services. You can search for all events in a specified date range, or you can filter the results based on specific criteria, such as the user who performed the action, the action, or the target object.
+Use the Search-UnifiedAuditLog cmdlet to search the unified audit log. This log contains events from Exchange Online, SharePoint Online, OneDrive for Business, Azure Active Directory, Microsoft Teams, Power BI, and other Microsoft 365 services. You can search for all events in a specified date range, or you can filter the results based on specific criteria, such as the user who performed the action, the action, or the target object.
 
 **Note**: We recommend that you use the Exchange Online PowerShell V2 module to connect to Exchange Online PowerShell. For instructions, see [Conect to Exchange Online PowerShell](https://docs.microsoft.com/powershell/exchange/connect-to-exchange-online-powershell).
 
@@ -360,8 +360,6 @@ The RecordType parameter filters the log entries by record type. Valid values ar
 
 - SkypeForBusinessUsersBlocked
 
-- Sway
-
 - SyntheticProbe
 
 - ThreatFinder

exchange/exchange-ps/exchange/Set-ActivityAlert.md

@@ -352,8 +352,6 @@ The RecordType parameter specifies a record type label for the activity alert. V
 
 - SkypeForBusinessUsersBlocked
 
-- Sway
-
 - ThreatIntelligence
 
 - ThreatIntelligenceAtpContent

exchange/exchange-ps/exchange/Set-EmailAddressPolicy.md

@@ -88,6 +88,13 @@ Set-EmailAddressPolicy -Identity "Contoso Corp" -DisabledEmailAddressTemplates $
 
 In on-premises Exchange, this example clears the disabled email address templates from the email address policy named Contoso Corp.
 
+### Example 3
+```powershell
+Set-EmailAddressPolicy -Identity 'Office 365 Groups' -EnabledEmailAddressTemplates "SMTP:@contoso.com","@contoso.onmicrosoft.com","smtp:@contoso.microsoftonline.com"
+```
+
+In Exchange Online, this example modifies the existing email adress policy named Office 365 Groups by setting the enabled email address templates to "SMTP:@contoso.com", and "@contoso.onmicrosoft.com", and "smtp:@contoso.microsoftonline.com". This will also set the enabled primary SMTP address template to "@contoso.com".
+
 ## PARAMETERS
 
 ### -Identity

exchange/exchange-ps/exchange/Set-UnifiedAuditLogRetentionPolicy.md

@@ -310,8 +310,6 @@ The RecordTypes parameter specifies the audit logs of a specific record type tha
 
 - SkypeForBusinessUsersBlocked
 
-- Sway
-
 - SyntheticProbe
 
 - TeamsHealthcare

teams/teams-ps/teams/Add-TeamChannelUser.md

@@ -23,8 +23,7 @@ Add-TeamChannelUser -GroupId <String> -DisplayName <String> -User <String> [-Rol
 
 ## DESCRIPTION
 
-> [!IMPORTANT]
-> Modules in the PS INT gallery for Microsoft Teams run on the /beta version in Microsoft Graph and are subject to change. Int modules can be install from here <https://www.poshtestgallery.com/packages/MicrosoftTeams>.
+Note: This cmdlet is part of the Public Preview version of Teams PowerShell Module, for more information see [Install Teams PowerShell public preview](https://docs.microsoft.com/microsoftteams/teams-powershell-install#install-teams-powershell-public-preview) and also see [Microsoft Teams PowerShell Release Notes](https://docs.microsoft.com/microsoftteams/teams-powershell-release-notes).
 
 ## EXAMPLES