Merge branch 'master' into patch-11

Kateyanne · web-flow · commit c2b641412442 · 2021-06-23T08:21:06.000-07:00
diff --git a/exchange/exchange-ps/exchange/New-AntiPhishPolicy.md b/exchange/exchange-ps/exchange/New-AntiPhishPolicy.md
@@ -28,6 +28,7 @@ New-AntiPhishPolicy [-Name] <String>
  [-AuthenticationFailAction <SpoofAuthenticationFailAction>]
  [-Confirm]
  [-Enabled <Boolean>]
+ [-EnableFirstContactSafetyTips <Boolean>]
  [-EnableMailboxIntelligence <Boolean>]
  [-EnableMailboxIntelligenceProtection <Boolean>]
  [-EnableOrganizationDomainsProtection <Boolean>]
@@ -174,6 +175,25 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -EnableFirstContactSafetyTips
+The EnableFirstContactSafetyTips parameter specifies whether to enable or disable the safety tip that's shown when recipients first receive an email from a sender or do not often receive email from a sender. Valid values are:
+
+- $true: First contact safety tips are enabled.
+- $false: First contact safety tips are disabled. This is the default value.
+
+```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
+```
+
 ### -EnableMailboxIntelligence
 This setting is part of impersonation protection and is only available in Microsoft Defender for Office 365.
 
diff --git a/exchange/exchange-ps/exchange/New-SafeLinksPolicy.md b/exchange/exchange-ps/exchange/New-SafeLinksPolicy.md
@@ -136,7 +136,7 @@ Accept wildcard characters: False
 ```
 
 ### -CustomNotificationText
-{{ Fill CustomNotificationText Description }}
+The custom notification text specifies the customized notification text to show to users. If the value contains spaces, enclose the value in quotation marks (").
 
 ```yaml
 Type: String
@@ -250,7 +250,10 @@ Accept wildcard characters: False
 ```
 
 ### -EnableOrganizationBranding
-{{ Fill EnableOrganizationBranding Description }}
+The EnableOrganizationBranding parameter specifies whether your organization's logo is displayed on Safe Links warning and notification pages. Valid values are:
+
+- $true: Organization branding is displayed on Safe Links warning and notification pages. Before you configure this value, you need to follow the instructions in [Customize the Microsoft 365 theme for your organization](https://docs.microsoft.com/microsoft-365/admin/setup/customize-your-organization-theme) to upload your company logo.
+- $false: Organization branding is not displayed on Safe Links warning and notification pages.
 
 ```yaml
 Type: Boolean
@@ -266,11 +269,11 @@ Accept wildcard characters: False
 ```
 
 ### -EnableSafeLinksForTeams
-**Note**: As of March 2020, this parameter is in Preview and is available only for members of the Microsoft Teams Technology Adoption Program (TAP).
+**Note**: As of March 2020, this parameter is in Preview and is available or functional only for members of the Microsoft Teams Technology Adoption Program (TAP).
 
 The EnableSafeLinksForTeams parameter specifies whether Safe Links is enabled for Microsoft Teams. Valid values are:
 
-- $true: Safe Links is enabled for Teams. If a protected user clicks a malicious link in a Teams conversation, group chat, or from channels, a warning page will appear in the default web browser.
+- $true: Safe Links is enabled for Teams. When a user clicks a link in a Teams conversation, group chat, or from channels, the link is checked by Safe Links. If the link is found to be malicious, a warning page appears in the default web browser.
 - $false: Safe Links isn't enabled for Teams. This is the default value.
 
 ```yaml
@@ -373,7 +376,10 @@ Accept wildcard characters: False
 ```
 
 ### -UseTranslatedNotificationText
-{{ Fill UseTranslatedNotificationText Description }}
+The UseTranslatedNotificationText specifies whether to use Microsoft Translator to automatically localize the custom notification text that you specified with the CustomNotificationText parameter. Valid values are:
+
+- $true: Translate custom notification text to the user's language.
+- $false: Don't translate custom notification text to the user's language. This is the default value.
 
 ```yaml
 Type: Boolean
diff --git a/exchange/exchange-ps/exchange/Set-AntiPhishPolicy.md b/exchange/exchange-ps/exchange/Set-AntiPhishPolicy.md
@@ -28,6 +28,7 @@ Set-AntiPhishPolicy -Identity <AntiPhishPolicyIdParameter>
  [-AuthenticationFailAction <SpoofAuthenticationFailAction>]
  [-Confirm]
  [-Enabled <Boolean>]
+ [-EnableFirstContactSafetyTips <Boolean>]
  [-EnableMailboxIntelligence <Boolean>]
  [-EnableMailboxIntelligenceProtection <Boolean>]
  [-EnableOrganizationDomainsProtection <Boolean>]
