Merge branch 'master' into patch-216

chrisda · web-flow · commit 58ffe58564ea · 2020-09-08T10:45:27.000-07:00
diff --git a/exchange/exchange-ps/exchange/Get-ThrottlingPolicyAssociation.md b/exchange/exchange-ps/exchange/Get-ThrottlingPolicyAssociation.md
@@ -48,31 +48,24 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 
 ### Example 1
 ```powershell
-Get-ThrottlingPolicyAssociation -OrganizationalUnit Users
-```
-
-In Exchange Server 2010 and 2013, this example returns a list of all the mailboxes in your organization in the Users OU.
-
-### Example 2
-```powershell
 Get-ThrottlingPolicyAssociation -ResultSize unlimited
 ```
 
 This example retrieves a summary list of all throttling policy associations in your organization.
 
-### Example 3
+### Example 2
 ```powershell
 Get-ThrottlingPolicyAssociation -Anr Chr -DomainController DC01
 ```
 
 In Exchange Server 2010 and 2013, this example returns all the mailboxes that resolve from the ambiguous name resolution search on the string "Chr" that are in the domain DC01. This example returns mailboxes for users such as Chris Ashton, Christian Hess, and Christa Geller.
 
-### Example 4
+### Example 3
 ```powershell
-Get-Group -Identity "Courtney Sweet" | Format-List
+Get-ThrottlingPolicyAssociation -Identity "Courtney Sweet" | Format-List
 ```
 
-This example returns detailed information for the throttling policy association named Courtney Sweet that's associated with the user's mailbox.
+This example returns detailed information for the throttling policy association named Courtney Sweet.
 
 ## PARAMETERS
 
diff --git a/exchange/exchange-ps/exchange/New-SafeLinksPolicy.md b/exchange/exchange-ps/exchange/New-SafeLinksPolicy.md
@@ -100,7 +100,7 @@ Accept wildcard characters: False
 ```
 
 ### -AllowClickThrough
-This parameter is reserved for internal Microsoft use.
+This parameter has been deprecated. Use the DoNotAllowClickThrough parameter instead.
 
 ```yaml
 Type: Boolean
@@ -176,7 +176,7 @@ Accept wildcard characters: False
 ```
 
 ### -DoNotRewriteUrls
-The DoNotRewriteUrls parameter specifies a URL that's skipped by Safe Links scanning. You can specify multiple values separated by commas.
+The DoNotRewriteUrls parameter specifies the URLs that skip Safe Links scanning and are always allowed. You can specify multiple values separated by commas. Wildcards are supported (up to three).
 
 ```yaml
 Type: MultiValuedProperty
@@ -192,7 +192,7 @@ Accept wildcard characters: False
 ```
 
 ### -DoNotTrackUserClicks
-The DoNotTrackUserClicks parameter specifies whether to track user clicks related to links in email messages. Valid values are:
+The DoNotTrackUserClicks parameter specifies whether to track user clicks related to links in email messages and Microsoft Teams. Valid values are:
 
 - $true: User clicks aren't tracked.
 
@@ -212,7 +212,7 @@ Accept wildcard characters: False
 ```
 
 ### -EnableForInternalSenders
-The EnableForInternalSenders parameter specifies whether the Safe Links policy is applied to internal senders. Valid values are:
+The EnableForInternalSenders parameter specifies whether the Safe Links policy is applied to messages sent between internal senders and internal recipients within the same Exchange Online organization. Valid values are:
 
 - $true: The policy is applied to internal and external senders.
 
@@ -234,7 +234,7 @@ Accept wildcard characters: False
 ### -EnableSafeLinksForTeams
 The EnableSafeLinksForTeams parameter specifies whether Safe Links is enabled for Microsoft Teams. Valid values are:
 
-- $true: Safe Links is enabled for Teams.
+- $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.
 
 - $false: Safe Links isn't enabled for Teams. This is the default value.
 
@@ -252,7 +252,7 @@ Accept wildcard characters: False
 ```
 
 ### -ExcludedUrls
-The ExcludedUrls parameter specifies a URL that's skipped by Safe Links scanning. You can specify multiple values separated by commas.
+This parameter has been deprecated. Use the DoNotRewriteUrls parameter instead.
 
 ```yaml
 Type: String[]
@@ -308,7 +308,7 @@ Accept wildcard characters: False
 ```
 
 ### -TrackClicks
-This parameter is reserved for internal Microsoft use.
+This parameter has been deprecated. Use the DoNotTrackUserClicks parameter instead.
 
 ```yaml
 Type: Boolean
