Merge pull request #8505 from MicrosoftDocs/chrisda

Chrisda to Master

Author: chrisda

exchange/exchange-ps/exchange/Set-ExchangeServer.md

@@ -29,8 +29,9 @@ Set-ExchangeServer [-Identity] <ServerIdParameter>
  [-ErrorReportingEnabled <Boolean>]
  [-InternetWebProxy <Uri>]
  [-InternetWebProxyBypassList <MultiValuedProperty>]
- [-MitigationsEnabled <Boolean>]
+ [-MitigationsApplied <MultiValuedProperty>]
  [-MitigationsBlocked <MultiValuedProperty>]
+ [-MitigationsEnabled <Boolean>]
  [-MonitoringGroup <String>]
  [-ProductKey <ProductKey>]
  [-StaticConfigDomainController <String>]
@@ -218,14 +219,11 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -MitigationsEnabled
-The MitigationsEnabled parameter specifies whether the EM Service will auto-apply mitigations on the Exchange server. Valid values are:
-
-- $true: The EM Service auto-applies mitigations on the Exchange server.
-- $false: Mitigations are not auto-applied on the Exchange server.
+### -MitigationsApplied
+Do not use this parameter. The EM service uses this parameter to store and track mitigation status.
 
 ```yaml
-Type: Boolean
+Type: MultiValuedProperty
 Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Server 2016, Exchange Server 2019
@@ -242,6 +240,27 @@ The MitigationsBlocked parameter specifies a list of mitigations that are blocke
 
 To enter multiple values and overwrite any existing Mitigation entries, use the following syntax: `@("Entry1","Entry2",..."EntryN")`.
 
+```yaml
+Type: MultiValuedProperty
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Server 2016, Exchange Server 2019
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -MitigationsEnabled
+The MitigationsEnabled parameter specifies whether the Exchange Emergency Mitigation service (EM service) automatically applies mitigations on the Exchange server. Valid values are:
+
+- $true: The EM Service automatically applies mitigations on the Exchange server.
+- $false: Mitigations are not automatically applied on the Exchange server.
+
+For more information, see [Exchange Emergency Mitigation (EM) service](https://docs.microsoft.com/exchange/exchange-emergency-mitigation-service).
+
 ```yaml
 Type: Boolean
 Parameter Sets: (All)

exchange/exchange-ps/exchange/Set-OrganizationConfig.md

@@ -191,6 +191,7 @@ Set-OrganizationConfig [-AdfsAudienceUris <MultiValuedProperty>]
  [-MicrosoftExchangeRecipientEmailAddressPolicyEnabled <Boolean>]
  [-MicrosoftExchangeRecipientPrimarySmtpAddress <SmtpAddress>]
  [-MicrosoftExchangeRecipientReplyRecipient <RecipientIdParameter>]
+ [-MitigationsEnabled <Boolean>]
  [-OAuth2ClientProfileEnabled <Boolean>]
  [-OrganizationSummary <MultiValuedProperty>]
  [-PreferredInternetCodePageForShiftJis <Int32>]
@@ -210,6 +211,7 @@ Set-OrganizationConfig [-AdfsAudienceUris <MultiValuedProperty>]
  [-SmtpActionableMessagesEnabled <Boolean>]
  [-UMAvailableLanguages <MultiValuedProperty>]
  [-UnblockUnsafeSenderPromptEnabled <Boolean>]
+ [-UseIcsSyncStateStreaming]
  [-WACDiscoveryEndpoint <String>]
  [-WhatIf]
  [<CommonParameters>]
@@ -273,6 +275,7 @@ Set-OrganizationConfig [-AdfsAuthenticationConfiguration <String>]
  [-MicrosoftExchangeRecipientEmailAddressPolicyEnabled <Boolean>]
  [-MicrosoftExchangeRecipientPrimarySmtpAddress <SmtpAddress>]
  [-MicrosoftExchangeRecipientReplyRecipient <RecipientIdParameter>]
+ [-MitigationsEnabled <Boolean>]
  [-OAuth2ClientProfileEnabled <Boolean>]
  [-OrganizationSummary <MultiValuedProperty>]
  [-PreferredInternetCodePageForShiftJis <Int32>]
@@ -293,6 +296,7 @@ Set-OrganizationConfig [-AdfsAuthenticationConfiguration <String>]
  [-SmtpActionableMessagesEnabled <Boolean>]
  [-UMAvailableLanguages <MultiValuedProperty>]
  [-UnblockUnsafeSenderPromptEnabled <Boolean>]
+ [-UseIcsSyncStateStreaming]
  [-WACDiscoveryEndpoint <String>]
  [-WhatIf]
  [<CommonParameters>]
@@ -2510,6 +2514,29 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -MitigationsEnabled
+This parameter is available only in on-premises Exchange.
+
+The MitigationsEnabled parameter specifies whether the Exchange Emergency Mitigation service (EM service) is enabled in the organization. Valid values are:
+
+- $true: The EM Service automatically applies mitigations on Exchange servers where the value of the _MitigationsEnabled_ parameter is $true on the **Set-ExchangeServer**.
+- $false: Mitigations are not automatically applied on Exchange servers.
+
+For more information, see [Exchange Emergency Mitigation (EM) service](https://docs.microsoft.com/exchange/exchange-emergency-mitigation-service).
+
+```yaml
+Type: Boolean
+Parameter Sets: AdfsAuthenticationParameter, AdfsAuthenticationRawConfiguration
+Aliases:
+Applicable: Exchange Server 2016, Exchange Server 2019
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -MobileAppEducationEnabled
 This parameter is available only in the cloud-based service.
 
@@ -3109,6 +3136,24 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -UseIcsSyncStateStreaming
+This parameter is available only in on-premises Exchange.
+
+{{ Fill UseIcsSyncStateStreaming Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: AdfsAuthenticationParameter, AdfsAuthenticationRawConfiguration
+Aliases:
+Applicable: Exchange Server 2016, Exchange Server 2019
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -VisibleMeetingUpdateProperties
 This parameter is available only in the cloud-based service.