Merge branch 'master' into master

kenwith · web-flow · commit 2c61b04bed50 · 2019-11-20T14:40:21.000-08:00
diff --git a/exchange/exchange-ps/exchange/antispam-antimalware/Add-AttachmentFilterEntry.md b/exchange/exchange-ps/exchange/antispam-antimalware/Add-AttachmentFilterEntry.md
@@ -21,7 +21,9 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-Add-AttachmentFilterEntry -Name <String> -Type <ContentType | FileName> [-Confirm] [-DomainController <Fqdn>]
+Add-AttachmentFilterEntry -Name <String> -Type <AttachmentType>
+ [-Confirm]
+ [-DomainController <Fqdn>]
  [-WhatIf] [<CommonParameters>]
 ```
 
@@ -49,7 +51,11 @@ This example adds an attachment filter entry based on the MIME content type imag
 ## PARAMETERS
 
 ### -Name
-The Name parameter specifies the MIME content type or file name of the attachment. If the Type parameter is set to FileName, the Name parameter can take any exact file name, such as BadFile.exe, or file name extension, such as \*.exe. If the Type parameter is set to ContentType, the Name parameter can take any valid MIME content type.
+The Name parameter specifies the files that you want to block. Valid values are:
+
+- A exact file name (for example, BadFile.exe) or file name extension (for example, \*.exe). You need to use the value Filename for the Type parameter.
+
+- A valid MIME content type (for example, application/javascript or text/scriplet). You need to use the value ContentType for the Type parameter.
 
 ```yaml
 Type: String
@@ -65,14 +71,14 @@ Accept wildcard characters: False
 ```
 
 ### -Type
-The Type parameter specifies what type of attachment the attachment filter entry blocks. Valid values are ContentType and FileName:
+The Type parameter specifies what type of attachment the attachment filter entry blocks. Valid values are:
 
-- ContentType: This value matches the attachment filter entry against the MIME content type specified in the Name parameter.
+- ContentType: This value matches the attachment filter entry against the MIME content type that's specified in the Name parameter.
 
-- FileName: This value matches the attachment filter entry against the simple file name specified in the Name parameter.
+- FileName: This value matches the attachment filter entry against the simple file name that's specified in the Name parameter.
 
 ```yaml
-Type: ContentType | FileName
+Type: AttachmentType
 Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
