Merge pull request MicrosoftDocs#4076 from MicrosoftDocs/master

Merges Master to Live. See commits for details.

Author: kenwith

exchange/exchange-ps/exchange/antispam-antimalware/New-MalwareFilterPolicy.md

@@ -80,7 +80,7 @@ The Action parameter specifies the action to take when malware is detected in a
 
 - DeleteAttachmentAndUseCustomAlert: Delivers the message, but replaces the message contents with the custom alert text specified by the AlertText parameter.
 
-Note: For Exchange Online Protection, any of these actions result in the message and any attachments being routed to quarantine. For more information about quarantined messages, see https://go.microsoft.com/fwlink/p/?linkid=874388.
+Note: For Exchange Online Protection, any of these actions result in the message being delivered. Attachments that contain malware are quarantined. For more information about quarantined messages, see https://docs.microsoft.com/microsoft-365/security/office-365-security/manage-quarantined-messages-and-files.
 
 ```yaml
 Type: DeleteMessage | DeleteAttachmentAndUseDefaultAlertText | DeleteAttachmentAndUseCustomAlertText

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

@@ -98,7 +98,7 @@ The Action parameter specifies the action to take when malware is detected in a
 
 - DeleteAttachmentAndUseCustomAlert: Delivers the message, but replaces the message contents with the custom alert text specified by the AlertText parameter.
 
-Note: For Exchange Online Protection, any of these actions results in the message and any attachments being routed to quarantine. For more information about quarantined messages, see https://go.microsoft.com/fwlink/p/?linkid=874388.
+Note: For Exchange Online Protection, any of these actions result in the message being delivered. Attachments that contain malware are quarantined. For more information about quarantined messages, see https://docs.microsoft.com/microsoft-365/security/office-365-security/manage-quarantined-messages-and-files.
 
 ```yaml
 Type: DeleteMessage | DeleteAttachmentAndUseDefaultAlertText | DeleteAttachmentAndUseCustomAlertText

exchange/exchange-ps/exchange/policy-and-compliance/New-Label.md

@@ -127,9 +127,9 @@ Accept wildcard characters: False
 ### -LocaleSettings
 The LocaleSettings parameter specifies one or more localized label name or label Tooltips in different languages. Regions include all region codes supported in Office Client applications. Valid values use the following syntax:
 
-- Label display names: {"localeKey":"DisplayName","Settings":[{"Key":"en-us","Value":"English display name"},{"Key":"de-de",Value":"Deutscher Anzeigename"},{"Key":"es-es",Value":"Nombre para mostrar en español"}]}
+- Label display names: {"localeKey":"DisplayName","Settings":[{"Key":"en-us","Value":"English display name"},{"Key":"de-de","Value":"Deutscher Anzeigename"},{"Key":"es-es","Value":"Nombre para mostrar en español"}]}
 
