Merge pull request MicrosoftDocs#4317 from tomkau/master

Additional updates for batch and group policy assignment docs

Author: kenwith

teams/teams-ps/teams/Get-CsUserPolicyAssignment.md

@@ -18,26 +18,62 @@ This cmdlet is used to return the policy assignments for a user, both directly a
 ## SYNTAX
 
 ```
-Get-CsUserPolicyAssignment [-Identity <String>]
+Get-CsUserPolicyAssignment -Identity <String> [-PolicyType <String>]
 ```
 
 ## DESCRIPTION
-This cmdlets returns the effective policies for a user, based on either direct policy assignment or inheritance from a group policy assignment.  For a given policy type, if an effective policy is not returned, this indicates that the effective policy for the user  
+This cmdlets returns the effective policies for a user, based on either direct policy assignment or inheritance from a group policy assignment.  For a given policy type, if an effective policy is not returned, this indicates that the effective policy for the user is either the tenant global default policy (if set) or the system global default policy.
 
 This cmdlet does not currently support returning policies for multiple users.
 
 ## EXAMPLES
 
 ### Example 1
-This examples returns the policies for a user and indicates whether the policy is directly assigned to the user or was inherited from a group.
+This examples returns the policies that are either directly assigned to a user or that the user inherited from a group.
 
 ```
-Get-CsUserPolicyAssignment -Identity 1471bd98-0a32-4426-930d-d790de8a0a70
+Get-CsUserPolicyAssignment -Identity 3b90faad-9056-49ff-8357-0b53b1d45d39
 
-PolicyType            PolicyName             PolicySource
--------               ----------             ----------  
-TeamsMeetingPolicy    Host:AllOn             Group
-TeamsMessagingPolicy  Tenant:SalesMessaging  Direct
+PolicyName            PolicyType
+----------            ----------
+AllowCalling          TeamsCallingPolicy
+Employees Events      TeamsMeetingBroadcastPolicy
+Kiosk                 TeamsMeetingPolicy
+```
+
+### Example 2
+The PolicySource property can be expanded to show  more details for a particular policy type.  The PolicySource property indicates whether a particular policy was directly assigned to the user or inherited from a group.
+
+In this example, the details for the TeamsBroadcastMeetingPolicy are shown. The user was directly assigned the "Employees Events" policy, which took precedence over the "Vendor Live Events" policy which is assigned to a group that the user belongs to.
+
+```
+Get-CsUserPolicyAssignment -Identity 3b90faad-9056-49ff-8357-0b53b1d45d39 -PolicyType TeamsMeetingBroadcastPolicy | select -ExpandProperty PolicySource
+
+AssignmentType PolicyName         Reference
+-------------- ----------         ---------
+Direct         Employees Events
+Group          Vendor Live Events 566b8d39-5c5c-4aaa-bc07-4f36278a1b38
+```
+
+### Example 3
+In this example, the details for the TeamsMeetingPolicy are shown. The user is a member of two groups, each of which is assigned a TeamsMeetingPolicy.  The user has inherited the "AllOn" policy because the priority of the assignment is higher than that of the "Kiosk" policy assignment to the other group.
+
+```
+Get-CsUserPolicyAssignment -Identity 3b90faad-9056-49ff-8357-0b53b1d45d39 -PolicyType TeamsMeetingPolicy | select -ExpandProperty PolicySource
+
+AssignmentType PolicyName Reference
+-------------- ---------- ---------
+Group          AllOn      d8ebfa45-0f28-4d2d-9bcc-b158a49e2d17
+Group          Kiosk      566b8d39-5c5c-4aaa-bc07-4f36278a1b38
+
+
+Get-CsGroupPolicyAssignment -PolicyType TeamsMeetingPolicy
+
+GroupId                              PolicyName PolicyType         Priority
+-------                              ---------- ----------         --------
+d8ebfa45-0f28-4d2d-9bcc-b158a49e2d17 AllOn      TeamsMeetingPolicy 1
+566b8d39-5c5c-4aaa-bc07-4f36278a1b38 Kiosk      TeamsMeetingPolicy 2
+```
 
 ## PARAMETERS
 
@@ -56,6 +92,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -PolicyType
+Use to filter to a specific policy type.
+
+```yaml
+Type: String
+Parameter Sets:
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+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).

teams/teams-ps/teams/New-CsBatchPolicyAssignmentOperation.md

@@ -28,6 +28,9 @@ Users can be specified by their object ID (guid) or by their UPN/SIP/email (user
 
 A batch may contain up to 20,000 users.
 
+Batch policy assignment is currently limited to the following policy types:
+CallingLineIdentity, TeamsAppSetupPolicy, TeamsAppPermissionPolicy, TeamsCallingPolicy, TeamsCallParkPolicy, TeamsChannelsPolicy, TeamsEducationAssignmentsAppPolicy, TeamsMeetingBroadcastPolicy, TeamsMeetingPolicy, TeamsMessagingPolicy, TeamsUpdateManagementPolicy, TeamsUpgradePolicy,  TeamsVerticalPackagePolicy, TeamsVideoInteropServicePolicy, TenantDialPlan
+
 ## EXAMPLES
 
 ### Example 1

teams/teams-ps/teams/New-CsGroupPolicyAssignment.md

@@ -22,11 +22,14 @@ New-CsGroupPolicyAssignment -GroupId <String> -PolicyType <String> -PolicyName <
 ```
 
 ## DESCRIPTION
-This cmdlet will assign a policy to a group.  The group can be specified by object id or by email/SIP address.
+This cmdlet will assign a policy to a group.  The policy assignment will then be propagated to the members of the group in accordance with the rules for group policy inheritance.  If a user is directly assigned a policy of a specific type, then they will not inherit a policy of the same type from a group.  If a user is a member of two or more groups that each have a policy of the same type assigned, then the user will inherit the policy based on the group policy assignment with the highest priority.
 
-The priority is used to determine which policy a user should inherit as their effective policy if they are a member of two or more groups that each have a policy of the same type assigned (and the user has not been directly assigned a policy of the same type).
+The group policy assignment is set at the time a policy is being assigned to a group and is relative to other group policy assignments of the same policy type.  For example, if there are two groups, each assigned a Teams Meeting policy, then one of the group assignments will be priority 1 while the other will be priority 2.
 
-It’s helpful to think of priority as determining the position of each policy assignment in an ordered list, from highest priority to lowest priority.  In fact, priority can be specified as any number, but these are converted into sequential values 1, 2, 3, etc. with 1 being the highest priority.  When assigning a policy to a group, set the priority to be the position in the list where you want the new group policy assignment to be.  If a priority is not specified, the policy assignment will be given the lowest priority.
+It’s helpful to think of priority as determining the position of each policy assignment in an ordered list, from highest priority to lowest priority.  In fact, priority can be specified as any number, but these are converted into sequential values 1, 2, 3, etc. with 1 being the highest priority.  When assigning a policy to a group, set the priority to be the position in the list where you want the new group policy assignment to be.  If a priority is not specified, the policy assignment will be given the lowest priority, corresponding to the end of the list.
+
+Group policy assignment is currently limited to the following policy types:
+TeamsCallingPolicy, TeamsCallParkPolicy, TeamsEducationAssignmentsAppPolicy, TeamsMeetingBroadcastPolicy, TeamsMeetingPolicy, TeamsMessagingPolicy, TeamsUpdateManagementPolicy
 
 ## EXAMPLES