Merge branch 'master' into patch-173

Author: kenwith

Get-TeamsApp.md

@@ -200,11 +200,9 @@ The Enabled parameter enables or disables the junk email rule on the mailbox (a
 
 You can view the status of the junk email rule by running either of the following commands to find the Enabled property value:
 
-- Get-MailboxJunkEmailConfiguration \<MailboxIdentity\>
+- Get-MailboxJunkEmailConfiguration -Identity \<MailboxIdentity\>
 
-- Get-InboxRule "Junk E-mail Rule" -Mailbox \<MailboxIdentity\> -IncludeHidden
-
-You use the JunkEmailEnabled parameter on the Set-OwaMailboxPolicy or Set-OwaVirtualDirectory cmdlets to control the availability of the junk email settings in Outlook on the web.
+- On-premises Exchange only: Get-InboxRule "Junk E-mail Rule" -Mailbox \<MailboxIdentity\> -IncludeHidden
 
 The state of the junk email rule on the mailbox doesn't affect the client-side junk email settings that are available in the Outlook Junk Email Filter. Even when the junk email rule is disabled in the mailbox, Outlook can still move messages to the Junk Email folder. For example, if Outlook determines the message is spam, or the sender is defined in the Blocked Senders list, Outlook can move the message to the Junk Email folder. For more information, see [Use Junk Email Filters to control which messages you see](https://go.microsoft.com/fwlink/p/?LinkID=797542).
 

exchange/exchange-ps/exchange/antispam-antimalware/Set-MailboxJunkEmailConfiguration.md

@@ -63,24 +63,31 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 
 ### Example 1
 ```powershell
-Set-FederationTrust -Identity "Microsoft Federation Gateway" -Thumbprint AC00F35CBA8359953F4126E0984B5CCAFA2F4F17
+Set-FederationTrust -Identity "Azure AD Authentication" -Thumbprint AC00F35CBA8359953F4126E0984B5CCAFA2F4F17
 ```
 
 This example configures the federation trust Microsoft Federation Gateway to use the certificate with the thumbprint AC00F35CBA8359953F4126E0984B5CCAFA2F4F17 as the next certificate.
 
 ### Example 2
 ```powershell
-Set-FederationTrust -Identity "Microsoft Federation Gateway" -PublishFederationCertificate
+Set-FederationTrust -Identity "Azure AD Authentication" -PublishFederationCertificate
 ```
 
 This example configures the federation trust Microsoft Federation Gateway to use the next certificate as the current certificate.
 
+### Example 3
+```powershell
+Set-FederationTrust -Identity "Azure AD Authentication" -MetadataUrl https://login.microsoftonline.us/FederationMetadata/2006-12/FederationMetadata.xml
+```
+
+This example updates the configuration if the tenant is hosted in Office 365 U.S. Government GCC High or DoD environment.
+
 Before you configure a federation trust to use the next certificate as the current certificate, you need to use the Test-FederationTrust cmdlet to verify that the certificate is available on all Exchange servers.
 
 ## PARAMETERS
 
 ### -Identity
-The Identity parameter specifies the name of the federation trust being modified.
+The Identity parameter specifies the name of the federation trust being modified. <br/><br/>**Note**: For Exchange Online tenants, use the value "Azure AD Authentication".
 
 ```yaml
 Type: FederationTrustIdParameter
@@ -168,7 +175,7 @@ Accept wildcard characters: False
 ```
 
 ### -MetadataUrl
-The MetadataUrl parameter specifies the URL where WS-FederationMetadata is published by the Microsoft Federation Gateway.
+The MetadataUrl parameter specifies the URL where WS-FederationMetadata is published by the Microsoft Federation Gateway. <br/><br/> **Note**: For GCC High or DoD tenants, use the value https://login.microsoftonline.us/FederationMetadata/2006-12/FederationMetadata.xml.
 
 ```yaml
 Type: Uri

exchange/exchange-ps/exchange/federation-and-hybrid/Set-FederationTrust.md

@@ -23,12 +23,12 @@ For information about the parameter sets in the Syntax section below, see [Excha
 
 ```
 Get-InboxRule [[-Identity] <InboxRuleIdParameter>]
+ [-BypassScopeCheck]
  [-DescriptionTimeFormat <String>]
  [-DescriptionTimeZone <ExTimeZoneValue>]
  [-DomainController <Fqdn>]
- [-Mailbox <MailboxIdParameter>]
  [-IncludeHidden]
- [-BypassScopeCheck]
+ [-Mailbox <MailboxIdParameter>]
  [-SweepRules]
  [<CommonParameters>]
 ```
@@ -56,6 +56,22 @@ This example retrieves the Inbox rule ReceivedLastYear from the mailbox joe@cont
 
 ## PARAMETERS
 
+### -BypassScopeCheck
+The BypassScopeCheck switch specifies whether to bypass the scope check for the user that's running the command. You don't need to specify a value with this switch.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -DescriptionTimeFormat
 The DescriptionTimeFormat parameter specifies the format for time values in the rule description. For example:
 
@@ -138,6 +154,24 @@ Accept pipeline input: True
 Accept wildcard characters: False
 ```
 
+### -IncludeHidden
+This parameter works only in on-premises Exchange.
+
+The IncludeHidden switch specifies whether to include hidden Inbox rules in the results. You don't need to specify a value with this switch.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Mailbox
 The Mailbox parameter specifies the mailbox that contains the Inbox rule. You can use any value that uniquely identifies the mailbox. For example:
 
@@ -174,41 +208,9 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -IncludeHidden
+### -SweepRules
 This parameter is available only in on-premises Exchange.
 
-The IncludeHidden switch specifies whether to include hidden Inbox rules in the results. You don't need to specify a value with this switch.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases:
-Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -BypassScopeCheck
-The BypassScopeCheck switch specifies whether to bypass the scope check for the user that's running the command. You don't need to specify a value with this switch.
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases:
-Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -SweepRules
 The SweepRules switch specifies whether to return only Sweep rules in the results. You don't need to specify a value with this switch.
 
 Sweep rules run at regular intervals to help keep your Inbox clean.
@@ -217,7 +219,7 @@ Sweep rules run at regular intervals to help keep your Inbox clean.
 Type: SwitchParameter
 Parameter Sets: (All)
 Aliases:
-Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
+Applicable: Exchange Server 2016, Exchange Server 2019
 
 Required: False
 Position: Named