Skip to content

Commit fef22e9

Browse files
authored
Merge branch 'master' into typo-paramater
2 parents c4107b5 + abbb0c6 commit fef22e9

File tree

5 files changed

+40
-34
lines changed

5 files changed

+40
-34
lines changed

skype/skype-ps/skype/Grant-CsTeamsCallParkPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ schema: 2.0.0
1111

1212
The TeamsCallParkPolicy controls whether or not users are able to leverage the call park feature in Microsoft Teams. Call park allows enterprise voice customers to place a call on hold and then perform a number of actions on that call: transfer to another department, retrieve via the same phone, or retrieve via a different Teams phone. The Grant-CsTeamsCallParkPolicy cmdlet lets you assign a custom policy to a specific user.
1313

14-
NOTE: the call park feature currently only available in desktop and web clients. Call Park functionality is currently completely disabled in mobile clients. Supported with TeamsOnly mode
14+
NOTE: the call park feature currently only available in desktop, web clients and mobile clients. Call Park functionality is currently on the roadmap for Teams IP Phones. Supported with TeamsOnly mode for users with the Phone Sytem license
1515

1616
## SYNTAX
1717

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ TeamsUpgradePolicy allows administrators to manage the transition from Skype for
2222

2323
This cmdlet enables admins to apply TeamsUpgradePolicy to either individual users or to set the default for the entire organization.
2424

25-
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 deprecated. Organizations with users in Legacy mode must update their configurations to use a different mode.
25+
**IMPORTANT:** TeamsUpgradePolicy has replaced TeamsInteropPolicy, which is no longer honored. Components that previously honored TeamsInteropPolicy have been fully updated to honor TeamsUpgradePolicy instead. Both TeamsInteropPolicy and Legacy mode have been retired.
2626

2727

2828

