Skip to content

Commit eeee1e5

Browse files
authored
Merge pull request MicrosoftDocs#5885 from MicrosoftDocs/master
Merges Master to Live. See commits for details.
2 parents 816780c + b4866c6 commit eeee1e5

File tree

5 files changed

+78
-30
lines changed

5 files changed

+78
-30
lines changed

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

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,13 @@ Moves one or more user accounts enabled for Skype for Business Server to a new R
2121
### (Default)
2222

2323
```
24-
Move-CsUser [-Identity] <UserIdParameter> [-Target] <Fqdn> [-Credential <PSCredential>] [-MoveToTeams] [-HostedMigrationOverrideUrl <String>] [-UseOAuth] [-BypassEnterpriseVoiceCheck] [-BypassAudioConferencingCheck] [-TenantAdminUserName] [-ProxyPool <Fqdn>] [-MoveConferenceData] [-UserList <String>] [-Confirm] [-Force] [-PassThru] [-WhatIf] [<CommonParameters>]
24+
Move-CsUser [-Identity] <UserIdParameter> [-Target] <Fqdn> [-Credential <PSCredential>] [-MoveToTeams] [-HostedMigrationOverrideUrl <String>] [-UseOAuth] [-BypassEnterpriseVoiceCheck] [-BypassAudioConferencingCheck] [-TenantAdminUserName] [-ProxyPool <Fqdn>] [-MoveConferenceData] [-Report <String>] [-Confirm] [-Force] [-PassThru] [-WhatIf] [<CommonParameters>]
25+
```
26+
27+
### UserList
28+
29+
```
30+
Move-CsUser -UserList <String> [-Target] <Fqdn> [-Credential <PSCredential>] [-MoveToTeams] [-HostedMigrationOverrideUrl <String>] [-UseOAuth] [-BypassEnterpriseVoiceCheck] [-BypassAudioConferencingCheck] [-TenantAdminUserName] [-ProxyPool <Fqdn>] [-MoveConferenceData] [-Report <String>] [-Confirm] [-Force] [-PassThru] [-WhatIf] [<CommonParameters>]
2531
```
2632

2733
## DESCRIPTION
@@ -36,9 +42,9 @@ The Move-CsUser cmdlet affects only the user's Skype for Business Server account
3642

3743
When moving a user to or from Office 365 (either Skype for Business Online or Teams):
3844

39-
- 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).
40-
- 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).
41-
- 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, meetings 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).
45+
- 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/SkypeForBusiness/skype-for-business-hybrid-solutions/deploy-hybrid-connectivity/deploy-hybrid-connectivity).
46+
- 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/skypeforbusiness/hybrid/move-users-between-on-premises-and-cloud).
47+
- 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, meetings 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/skypeforbusiness/audio-conferencing-in-office-365/setting-up-the-meeting-migration-service-mms).
4248
- 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:
4349