@@ -178,6 +179,25 @@ Accept pipeline input: false
 Accept wildcard characters: False
 ```
 
+### -EnableFirstContactSafetyTips
+The EnableFirstContactSafetyTips parameter specifies whether to enable or disable the safety tip that's shown when recipients first receive an email from a sender or do not often receive email from a sender. Valid values are:
+
+- $true: First contact safety tips are enabled.
+- $false: First contact safety tips are disabled. This is the default value.
+
+```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
+```
+
 ### -EnableMailboxIntelligence
 This setting is part of impersonation protection and is only available in Microsoft Defender for Office 365.
 
diff --git a/exchange/exchange-ps/exchange/Set-SafeLinksPolicy.md b/exchange/exchange-ps/exchange/Set-SafeLinksPolicy.md
@@ -135,7 +135,7 @@ Accept wildcard characters: False
 ```
 
 ### -CustomNotificationText
-{{ Fill CustomNotificationText Description }}
+The custom notification text specifies the customized notification text to show to users. If the value contains spaces, enclose the value in quotation marks (").
 
 ```yaml
 Type: String
@@ -247,7 +247,10 @@ Accept wildcard characters: False
 ```
 
 ### -EnableOrganizationBranding
-{{ Fill EnableOrganizationBranding Description }}
+The EnableOrganizationBranding parameter specifies whether your organization's logo is displayed on Safe Links warning and notification pages. Valid values are:
+
+- $true: Organization branding is displayed on Safe Links warning and notification pages. Before you configure this value, you need to follow the instructions in [Customize the Microsoft 365 theme for your organization](https://docs.microsoft.com/microsoft-365/admin/setup/customize-your-organization-theme) to upload your company logo.
+- $false: Organization branding is not displayed on Safe Links warning and notification pages.
 
 ```yaml
 Type: Boolean
@@ -263,7 +266,7 @@ Accept wildcard characters: False
 ```
 
 ### -EnableSafeLinksForTeams
-**Note**: As of March 2020, this parameter is in Preview is available only for members of the Microsoft Teams Technology Adoption Program (TAP).
+**Note**: As of March 2020, this parameter is in Preview and is available or functional only for members of the Microsoft Teams Technology Adoption Program (TAP).
 
 The EnableSafeLinksForTeams parameter specifies whether Safe Links is enabled for Microsoft Teams. Valid values are:
 
@@ -354,7 +357,10 @@ Accept wildcard characters: False
 ```
 
 ### -UseTranslatedNotificationText
-{{ Fill UseTranslatedNotificationText Description }}
+The UseTranslatedNotificationText specifies whether to use Microsoft Translator to automatically localize the custom notification text that you specified with the CustomNotificationText parameter. Valid values are:
+
+- $true: Translate custom notification text to the user's language.
+- $false: Don't translate custom notification text to the user's language. This is the default value.
 
 ```yaml
 Type: Boolean
diff --git a/exchange/exchange-ps/exchange/Start-ManagedFolderAssistant.md b/exchange/exchange-ps/exchange/Start-ManagedFolderAssistant.md
@@ -118,6 +118,8 @@ The Identity parameter specifies the mailbox to be processed. In cross-premises
 - SamAccountName
 - User ID or user principal name (UPN)
 
+**Note**: In the cloud-based service, if you receive an error, try using the mailbox GUID for the value of this parameter. You can get the mailbox GUID value by replacing <UserIdentity> with the email address of the user and running the following command: `Get-Mailbox -User <UserIdentity> | Format-List *GUID,MailboxLocations`.
+
 ```yaml
 Type: MailboxOrMailUserIdParameter
 Parameter Sets: (All)
diff --git a/sharepoint/sharepoint-ps/sharepoint-server/Backup-SPFarm.md b/sharepoint/sharepoint-ps/sharepoint-server/Backup-SPFarm.md
@@ -201,6 +201,8 @@ Accept wildcard characters: False
 ### -ConfigurationOnly
 If set, the backup will contain configuration settings only (no data) for each of the objects to be backed up.
 
+SharePoint may overestimate the amount of space required for a configuration-only backup, which may result in SharePoint estimating that it doesn't have sufficient space to store the backup at the specified path. Use the `-Force` parameter in this situation to proceed with the backup if you have sufficient space to store the configuration-only backup.
+
 ```yaml
 Type: SwitchParameter
 Parameter Sets: (All)
@@ -325,4 +327,3 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## NOTES
 
 ## RELATED LINKS
-
diff --git a/teams/teams-ps/teams/New-TeamChannel.md b/teams/teams-ps/teams/New-TeamChannel.md
@@ -87,7 +87,7 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -MembershipType (available in private preview)
+### -MembershipType
 Channel membership type, Standard or Private.
 
 ```yaml
@@ -102,7 +102,7 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
-### -Owner (available in private preview)
+### -Owner
 UPN of owner that can be specified while creating a private channel.
 
 ```yaml