@@ -201,21 +201,21 @@ Accept wildcard characters: False
201201
202202
## NOTES
203203
204-
Legacy mode in TeamsUpgradePolicy 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.
205-
206-
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.
204+
Legacy mode in TeamsUpgradePolicy has been deprecated and it is no longer possible to grant legacy mode. Both Legacy mode and TeamsInteropPolicy have been retired.
207205
208206
209207
210208
211209
## RELATED LINKS
212210
211+
[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)
212+
213+
[Using the Meeting Migration Service (MMS)](https://docs.microsoft.com/en-us/skypeforbusiness/audio-conferencing-in-office-365/setting-up-the-meeting-migration-service-mms)
214+
215+
[Coexistence with Skype for Business](https://docs.microsoft.com/en-us/microsoftteams/coexistence-chat-calls-presence)
216+
213217
[Get-CsTeamsUpgradeConfiguration](Get-CsTeamsUpgradeConfiguration.md)
214218
215219
[Set-CsTeamsUpgradeConfiguration](Set-CsTeamsUpgradeConfiguration.md)
216220
217221
[Get-CsTeamsUpgradePolicy](Get-CsTeamsUpgradePolicy.md)
218-
219-
[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)
220-
221-
[Using the Meeting Migration Service (MMS)](https://docs.microsoft.com/en-us/skypeforbusiness/audio-conferencing-in-office-365/setting-up-the-meeting-migration-service-mms)

skype/skype-ps/skype/Move-CsUser.md

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,17 @@ The Move-CsUser cmdlet enables you to move a user account enabled for Skype for
3232
The Move-CsUser cmdlet affects only the user's Skype for Business Server account location; it does not move the user's Active Directory account to a new organizational unit (OU) or other new location.
3333

3434
When moving a user to or from Office 365 (either Skype for Business Online or Teams):
35-
- Skype for Business hybrid must be configured. For more information, see https://docs.microsoft.com/en-us/SkypeForBusiness/skype-for-business-hybrid-solutions/deploy-hybrid-connectivity/deploy-hybrid-connectivity
35+
- Skype for Business hybrid must be configured. For more information, see [Deploy hybrid connectivity between Skype for Business Server and Skype for Business Online](https://docs.microsoft.com/en-us/SkypeForBusiness/skype-for-business-hybrid-solutions/deploy-hybrid-connectivity/deploy-hybrid-connectivity).
36+
- To move a user to Office 365, specify the ProxyFqdn of the hosting provider as the Target. In most cases, this is "sipfed.online.lync.com" but in specialized environments there will be variants of this address. For more details, see [Move users between on-premises and cloud](https://docs.microsoft.com/en-us/skypeforbusiness/hybrid/move-users-between-on-premises-and-cloud).
37+
- When migrating from on-premises to the cloud, meetings are migrated from Skype for Business Server to online. If the `MoveToTeams` switch is specified, the meetings will be migrated to Teams meetings. Otherwise, meeetings are migrated to Skype for Business Online. Teams-only users can still join meetings hosted in Skype for Business. For details see [Using the Meeting Migration Service (MMS)](https://docs.microsoft.com/en-us/skypeforbusiness/audio-conferencing-in-office-365/setting-up-the-meeting-migration-service-mms).
38+
- Moving a user to Teams is achieved by specifying the MoveToTeams switch. This performs the same operations as a move to Skype for Business Online (without the specifying -MoveToTeams) and also performs the following actions:
39+
- TeamsUpgradePolicy with Mode=TeamsOnly is assigned to the online user account.
40+
- Meeting migration is triggered to move meetings to Teams instead of Skype for Business Online. This functionality is currently available to TAP customers only. For customers not in TAP, meetings are always migrated to Skype for Business Online.
3641
- Contacts are moved in all cases, unless -force is specified.
37-
- Meetings are migrated from Skype for Business Server to Skype for Business Online for any move from Skype for Business Server. Teams- only users can still join meetings hosted in Skype for Business.
38-
- To move a user to Office 365, specify the ProxyFqdn of the hosting provider as the Target. In most cases, this is "sipfed.online.lync.com" but in specialized environments there will be variants of this address.
39-
- Moving a user to Teams is achieved by specifying the MoveToTeams switch. This performs the same operations as a move to Skype for Business Online and also applies TeamsUpgradePolicy and TeamsInteropPolicy to the online user account.
42+
43+
44+
> [!NOTE]
45+
> The MoveToTeams switch is only available on Skype for Business Server 2019 and CU8 for Skype for Business Server 2015. Organizations using other versions of Skype for Business Server must first move the user to Skype for Business Online, and then apply TeamsUpgradePolicy.
4046
4147

4248

@@ -52,8 +58,6 @@ Move-CsUser -Identity "[email protected]" -Target "sipfed.online.lync.com" -Mov
5258

5359
In Example 1, the Move-CsUser cmdlet is used to move the user account with sip address [email protected] to Teams. This user will now be a Teams only user. If -Credential parameter is not specified, the admin will be prompted for credentials.
5460

55-
NOTE: The MoveToTeams switch is only available on Skype for Business Server 2019. Organizations using other versions of Skype for Business Server must first move the user to Skype for Business Online, and then apply TeamsUpgradePolicy.
56-
5761
### ------- EXAMPLE 2: Move a user to Skype for Business Online ----
5862
```
5963
$cred=get-credential
@@ -128,7 +132,7 @@ Accept wildcard characters: False
128132
129133
130134
### -MoveToTeams
131-
If specified, the user will be moved to Office 365 as a Teams-only user. This will ensure incoming chats and calls land in the user's Teams client. This parameter is only available with the upcoming releases of Skype for Business Server 2019 and CU8 for Skype for Business Server 2015.
135+
If specified, the user will be moved to Office 365 as a Teams-only user. This will ensure incoming chats and calls land in the user's Teams client. This parameter is only available with Skype for Business Server 2019 and CU8 for Skype for Business Server 2015.
132136
133137
```yaml
134138
Type: SwitchParameter
@@ -164,7 +168,7 @@ Accept wildcard characters: False
164168
165169
### -HostedMigrationOverrideUrl
166170
167-
The hosted migration service is the service in Office 365 that performs user moves. By default, there is no need to specify a value for this parameter, as long as the hosting provider has its AutoDiscover URL properly configured. However, a specific URL can be specified if required.
171+
The hosted migration service is the service in Office 365 that performs user moves. By default, there is no need to specify a value for this parameter, as long as the hosting provider has its AutoDiscover URL properly configured and you are using an admin account the ends in .onmicrosoft.com. If you are using a user account from on-premises that synchronized to the cloud, you must specify this parameter. See [Required administrative credentials](https://docs.microsoft.com/en-us/skypeforbusiness/hybrid/move-users-between-on-premises-and-cloud#required-administrative-credentials).
168172
169173
170174
@@ -182,7 +186,7 @@ Accept wildcard characters: False
182186
```
183187
184188
### -BypassAudioConferencingCheck
185-
By default, if the on-premise user is configured for dial in conferencing, moving the user to Office 365 will provision the user for Audio Conferencing, for an additional license is required. If you want to move such a user to Office 365 but do not want to configure them for Audio Conferencing, specify this switch to by-pass the license check. This parameter is only available with the upcoming releases of Skype for Business Server 2019 and CU8 for Skype for Business Server 2015.
189+
By default, if the on-premise user is configured for dial in conferencing, moving the user to Office 365 will provision the user for Audio Conferencing, for an additional license is required. If you want to move such a user to Office 365 but do not want to configure them for Audio Conferencing, specify this switch to by-pass the license check. This parameter is only available with Skype for Business Server 2019 and CU8 for Skype for Business Server 2015.
186190
187191
```yaml
188192
Type: SwitchParameter
@@ -196,7 +200,7 @@ Accept pipeline input: False
196200
Accept wildcard characters: False
197201
```
198202
### -BypassEnterpriseVoiceCheck
199-
By default, if the on-premise user is configured for Enteprise Voice, moving the user to Office 365 will provision the user for Microsoft Phone System, for an additional license is required. If you want to move such a user to Office 365 but do not want to configure them for Phone System, specify this switch to by-pass the license check. This parameter is only available with the upcoming releases of Skype for Business Server 2019 and CU8 for Skype for Business Server 2015.
203+
By default, if the on-premise user is configured for Enteprise Voice, moving the user to Office 365 will provision the user for Microsoft Phone System, for an additional license is required. If you want to move such a user to Office 365 but do not want to configure them for Phone System, specify this switch to by-pass the license check. This parameter is only available with Skype for Business Server 2019 and CU8 for Skype for Business Server 2015.
200204
201205
```yaml
202206
Type: SwitchParameter
@@ -211,7 +215,7 @@ Accept wildcard characters: False
211215
```
212216
213217
### -TenantAdminUserName
214-
This is an optional parameter that if, specified, pre-populates the username of the tenant admin when moving users to or from Office 365. This can be useful for scenarios involving smart card authentication or 2 factor auth. This parameter is only available with the upcoming releases of Skype for Business Server 2019 and CU8 for Skype for Business Server 2015.
218+
This is an optional parameter that if, specified, pre-populates the username of the tenant admin when moving users to or from Office 365. This can be useful for scenarios involving smart card authentication or 2 factor auth. This parameter is only available with Skype for Business Server 2019 and CU8 for Skype for Business Server 2015.
215219
216220
217221
```yaml
@@ -339,9 +343,11 @@ Instead, the cmdlet modifies instances of the Microsoft.Rtc.Management.ADConnect
339343

340344
## RELATED LINKS
341345

342-
[Get-CsUser](Get-CsUser.md)
346+
[Move users between on-premises and cloud](https://docs.microsoft.com/en-us/skypeforbusiness/hybrid/move-users-between-on-premises-and-cloud)
343347

344348
[Skype for Business Hybrid Solutions](https://docs.microsoft.com/en-us/SkypeForBusiness/skype-for-business-hybrid-solutions/skype-for-business-hybrid-solutions)
345349

346350
[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)
347351

352+
[Using the Meeting Migration Service (MMS)](https://docs.microsoft.com/en-us/skypeforbusiness/audio-conferencing-in-office-365/setting-up-the-meeting-migration-service-mms)
353+

skype/skype-ps/skype/Set-CsMobilityPolicy.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,9 @@ Accept wildcard characters: False
403403
When set to True (the default value) users will be allowed to save credentials information (such as passwords) on their mobile device.
404404
This information can then be applied to auto-logon scenarios.
405405

406+
Note: If a user has AllowSaveCredentials set to False in the CsMobility policy, the Skype for Business App for iOS may sign out automatically when bringing it from the background to the foreground. This is due to the password not being saved anywhere but in the iOS process memory. Once the process is killed by the iOS system, the password will no longer be available, so the user will need to enter it again. However, there is no impact if modern authenticaion is implemented.
407+
408+
406409

407410
```yaml
408411
Type: Boolean

tools/office-cmdlet-updater/README.md

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Usage:
44
1. Clone repo at: https://github.com/microsoftdocs/office-docs-powershell
5-
2. Configure your email address in tools/.local/config/default.json to receive emailed logs. (OPTIONAL)
5+
2. Configure your email address in tools/.local/default.json to receive emailed logs. (OPTIONAL)
66
3. Confirm you have NodeJS installed.
77
Open PowerShell or GitBash and type `npm --version`.
88
If not, install from [https://nodejs.org/en/download/](https://nodejs.org/en/download/).
@@ -14,23 +14,20 @@
1414
- execute into console `winrm quickconfig`
1515
- Microsoft Teams:
1616
- https://www.powershellgallery.com/packages/MicrosoftTeams
17+
- alternatively, it could be installed by the tool, check Notes section below
1718
- SharePoint Online:
1819
- https://www.microsoft.com/en-us/download/details.aspx?id=35588
19-
- Exchange Online cmdlets could be imported using [this guide](https://docs.microsoft.com/en-us/powershell/exchange/exchange-online/connect-to-exchange-online-powershell/connect-to-exchange-online-powershell)
20+
- Exchange Online:
21+
- cmdlets could be imported using [this guide](https://docs.microsoft.com/en-us/powershell/exchange/exchange-online/connect-to-exchange-online-powershell/connect-to-exchange-online-powershell)
2022
- Whiteboard:
2123
- https://www.powershellgallery.com/packages/WhiteboardAdmin
22-
- StaffHub:
23-
- https://www.powershellgallery.com/packages/MicrosoftStaffHub
24-
- Office Online Server cmdlets are not distributed separately
25-
- SharePoint Migration Tool (SPMT):
26-
- https://docs.microsoft.com/en-us/powershell/module/spmt
27-
7. Run the app, type `npm start` and press Enter.
24+
- alternatively, it could be installed by the tool, check Notes section below
25+
7. Run the app, type `node index` and press Enter in order to get info for all modules
26+
8. Run the app for a certain module, type `node index -m <TypeModuleNameHere>`, with one of the following options - teams, skype, sharepoint, whiteboard, exchange. For example, you should run `node index -m teams` to run the tool for Microsoft Teams
27+
9. Run `node index -help` to get help information for all available commands
2828

2929
## Notes
30-
1. The modules are installed from the PowerShell Gallery (PSGallery).
31-
This gallery contains user submitted code.
32-
If you would rather not install modules from the PSGallery then you can install the modules manually prior to running the tool.
33-
If you need to add PSGallery as a trusted source, you can do so with the following command:
34-
`Set-PSRepository -Name "PSGallery" -InstallationPolicy Trusted`
30+
1. Some modules could be installed from the PowerShell Gallery (PSGallery). This gallery contains user submitted code. If you would rather not install modules from the PSGallery then you can install the modules manually prior to running the tool. If you need to add PSGallery as a trusted source, you can do so with the following command: `Set-PSRepository -Name "PSGallery" -InstallationPolicy Trusted`
31+
2. Run the tool from PowerShell x64 as an Administrator user
3532

3633
## Sample Run

0 commit comments

Comments
 (0)