Merge branch 'master' into v-cichur-meeting-overflow

Teams/deploy-apps-microsoft-teams-landing-page.md

@@ -7,7 +7,7 @@ author: SerdarSoysal
 ms.author: serdars
 manager: serdars
 audience: admin
-ms.date: 01/28/2019
+ms.date: 02/10/2021
 ms.service: msteams
 ms.collection: 
   - M365-collaboration
@@ -21,11 +21,26 @@ ms.custom: seo-marvel-apr2020
 ---
 # Apps, bots, & connectors in Microsoft Teams
 
-Apps let you find content from your favorite services and share it right in Teams. They help you do things such as pin services at the top of a channel, chat with bots, or share and assign tasks. To learn more, read [Overview of apps in Teams](https://support.office.com/article/overview-of-apps-in-teams-747492ee-7cdd-4115-a993-8c7e7f98a3d0).
+Apps let you find content from your favorite services and share it in Teams. They help you do things such as pin services at the top of a channel, chat with bots, or share and assign tasks. To learn more, read [Overview of apps in Teams](https://support.office.com/article/overview-of-apps-in-teams-747492ee-7cdd-4115-a993-8c7e7f98a3d0). 
 
-We recommend that you include our featured apps - such as Planner - in your initial Teams rollout. Add other apps, bots, & connectors as you drive Teams adoption.
+You can add apps to your Teams deployment by using the apps provided with Microsoft Teams, by using certified third-party apps and templates, and by creating your own custom apps.
+
+## Use Microsoft-provided apps
+
+Teams comes with a set of built-in apps, including Lists, Tasks, Praise, Approvals, and more. We recommend that you include Teams featured apps - such as Planner - in your initial Teams rollout. Add other apps, bots, & connectors as you drive Teams adoption.
+
+## Use third-party apps
+
+In addition to Microsoft-provided apps, you can use Microsoft-certified third-party apps. Microsoft works with  Microsoft 365 developer partners to provide the information needed to expedite decisions about using Teams apps and add-ins. For more information, see [Microsoft Teams App Security and Compliance](https://docs.microsoft.com/microsoft-365-app-certification/teams/teams-apps).
+
+## Use Teams templates
+
+You can also use [Teams templates](https://docs.microsoft.com/microsoftteams/platform/samples/app-templates?toc=/MicrosoftTeams/toc.json&bc=/microsoftteams/breadcrumb/toc.json), production-ready apps for Microsoft Teams that are community driven, open-source, and available on GitHub.
+
+## Create custom apps
+
+You can quickly build custom low-code solutions by using Teams integration with [Microsoft Power Platform](teams-power-platfom-integration.md). You can also create your own custom app to suit your business needs. For more information, see [Build apps for Microsoft Teams](https://docs.microsoft.com/microsoftteams/platform/overview).  
 
-You also have the option of creating your own custom apps. See our [developer documentation](/microsoftteams/platform/overview) for more information.
 
 ## Apps deployment decisions
 
@@ -37,7 +52,7 @@ These are the apps settings that most organizations want to change (if the Teams
 
 ### App availability settings 
 
-Teams provides a number of apps published by Microsoft and by third parties to engage users, support productivity, and integrate commonly used business services into Teams. Get apps from the Teams Store. By default, all apps, including custom apps that you've submitted via the [Teams Store approval process](https://docs.microsoft.com/microsoftteams/platform/publishing/apps-publish#microsoft-teams-app-approval-process), are turned on for all users. For example, users can use the Planner app to build and manage team tasks in Teams.
+Teams provides many apps published by Microsoft and by third parties to engage users, support productivity, and integrate commonly used business services into Teams. Get apps from the Teams Store. By default, all apps, including custom apps that you've submitted via the [Teams Store approval process](https://docs.microsoft.com/microsoftteams/platform/publishing/apps-publish#microsoft-teams-app-approval-process), are turned on for all users. For example, users can use the Planner app to build and manage team tasks in Teams.
 
 By default, all Microsoft-provided, third-party, and custom apps are available, and you can turn individual apps on or off. There are org-wide settings that lets you turn all third-party and/or custom apps on or off for your entire organization.
 
@@ -105,9 +120,6 @@ App templates are production-ready apps for Microsoft Teams that are community d
 |||
 
 
-## Next steps
-- [Drive adoption](adopt-microsoft-teams-landing-page.md) of featured apps, such as Planner.
-- [Roll out meetings & conferencing](deploy-meetings-microsoft-teams-landing-page.md)
-- [Roll out cloud voice](cloud-voice-landing-page.md)
+
 
 

Teams/direct-routing-survivable-branch-appliance.md

@@ -23,12 +23,9 @@ appliesto:
   - Microsoft Teams
 ---
 
-# Survivable Branch Appliance (SBA) for Direct Routing - Public Preview
+# Survivable Branch Appliance (SBA) for Direct Routing
 
 
-> [!NOTE]
-> This is a public preview release.
-
 Occasionally, a customer site using Direct Routing to connect to Microsoft Phone System may experience an internet outage.
 
 Assume that the customer site--called a branch--temporarily cannot connect to the Microsoft cloud through Direct Routing. However, the intranet inside the branch is still fully functional and users can connect to the Session Border Controller (SBC) that is providing PSTN connectivity.

Teams/purchase-third-party-apps.md

@@ -1,5 +1,5 @@
 ---
-title: Purchase services for Teams third-party apps in the Microsoft Teams admin center
+title: Purchase third-party apps for Teams
 author: cichur
 ms.author: v-cichur
 manager: serdars
@@ -12,12 +12,12 @@ ms.collection:
 ms.reviewer: chhavib, vaibhava
 search.appverid: MET150
 f1keywords: 
-description: Learn how to purchase services for Teams third-party apps on the Manage apps page of the Microsoft Teams admin center.
+description: Learn how to purchase third-party apps for Teams in the Microsoft Teams admin center.
 appliesto: 
 - Microsoft Teams
 localization_priority: Normal
 ---
-Purchase services for Teams third-party apps in the Microsoft Teams admin center
+Purchase third-party apps for Teams
 ======================================================
 
 > [!NOTE]

Teams/rooms/index.md

@@ -1,5 +1,5 @@
 ---
-title: Microsoft Teams virtual meeting rooms
+title: Microsoft Teams Rooms
 ms.reviewer: 
 ms.author: dstrome
 author: dstrome

Teams/teams-add-on-licensing/assign-teams-add-on-licenses.md

@@ -29,22 +29,22 @@ You can use the Microsoft 365 admin center or PowerShell to assign licenses to u
 
 ## What you need to know before you assign Phone System, Calling Plan, and Communication Credits licenses
 
-Before you get started, review the following:
+Before you get started, review the following requirements:
 
 - If you're using on-premises Public Switched Telephone Network (PSTN) connectivity for hybrid users, you only need to assign a Phone System license. Do NOT assign a Calling Plan license.
 
 - Because of the latency between Microsoft 365 and Microsoft Teams, it can take up to 24 hours for a user to be assigned a Calling Plan after you assign a license. If the user isn't assigned a Calling Plan after 24 hours, [contact support for business products - admin help](https://support.office.com/article/32a17ca7-6fa0-4870-8a8d-e25ba4ccfd4b).
 
 - You'll get an error message if you haven't purchased the correct number of licenses. If you need to buy more Calling Plan licenses, choose the option to buy more.
 
-- Even if your users are assigned Enterprise E5 licenses, you still need to assign [Communications Credits](../what-are-communications-credits.md) licenses to them if they want make or receive calls from the PSTN.
+- Even if your users are assigned Enterprise E5 licenses, you still need to assign [Communications Credits](../what-are-communications-credits.md) licenses to them if they want to make or receive calls from the PSTN.
 
 - After you assign Calling Plan or Communication Credits licenses to your users, you'll need to get phone numbers for your organization, and then assign those numbers to users. For step-by-step instructions, see [Set up Calling Plans](../set-up-calling-plans.md).
 
 ## Using the Microsoft 365 admin center
 
 Use the Microsoft 365 admin center to assign licenses to individual users or small sets of users at a time. 
-You can assign licenses on the **Licenses** page (for up to 20 users at a time) or the **Active users** page. The method you choose depends on whether you want to manage product licenses for specific users or manage user licenses for specific products.
+You assign licenses on the **Licenses** page (for up to 20 users at a time) or the **Active users** page. The method you choose depends on whether you want to manage product licenses for specific users or manage user licenses for specific products.
 
 For step-by-step instructions, see [Assign licenses to users](https://docs.microsoft.com/microsoft-365/admin/manage/assign-licenses-to-users).
 
@@ -58,7 +58,7 @@ Use PowerShell to assign licenses to users in bulk.  To learn more, see [Assign
 
 Here's an example of how to use a script to assign licenses to your users.
 
-1. Install the 64-bit version of the [Microsoft Online Services Sign-in Assistant for IT Professionals RTW](https://go.microsoft.com/fwlink/p/?LinkId=286152).
+1. Install the 64-bit version of the [Microsoft Online Services Sign-in Assistant for IT Professionals RTW](https://docs.microsoft.com/collaborate/connect-redirect?DownloadID=59185).
 2. Install the Microsoft Azure Active Directory Module for Windows PowerShell:
     1. Open an elevated Windows PowerShell command prompt (run Windows PowerShell as an admin).
     2. Run the following command:

Teams/teams-and-skypeforbusiness-coexistence-and-interoperability.md

@@ -91,7 +91,7 @@ Organizations with a starting point of Skype for Business Server on premises or
 
 Use this coexistence mode to accelerate the availability of Teams meeting capabilities in your organization, in addition to its collaboration capabilities, enabling your users to take advantage of the superior Teams meetings experience-great quality, innovative capabilities such as transcription and translation or background blurring, and superior user experience across all platforms, including mobile devices and browsers.
 
-Along with using Teams for teams and channels–based conversations in this mode, users will use Teams to schedule and conduct their meetings. Private chat and calling remain on Skype for Business. Teams and Skype for Business benefit from a range of "better together" capabilities, such as presence reconciliation, automatic hold/unhold, and HID device support across both applications. Note that it is possible to hide teams and channels if desired using the App Permissions policy.
+Along with using Teams for teams and channels–based conversations in this mode, users will use Teams to schedule and conduct their meetings. Private chat and calling remain on Skype for Business. Teams and Skype for Business benefit from a range of "better together" capabilities, such as presence reconciliation, automatic hold/unhold, and HID device support across both applications. Note that it is possible to hide teams and channels if desired using the App Setup policy.
 
 This coexistence mode is especially useful for organizations with Skype for Business on-premises deployments with Enterprise Voice, who are likely to take some time to upgrade to Teams and want to benefit from the superior Teams meetings as soon as possible.
 

Teams/teams-exploratory.md

@@ -55,6 +55,8 @@ Users fit the criteria for a Teams Exploratory experience if they:
 
 - Have a managed Azure AD domain email address.
 - Belong to a tenant with a paid subscription.
+- Do not have an active Teams license.
+- Are not in a tenant where a license assignment policy was created.
 
 Users must be enabled to sign up for apps and trials (in the Microsoft 365 admin center). For more information, see [Manage the Teams Exploratory experience](#manage-the-teams-exploratory-experience), later in this article.
 
@@ -166,17 +168,13 @@ See [Microsoft 365 subscription information](https://docs.microsoft.com/microsof
 
 ## How long does the Teams Exploratory experience last
 
-The Microsoft Teams Exploratory experience is available at no additional cost for 12 months (from initial user sign-up) plus an additional 30 day grace period. At that time, end users on a Microsoft Exploratory experience license will need to move to a paid license that includes Teams. The same end date will apply to all users on the same tenant, with the 12-month term starting on the first user’s sign-up date.
+As of early 2021, Teams Exploratory is available as a 12 month subscription (from initial user sign-up) for all new customers. The new Teams Exploratory subscription starts when the first user in an organization signs-up for Teams Exploratory and it will expire after 12 months. The expiry date will apply to all users in the same tenant as the 12-month term begins on the first user's sign-up date.
 
-### What happens if an end user initiates the Microsoft Teams Exploratory experience just before the anniversary or renewal date
-
-Microsoft Teams Exploratory experience licenses initiated within 90 days of your **agreement anniversary** or **renewal** won't be required to move to a paid license until the subsequent anniversary or renewal cycle.
-
-### What if my agreement doesn’t have an anniversary or yearly renewal date (for example, month-to-month agreements)
+> [!NOTE]
+> The end date for the experience is configured at an organization level, meaning it will apply to all users in the same organization. For example, User 1 signs up for the subscription on January 1, 2021. This initiates a subscription end-date of December 31, 2021. Another user, User 2, signs up for the subscription on October 1, 2021. User 2 can use Teams Exploratory for two months, as their end-date will be December 31, 2021 because they're under the same organization's subscription as User 1.
 
-For agreements without an anniversary or yearly renewal date, the subsequent year after the first end user activates the Microsoft Teams Exploratory experience licenses will be treated as the anniversary or renewal date. Users on the Microsoft Teams Exploratory license must be converted to a paid license by that date each year, according to the policies outlined in this article.
+### What should administrators do at the end of the 12 month Teams Exploratory experience
 
-For example, if the first end user activates Microsoft Teams Exploratory on June 19, 2020, then they and all other eligible users in the customer tenant must convert to a paid license with Teams by June 19, 2021.
+At the end of the 12 month subscription, administrators should convert all Teams Exploratory users to a paid license that includes Teams. It is vital to ensure this is completed before the Teams Exploratory subscription expires to avoid any disruption to user's experience.
 
-> [!Note]
-> Customers will be disabled and blocked from starting a new Exploratory trial licenses for 3 months past the expiration of their previous Exploratory trial license.
+For more information, see [Upgrade users from the Teams Exploratory license](#upgrade-users-from-the-teams-exploratory-license)), above in this article.

Teams/toc.yml

@@ -340,6 +340,8 @@ items:
               href: troubleshoot-guest-access.md
     - name: Cortana in Teams
       href: cortana-in-teams.md
+    - name: Set up your team targeting hierarchy
+      href: set-up-your-team-hierarchy.md
 
 
 - name: Meetings and conferencing
@@ -1039,50 +1041,57 @@ items:
   items: 
     - name: Overview
       href: deploy-apps-microsoft-teams-landing-page.md
-    - name: Integrate with Power Platform
-      href: teams-power-platfom-integration.md
-    - name: Manage apps for Teams
-      href: manage-apps.md
-    - name: Admin settings for apps in Teams
-      href: admin-settings.md
-    - name: Use built-in and custom tabs
-      href: built-in-custom-tabs.md
-    - name: Use Microsoft 365 or Office 365 and custom connectors
-      href: Office-365-custom-connectors.md
-    - name: Resource-specific consent
-      href: resource-specific-consent.md
-    - name: Custom apps
-      items: 
-        - name: Publish a custom app submitted through the Teams App Submission API
-          href: submit-approve-custom-apps.md
+    - name: Apps from Microsoft
+      items:
+        - name: Manage the Lists app 
+          href: manage-lists-app.md
+        - name: Manage the Tasks app
+          href: manage-tasks-app.md
+        - name: Manage the Praise app
+          href: manage-praise-app.md
+        - name: Manage the Teams Approvals app
+          href: approval-admin.md
+        - name: Manage the Shifts app for your organization in Teams
+          href: expand-teams-across-your-org/shifts/manage-the-shifts-app-for-your-organization-in-teams.md
+
+    - name: Third-party apps
+      items:
+        - name: App certification
+          href: https://docs.microsoft.com/en-us/microsoft-365-app-certification/overview
+        - name: Purchase third-party apps for Teams
+          href: purchase-third-party-apps.md
+    - name: App templates for Teams
+      href: https://docs.microsoft.com/microsoftteams/platform/samples/app-templates?toc=/MicrosoftTeams/toc.json&bc=/microsoftteams/breadcrumb/toc.json
+
+    - name: How to build and customize your own apps
+      items:
+        - name: Integrate with Power Platform
+          href: teams-power-platfom-integration.md
         - name: Manage Power Platform apps in the Microsoft Teams admin center
           href: manage-power-platform-apps.md
+        - name: Publish a custom app submitted through the Teams App Submission API
+          href: submit-approve-custom-apps.md
         - name: Publish a custom app by uploading an app package
           href: upload-custom-apps.md
         - name: Custom apps store 
           href: customize-your-app-store.md
-    - name: App certification
-      href: /teams-app-certification/all-apps?toc=/MicrosoftTeams/toc.json&bc=/microsoftteams/breadcrumb/toc.json
-    - name: View app permissions and grant admin consent in the Microsoft Teams admin center
-      href: app-permissions-admin-center.md
-    - name: Apps permissions and considerations
-      href: app-permissions.md
-    - name: Purchase services for Teams third-party apps
-      href: purchase-third-party-apps.md
-    - name: App templates for Teams
-      href: https://docs.microsoft.com/microsoftteams/platform/samples/app-templates?toc=/MicrosoftTeams/toc.json&bc=/microsoftteams/breadcrumb/toc.json
-    - name: Manage the Lists app for your organization in Teams
-      href: manage-lists-app.md
-    - name: Manage the Tasks app for your organization
-      href: manage-tasks-app.md
-    - name: Set up your team targeting hierarchy
-      href: set-up-your-team-hierarchy.md
-    - name: Manage the Praise app in the Teams admin center
-      href: manage-praise-app.md
-    - name: Configure the Skype Meetings App to work with Teams
-      href: configure-skype-meetings-app-to-work-with-teams.md
-    - name: Teams Approvals app availability
-      href: approval-admin.md
+
+    - name: Manage apps for Teams
+      items:
+        - name: Overview
+          href: manage-apps.md
+        - name: View app permissions and grant admin consent in the Microsoft Teams admin center
+          href: app-permissions-admin-center.md
+        - name: Resource-specific consent
+          href: resource-specific-consent.md
+        - name: Apps permissions and considerations
+          href: app-permissions.md
+        - name: Admin settings for apps in Teams
+          href: admin-settings.md
+        - name: Use built-in and custom tabs
+          href: built-in-custom-tabs.md
+        - name: Use Microsoft 365 or Office 365 and custom connectors
+          href: Office-365-custom-connectors.md
 
 - name: Adopt
   items: