Merge pull request MicrosoftDocs#7097 from MicrosoftDocs/chrisda

Chrisda to Master

Author: chrisda

exchange/exchange-ps/exchange/Export-TransportRuleCollection.md

@@ -24,6 +24,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
 Export-TransportRuleCollection [[-Identity] <RuleIdParameter>]
  [-Confirm]
  [-DomainController <Fqdn>]
+ [-Format <RuleCollectionFormat>]
  [-ExportLegacyRules]
  [-WhatIf]
  [<CommonParameters>]
@@ -61,7 +62,11 @@ In Exchange Server 2010, this example exports legacy transport rules created in
 ### -Identity
 This cmdlet is available only in on-premises Exchange, and is functional only in Exchange Server 2010.
 
-The Identity parameter specifies the name or GUID of a transport rule to be exported.
+The Identity parameter specifies the transport rule that you want to export. You can use any value that uniquely identifies the rule. For example:
+
+- Name
+- Distinguished name (DN)
+- GUID
 
 ```yaml
 Type: RuleIdParameter
@@ -133,6 +138,28 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -Format
+This parameter is available only in the cloud-based service.
+
+The Format parameter specifics the format of the exported transport rule collection. Valid values are:
+
+- RuleCollectionXML
+- InternalXML
+- DlpMigrationRuleCollection
+
+```yaml
+Type: RuleCollectionFormat
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -WhatIf
 The WhatIf switch simulates the actions of the command. You can use this switch to view the changes that would occur without actually applying those changes. You don't need to specify a value with this switch.
 

exchange/exchange-ps/exchange/Import-TransportRuleCollection.md

@@ -46,7 +46,7 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 Import-TransportRuleCollection -FileData $Data
 ```
 
-This example imports a transport rule collection from the XML file named ExportedRules.xml in the  C:\\TransportRules folder.
+This example imports a transport rule collection from the XML file named ExportedRules.xml in the C:\\TransportRules folder.
 
 **Note**: In PowerShell 6.0 or later, replace `-Encoding Byte` with `-AsByteStream`.
 
@@ -55,7 +55,11 @@ This example imports a transport rule collection from the XML file named Exporte
 ### -Identity
 This cmdlet is available only in on-premises Exchange, and is only functional in Exchange Server 2010.
 
-The Identity parameter specifies the transport rule to be imported. Use either the GUID or the name of the rule. You can omit the parameter label.
+The Identity parameter specifies the transport rule that you want to import. You can use any value that uniquely identifies the rule. For example:
+
+- Name
+- Distinguished name (DN)
+- GUID
 
 ```yaml
 Type: RuleIdParameter
@@ -71,7 +75,11 @@ Accept wildcard characters: False
 ```
 
 ### -FileData
-The FileData parameter specifies the variable name that contains the content of the XML file. The content is retrieved using the Get-Content cmdlet.
+The FileData parameter specifies the variable name that contains the content of the XML file.
+
+A valid value for this parameter requires you to read the file to a byte-encoded object using the Get-Content cmdlet. For example, `(Get-Content -Encoding Byte -Path "C:\My Documents\<filename>" -ReadCount 0)`.
+
+**Note**: In PowerShell 6.0 or later, replace `-Encoding Byte` with `-AsByteStream`.
 
 ```yaml
 Type: Byte[]

exchange/exchange-ps/exchange/New-HostedContentFilterPolicy.md

@@ -74,7 +74,6 @@ New-HostedContentFilterPolicy [-Name] <String>
  [-TestModeAction <SpamFilteringTestModeAction>]
  [-TestModeBccToRecipients <MultiValuedProperty>]
  [-WhatIf]
- [-ZapEnabled <Boolean>]
  [<CommonParameters>]
 ```
 
@@ -1172,22 +1171,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -ZapEnabled
-This parameter has been deprecated and is no longer used. Use the PhishZapEnabled and SpamZapEnabled parameters instead.
-
-```yaml
-Type: Boolean
-Parameter Sets: (All)
-Aliases:
-Applicable: Exchange Online, Exchange Online Protection
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/p/?LinkID=113216).
 

exchange/exchange-ps/exchange/Set-HostedContentFilterPolicy.md

@@ -75,7 +75,6 @@ Set-HostedContentFilterPolicy [-Identity] <HostedContentFilterPolicyIdParameter>
  [-TestModeAction <SpamFilteringTestModeAction>]
  [-TestModeBccToRecipients <MultiValuedProperty>]
  [-WhatIf]
- [-ZapEnabled <Boolean>]
  [<CommonParameters>]
 ```
 
@@ -1193,22 +1192,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -ZapEnabled
-This parameter has been deprecated and is no longer used. Use the PhishZapEnabled and SpamZapEnabled parameters instead.
-
-```yaml
-Type: Boolean
-Parameter Sets: (All)
-Aliases:
-Applicable: Exchange Online, Exchange Online Protection
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/p/?LinkID=113216).