Merge pull request MicrosoftDocs#7975 from MicrosoftDocs/master

Publish 06/22/2021, 10:30 AM

Author: v-dihans

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

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

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

@@ -35,7 +35,7 @@ Set-SPOSite [-Identity] <SpoSitePipeBind> [-AllowSelfServiceUpgrade <Boolean>] [
  [-SharingBlockedDomainList <String>] [-SharingDomainRestrictionMode <SharingDomainRestrictionModes>]
  [-ShowPeoplePickerSuggestionsForGuestUsers <Boolean>] [-StorageQuotaReset]
  [-DefaultSharingLinkType] [-DefaultLinkPermission] [-DefaultLinkToExistingAccess]
- [-ConditionalAccessPolicy <SPOConditionalAccessPolicyType>] [-ProtectionLevelName <String>] [-LimitedAccessFileType <SPOLimitedAccessFileType>] [-AllowEditing <Boolean>] [-AnonymousLinkExpirationInDays <Int32>] [-OverrideTenantAnonymousLinkExpirationPolicy <Boolean>] [-SensitivityLabel <String>]
+ [-ConditionalAccessPolicy <SPOConditionalAccessPolicyType>] [-AuthenticationContextName <String>] [-LimitedAccessFileType <SPOLimitedAccessFileType>] [-AllowEditing <Boolean>] [-AnonymousLinkExpirationInDays <Int32>] [-OverrideTenantAnonymousLinkExpirationPolicy <Boolean>] [-SensitivityLabel <String>]
  [-RemoveLabel] [<CommonParameters>]
 ```
 
@@ -153,6 +153,14 @@ Set-SPOSite -Identity https://contoso.sharepoint.com/sites/research -RemoveInfor
 
 In example, InformationSegment 'a17efb47-e3c9-4d85-a188-1cd59c83de32' is removed from the site.
 
+### -----------------------EXAMPLE 10-----------------------------
+
+```powershell
+Set-SPOSite -Identity https://contoso.sharepoint.com/sites/research -ConditionalAccessPolicy AuthenticationContext -AuthenticationContextName "MFA"
+```
+
+In this example, an authentication context called MFA is attached to the site.
+
 ## PARAMETERS
 
 ### -EnablePWA
@@ -833,6 +841,7 @@ Possible values:
 - AllowFullAccess: Allows full access from desktop apps, mobile apps, and the web.
 - AllowLimitedAccess: Allows limited, web-only access.
 - BlockAccess: Blocks Access.
+- AuthenticationContext: Assign an Azure AD authentication context. Must add the AuthenticationContextName. Please read [Configure authentication contexts](/azure/active-directory/conditional-access/concept-conditional-access-cloud-apps#configure-authentication-contexts).
 
 
 ```yaml
@@ -848,9 +857,9 @@ Accept wildcard characters: False
 ```
 
 
-### -ProtectionLevelName
+### -AuthenticationContextName 
 
-The conditional access protection level name. For example "urn:microsoft:req1"
+The conditional access authentication context name.
 
 ```yaml
 Type: String