-- Label Tooltips: {"localeKey":"Tooltip","Settings":[{"Key":"en-us","Value":"English Tooltip"},{"Key":"de-de",Value":"Deutscher Tooltip"},{"Key":"es-es",Value":"Tooltip Español"}]}
+- Label Tooltips: {"localeKey":"Tooltip","Settings":[{"Key":"en-us","Value":"English Tooltip"},{"Key":"de-de",Value":"Deutscher Tooltip"},{"Key":"es-es","Value":"Tooltip Español"}]}
 
 ```yaml
 Type: MultiValuedProperty

sharepoint/sharepoint-ps/sharepoint-online/Get-SPOTenantTaxonomyReplicationParameters.md

@@ -21,7 +21,8 @@ Get-SPOTenantTaxonomyReplicationParameters [<CommonParameters>]
 ```
 
 ## DESCRIPTION
-Before you use this cmdlet, please use "Connect-SPOService" to connect to SharePoint Online first
+Before using this cmdlet, make sure you connect to Sharepoint Online using [Connect-SPOService](Connect-SPOService.md) and the desirable satellite location URL as the -Url parameter.
+
 This Cmdlet gets the replication parameters and it works to get the replication taxonomy in a Multi-Geo tenant.
 It works with the [Set-SPOTenantTaxonomyReplicationParameters](Set-SPOTenantTaxonomyReplicationParameters.md) to set the parameters.
 
@@ -50,7 +51,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 [Get-SPOAppErrors](Get-SPOAppErrors.md)
 
-[Get-SPOTenantTaxonomyReplicationParameters](Get-SPOTenantTaxonomyReplicationParameters.md)
+[Set-SPOTenantTaxonomyReplicationParameters](Set-SPOTenantTaxonomyReplicationParameters.md)
 
 [Get-SPOTenantContentTypeReplicationParameters](Get-SPOTenantContentTypeReplicationParameters.md)
 

sharepoint/sharepoint-ps/sharepoint-online/Set-SPOTenantTaxonomyReplicationParameters.md

@@ -27,7 +27,8 @@ Set-SPOTenantTaxonomyReplicationParameters -ReplicatedGroups <String[]> [<Common
 ```
 
 ## DESCRIPTION
-Before you run the cmdlets, please use �Connect-SPOService� to connect to SharePoint Online first.
+Before using this cmdlet, make sure you connect to Sharepoint Online using [Connect-SPOService](Connect-SPOService.md) and the desirable satellite location URL as the -Url parameter.
+
 By default, all global groups except system/search/people/sitecollection in primary location will be replicated to
 satellite. 
 

sharepoint/sharepoint-ps/sharepoint-pnp/Add-PnPFieldFromXml.md

@@ -8,7 +8,7 @@ schema: 2.0.0
 ## SYNOPSIS
 Adds a field to a list or as a site column based upon a CAML/XML field definition
 
-## SYNTAX 
+## SYNTAX
 
 ```powershell
 Add-PnPFieldFromXml -FieldXml <String>
@@ -91,4 +91,4 @@ Accept pipeline input: False
 
 ## RELATED LINKS
 
-[SharePoint Developer Patterns and Practices](https://aka.ms/sppnp)[Field CAML](http://msdn.microsoft.com/en-us/library/office/ms437580(v=office.15).aspx)
+[SharePoint Developer Patterns and Practices](https://aka.ms/sppnp)[Field CAML](https://msdn.microsoft.com/en-us/library/office/ms437580(v=office.15).aspx)

sharepoint/sharepoint-ps/sharepoint-pnp/Get-PnPWebTemplates.md

@@ -8,7 +8,7 @@ schema: 2.0.0
 ## SYNOPSIS
 Returns the available web templates.
 
-## SYNTAX 
+## SYNTAX
 
 ```powershell
 Get-PnPWebTemplates [-Lcid <UInt32>]
@@ -86,4 +86,4 @@ Accept pipeline input: False
 
 ## RELATED LINKS
 
-[SharePoint Developer Patterns and Practices](https://aka.ms/sppnp)[Locale IDs](http://go.microsoft.com/fwlink/p/?LinkId=242911Id=242911)
+[SharePoint Developer Patterns and Practices](https://aka.ms/sppnp)[Locale IDs](https://go.microsoft.com/fwlink/p/?LinkId=242911Id=242911)

sharepoint/sharepoint-ps/sharepoint-pnp/New-PnPTenantSite.md

@@ -8,7 +8,7 @@ schema: 2.0.0
 ## SYNOPSIS
 Creates a new site collection for the current tenant
 
-## SYNTAX 
+## SYNTAX
 
 ```powershell
 New-PnPTenantSite -Title <String>
@@ -29,7 +29,7 @@ New-PnPTenantSite -Title <String>
 
 ## DESCRIPTION
 The New-PnPTenantSite cmdlet creates a new site collection for the current company. However, creating a new SharePoint
-Online site collection fails if a deleted site with the same URL exists in the Recycle Bin. If you want to use this command for an on-premises farm, please refer to http://blogs.msdn.com/b/vesku/archive/2014/06/09/provisioning-site-collections-using-sp-app-model-in-on-premises-with-just-csom.aspx 
+Online site collection fails if a deleted site with the same URL exists in the Recycle Bin. If you want to use this command for an on-premises farm, please refer to http://blogs.msdn.com/b/vesku/archive/2014/06/09/provisioning-site-collections-using-sp-app-model-in-on-premises-with-just-csom.aspx
 
 ## EXAMPLES
 
@@ -62,7 +62,7 @@ Accept pipeline input: False
 ```
 
 ### -Lcid
-Specifies the language of this site collection. For more information, see Locale IDs Assigned by Microsoft: https://msdn.microsoft.com/en-us/library/microsoft.sharepoint.splanguage.lcid.aspx. To get the list of supported languages use: (Get-PnPWeb -Includes RegionalSettings.InstalledLanguages).RegionalSettings.InstalledLanguages 
+Specifies the language of this site collection. For more information, see Locale IDs Assigned by Microsoft: https://msdn.microsoft.com/en-us/library/microsoft.sharepoint.splanguage.lcid.aspx. To get the list of supported languages use: (Get-PnPWeb -Includes RegionalSettings.InstalledLanguages).RegionalSettings.InstalledLanguages
 
 ```yaml
 Type: UInt32
@@ -221,4 +221,4 @@ Accept pipeline input: False
 
 ## RELATED LINKS
 
-[SharePoint Developer Patterns and Practices](https://aka.ms/sppnp)[Locale IDs](http://go.microsoft.com/fwlink/p/?LinkId=242911Id=242911)[Resource Usage Limits on Sandboxed Solutions in SharePoint 2010](http://msdn.microsoft.com/en-us/library/gg615462.aspx.)[Creating on-premises site collections using CSOM](http://blogs.msdn.com/b/vesku/archive/2014/06/09/provisioning-site-collections-using-sp-app-model-in-on-premises-with-just-csom.aspx)
+[SharePoint Developer Patterns and Practices](https://aka.ms/sppnp)[Locale IDs](https://go.microsoft.com/fwlink/p/?LinkId=242911Id=242911)[Resource Usage Limits on Sandboxed Solutions in SharePoint 2010](https://msdn.microsoft.com/en-us/library/gg615462.aspx.)[Creating on-premises site collections using CSOM](https://blogs.msdn.com/b/vesku/archive/2014/06/09/provisioning-site-collections-using-sp-app-model-in-on-premises-with-just-csom.aspx)

sharepoint/sharepoint-ps/sharepoint-pnp/Set-PnPTenant.md

@@ -8,7 +8,7 @@ schema: 2.0.0
 ## SYNOPSIS
 Sets organization-level site collection properties
 
-## SYNTAX 
+## SYNTAX
 
 ```powershell
 Set-PnPTenant [-MinCompatibilityLevel <Int>]
@@ -793,7 +793,7 @@ The valid values are:
 ExternalUserAndGuestSharing (default) - External user sharing (share by email) and guest link sharing are both enabled. Disabled - External user sharing (share by email) and guest link sharing are both disabled.
 ExternalUserSharingOnly - External user sharing (share by email) is enabled, but guest link sharing is disabled.
 
-For more information about sharing, see Manage external sharing for your SharePoint online environment (http://office.microsoft.com/en-us/office365-sharepoint-online-enterprise-help/manage-external-sharing-for-your-sharepoint-online-environment-HA102849864.aspx).
+For more information about sharing, see Manage external sharing for your SharePoint online environment (https://office.microsoft.com/en-us/office365-sharepoint-online-enterprise-help/manage-external-sharing-for-your-sharepoint-online-environment-HA102849864.aspx).
 
 ```yaml
 Type: SharingCapabilities

sharepoint/sharepoint-ps/sharepoint-pnp/Set-PnPUserProfileProperty.md

@@ -36,14 +36,14 @@ Requires a connection to a SharePoint Tenant Admin site.
 
 ### ------------------EXAMPLE 1------------------
 ```powershell
-Set-PnPUserProfileProperty -Account '[email protected]' -Property 'SPS-Location' -Value 'Stockholm'
+Set-PnPUserProfileProperty -Account '[email protected]' -PropertyName 'SPS-Location' -Value 'Stockholm'
 ```
 
 Sets the SPS-Location property for the user as specified by the Account parameter
 
 ### ------------------EXAMPLE 2------------------
 ```powershell
-Set-PnPUserProfileProperty -Account '[email protected]' -Property 'MyProperty' -Values 'Value 1','Value 2'
+Set-PnPUserProfileProperty -Account '[email protected]' -PropertyName 'MyProperty' -Values 'Value 1','Value 2'
 ```
 
 Sets the MyProperty multi value property for the user as specified by the Account parameter
@@ -112,4 +112,4 @@ Accept pipeline input: False
 
 ## RELATED LINKS
 
-[SharePoint Developer Patterns and Practices](https://aka.ms/sppnp)
+[SharePoint Developer Patterns and Practices](https://aka.ms/sppnp)

sharepoint/sharepoint-ps/sharepoint-server/Update-SPProfileSync.md

@@ -169,7 +169,7 @@ 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 (http://go.microsoft.com/fwlink/?LinkID=113216).
+For more information, see about_CommonParameters (https://go.microsoft.com/fwlink/?LinkID=113216).
 
 ## INPUTS
 

skype/skype-ps/skype/Get-CsOnlineLisCivicAddress.md

@@ -1,11 +1,11 @@
 ---
-external help file: Microsoft.Rtc.Management.Hosted.dll-help.xml 
+external help file: Microsoft.Rtc.Management.Hosted.dll-help.xml
 applicable: Skype for Business Online
 title: Get-CsOnlineLisCivicAddress
 schema: 2.0.0
 manager: bulenteg
-author: tomkau
-ms.author: tomkau
+author: junya
+ms.author: junya
 ms.reviewer:
 ---
 
@@ -55,7 +55,7 @@ Valid inputs are "Assigned", or "Unassigned".
 ```yaml
 Type: String
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 Applicable: Skype for Business Online
 
 Required: False
@@ -71,7 +71,7 @@ Specifies the city of the target civic address.
 ```yaml
 Type: String
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 Applicable: Skype for Business Online
 
 Required: False
@@ -87,7 +87,7 @@ Specifies the identification number of the civic address to return.
 ```yaml
 Type: Guid
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 Applicable: Skype for Business Online
 
 Required: False
@@ -103,7 +103,7 @@ Specifies the country or region of the target civic address.
 ```yaml
 Type: String
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 Applicable: Skype for Business Online
 
 Required: False
@@ -119,7 +119,7 @@ Specifies the administrator defined description of the target civic address.
 ```yaml
 Type: String
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 Applicable: Skype for Business Online
 
 Required: False
@@ -136,7 +136,6 @@ This parameter is reserved for internal Microsoft use.
 Type: Fqdn
 Parameter Sets: (All)
 Aliases: DC
-Applicable: Skype for Business Online
 
 Required: False
 Position: Named
@@ -153,12 +152,12 @@ If the Force switch isn't provided in the command, you're prompted for administr
 ```yaml
 Type: SwitchParameter
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 Applicable: Skype for Business Online
 
 Required: False
 Position: Named
-Default value: None
+Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
@@ -169,7 +168,7 @@ This parameter is reserved for internal Microsoft use.
 ```yaml
 Type: Guid
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 Applicable: Skype for Business Online
 
 Required: False
@@ -185,12 +184,12 @@ If there are a large number of civic addresses, you can limit the number of retu
 If you limited the first cmdlet execution to 25 results, and want to look at the next 25 locations, then you leave ResultSize at 25 and set NumberOfResultsToSkip to 25 to omit the first 25 you've reviewed.
 For example the command below will return civic addresses 26-50 for Seattle.
 
-`Get-CsOnlineLisCivicAddress -City Seattle -ResultSize 25 -NumberOfResultsToSkip 25`
+\`Get-CsOnlineLisCivicAddress -City Seattle -ResultSize 25 -NumberOfResultsToSkip 25\`
 
 ```yaml
 Type: Int32
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 Applicable: Skype for Business Online
 
 Required: False
@@ -206,12 +205,12 @@ If present, the PopulateNumberOfVoiceUsers switch causes the cmdlet to provide t
 ```yaml
 Type: SwitchParameter
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 Applicable: Skype for Business Online
 
 Required: False
 Position: Named
-Default value: None
+Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
@@ -222,7 +221,7 @@ Specifies the maximum number of results to return.
 ```yaml
 Type: Int32
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 Applicable: Skype for Business Online
 
 Required: False
@@ -238,7 +237,7 @@ This parameter is reserved for internal Microsoft use.
 ```yaml
 Type: Guid
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 Applicable: Skype for Business Online
 
 Required: False
@@ -255,23 +254,7 @@ Valid inputs are: Valid, Invalid, and Notvalidated.
 ```yaml
 Type: String
 Parameter Sets: (All)
-Aliases: 
-Applicable: Skype for Business Online
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -AsJob
-{{Fill AsJob Description}}
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases: 
+Aliases:
 Applicable: Skype for Business Online
 
 Required: False
@@ -287,19 +270,18 @@ Accept wildcard characters: False
 ```yaml
 Type: SwitchParameter
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 Applicable: Skype for Business Online
 
 Required: False
 Position: Named
-Default value: None
+Default value: False
 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/?LinkID=113216).
-
+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/?LinkID=113216).
 
 ## INPUTS