Merge branch 'master' into patch-15

Author: kenwith

skype/skype-ps/skype/Get-CsTeamsInteropPolicy.md

@@ -11,13 +11,13 @@ schema: 2.0.0
 
 IMPORTANT: TeamsInteropPolicy has been replaced by TeamsUpgradePolicy. Please read description for more details. You can also find more guidance here: [Migration and interoperability guidance for organizations using Teams together with Skype for Business](https://docs.microsoft.com/en-us/microsoftteams/migration-interop-guidance-for-teams-with-skype).
 
-If TeamsUpgradePolicy has mode=Legacy, TeamsInteropPolicy  determines how calls are routed between Skype for Business and Microsoft Teams. Otherwise it is ignored.
+If TeamsUpgradePolicy has mode=Legacy, TeamsInteropPolicy  determines how calls are routed between Skype for Business and Microsoft Teams. *Otherwise TeamsInteropPolicy is ignored.* Granting TeamsUpgradePolicy with mode=Legacy is now blocked. Customers with exisitng configurations using Legacy mode must update their configuration to use a mode other than Legacy.
 
 
 ## SYNTAX
 
 ```
-Get-CsTeamsInteropPolicy [-LocalStore] [[-Identity] <Object>] [-Tenant <Object>] [-Filter <Object>] [-AsJob]
+Get-CsTeamsInteropPolicy  [-Identity] <Object>] [-Tenant <Object>] [-Filter <Object>] [-AsJob]
 ```
 
 ## DESCRIPTION
@@ -26,31 +26,7 @@ IMPORTANT: TeamsInteropPolicy has been replaced by TeamsUpgradePolicy. TeamsInte
 
 For any user that is still assigned TeamsInteropPolicy and in Legacy mode, these users must be assigned only one of these three built-in instances for which CallingDefaultClient = ChatDefaultClient, and for which AllowEndUserClientOverride = false. The other instances are not longer valid configurations, are not supported and will be removed. 
 
-The valid instances are:
 
-
-**Identity: DisallowOverrideCallingDefaultChatDefault**   
-**AllowEndUserClientOverride: False**   
-**CallingDefaultClient: Default**   
-**ChatDefaultClient: Default**
-
-**Identity: DisallowOverrideCallingSfbChatSfb**   
-**AllowEndUserClientOverride: False**   
-**CallingDefaultClient: Sfb**   
-**ChatDefaultClient: Sfb**
-
-**Identity: DisallowOverrideCallingTeamsChatTeams**   
-**AllowEndUserClientOverride: False**   
-**CallingDefaultClient: Teams**     
-**ChatDefaultClient: Teams**
-
-
-Use the following cmdlet syntax, where $policy is one of the above values of identity:
-`Grant-CsTeamsInteropPolicy -PolicyName $policy -Identity $SipAddress`
-
-
-If you customized the built-in global policy, undo this by running `Remove-CsTeamsInteropPolicy`. This will remove the tenant-specific global policy and revert back to the system-wide built-in policy (which cannot be removed). Use the following syntax:
-Remove-CsTeamsInteropPolicy -Identity Global
 
 For comprehensive documentation on this policy and its settings, see [Migration and interoperability guidance for organizations using Teams together with Skype for Business](https://docs.microsoft.com/en-us/microsoftteams/migration-interop-guidance-for-teams-with-skype).
 
@@ -59,10 +35,10 @@ For comprehensive documentation on this policy and its settings, see [Migration
 
 ### -------------------------- Example 1 --------------------------
 ```
-PS C:\> {{ Add example code here }}
+PS C:\> Get-CsTeamsInteropPolicy
 ```
 
-{{ Add example description here }}
+List all available instances of TeamsInteropPolicy.
 
 ## PARAMETERS
 
@@ -83,7 +59,7 @@ Accept wildcard characters: False
 ```
 
 ### -Identity
-{{Fill Identity Description}}
+The name of the policy instance
 
 ```yaml
 Type: Object
@@ -98,21 +74,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -LocalStore
-{{Fill LocalStore Description}}
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases: 
-Applicable: Skype for Business Online 
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
 
 ### -Tenant
 {{Fill Tenant Description}}

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

@@ -29,10 +29,9 @@ TeamsUpgradePolicy allows administrators to manage the transition from Skype for
 NOTES: 
   - Except for on-premise versions of Skype for Business Server, all relevant instances of TeamsUpgradePolicy are built into the system, so there is no corresponding New cmdlet. 
   - 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 are not yet functional. From a routing perspective, this will behave like SfBOnly mode.
-  - Action property is redundnant with the combination of NotifySfBUsers and Mode. It will eventually be removed.  
+  - 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.
+IMPORTANT: TeamsUpgradePolicy has replaced TeamsInteropPolicy. Components that previously honored TeamsInteropPolicy have been updated to honor TeamsUpgradePolicy instead. Do not use TeamsInteropPolicy.
 
 
 ## EXAMPLES
@@ -45,25 +44,21 @@ Identity       : Global
 Description    : Users can use either Skype for Business client or Teams client
 Mode           : Islands
 NotifySfbUsers : False
-Action         : None
 
 Identity       : Tag:NoUpgrade
 Description    : Users can use either Skype for Business client or Teams client
 Mode           : Legacy
 NotifySfbUsers : False
-Action         : None
 
 Identity       : Tag:NotifyForTeams
 Description    : Show notification of pending upgrade in Skype for Business client
 Mode           : Legacy
 NotifySfbUsers : True
-Action         : Notify
 
 Identity       : Tag:UpgradeToTeams
 Description    : Use Teams Only
 Mode           : TeamsOnly
 NotifySfbUsers : False
-Action         : Upgrade
 
 Identity       : Tag:Islands
 Description    : Use either Skype for Business client or Teams client
@@ -75,32 +70,36 @@ Identity       : Tag:IslandsWithNotify
 Description    : Use either Skype for Business client or Teams client
 Mode           : Islands
 NotifySfbUsers : True
-Action         : Notify
 
 Identity       : Tag:SfBOnly
 Description    : Use only Skype for Business
 Mode           : SfBOnly
 NotifySfbUsers : False
-Action         : None
 
 Identity       : Tag:SfBOnlyWithNotify
 Description    : Use only Skype for Business
 Mode           : SfBOnly
 NotifySfbUsers : True
-Action         : Notify
 
 Identity       : Tag:SfBWithTeamsCollab
 Description    : Use Skype for Business and use Teams only for group collaboration
 Mode           : SfBWithTeamsCollab
 NotifySfbUsers : False
-Action         : None
 
 Identity       : Tag:SfBWithTeamsCollabWithNotify
 Description    : Use Skype for Business and use Teams only for group collaboration
 Mode           : SfBWithTeamsCollab
 NotifySfbUsers : True
-Action         : Notify
 
+Identity       : Tag:SfBWithTeamsCollabAndMeetings
+Description    : Use Skype for Business and use Teams only for group collaboration
+Mode           : SfBWithTeamsCollabAndMeetings
+NotifySfbUsers : False
+
+Identity       : Tag:SfBWithTeamsCollabAndMeetingsWithNotify
+Description    : Use Skype for Business and use Teams only for group collaboration
+Mode           : SfBWithTeamsCollabAndMeetings
+NotifySfbUsers : True
 ```
 
 List all instances of TeamsUpgradePolicy
@@ -114,7 +113,6 @@ Identity       : Global
 Description    : Users can use either Skype for Business client or Teams client
 Mode           : Islands
 NotifySfbUsers : False
-Action         : None
 
 ```
 
@@ -165,21 +163,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -LocalStore
-Do Not Use
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases: 
-Applicable: Skype for Business Online, Skype for Business Server 2019
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
 
 ### -Tenant
 {{Fill Tenant Description}}

skype/skype-ps/skype/Grant-CsTeamsInteropPolicy.md

@@ -9,9 +9,9 @@ schema: 2.0.0
 
 ## SYNOPSIS
 
-IMPORTANT: TeamsInteropPolicy has been replaced by TeamsUpgradePolicy. See description for more information. You can also find more guidance here: https://docs.microsoft.com/en-us/MicrosoftTeams/migration-interop-guidance-for-teams-with-skype
+IMPORTANT: TeamsInteropPolicy has been replaced by TeamsUpgradePolicy. See description for more information. You can also find more guidance here: [Migration and interoperability guidance for organizations using Teams together with Skype for Business](https://docs.microsoft.com/en-us/MicrosoftTeams/migration-interop-guidance-for-teams-with-skype).
 
-This cmdlet previously determined how calls are routed between Skype for Business and Microsoft Teams. It is no longer honored, except if TeamsUpgradePolicy mode=Legacy. However, Legacy mode has been deprecated and customers should update their configurations to use a mode other than Legacy.
+This cmdlet previously determined how calls are routed between Skype for Business and Microsoft Teams. It is no longer honored, except if TeamsUpgradePolicy mode=Legacy. However, Legacy mode has been deprecated and can no longer be granted.  Any customers with user or tenant policy using Legacy mode must update their configurations to use a mode other than Legacy.
 
 
 ## SYNTAX
@@ -23,30 +23,8 @@ Grant-CsTeamsInteropPolicy [-PassThru] [-Confirm] [[-PolicyName] <Object>] [[-Id
 
 ## DESCRIPTION
 
-IMPORTANT: TeamsInteropPolicy has been replaced by TeamsUpgradePolicy. It is no longer honored by the system, except if TeamsUpgradePolicy has mode=Legacy.  Legacy mode is being deprecated. Customers that are still using Legacy mode should update their configurations to use a mode other than Legacy.  Granting mode=Legacy is now blocked by default, although admins can override this using -Force for the time being. Eventually, the -Force switch will be removed and granting mode=Legacy will not be possible.
+IMPORTANT: TeamsInteropPolicy has been replaced by TeamsUpgradePolicy. It is no longer honored by the system, except if TeamsUpgradePolicy has mode=Legacy. However, Legacy mode has been deprecated. Granting mode=Legacy is now blocked. Customers that are still using Legacy mode must update their configurations to use a mode other than Legacy.  
 
-Any customers still using Legacy mode must ensure the following:
-
- - The global policy must have CallingDefaultClient=ChatDefaultClient, and AllowEndUserClientOverride must be false.  If you customized the built-in global policy, undo this by running `Remove-CsTeamsInteropPolicy`. This will remove the tenant-specific global policy and revert back to the system-wide built-in policy (which cannot be removed). Use the following syntax: `Remove-CsTeamsInteropPolicy -Identity Global`.
-
- - If TeamsInteropPolicy is explicitly assigned to any users, one of these three built-in instances for which CallingDefaultClient = ChatDefaultClient, and for which AllowEndUserClientOverride = false. The other instances are no longer valid configurations, are not supported, and will soon be removed from the system.  The valid instances are:
-
-**Identity: DisallowOverrideCallingDefaultChatDefault**   
-**AllowEndUserClientOverride: False**   
-**CallingDefaultClient: Default**   
-**ChatDefaultClient: Default**
-
-**Identity: DisallowOverrideCallingSfbChatSfb**   
-**AllowEndUserClientOverride: False**   
-**CallingDefaultClient: Sfb**   
-**ChatDefaultClient: Sfb**
-
-**Identity: DisallowOverrideCallingTeamsChatTeams**   
-**AllowEndUserClientOverride: False**   
-**CallingDefaultClient: Teams**     
-**ChatDefaultClient: Teams**
-
-Use the following cmdlet syntax, where $policy is one of the above values of identity: `Grant-CsTeamsInteropPolicy -PolicyName $policy -Identity $SipAddress`.
 
 For comprehensive documentation on this policy and its settings, see [Microsoft Teams and Skype for Business Interoperability](https://docs.microsoft.com/MicrosoftTeams/teams-and-skypeforbusiness-interoperability).
 
@@ -57,19 +35,6 @@ For comprehensive documentation on this policy and its settings, see [Microsoft
 Grant-CsTeamsInteropPolicy -PolicyName DisallowOverrideCallingDefaultChatDefault -Identity [email protected]
 ```
 
-**Default Policy**
-
-By default, Microsoft Teams is configured to ensure that existing Skype for Business and Microsoft Teams calling workloads remain distinct and separate. 
-This is a safe configuration for organizations just beginning to experiment with Teams Calling.
-
-### -------------------------- Example 2 --------------------------
-```
-Grant-CsTeamsInteropPolicy -PolicyName DisallowOverrideCallingTeamsChatTeams -Identity [email protected]
-```
-
-**Policy to enable all inbound calls and chats to be routed to Microsoft Teams (assumed Mode=Legacy)**
-
-Users who have calling plans and would like to receive their calls in Microsoft Teams can have their calls routed to Teams.
 
 
 ## PARAMETERS
@@ -90,21 +55,7 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -DomainController
-{{Fill DomainController Description}}
-
-```yaml
-Type: Object
-Parameter Sets: (All)
-Aliases: 
-Applicable: Skype for Business Online 
 
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
 
 ### -Identity
 For this cmdlet, the full UserPrincipalName/SIP address is required. If you don't provide the full UPN/SIP and instead provide an Alias, the cmdlet can throw an "Object reference not set to an instance of an object" error.
@@ -122,33 +73,33 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -PassThru
-{{Fill PassThru Description}}
+### -PolicyName
+{{Fill PolicyName Description}}
 
 ```yaml
-Type: SwitchParameter
+Type: Object
 Parameter Sets: (All)
 Aliases: 
 Applicable: Skype for Business Online 
 
 Required: False
-Position: Named
+Position: 1
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -PolicyName
-{{Fill PolicyName Description}}
+### -PassThru
+{{Fill PassThru Description}}
 
 ```yaml
-Type: Object
+Type: SwitchParameter
 Parameter Sets: (All)
 Aliases: 
 Applicable: Skype for Business Online 
 
 Required: False
-Position: 1
+Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
@@ -212,7 +163,7 @@ Accept wildcard characters: False
 ### System.Object
 
 ## NOTES
-This policy has been deprecated. Customers should use TeamsUpgradePolicy to control interop and routing.
+This policy has been deprecated and should not be used. Instead, customers should use TeamsUpgradePolicy to control interop and routing.
 
 ## RELATED LINKS