diff --git a/exchange/exchange-ps/exchange/antispam-antimalware/Set-AttachmentFilterListConfig.md b/exchange/exchange-ps/exchange/antispam-antimalware/Set-AttachmentFilterListConfig.md
@@ -21,9 +21,14 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-Set-AttachmentFilterListConfig [-Action <Reject | Strip | SilentDelete>] [-AdminMessage <String>] [-Confirm]
- [-DomainController <Fqdn>] [-ExceptionConnectors <MultiValuedProperty>] [-RejectResponse <String>] [-WhatIf]
- [<CommonParameters>]
+Set-AttachmentFilterListConfig
+ [-Action <FilterActions>]
+ [-AdminMessage <String>]
+ [-Confirm]
+ [-DomainController <Fqdn>]
+ [-ExceptionConnectors <MultiValuedProperty>]
+ [-RejectResponse <String>]
+ [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -43,16 +48,16 @@ This example modifies the action that the Attachment Filtering agent takes on an
 ## PARAMETERS
 
 ### -Action
-The Action parameter specifies how the Attachment Filtering agent handles an attachment that matches an entry on the attachment filter list. The default value is Reject. You can use one of the following values:
+The Action parameter specifies how the Attachment Filtering agent handles an attachment that matches an entry on the attachment filter list. Valid values are:
 
-- Reject: This value prevents both the email message and attachment from being delivered to the recipient and issues a non-delivery report (NDR) to the sender.
+- Reject: This value prevents both the email message and attachment from being delivered to the recipient and issues a non-delivery report (NDR) to the sender. This is the default value.
 
 - Strip: This value removes the offending attachment from the email message and allows the message and other attachments that don't match an entry on the attachment filter list through. A notification that the attachment was removed is added to the email message.
 
 - SilentDelete: This value prevents both the email message and the attachment from being delivered to the recipient. No notification that the email message and attachment were blocked is sent to the sender.
 
 ```yaml
-Type: Reject | Strip | SilentDelete
+Type: FilterActions
 Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
diff --git a/exchange/exchange-ps/exchange/mail-flow/New-EdgeSyncServiceConfig.md b/exchange/exchange-ps/exchange/mail-flow/New-EdgeSyncServiceConfig.md
@@ -21,12 +21,23 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-New-EdgeSyncServiceConfig [-ConfigurationSyncInterval <EnhancedTimeSpan>] [-Confirm]
- [-CookieValidDuration <EnhancedTimeSpan>] [-DomainController <Fqdn>] [-FailoverDCInterval <EnhancedTimeSpan>]
- [-LockDuration <EnhancedTimeSpan>] [-LockRenewalDuration <EnhancedTimeSpan>] [-LogEnabled <Boolean>]
- [-LogLevel <None | Low | Medium | High>] [-LogMaxAge <EnhancedTimeSpan>] [-LogMaxDirectorySize <Unlimited>]
- [-LogMaxFileSize <Unlimited>] [-LogPath <String>] [-OptionDuration <EnhancedTimeSpan>]
- [-RecipientSyncInterval <EnhancedTimeSpan>] [-Site <AdSiteIdParameter>] [-WhatIf] [<CommonParameters>]
+New-EdgeSyncServiceConfig [-ConfigurationSyncInterval <EnhancedTimeSpan>]
+ [-Confirm]
+ [-CookieValidDuration <EnhancedTimeSpan>]
+ [-DomainController <Fqdn>]
+ [-FailoverDCInterval <EnhancedTimeSpan>]
+ [-LockDuration <EnhancedTimeSpan>]
+ [-LockRenewalDuration <EnhancedTimeSpan>]
+ [-LogEnabled <Boolean>]
+ [-LogLevel <EdgeSyncLoggingLevel>]
+ [-LogMaxAge <EnhancedTimeSpan>]
+ [-LogMaxDirectorySize <Unlimited>]
+ [-LogMaxFileSize <Unlimited>]
+ [-LogPath <String>]
+ [-OptionDuration <EnhancedTimeSpan>]
+ [-RecipientSyncInterval <EnhancedTimeSpan>]
+ [-Site <AdSiteIdParameter>]
+ [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -194,10 +205,18 @@ Accept wildcard characters: False
 ```
 
 ### -LogLevel
-The LogLevel parameter specifies the EdgeSync logging level. Valid values for this parameter are None, Low, Medium and High. The default value is None.
+The LogLevel parameter specifies the EdgeSync logging level. Valid values are:
+
+- None (This is the default value)
+
+- Low
+
+- Medium
+
+- High
 
 ```yaml
-Type: None | Low | Medium | High
+Type: EdgeSyncLoggingLevel
 Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
diff --git a/exchange/exchange-ps/exchange/mail-flow/Set-EdgeSyncServiceConfig.md b/exchange/exchange-ps/exchange/mail-flow/Set-EdgeSyncServiceConfig.md
@@ -22,12 +22,23 @@ For information about the parameter sets in the Syntax section below, see [Excha
 
 ```
 Set-EdgeSyncServiceConfig [-Identity] <EdgeSyncServiceConfigIdParameter>
- [-ConfigurationSyncInterval <EnhancedTimeSpan>] [-Confirm] [-CookieValidDuration <EnhancedTimeSpan>]
- [-DomainController <Fqdn>] [-FailoverDCInterval <EnhancedTimeSpan>] [-LockDuration <EnhancedTimeSpan>]
- [-LockRenewalDuration <EnhancedTimeSpan>] [-LogEnabled <Boolean>]
- [-LogLevel <None | Low | Medium | High>] [-LogMaxAge <EnhancedTimeSpan>] [-LogMaxDirectorySize <Unlimited>]
- [-LogMaxFileSize <Unlimited>] [-LogPath <String>] [-Name <String>] [-OptionDuration <EnhancedTimeSpan>]
- [-RecipientSyncInterval <EnhancedTimeSpan>] [-WhatIf] [<CommonParameters>]
+ [-ConfigurationSyncInterval <EnhancedTimeSpan>]
+ [-Confirm]
+ [-CookieValidDuration <EnhancedTimeSpan>]
+ [-DomainController <Fqdn>]
+ [-FailoverDCInterval <EnhancedTimeSpan>]
+ [-LockDuration <EnhancedTimeSpan>]
+ [-LockRenewalDuration <EnhancedTimeSpan>]
+ [-LogEnabled <Boolean>]
+ [-LogLevel <EdgeSyncLoggingLevel>]
+ [-LogMaxAge <EnhancedTimeSpan>]
+ [-LogMaxDirectorySize <Unlimited>]
+ [-LogMaxFileSize <Unlimited>]
+ [-LogPath <String>]
+ [-Name <String>]
+ [-OptionDuration <EnhancedTimeSpan>]
+ [-RecipientSyncInterval <EnhancedTimeSpan>]
+ [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -211,10 +222,18 @@ Accept wildcard characters: False
 ```
 
 ### -LogLevel
-The LogLevel parameter specifies the EdgeSync logging level. Valid values for this parameter are None, Low, Medium and High. The default value is None.
+The LogLevel parameter specifies the EdgeSync logging level. Valid values are:
+
+- None (This is the default value)
+
+- Low
+
+- Medium
+
+- High
 
 ```yaml
-Type: None | Low | Medium | High
+Type: EdgeSyncLoggingLevel
 Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
diff --git a/exchange/exchange-ps/exchange/mail-flow/Start-HistoricalSearch.md b/exchange/exchange-ps/exchange/mail-flow/Start-HistoricalSearch.md
@@ -36,7 +36,7 @@ Start-HistoricalSearch -EndDate <DateTime> -ReportTitle <String> -ReportType <Hi
 ```
 
 ## DESCRIPTION
-A historical search provides message trace and report details in a comma-separated value (CSV) file for messages that are aged between 1-4 hours (depending on your environment) and 90 days old. There is a limit of 250 historical searches that you can submit in a 24 hour period; you'll be warned if you're nearing the daily quota. Cancelled searches count against the daily quota.
+A historical search provides message trace and report details in a comma-separated value (CSV) file for messages that are aged between 1-4 hours (depending on your environment) and 90 days old. There is a limit of 250 historical searches that you can submit in a 24 hour period; you'll be warned if you're nearing the daily quota. Cancelled searches count against the daily quota. Also, in each CSV file there is a limit of 50000 results or lines.
 
 You need to be assigned permissions before you can run this cmdlet. Although this topic lists all parameters for the cmdlet, you may not have access to some parameters if they're not included in the permissions assigned to you. To find the permissions required to run any cmdlet or parameter in your organization, see [Find the permissions required to run any Exchange cmdlet](https://docs.microsoft.com/powershell/exchange/exchange-server/find-exchange-cmdlet-permissions).
 
diff --git a/exchange/exchange-ps/exchange/mailboxes/Get-Mailbox.md b/exchange/exchange-ps/exchange/mailboxes/Get-Mailbox.md
@@ -141,7 +141,7 @@ Get-Mailbox [-MailboxPlan <MailboxPlanIdParameter>]
 
 ### AsyncParameterSet
 ```
-Get-Mailbox [-Async] -Properties <String[]>
+Get-Mailbox -Async -Properties <String[]>
  [-Archive]
  [-Filter <String>]
  [-GroupMailbox]
@@ -267,7 +267,7 @@ Accept wildcard characters: False
 ### -Async
 This parameter is available only in the cloud-based service.
 
-{{Fill Async Description}}
+This parameter is reserved for internal Microsoft use.
 
 ```yaml
 Type: SwitchParameter
diff --git a/exchange/exchange-ps/exchange/policy-and-compliance-dlp/New-DlpKeywordDictionary.md b/exchange/exchange-ps/exchange/policy-and-compliance-dlp/New-DlpKeywordDictionary.md
@@ -34,7 +34,7 @@ You need to be assigned permissions in the Office 365 Security & Compliance Cent
 
 ### Example 1
 ```powershell
-$Keywords = "Aarskog's syndrome, Abandonment, Abasia, Abderhalden-Kaufmann-Lignac, Abdominalgia, Abduction contracture, Abetalipo proteinemia, Abiotrophy, Ablatio, ablation, Ablepharia, Abocclusion, Abolition, Aborter, Abortion, Abortus, Aboulomania, Abrami's disease, Abramo"; $EncodedKeywords = [system.Text.Encoding]::UTF8.GetBytes($Keywords); New-DlpKeywordDictionary -Name "Diseases" -Description "Names of diseases and injuries from ICD-10-CM lexicon" -FileData $EncodedKeywords
+$Keywords = "Aarskog's syndrome","Abandonment","Abasia","Abderhalden-Kaufmann-Lignac","Abdominalgia","Abduction contracture","Abetalipo proteinemia","Abiotrophy","Ablatio","ablation","Ablepharia","Abocclusion","Abolition","Aborter","Abortion","Abortus","Aboulomania","Abrami's disease","Abramo"; $EncodedKeywords = $Keywords | ForEach-Object{[system.Text.Encoding]::UTF8.GetBytes($_+"rn")}; New-DlpKeywordDictionary -Name "Diseases" -Description "Names of diseases and injuries from ICD-10-CM lexicon" -FileData $EncodedKeywords
 ```
 
 This example creates a DLP keyword dictionary named Diseases by using the specified values.
diff --git a/skype/skype-ps/skype/Set-CsAuthConfig.md b/skype/skype-ps/skype/Set-CsAuthConfig.md
@@ -54,7 +54,7 @@ PS C:\> Set-CsAuthConfig -Scenario BlockWindowsAuthExternalyAndModernAuthInterna
 
 This example blocks NTLM externally and MA internally. It forces all external clients to use MA, but allows all clients to use legacy authentication methods internally (even ADAL-capable clients). 
 >[!NOTE]
->Please note that in the current version of the module the parameter value BlockWindowsAuthExternalyAndModernAuthInternally is mispelled and to be able to use it, only one l for Externally should be used.
+>Please note that in the current version of the module the parameter value BlockWindowsAuthExternalyAndModernAuthInternally is misspelled and to be able to use it, only one l for Externally should be used.
 
 
 ## PARAMETERS