@@ -340,7 +340,7 @@ Accept wildcard characters: False
 ```
 
 ### -WhiteListedUrls
-This parameter is reserved for internal Microsoft use.
+This parameter has been deprecated. Use the DoNotRewriteUrls parameter instead.
 
 ```yaml
 Type: String
diff --git a/exchange/exchange-ps/exchange/Set-AtpPolicyForO365.md b/exchange/exchange-ps/exchange/Set-AtpPolicyForO365.md
@@ -77,11 +77,11 @@ Accept wildcard characters: False
 ```
 
 ### -AllowClickThrough
-The AllowClickThrough parameter specifies whether to allow users to click through to the original blocked URL in Office 365 ProPlus. Valid values are:
+The AllowClickThrough parameter specifies whether to allow users to click through to the original blocked URL in Office 365 apps on desktop, mobile, and web clients. Valid values are:
 
-- $true: Users are allowed to click through to the original URL. This is the default value.
+- $true: Users are allowed to click through to the original URL.
 
-- $false: Users aren't allowed to click through to the original URL.
+- $false: Users aren't allowed to click through to the original URL. This is the default value.
 
 ```yaml
 Type: Boolean
@@ -117,7 +117,7 @@ Accept wildcard characters: False
 ```
 
 ### -BlockUrls
-The BlockUrls parameter specifies the URLs that are always blocked by Safe Links scanning. You can specify multiple values separated by commas.
+The BlockUrls parameter specifies the URLs that are always blocked by Safe Links scanning in email messages, Microsoft Teams, and Office documents. You can specify multiple values separated by commas.
 
 ```yaml
 Type: MultiValuedProperty
@@ -193,11 +193,11 @@ Accept wildcard characters: False
 ```
 
 ### -EnableSafeLinksForO365Clients
-The EnableSafeLinksForO365Clients parameter specifies whether Safe Links is enabled for Microsoft 365 apps on desktop and mobile clients. Valid values are:
+The EnableSafeLinksForO365Clients parameter specifies whether Safe Links is enabled for Microsoft 365 apps on desktop, mobile, and web clients. Valid values are:
 
-- $true: Safe Links are enabled for Microsoft 365 desktop and mobile apps. This is the default value.
+- $true: Safe Links are enabled for Microsoft 365 desktop, mobile, and web apps. This is the default value.
 
-- $false: Safe Links are disabled for Microsoft 365 desktop and mobile apps.
+- $false: Safe Links are disabled for Microsoft 365 desktop, mobile, and web apps.
 
 ```yaml
 Type: Boolean
@@ -213,11 +213,11 @@ Accept wildcard characters: False
 ```
 
 ### -TrackClicks
-The TrackClicks parameter specifies whether to track user clicks related to blocked URLs. Valid values are:
+The TrackClicks parameter specifies whether to track user clicks related to blocked URLs in Office documents. Valid values are:
 
-- $true: User clicks are tracked. This is the default value.
+- $true: User clicks are tracked.
 
-- $false: User clicks aren't tracked.
+- $false: User clicks aren't tracked. This is the default value.
 
 ```yaml
 Type: Boolean
diff --git a/exchange/exchange-ps/exchange/Set-CalendarNotification.md b/exchange/exchange-ps/exchange/Set-CalendarNotification.md
@@ -15,7 +15,7 @@ monikerRange: "exchserver-ps-2010 || exchserver-ps-2013 || exchserver-ps-2016 ||
 ## SYNOPSIS
 This cmdlet is available in on-premises Exchange and in the cloud-based service. Some parameters and settings may be exclusive to one environment or the other.
 
-The Set-CalendarNotification cmdlet allows users to set text message notification options for calendar events in their own calendar. By default, the MyTextMessaging end-user role gives access to this cmdlet, so admins can't configure text messaging notification for calender events in user calendars.
+The Set-CalendarNotification cmdlet allows users to set text message notification options for calendar events in their own calendar. By default, the MyTextMessaging end-user role gives access to this cmdlet, so admins can't configure text messaging notification for calendar events in user calendars.
 
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
 
diff --git a/exchange/exchange-ps/exchange/Set-SafeLinksPolicy.md b/exchange/exchange-ps/exchange/Set-SafeLinksPolicy.md
@@ -100,7 +100,7 @@ Accept wildcard characters: False
 ```
 
 ### -AllowClickThrough
-This parameter is reserved for internal Microsoft use.
+This parameter has been deprecated. Use the DoNotAllowClickThrough parameter instead.
 
 ```yaml
 Type: Boolean