4450
- TeamsUpgradePolicy with Mode=TeamsOnly is assigned to the online user account.
@@ -49,9 +55,6 @@ When moving a user to or from Office 365 (either Skype for Business Online or Te
4955
> [!NOTE]
5056
> <ul><li>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.</li><li>If you are using Skype for Business Server 2015 with CU8 or later, we recommend you pass the `-UseOAuth` switch, which ensures the on-premises code authenticates using OAuth, instead of Legacy LiveID authentication. In Skype for Business Server 2019 and later versions, OAuth is always used hence the switch is not relevant on those versions.</li></ul>
5157
52-
53-
54-
5558
## EXAMPLES
5659

5760
### ------- EXAMPLE 1: Move a user to Teams-----------------------
@@ -89,6 +92,15 @@ Get-CsUser -OU "ou=Finance,dc=litwareinc,dc=com" | Move-CsUser -Target "atl-cs-0
8992
In Example 4, all the user accounts in the Finance organizational unit (OU) are moved to the Registrar pool atl-cs-001.litwareinc.com.
9093
To carry out this task, the command first uses the Get-CsUser cmdlet and the OU parameter to retrieve a collection of all the user accounts in the Finance OU. After the data has been retrieved, the information is piped to the Move-CsUser cmdlet, which moves each account in the collection to the Registrar pool atl-cs-001.litwareinc.com.
9194

95+
### --------- EXAMPLE 5: Move multiple users listed in a file ---------------------------
96+
97+
```powershell
98+
Move-CsUser -UserList C:\Folder1\Folder2\file1.txt -Target "atl-cs-001.litwareinc.com" -Report C:\Folder1\Folder2\out.csv
99+
```
100+
101+
In Example 5, all the users listed in file1.txt are moved to the the Registrar pool atl-cs-001.litwareinc.com.
102+
Also, a detailed report is created in the out.csv file.
103+
92104
## PARAMETERS
93105

94106
### -Identity
@@ -298,7 +310,6 @@ Accept pipeline input: False
298310
Accept wildcard characters: False
299311
```
300312
301-
302313
### -Confirm
303314
304315
Enables you to bypass the confirmation prompt that would otherwise appear when you attempt to move a user.
@@ -325,7 +336,7 @@ Accept wildcard characters: False
325336

326337
### -Report
327338

328-
PARAMVALUE: String
339+
A CSV file to be created with detailed information about the move. You can supply the file name if you want to create the file in the current folder, or an absolute path.
329340

330341
```yaml
331342
Type: String
@@ -342,7 +353,7 @@ Accept wildcard characters: False
342353

343354
### -UserList
344355

345-
A List of users to be moved, in the following format example: "sip:[email protected],sip:[email protected],sip:[email protected]".
356+
A text file with a list of users to be moved, in the following format example: "sip:[email protected],sip:[email protected],sip:[email protected]". You can supply the file name if it's located in the current folder, or the absolute path to the file.
346357

347358
```yaml
348359
Type: String

skype/skype-ps/skype/New-CsTeamsMeetingPolicy.md

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ New-CsTeamsMeetingPolicy [-Tenant <Guid>] [-Description <String>]
2626
[-AllowSharedNotes <Boolean>] [-AllowWhiteboard <Boolean>] [-AllowTranscription <Boolean>]
2727
[-MediaBitRateKb <UInt32>] [-ScreenSharingMode <String>] [-PreferredMeetingProviderForIslandsMode <String>]
2828
[-VideoFiltersMode <String>] [-Identity] <XdsIdentity> [-AllowEngagementReport <String>]
29-
[-AllowNDIStreaming <Boolean>] [-DesignatedPresenterRoleMode <String>] [-InMemory] [-Force] [-WhatIf]
30-
[-Confirm] [<CommonParameters>]
29+
[-AllowNDIStreaming <Boolean>] [-DesignatedPresenterRoleMode <String>] [-AllowPSTNUsersToBypassLobby <Boolean>]
30+
[-InMemory] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
3131
```
3232

3333
## DESCRIPTION
@@ -516,6 +516,21 @@ Accept pipeline input: False
516516
Accept wildcard characters: False
517517
```
518518
519+
### -AllowPSTNUsersToBypassLobby
520+
Determines whether a PSTN user joining the meeting is allowed or not to bypass the lobby. If you set this parameter to True, PSTN users are allowed to bypass the lobby as long as an authenticated user is joined to the meeting.
521+
522+
```yaml
523+
Type: Boolean
524+
Parameter Sets: (All)
525+
Aliases:
526+
527+
Required: False
528+
Position: Named
529+
Default value: None
530+
Accept pipeline input: False
531+
Accept wildcard characters: False
532+
```
533+
519534
## INPUTS
520535
521536
### None

skype/skype-ps/skype/Set-CsUserCallForwardingSettings.md

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,31 @@ Server auto-discovery needs to be enabled. There are no additional licensing req
5353

5454
### Example 1
5555
```powershell
56-
PS C:\> {{ Add example code here }}
56+
PS C:\> Set-CsUserCallForwardingSettings -User [email protected] -DisableForwarding
5757
```
5858

59-
{{ Add example description here }}
59+
This example disables the user’s call forwarding settings.
60+
61+
### Example 2
62+
```powershell
63+
PS C:\> Set-CsUserCallForwardingSettings -User [email protected] -EnableForwarding +4721956666
64+
```
65+
66+
This example modifies the user’s call forwarding settings, activating call forwarding to a specific phone number.
67+
68+
### Example 3
69+
```powershell
70+
PS C:\> Set-CsUserCallForwardingSettings -User [email protected] -EnableSimulRing Team -Team [email protected],[email protected] -TeamDelegateRingWaitTime 5
71+
```
72+
73+
This example modifies the SimulRing settings, activating simultaneous ring for the users listed in the Team parameter.
74+
75+
### Example 4
76+
```powershell
77+
PS C:\> Set-CsUserCallForwardingSettings -User [email protected] -DisableForwarding -UnansweredToVoicemail -UnansweredWaitTime 30
78+
```
79+
80+
This example sends unanswered calls to voicemail after 30 seconds.
6081

6182
## PARAMETERS
6283

@@ -77,8 +98,7 @@ Accept wildcard characters: False
7798
```
7899
79100
### -DelegateRingWaitTime
80-
Specifies the time, in seconds, to wait before ringing delegates.
81-
Acceptable inputs: 0, 5, 10
101+
Specifies the time, in seconds, to wait before ringing delegates. Acceptable inputs: 0, 5, 10.
82102
83103
84104
```yaml
@@ -95,7 +115,7 @@ Accept wildcard characters: False
95115
```
96116
97117
### -Delegates
98-
Specifies list of delegates that calls will be forwarded to. This parameter can only be used with EnableForwarding and EnableSimulRing parameters.
118+
Specifies the list of delegates that calls will be forwarded to. This parameter can only be used with EnableForwarding and EnableSimulRing parameters.
99119
100120
```yaml
101121
Type: System.Management.Automation.PSListModifier`1[System.String]
@@ -143,9 +163,7 @@ Accept wildcard characters: False
143163
```
144164
145165
### -EnableSimulRing
146-
This is a switch parameter that enables forwarding to the specified destination. Cannot be used along with the DisableForwarding and EnableForwarding parameters.
147-
oSimulRingDestination can be a phone number, delegates, or team call group.
148-
 Acceptable input formats: "<phone number>", Team, Delegates
166+
This is a switch parameter that enables forwarding to the specified destination. Cannot be used along with the DisableForwarding and EnableForwarding parameters. SimulRingDestination can be a phone number, delegates, or team call group. Acceptable input formats: "<phone number>", Team, Delegates.
149167
150168
151169
```yaml
@@ -178,9 +196,7 @@ Accept wildcard characters: False
178196
```
179197
180198
### -Team
181-
Specifies list of team members that calls will be forwarded to. The add and remove switches will add and remove specified users from the Team Members list. The replace parameter will set the list to the specified list, wiping out the previous list. Add and remove can be used together, but neither of them can be used along with replace.
182-
o Acceptable input formats for add/remove/replace list: The inputs can be a single user address (in one of the below formats), or a comma separated list of user addresses, in the 4 standard formats that Identity parameter accepts.
183-
199+
Specifies list of team members that calls will be forwarded to. The add and remove switches will add and remove specified users from the Team Members list. The replace parameter will set the list to the specified list, wiping out the previous list. Add and remove can be used together, but neither of them can be used along with replace. Acceptable input formats for add/remove/replace list: The inputs can be a single user address (in one of the below formats), or a comma separated list of user addresses, in the 4 standard formats that Identity parameter accepts.
184200
185201
```yaml
186202
Type: System.Management.Automation.PSListModifier`1[System.String]
@@ -196,7 +212,7 @@ Accept wildcard characters: False
196212
```
197213
198214
### -TeamDelegateRingWaitTime
199-
{{ Fill TeamDelegateRingWaitTime Description }}
215+
Specifies the time, in seconds, to wait before ringing team members.
200216
201217
```yaml
202218
Type: Int32
@@ -212,7 +228,7 @@ Accept wildcard characters: False
212228
```
213229
214230
### -UnansweredToOther
215-
{{ Fill UnansweredToOther Description }}
231+
Specifies that unanswered calls will be send to other user or phone number.
216232
217233
```yaml
218234
Type: String
@@ -228,7 +244,7 @@ Accept wildcard characters: False
228244
```
229245
230246
### -UnansweredToVoicemail
231-
{{ Fill UnansweredToVoicemail Description }}
247+
Specifies that unanswered calls will be send to voicemail.
232248
233249
```yaml
234250
Type: SwitchParameter
@@ -244,7 +260,7 @@ Accept wildcard characters: False
244260
```
245261
246262
### -UnansweredWaitTime
247-
{{ Fill UnansweredWaitTime Description }}
263+
Specifies the time, in seconds, to wait before send unanswered calls to voicemail.
248264
249265
```yaml
250266
Type: Int32
@@ -260,7 +276,7 @@ Accept wildcard characters: False
260276
```
261277
262278
### -User
263-
{{ Fill User Description }}
279+
Specifies the SIP address of the user whose call forwarding settings will be modified.
264280
265281
```yaml
266282
Type: String

teams/teams-ps/teams/Get-CsBatchPolicyAssignmentOperation.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,13 @@ Contains the status for each user in the batch.
132132
133133
**Id:** The ID of the user as specified when the batch was submitted. Either the user object ID (guid) or UPN/SIP/email.
134134
135-
**result:** The result of the assignment operation for the user: Success or an error.
135+
**result:** The result of the assignment operation for the user: Success or an error. Some common errors include:
136+
- User not found. Check the ID or SIP address of the user to confirm it is correct. If the UPN or email address was used, but it does not match the SIP address, then the user will not be found.
137+
- Multiple users found with a given SIP address. This is typically a result of on-prem to cloud sync. Check your directory and update the affected users.
138+
- User invalid. If you are syncing users from on-prem to the cloud, some users might not have been synced properly and are in an invalid state. Check the sync status for the user.
139+
- User ineligible for the policy or missing a necessary license. Check the documentation for the specific policy type being assigned to understand the requirements and update the user accordingly.
140+
- The policy settings are incorrect. Check the documentation for the specific policy type being assigned to understand the requirements and update the policy accordingly.
141+
- Unknown errors. In rare cases, there can be transient system errors that failed on all initial retry attempts during batch process. Resubmit these users in a separate batch.
136142
137143
**state:** The status for the user: NotStarted, InProgress, Completed
138144

whiteboard/whiteboard-ps/whiteboard/whiteboard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Microsoft Whiteboard
88

99
## Description
1010

11-
The following cmdlet references are for Microsoft Whiteboard. See [Overview](../../../whiteboard/docs-conceptual/overview.md) for details on installing the module. The module can only be run by a global tenant admin.
11+
The following cmdlet references are for Microsoft Whiteboard. See [Overview](../../docs-conceptual/overview.md) for details on installing the module. The module can only be run by a global tenant admin.
1212

1313
### [Get-Whiteboard](Get-Whiteboard.md)
1414

0 commit comments

Comments
 (0)