Merge branch 'master' into chrisda

chrisda · chrisda · commit 03c47d9a8e77 · 2018-10-12T13:01:04.000-07:00
diff --git a/skype/skype-ps/skype/Get-CsTeamsInteropPolicy.md b/skype/skype-ps/skype/Get-CsTeamsInteropPolicy.md
@@ -9,11 +9,9 @@ schema: 2.0.0
 
 ## SYNOPSIS
 
-IMPORTANT: TeamsInteropPolicy is being replaced by TeamsUpgradePolicy. Please read description for more details. 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. 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).
 
-This cmdlet determines how calls are routed between Skype for Business and Microsoft Teams. This cmdlet is typically used by organizations that have users on both Skype for Business and Microsoft Teams and want to configure how calls are handled in their organization.
-
-Note: This document is provided for early evaluation of Calling Plans support for Microsoft Teams. TeamsInteropPolicy does not currently respect the policy’s chat settings, and the current implementation may change in the future.
+If TeamsUpgradePolicy has mode=Legacy, TeamsInteropPolicy  determines how calls are routed between Skype for Business and Microsoft Teams. Otherwise it is ignored.
 
 
 ## SYNTAX
@@ -24,9 +22,9 @@ Get-CsTeamsInteropPolicy [-LocalStore] [[-Identity] <Object>] [-Tenant <Object>]
 
 ## DESCRIPTION
 
-IMPORTANT: TeamsInteropPolicy is being replaced by TeamsUpgradePolicy. During the transition, some components will honor TeamsInteropPolicy while others honor TeamsUpgradePolicy. Therefore, use of these two policies must be coordinated during the transition. After the transition is complete, TeamsInteropPolicy will be removed. To prepare for these upcoming changes, customers should do the following:
- 
-Ensure that users with TeamsInteropPolicy are assigned only one of these three built-in instances for which CallingDefaultClient = ChatDefaultClient, and for which AllowEndUserClientOverride = false. The other instances are no longer valid configurations and will not be supported. 
+IMPORTANT: TeamsInteropPolicy has been replaced by TeamsUpgradePolicy. TeamsInteropPolicy is only honored if TeamsUpgradePolicy mode=Legacy.  However, Legacy mode has been deprecated and TeamsInteropPolicy will be removed in the near future.  Any customer still using TeamsUpgradePolicy with mode=Legacy must update their configuration of TeamsUpgradePolicy to use a different mode.
+
+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:
 
@@ -54,28 +52,7 @@ Use the following cmdlet syntax, where $policy is one of the above values of ide
 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
  
-Grant TeamsInteropPolicy and TeamsUpgradePolicy together as noted below to manage users:
- 
-- Coordinate granting of TeamsUpgradePolicy and TeamsInteropPolicy:
-
-
-    **Grant instance of TeamsUpgradePolicy using mode: Islands**  
-    **Grant instance of TeamsInteropPolicy: DisallowOverrideCallingDefaultChatDefault**
-
-    **Grant instance of TeamsUpgradePolicy using mode: SfBonly, SfBWithTeamsCollab**  
-    **Grant instance of TeamsInteropPolicy: DisallowOverrideCallingSfbChatSfb**
-
-    **Grant instance of TeamsUpgradePolicy using mode: TeamsOnly**    
-    **Grant instance of TeamsInteropPolicy: DisallowOverrideCallingTeamsChatTeams**
-
-
-In particular, if you grant the TeamsUpgradePolicy instance “UpgradeToTeams” (Mode =TeamsOnly) to any user, you must also grant the DisallowOverrideCallingTeamsChatTeams instance of TeamsInteropPolicy to ensure that the user can receive chats and calls.
-
-Interoperability (interop for short) enables Skype for Business and Teams users to chat and call with one another, ensuring that communications remain fluid across your organization. This policy helps IT pros manage the adoption of Teams by determining how to route calls across apps and whether to enable users to choose which app to use for calling. Teams interop policy can be defined at the tenant or per-user level.
-
-Teams interop policy can be configured to keep voice communications in Teams and Skype for Business siloed, or it can be configured to enable users to communicate across application boundaries.
-
-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).
+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).
 
 
 ## EXAMPLES
@@ -178,26 +155,10 @@ Accept wildcard characters: False
 ### System.Object
 
 ## NOTES
-
-**External Calling Support**
-Calls from external callers on PSTN is only available for users who have been provisioned with a Calling Plan.
-
-**Supported Topologies**
-Interoperability between Teams and Skype for Business is supported between users who are purely online (Skype for Business Online and Teams) and users homed in a Skype for Business on-premises deployment in a mixed (Hybrid) deployment topology.
-
-**Hybrid Voice is not supported at this time**
-Interop support for Skype for Business Hybrid does not include Hybrid Voice capabilities delivered through CCE (Cloud Connector Edition) or on-premises PSTN connectivity using existing deployment--commonly called OPCH (On Prem Config Hybrid). 
-Teams users cannot be enabled for PSTN calling capabilities using CCE or OPCH.
-
-**IP Phone Support**
-Currently, changing CallingDefaultClient to Teams will also affect calls to Skype for Business IP phones. 
-Incoming calls will not be received on the phones and will only ring Teams clients. 
-Please consult the [Skype for Business to Microsoft Teams Capabilities Roadmap](https://aka.ms/skype2teamsroadmap) for information about support for existing certified SIP phones.
+TeamsInteropPolicy has been replaced by TeamsUpgradePolicy. It is not honored except if TeamsUpgradePolicy mode=Legacy. Legacy mode is being deprecated so customers should update their configuration of TeamsUpgradePolicy to use modes other than Legacy. 
 
 
 ## RELATED LINKS
 
-[Skype for Business to Microsoft Teams Capabilities Roadmap](https://aka.ms/skype2teamsroadmap)
-
-[Microsoft Teams and Skype for Business Interoperability](https://docs.microsoft.com/MicrosoftTeams/teams-and-skypeforbusiness-interoperability)
+[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)
 
diff --git a/skype/skype-ps/skype/Get-CsTeamsUpgradePolicy.md b/skype/skype-ps/skype/Get-CsTeamsUpgradePolicy.md
@@ -8,7 +8,7 @@ schema: 2.0.0
 # Get-CsTeamsUpgradePolicy
 
 ## SYNOPSIS
-TeamsUpgradePolicy allows administrators to manage the transition from Skype for Business to Teams. IMPORTANT:  TeamsUpgradePolicy will replace TeamsInteropPolicy.  Aspects of TeamsUpgradePolicy are still in preview mode as described below.
+TeamsUpgradePolicy allows administrators to manage the transition from Skype for Business to Teams. IMPORTANT:  TeamsUpgradePolicy has replaced TeamsInteropPolicy.  However, aspects of TeamsUpgradePolicy are still in preview mode as described below.
 
 
 ## SYNTAX
@@ -34,7 +34,7 @@ NOTES:
   - 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.  
 
-IMPORTANT:  TeamsUpgradePolicy will replace TeamsInteropPolicy. Components that previously honored TeamsInteropPolicy are being updated to honor TeamsUpgradePolicy instead. During the transition, use of these 2 policies must be coordinated during the transition. After transition is complete, TeamsInteorpPolicy will be removed.
+IMPORTANT:  TeamsUpgradePolicy has replaced TeamsInteropPolicy. Components that previously honored TeamsInteropPolicy have been updated to honor TeamsUpgradePolicy instead.
 
 
 ## EXAMPLES
diff --git a/skype/skype-ps/skype/Grant-CsTeamsInteropPolicy.md b/skype/skype-ps/skype/Grant-CsTeamsInteropPolicy.md
@@ -9,11 +9,10 @@ schema: 2.0.0
 
 ## SYNOPSIS
 
-IMPORTANT: TeamsInteropPolicy is being 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: https://docs.microsoft.com/en-us/MicrosoftTeams/migration-interop-guidance-for-teams-with-skype
 
-This cmdlet determines how calls are routed between Skype for Business and Microsoft Teams. This cmdlet is typically used by organizations that have users on both Skype for Business and Microsoft Teams and want to configure how calls are handled in their organization.
+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.
 
-Note: This document is provided for early evaluation of Calling Plans support for Microsoft Teams. TeamsInteropPolicy does not currently respect the policy’s chat settings, and the current implementation may change in the future.
 
 ## SYNTAX
 
@@ -24,11 +23,14 @@ Grant-CsTeamsInteropPolicy [-PassThru] [-Confirm] [[-PolicyName] <Object>] [[-Id
 
 ## DESCRIPTION
 
-IMPORTANT: TeamsInteropPolicy is being replaced by TeamsUpgradePolicy. During the transition, some components will honor TeamsInteropPolicy while others honor TeamsUpgradePolicy. Therefore, use of these two policies must be coordinated during the transition. After the transition is complete, TeamsInteropPolicy will be removed. To prepare for these upcoming changes, customers should do the following:
+IMPORTANT: TeamsInteropPolicy has been replaced by TeamsUpgradePolicy. It is no longer honored by the system, except if TeamsUpgradePolicy has mode=Lgeacy.  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.
+
+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:
  
-Ensure that users with TeamsInteropPolicy are assigned only one of these three built-in instances for which CallingDefaultClient = ChatDefaultClient, and for which AllowEndUserClientOverride = false. The other instances are no longer valid configurations and will not be supported. 
+Remove-CsTeamsInteropPolicy -Identity Global
 
-The valid instances are:
+ - 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**   
@@ -51,30 +53,6 @@ Use the following cmdlet syntax, where $policy is one of the above values of ide
 `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
- 
-Grant TeamsInteropPolicy and TeamsUpgradePolicy together as noted below to manage users:
- 
-- Coordinate granting of TeamsUpgradePolicy and TeamsInteropPolicy:
-
-
-    **Grant instance of TeamsUpgradePolicy using mode: Islands**  
-    **Grant instance of TeamsInteropPolicy: DisallowOverrideCallingDefaultChatDefault**
-
-    **Grant instance of TeamsUpgradePolicy using mode: SfBonly, SfBWithTeamsCollab**  
-    **Grant instance of TeamsInteropPolicy: DisallowOverrideCallingSfbChatSfb**
-
-    **Grant instance of TeamsUpgradePolicy using mode: TeamsOnly**    
-    **Grant instance of TeamsInteropPolicy: DisallowOverrideCallingTeamsChatTeams**
-
-In particular, if you grant the TeamsUpgradePolicy instance “UpgradeToTeams” (Mode =TeamsOnly) to any user, you must also grant the DisallowOverrideCallingTeamsChatTeams instance of TeamsInteropPolicy to ensure that the user can receive chats and calls.
-
-
-Interoperability (interop for short) enables Skype for Business and Teams users to chat and call with one another, ensuring that communications remain fluid across your organization. This policy helps IT pros manage the adoption of Teams by determining how to route calls across apps and whether to enable users to choose which app to use for calling. Teams interop policy can be defined at the tenant or per-user level.
-
-Teams interop policy can be configured to keep voice communications in Teams and Skype for Business siloed, or it can be configured to enable users to communicate across application boundaries.
-
 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).
 
 ## EXAMPLES
@@ -94,34 +72,11 @@ This is a safe configuration for organizations just beginning to experiment with
 Grant-CsTeamsInteropPolicy -PolicyName DisallowOverrideCallingTeamsChatTeams -Identity user@contoso.com
 ```
 
-**Policy to enable all inbound calls to be routed to Microsoft Teams**
+**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.
 
 
-### -------------------------- Example 3 --------------------------
-```
-Grant-CsTeamsInteropPolicy -PolicyName AllowOverrideCallingDefaultChatTeams -Identity user@contoso.com
-```
-
-**Enabling users to choose what app to use to receive calls**
-
-TeamsInteropPolicy supports the ability for IT administrators to grant end users the choice of what app to use to receive calls through *AllowEndUserClientOverride*. 
-When enabled, this setting will display end-user settings in Microsoft Teams, enabling the user to choose either Microsoft Teams or Skype for Business as their preferred calling client. 
-When selected, the change immediately re-routes calls to the app of choice.
-
-
-### -------------------------- Example 4 --------------------------
-```
-Grant-CsTeamsInteropPolicy -PolicyName DisallowOverrideCallingDefaultChatDefault -Identity user@contoso.com
-```
-
-**Policy for Skype for Business on-premises or Hybrid Voice (CCE or OPCH) users**
-
-Skype for Business on-premises users and Hybrid Voice users should never have their TeamsInteropPolicy configured to receive calls exclusively in Teams. 
-If they do, they will be unable to receive calls. This example is used for on-premises users.
-
-
 ## PARAMETERS
 
 ### -Confirm
@@ -262,26 +217,9 @@ Accept wildcard characters: False
 ### System.Object
 
 ## NOTES
-
-**External Calling Support**
-Calls from external callers on PSTN is only available for users who have been provisioned with a Calling Plan.
-
-**Supported Topologies**
-Interoperability between Teams and Skype for Business is supported between users who are purely online (Skype for Business Online and Teams), and users homed in a Skype for Business on-premises deployment in a mixed (Hybrid) deployment topology.
-
-**Hybrid Voice is not supported at this time**
-Interop support for Skype for Business Hybrid does not include Hybrid Voice capabilities delivered through CCE (Cloud Connector Edition) or on-premises PSTN connectivity using existing deployment--commonly called OPCH (On Prem Config Hybrid). 
-Teams users cannot be enabled for PSTN calling capabilities using CCE or OPCH.
-
-**IP Phone Support**
-Currently, changing CallingDefaultClient to Teams will also affect calls to Skype for Business IP phones. 
-Incoming calls will not be received on the phones and will only ring Teams clients. 
-Please consult the [Skype for Business to Microsoft Teams Capabilities Roadmap](https://aka.ms/skype2teamsroadmap) for information about support for existing certified SIP phones.
-
+This policy has been deprecated. Customters should use TeamsUpgradePolicy to control interop and routing.
 
 ## RELATED LINKS
 
-[Skype for Business to Microsoft Teams Capabilities Roadmap](https://aka.ms/skype2teamsroadmap)
-
-[Microsoft Teams and Skype for Business Interoperability](https://docs.microsoft.com/MicrosoftTeams/teams-and-skypeforbusiness-interoperability)
+[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)
 
diff --git a/skype/skype-ps/skype/Grant-CsTeamsUpgradePolicy.md b/skype/skype-ps/skype/Grant-CsTeamsUpgradePolicy.md