@@ -176,7 +176,7 @@ Accept wildcard characters: False
 ```
 
 ### -DoNotRewriteUrls
-The DoNotRewriteUrls parameter specifies a URL that's skipped by Safe Links scanning. You can specify multiple values separated by commas.
+The DoNotRewriteUrls parameter specifies the URLs that skip Safe Links scanning and are always allowed. You can specify multiple values separated by commas. Wildcards are supported (up to three).
 
 ```yaml
 Type: MultiValuedProperty
@@ -192,7 +192,7 @@ Accept wildcard characters: False
 ```
 
 ### -DoNotTrackUserClicks
-The DoNotTrackUserClicks parameter specifies whether to track user clicks related to links in email messages. Valid values are:
+The DoNotTrackUserClicks parameter specifies whether to track user clicks related to links in email messages and Microsoft Teams. Valid values are:
 
 - $true: User clicks aren't tracked.
 
@@ -212,7 +212,7 @@ Accept wildcard characters: False
 ```
 
 ### -EnableForInternalSenders
-The EnableForInternalSenders parameter specifies whether the Safe Links policy is applied to internal senders. Valid values are:
+The EnableForInternalSenders parameter specifies whether the Safe Links policy is applied to messages sent between internal senders and internal recipients within the same Exchange Online organization. Valid values are:
 
 - $true: The policy is applied to internal and external senders.
 
@@ -234,9 +234,9 @@ Accept wildcard characters: False
 ### -EnableSafeLinksForTeams
 The EnableSafeLinksForTeams parameter specifies whether Safe Links is enabled for Microsoft Teams. Valid values are:
 
-- $true: Safe Links is enabled for Teams.
+- $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.
+- $false: Safe Links isn't enabled for Teams. This is the default value.
 
 ```yaml
 Type: Boolean
@@ -252,7 +252,7 @@ Accept wildcard characters: False
 ```
 
 ### -ExcludedUrls
-The ExcludedUrls parameter has been deprecated. Use the DoNotRewriteUrls parameter instead. If you have any scripts that use the ExcludedUrls parameter, update them to use the DoNotRewriteUrls parameter.
+This parameter has been deprecated. Use the DoNotRewriteUrls parameter instead.
 
 ```yaml
 Type: String[]
@@ -272,7 +272,7 @@ The IsEnabled parameter specifies whether to rewrite URLs and check against a li
 
 - $true: Rewrite URLs and check against a list of known malicious links whenever a user clicks on a link.
 
-- $false: Don't rewrite URLs. This is the default value.
+- $false: Don't rewrite URLs and do not check links. This is the default value.
 
 ```yaml
 Type: Boolean
@@ -340,7 +340,7 @@ Accept wildcard characters: False
 ```
 
 ### -WhiteListedUrls
-The WhiteListedUrls parameter has been deprecated. Use the DoNotRewriteUrls parameter instead. If you have any scripts that use the WhiteListedUrls parameter, update them to use the DoNotRewriteUrls parameter.
+This parameter has been deprecated. Use the DoNotRewriteUrls parameter instead.
 
 ```yaml
 Type: String
diff --git a/teams/teams-ps/teams/New-CsGroupPolicyAssignment.md b/teams/teams-ps/teams/New-CsGroupPolicyAssignment.md
@@ -32,7 +32,7 @@ Group policy assignment allows you to easily manage policies across different su
 Group policy assignments are only propagated to users that are direct members of the group; the assignments are not propagated to members of nested groups.
 
 Group policy assignment is currently limited to the following policy types:
-CallingLineIdentity, OnlineVoiceRoutingPolicy, TeamsAppSetupPolicy, TeamsCallingPolicy, TeamsCallParkPolicy, TeamsChannelsPolicy, TeamsComplianceRecordingPolicy, TenantDialPlan, TeamsEducationAssignmentsAppPolicy, TeamsMeetingBroadcastPolicy, TeamsMeetingPolicy, TeamsMessagingPolicy, TeamsUpdateManagementPolicy.
+CallingLineIdentity (Caller ID policies), OnlineVoiceRoutingPolicy (Voice Routing policies), TeamsAppSetupPolicy (App Setup policies), TeamsCallingPolicy (Calling policies), TeamsCallParkPolicy (Call park policies), TeamsChannelsPolicy, TeamsComplianceRecordingPolicy, TenantDialPlan, TeamsEducationAssignmentsAppPolicy, TeamsMeetingBroadcastPolicy (Live Events policies), TeamsMeetingPolicy (Meeting policies), TeamsMessagingPolicy (Messaging policies), TeamsUpdateManagementPolicy.
 
 ## EXAMPLES
 
