Merge branch 'public' into fix-hidden-path-separators

.openpublishing.redirection.json

@@ -2687,7 +2687,7 @@
     },
     {
       "source_path": "Teams/data-collection-practices.md",
-      "redirect_url": "/microsoftteams/privacy/teams-privacy",
+      "redirect_url": "/microsoftteams/privacy/location-of-data-in-teams",
       "redirect_document_id": false
     },
     {
@@ -4737,8 +4737,8 @@
   },
   {
     "source_path": "teams/teams-privacy.md",
-    "redirect_url": "/microsoftteams/privacy/teams-privacy",
-    "redirect_document_id": true
+    "redirect_url": "/microsoftteams/privacy/location-of-data-in-teams",
+    "redirect_document_id": false
   },
   {
     "source_path": "teams/location-of-data-in-teams.md",
@@ -4777,13 +4777,38 @@
  },
  {
     "source_path": "teams/privacy/index.md",
-    "redirect_url": "/microsoftteams/privacy/teams-privacy",
+    "redirect_url": "/microsoftteams/privacy/location-of-data-in-teams",
     "redirect_document_id": false
  },
  {
     "source_path": "teams/new-teams-automatic-upgrade-announced.md",
     "redirect_url": "/microsoftteams/teams-classic-client-end-of-availability",
     "redirect_document_id": false
-} 
+},
+{
+  "source_path": "teams/manage-freemium.md",
+  "redirect_url": "/microsoftteams/user-access",
+  "redirect_document_id": false
+},
+{
+  "source_path": "teams/upgrade-freemium.md",
+  "redirect_url": "/microsoftteams/user-access",
+  "redirect_document_id": false
+},
+{
+  "source_path": "teams/teams-add-on-licensing/remove-assign-free-licenses.md",
+  "redirect_url": "/microsoftteams/user-access",
+  "redirect_document_id": false
+},
+{
+  "source_path": "Skype/SfbHybrid/hybrid/move-users-from-on-premises-to-skype-for-business-online.md",
+  "redirect_url": "/skypeforbusiness/hybrid/move-users-between-on-premises-and-cloud",
+  "redirect_document_id": false
+},
+{
+  "source_path": "teams/privacy/teams-privacy.md",
+  "redirect_url": "/microsoftteams/privacy/location-of-data-in-teams",
+  "redirect_document_id": false
+}
 ] 
 }

Skype/SfbHybrid/hybrid/move-users-between-on-premises-and-cloud.md

@@ -97,11 +97,7 @@ To move users between on-premises and the cloud, you must use an account with su
   > [!IMPORTANT]
   > If you are using the Skype for Business Admin Control Panel, you will be prompted to provide credentials for a Microsoft 365 account with the appropriate roles, as noted above. You must supply an account that ends in .onmicrosoft.com. If that is not possible, then use the Move-CsUser cmdlet.
   >
-  > If you are using Move-CsUser in PowerShell, you can either use an account that ends in .onmicrosoft.com, or you can use any on-premises account that is synchronized into Microsoft Entra ID, provided that you also specify the HostedMigrationOverrideUrl parameter in the cmdlet. The value of the hosted migration override URL is a variant of the following URL: `https://adminXX.online.lync.com/HostedMigration/hostedmigrationService.svc` In the above URL, replace the XX with either two or three characters, determined as follows:
-  >
-  > - In a Teams PowerShell session, run the following cmdlet:<br>`Get-CsTenant | ft ServiceInstance`
-  > - The resulting value will be in the following format:<br>`MicrosoftCommunicationsOnline/YYYY-XX-ZZ`
-  > - The two- or three-character code is the XX contained in the section YYYY-XX-ZZ. If it’s a two-character code, it will be a digit followed by a number (such as 4A). If it’s a three-character code, it will be two letters followed by a digit (such as JP1). An example is NOAM-4A-S7.
+  > If you are using Move-CsUser in PowerShell, you can either use an account that ends in .onmicrosoft.com, or you can use any on-premises account that is synchronized into Microsoft Entra ID. 
 
 ## Voice configuration requirements
 

Skype/SfbHybrid/hybrid/move-users-from-on-premises-to-teams.md

