Merge branch 'master' into chrisda

Author: chrisda

skype/skype-ps/skype/Get-CsTeamsUpgradePolicy.md

@@ -31,7 +31,7 @@ NOTES:
   - If you are using Skype for Business Server, there are no built-in instances and you'll need to create one. Also, only the NotifySfBUsers property is available. Mode is not present
   - Instances with mode set to SfBWithTeamsCollab and SfBWithTeamsCollabAndMeetings are not yet fully functional. From a routing perspective, they will behave like SfBOnly mode.
 
-IMPORTANT: TeamsUpgradePolicy has replaced TeamsInteropPolicy. Components that previously honored TeamsInteropPolicy have been updated to honor TeamsUpgradePolicy instead. Do not use TeamsInteropPolicy.
+IMPORTANT: TeamsUpgradePolicy has replaced TeamsInteropPolicy. Components that previously honored TeamsInteropPolicy have been updated to honor TeamsUpgradePolicy instead. Do not use TeamsInteropPolicy. In addition, Legacy mode in TeamsUpgradePolicy has been retired.
 
 
 ## EXAMPLES
@@ -45,16 +45,6 @@ Description    : Users can use either Skype for Business client or Teams client
 Mode           : Islands
 NotifySfbUsers : False
 
-Identity       : Tag:NoUpgrade
-Description    : Users can use either Skype for Business client or Teams client
-Mode           : Legacy
-NotifySfbUsers : False
-
-Identity       : Tag:NotifyForTeams
-Description    : Show notification of pending upgrade in Skype for Business client
-Mode           : Legacy
-NotifySfbUsers : True
-
 Identity       : Tag:UpgradeToTeams
 Description    : Use Teams Only
 Mode           : TeamsOnly

skype/skype-ps/skype/Grant-CsTeamsUpgradePolicy.md

@@ -23,7 +23,7 @@ TeamsUpgradePolicy allows administrators to manage the transition from Skype for
 This cmdlet enables admins to apply TeamsUpgradePolicy to either individual users or to set the default for the entire organization. TeamsUpgradePolicy can be granted either on a per user basis or on a tenant-wide basis.  
 
 
-IMPORTANT:  TeamsUpgradePolicy has replaced TeamsInteropPolicy. Components that previously honored TeamsInteropPolicy have been fully updated to honor TeamsUpgradePolicy instead. TeamsInteropPolicy is not honored, except if TeamsUpgradePolicy mode=Legacy. However, Legacy mode has been deprecated and it is no longer possible to grant TeamsUpgradePolicy with mode=Legacy. Organizations with users in Legacy mode must update their configurations to use a different mode.
+IMPORTANT:  TeamsUpgradePolicy has replaced TeamsInteropPolicy. Components that previously honored TeamsInteropPolicy have been fully updated to honor TeamsUpgradePolicy instead. TeamsInteropPolicy is not honored and has been been deprecated. Organizations with users in Legacy mode must update their configurations to use a different mode.
 
 
 
@@ -43,8 +43,6 @@ Office 365 provides all relevant instances of TeamsUpgradePolicy via built-in, r
 |SfBWithTeamsCollabWithNotify|SfBWithTeamsCollabAndMeetings|True|This mode exists at the PowerShell layer but is not yet exposed in the admin user experience. From a routing perspective, this is the same as SfBOnly mode. When TeamsAppPermissionsPolicy is available, this will allow Channels and meeting scheduling in Teams app.|
 |UpgradeToTeams|TeamsOnly|False|Use this mode to upgrade users to Teams and to prevent chat, calling, and meeting scheduling in Skype for Business.|
 |Global|Islands|False||
-|NoUpgrade|Legacy|False|This instance is deprecated and it is no longer possible to grant this. Organizations that have already granted this instance must update their configuration to use a difference policy instance.|
-|NotifyForTeams|Legacy|True|This instance is deprecated and it is no longer possible to grant this. Organizations that have already granted this instance must update their configuration to use a difference policy instance.|
 |||||
 
 
@@ -57,7 +55,7 @@ NOTES:
     - Coexistence mode is honored by users homed on-premises, however on-premises users cannot be granted the UpgradeToTeams instance (mode=TeamsOnly) of TeamsUpgradePolicy.  Users must be either homed in Skype for Business Online or have no Skype account anywhere to be upgraded to TeamsOnly mode.    
     - The NotifySfBUsers setting of Office 365 TeamsUpgradePolicy is not honored by users homed on-premises. Instead, the on-premises version of TeamsUpgradePolicy must be used. 
 - In Office 365, all relevant instances of TeamsUpgradePolicy are built into the system, so there is no corresponding New cmdlet available. In contrast, Skype for Business Server does not contain built-in instances, so the New cmdlet is available on-premises.  Only NotifySfBUsers property is available in on-premises.
-- Instances with mode set to SfBWithTeamsCollab and SfBWithTeamsCollabAndMeetings are not yet functional. From a routing perspective, this will behave like SfBOnly mode.
+- Instances with mode set to SfBWithTeamsCollab and SfBWithTeamsCollabAndMeetings are not yet fully functional in terms of changing Teams client UX. From a routing perspective, this will behave like SfBOnly mode.
 
 
 ## EXAMPLES
@@ -159,9 +157,10 @@ Accept wildcard characters: False
 
 ## NOTES
 
-TeamsInteropPolicy has been replaced by TeamsUpgradePolicy. All components that previously honored TeamsInteropPolicy have been updated to honor TeamsUpgradePolicy instead. TeamsInteropPolicy is no longer honored and should not be used.
+Legacy mode in TeamsUprgradePolicy has been deprecated and it is no longer possible to grant legacy mode. Customers using Legacy mode must update their configuration of TeamsUpgradePolicy to use one of the other modes.
+
+TeamsInteropPolicy has been replaced by TeamsUpgradePolicy. All components that previously honored TeamsInteropPolicy have been updated to honor TeamsUpgradePolicy instead. TeamsInteropPolicy is no longer honored and should not be used for routing.
 
-Microsoft previously introduced the “Legacy” mode in TeamsUpgradePolicy to facilitate the transition from TeamsInteropPolicy to TeamsUpgradePolicy. In Legacy mode, routing components that understood TeamsUpgradePolicy would revert back to TeamsInteropPolicy. Routing now fully supports TeamsUpgradePolicy and there is no further need to use Legacy mode. Legacy mode in TeamsUprgradePolicy has been deprecated and it is no longer possible to grant legacy mode. Customers using Legacy mode must update their configuration of TeamsUpgradePolicy to use one of the other modes.
 
 
 

skype/skype-ps/skype/Set-CsTeamsCallingPolicy.md

@@ -18,15 +18,15 @@ Use this cmdlet to update values in existing Teams Calling Policies.
 ```
 Set-CsTeamsCallingPolicy [-Tenant <System.Guid>] [-AllowCalling <Boolean>] [-AllowPrivateCalling <Boolean>]
  [-AllowVoicemail <String>] [-AllowCallGroups <Boolean>] [-AllowDelegation <Boolean>]
- [-AllowUserControl <Boolean>] [-AllowCallForwardingToUser <Boolean>] [-AllowCallForwardingToPhone <Boolean>]
+  [-AllowCallForwardingToUser <Boolean>] [-AllowCallForwardingToPhone <Boolean>]
  [-PreventTollBypass <Boolean>] [[-Identity] <XdsIdentity>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### Instance
 ```
 Set-CsTeamsCallingPolicy [-Tenant <System.Guid>] [-AllowCalling <Boolean>] [-AllowPrivateCalling <Boolean>]
  [-AllowVoicemail <String>] [-AllowCallGroups <Boolean>] [-AllowDelegation <Boolean>]
- [-AllowUserControl <Boolean>] [-AllowCallForwardingToUser <Boolean>] [-AllowCallForwardingToPhone <Boolean>]
+  [-AllowCallForwardingToUser <Boolean>] [-AllowCallForwardingToPhone <Boolean>]
  [-PreventTollBypass <Boolean>] [-Instance <PSObject>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -185,7 +185,7 @@ Accept wildcard characters: False
 ```
 
 ### -AllowCallForwardingToUser
-{{Fill AllowCallForwardingToUser Description}}
+Enables call forwarding or simultaneous ringing of inbound calls to other users
 
 ```yaml
 Type: Boolean
@@ -200,7 +200,7 @@ Accept wildcard characters: False
 ```
 
 ### -AllowCallGroups
-{{Fill AllowCallGroups Description}}
+Enables inbound calls to be routed to call groups 
 
 ```yaml
 Type: Boolean
@@ -215,22 +215,7 @@ Accept wildcard characters: False
 ```
 
 ### -AllowDelegation
-{{Fill AllowDelegation Description}}
-
-```yaml
-Type: Boolean
-Parameter Sets: (All)
-Aliases:
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### -AllowUserControl
-{{Fill AllowUserControl Description}}
+Enables inbound calls to be routed to delegates; allows delegates to make outbound calls on behalf of the users for whom they have delegated permissions.
 
 ```yaml
 Type: Boolean
@@ -245,7 +230,7 @@ Accept wildcard characters: False
 ```
 
 ### -AllowVoicemail
-{{Fill AllowVoicemail Description}}
+Enables inbound calls to be routed to voice mail.  Valid options are: AlwaysEnabled, AlwaysDisabled, UserOverride
 
 ```yaml
 Type: String
@@ -260,7 +245,7 @@ Accept wildcard characters: False
 ```
 
 ### -PreventTollBypass
-{{Fill PreventTollBypass Description}}
+Setting this parameter to True will send calls through PSTN and incur charges rather than going through the network and bypassing the tolls. 
 
 ```yaml
 Type: Boolean

skype/skype-ps/skype/skype.md

@@ -20,7 +20,7 @@ zh-TW Version: 17.0.15229.2100
 
 # Skype for Business PowerShell
 ## Description
-The following cmdlet references are for Skype for Business and Microsoft Teams.
+The following cmdlet references are for Skype for Business and Microsoft Teams. You can find information on installing the module for Skype for Business Online here: https://docs.microsoft.com/office365/enterprise/powershell/manage-skype-for-business-online-with-office-365-powershell. If you are using Skype for Business Server then the cmdlets are available in the Skype for Business Server Management Shell and you can find information about it here: https://docs.microsoft.com/skypeforbusiness/manage/management-shell.
 
 ## Skype for Business Cmdlets
 ### [New-CSOnlinePSTNGateway](New-CSOnlinePSTNGateway.md)