Merge branch 'master' into patch-1

Author: chrisda

exchange/exchange-ps/exchange/Get-MobileDevice.md

@@ -110,7 +110,7 @@ Accept wildcard characters: False
 ```
 
 ### -ActiveSync
-The ActiveSync switch specifies whether to include mobile devices that synchronize with Exchange ActiveSync. You don't need to specify a value with this switch.
+The ActiveSync switch filters the results by Exchange ActiveSync devices. You don't need to specify a value with this switch.
 
 ```yaml
 Type: SwitchParameter

exchange/exchange-ps/exchange/Get-SafeLinksDetailReport.md

@@ -36,7 +36,7 @@ Get-SafeLinksDetailReport [-Action <MultiValuedProperty>]
 ```
 
 ## DESCRIPTION
-**Note**: If you run Get-SafeLinksAggregateReport without specifying a date range, the command will return an unspecified error.
+**Note**: If you run Get-SafeLinksDetailReport without specifying a date range, the command will return an unspecified error.
 
 Safe Links is a feature in Microsoft Defender for Office 365 that checks links in email messages to see if they lead to malicious web sites. When a user clicks a link in a message, the URL is temporarily rewritten and checked against a list of known, malicious web sites.
 

exchange/exchange-ps/exchange/New-AutoSensitivityLabelPolicy.md

@@ -72,7 +72,7 @@ Accept wildcard characters: False
 ```
 
 ### -ApplySensitivityLabel
-The AppleSensitivityLabel parameter specifies which label to use for the autolabel policy.
+The ApplySensitivityLabel parameter specifies the label to use for the autolabel policy.
 
 ```yaml
 Type: String

exchange/exchange-ps/exchange/Remove-MailboxFolderPermission.md

@@ -22,6 +22,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
 
 ```
 Remove-MailboxFolderPermission [-Identity] <MailboxFolderIdParameter> -User <MailboxFolderUserIdParameter>
+ [-ResetDelegateUserCollection]
  [-Confirm]
  [-DomainController <Fqdn>]
  [-WhatIf]
@@ -42,6 +43,13 @@ Remove-MailboxFolderPermission -Identity [email protected]:\Training -User john@co
 
 This example removes John's permissions to the Training folder in Kim's mailbox.
 
+### Example 2
+```powershell
+Remove-MailboxFolderPermission -Identity [email protected]:\Calendar -ResetDelegateUserCollection
+```
+
+This example will clear any corrupted delegate information from Kim’s mailbox.
+
 ## PARAMETERS
 
 ### -Identity
@@ -149,6 +157,24 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -ResetDelegateUserCollection
+This parameter is available only in the cloud-based service.
+
+The ResetDelegateUserCollection switch can only be used together with -Identity parameter, and the value of Identity should be the user's primary calendar folder, for example, [email protected]:\Calendar. If you run into a problem when trying to add, change, or remove delegate permissions, it is possible that the delegate information stored in the LocalFreeBusy item or the PR_FREEBUSY_ENTRYIDS has become corrupted. Including this switch will delete those files and will downgrade any existing Delegates to Editor status. You will need to grant Delegate permissions again using -SharingPermissionFlag Delegate.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -SendNotificationToUser
 This parameter is available only in the cloud-based service.
 

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

@@ -2020,8 +2020,6 @@ Accept wildcard characters: False
 ### -OutlookGifPickerDisabled
 This parameter is available only in the cloud-based service.
 
-This feature is currently in Preview, is not available everywhere, and is subject to change.
-
 The OutlookGifPickerDisabled parameter disables the GIF Search (powered by Bing) feature that's built into the Compose page in Outlook on the web. Valid values are:
 
 - $true: GIF Search in Outlook on the web is disabled.