@@ -64,23 +64,20 @@ Move-CsUser is available from an on-premises Skype for Business Server Managemen
 
 - Specify the user to move using the `Identity` parameter.
 - Specify the `-Target` parameter with the value “sipfed.online.lync.<span>com” (or similar value if your tenant is government cloud).
-- If you don't have one account with sufficient permissions in both on premises and the cloud service (Microsoft 365), use the `-credential` parameter to supply an account with sufficient permissions in Microsoft 365.
-- If the account with permissions in Microsoft 365 doesn't end in “onmicrosoft.<span>com”, you must specify the `-HostedMigrationOverrideUrl` parameter, with the correct value as described in [Required administrative credentials](move-users-between-on-premises-and-cloud.md#required-administrative-credentials).
+- You must have sufficient privileges in both the on-premises environment and the cloud service (Microsoft 365), as described in [Required administrative credentials](move-users-between-on-premises-and-cloud.md#required-administrative-credentials).
 - Make sure the computer running the on-premises administration tools is using the latest CU for your version of Skype for Business Server or Lync Server 2013, to ensure OAuth is used for authentication. 
 
 The following cmdlet sequence can be used to move a user to TeamsOnly, and assumes the Microsoft 365 credential is a separate account and supplied as input for the Get-Credential prompt. The behavior is the same whether `-MoveToTeams` switch is specified or not.
 
   ```powershell
   $cred=Get-Credential
-  $url="https://admin1a.online.lync.com/HostedMigration/hostedmigrationService.svc"
-  Move-CsUser -Identity [email protected] -Target sipfed.online.lync.com -Credential $cred -HostedMigrationOverrideUrl $url
-  ```
+  Move-CsUser -Identity [email protected] -Target sipfed.online.lync.com -Credential $cred 
 
 > [!TIP]
 > As there are different circumstances requiring different parameters, the default command for most cases is:
 
 ```powershell
-Move-CsUser -Identity [email protected] -Target sipfed.online.lync.com -HostedMigrationOverrideUrl $url
+Move-CsUser -Identity [email protected] -Target sipfed.online.lync.com
 ```
 
 ### Move to Teams using Skype for Business Server Control Panel

Skype/SfbHybrid/hybrid/move-users-from-the-cloud-to-on-premises.md

@@ -54,14 +54,13 @@ To move a user to on-premises using Move-CsUser:
 - Specify the user to move using the Identity parameter.
 - Specify the -Target parameter with the fully qualified domain name of the desired on-premises pool that will host the user.
 - If you don't have one account with sufficient permissions in both on-premises and the cloud service (Microsoft 365), use the -credential parameter to supply an account with sufficient permissions in Microsoft 365.
-- If the account with permissions in Microsoft 365 doesn't end in “on.microsoft.com”, you must specify the -HostedMigrationOverrideUrl parameter, with the correct value as described in [Required administrative credentials](move-users-between-on-premises-and-cloud.md#required-administrative-credentials).
+- You must have sufficient privileges in both the on-premises environment and the cloud service (Microsoft 365), as described in [Required administrative credentials](move-users-between-on-premises-and-cloud.md#required-administrative-credentials).
 
 The following cmdlet sequence can be used to move a user to Skype for Business Server, and assumes the Microsoft 365 credential is a separate account and supplied as input for the Get-Credential prompt.
 
 ```PowerShell
 $cred=Get-Credential
-$url="https://admin1a.online.lync.com/HostedMigration/hostedmigrationService.svc"
-Move-CsUser -Identity [email protected] -Target pool.corp.contoso.com -Credential $cred -HostedMigrationOverrideUrl $url
+Move-CsUser -Identity [email protected] -Target pool.corp.contoso.com -Credential $cred
 ```
 
 ### Move users with the Skype for Business Server Control Panel

Skype/SfbServer/skype-for-business-hybrid-solutions/plan-your-phone-system-cloud-pbx-solution/enable-users-for-phone-system.md

@@ -48,6 +48,4 @@ Enabling a user for Phone System with on-premises PSTN connectivity and then mov
 
 - [Synchronize users to the cloud and assign licenses](../../../SfbHybrid/hybrid/configure-hybrid-connectivity.md?bc=%2fSkypeForBusiness%2fbreadcrumb%2ftoc.json&toc=%2fSkypeForBusiness%2ftoc.json) (performed using Office 365).
 
-- [Move on-premises users to Skype for Business Online](../../../SfbHybrid/hybrid/move-users-from-on-premises-to-skype-for-business-online.md) (performed using Windows PowerShell on-premises, but using your Office 365 administrator credentials).
-
 - [Enable users for Enterprise Voice online and Phone System Voicemail](enable-users-for-enterprise-voice-online-and-phone-system-voicemail.md) (performed using Remote PowerShell.

Teams/ITAdmin-readiness.md

@@ -59,6 +59,8 @@ Use the training resources to educate yourself about Teams, teach others or run
 | SIP gateway enablement and migration | | [Deck](https://aka.ms/SIP-gateway-enablement-migration-playbook) |
 | Teams Devices Deployment playbook | | [Deck](https://aka.ms/teams-devices-deployment-playbook) |
 | Teams Phone Deployment playbook | | [Deck](https://aka.ms/teams-phone-deployment-playbook) |
+| Teams Phone for Frontline Workers Deployment playbook | | [Deck](https://aka.ms/teams-phone-FLW-deployment-playbook) |
+| Teams Phone Service Reliability and Survivability playbook | | [Deck](https://aka.ms/teams-phone-service-reliability-playbook) |
 | Upgrade from Skype for Business to Teams | [Video 1: Introduction to Upgrade](https://aka.ms/teams-upgrade-intro)</br>[Video 2: Plan your upgrade](https://aka.ms/teams-upgrade-plan)</br>[Video 3: Coexistence and Interoperability](https://aka.ms/teams-upgrade-coexistence-interop)</br>[Video 4: Administrator experience](https://aka.ms/teams-upgrade-admin) | [Deck](https://aka.ms/teams-upgrade-deck)|
 | Windows desktop client | [Video](https://aka.ms/teams-clients) | [Deck](https://aka.ms/teams-clients-deck) |
 | Windows Defender Application Control for new Teams |  | [Deck](https://aka.ms/new-teams-WDAC) |

Teams/app-centric-management.md

@@ -31,7 +31,7 @@ ms.custom: seo-marvel-apr2020
 
 App centric management functionality introduces a new way to control how you control access to Teams apps for users and groups. It replaces app permission policies. This functionality lets you specify which users and groups can use each app and you can control it on a per-app basis.
 
-When you start using this functionality, we retain your existing app access that you defined using permission policies. Users continue to have access to only those apps that you've allowed for them.
+When you start using this functionality, we retain your existing app access that you defined using permission policies. Users continue to have access to only those apps that you allow for them.
 
 You can manage access to apps for individual users, supported groups, or everyone in the organization. You have complete control over who can or can't add and use apps in your organization. You can also control the access to new apps that we publish to Teams app store.
 
@@ -69,7 +69,7 @@ To assign users or groups to an app, follow these steps:
 
 1. To remove one or more users or groups from an app, select the rows and select **Remove**.
 
-    :::image type="content" source="media/acm-remove-access.png" alt-text="Screenshot showing how to remove an existing app assignment from the app details page.":::
+    :::image type="content" source="media/acm-remove-access.png" alt-text="Screenshot showing how to remove an existing app assignment from the app details page." lightbox="media/acm-remove-access-large.png":::
 
 > [!NOTE]
 > You can view and modify the assignments of a blocked app but your assignments take effect only when you [allow the app](manage-apps.md#allow-or-block-apps).
@@ -131,8 +131,11 @@ When your tenant's admin center receives this feature, the following updates are
 | Allowed            | Blocked                                     | No one can install                          |
 | Allowed            | Allowed                                     | Everyone                                    |
 
-> [!NOTE]
-> You can't access, edit, or use permission policies after switching to this feature.
+## Considerations and limitations
+
+* After you switch to this feature, you can't access, edit, or use permission policies.
+
+* [PowerShell cmdlets](/powershell/module/teams/?view=teams-ps&preserve-view=true) for permission policies aren't supported on tenants that switch to this feature. These cmdlets return the results but the results aren't applicable to tenants that use this feature. App permission policy PowerShell cmdlets are not supported if you use this feature.
 
 ## Related article