Skip to content

Commit 04aa343

Browse files
authored
Merge branch 'master' into patch-43
2 parents 3b7b9da + 62f6936 commit 04aa343

File tree

15 files changed

+84
-36
lines changed

15 files changed

+84
-36
lines changed

exchange/exchange-ps/exchange/users-and-groups/Set-User.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ The Identity parameter specifies the user that you want to modify. You can use a
117117

118118
- GUID
119119

120+
- UserPrincipalName
121+
120122
```yaml
121123
Type: UserIdParameter
122124
Parameter Sets: (All)

skype/skype-ps/skype/New-CsAutoAttendantCallHandlingAssociation.md

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.reviewer:
1111
# New-CsAutoAttendantCallHandlingAssociation
1212

1313
## SYNOPSIS
14-
Use the New-CsAutoAttendantCallHandlingAssociation cmdlet to create a new call handling association.
14+
Use the `New-CsAutoAttendantCallHandlingAssociation` cmdlet to create a new call handling association.
1515

1616
## SYNTAX
1717

@@ -20,14 +20,14 @@ New-CsAutoAttendantCallHandlingAssociation -CallFlowId <String> -ScheduleId <Str
2020
```
2121

2222
## DESCRIPTION
23-
The New-CsAutoAttendantCallHandlingAssociation cmdlet creates a new call handling association to be used with the Auto Attendant (AA) service. The OAA service uses call handling associations to determine which call flow to execute when a specific schedule is in effect.
23+
The `New-CsAutoAttendantCallHandlingAssociation` cmdlet creates a new call handling association to be used with the Auto Attendant (AA) service. The OAA service uses call handling associations to determine which call flow to execute when a specific schedule is in effect.
2424

2525
## EXAMPLES
2626

2727
### -------------------------- Example 1 --------------------------
2828
```powershell
2929
$tr = New-CsOnlineTimeRange -Start 09:00 -End 17:00
30-
$schedule = New-CsOnlineSchedule -Name "Business Hours" -WeeklyRecurrentSchedule -MondayHours @($tr)
30+
$schedule = New-CsOnlineSchedule -Name "Business Hours" -WeeklyRecurrentSchedule -MondayHours @($tr) -TuesdayHours @($tr) -WednesdayHours @($tr) -ThursdayHours @($tr) -FridayHours @($tr)
3131
$scheduleId = $schedule.Id
3232
3333
$menuPrompt = New-CsAutoAttendantPrompt -TextToSpeechPrompt "To reach your party by name, enter it now, followed by the pound sign."
@@ -38,7 +38,7 @@ $callFlowId = $callFlow.Id
3838
$callHandlingAssociation = New-CsAutoAttendantCallHandlingAssociation -Type AfterHours -ScheduleId $scheduleId -CallFlowId $callFlowId
3939
```
4040

41-
This example creates the following
41+
This example creates the following:
4242

4343
- a new after-hours schedule
4444
- a new after-hours call flow
@@ -47,7 +47,7 @@ This example creates the following
4747
### -------------------------- Example 2 --------------------------
4848
```powershell
4949
$tr = New-CsOnlineTimeRange -Start 09:00 -End 17:00
50-
$schedule = New-CsOnlineSchedule -Name "Business Hours" -WeeklyRecurrentSchedule -MondayHours @($tr)
50+
$schedule = New-CsOnlineSchedule -Name "Business Hours" -WeeklyRecurrentSchedule -MondayHours @($tr) -TuesdayHours @($tr) -WednesdayHours @($tr) -ThursdayHours @($tr) -FridayHours @($tr)
5151
$scheduleId = $schedule.Id
5252
5353
$menuPrompt = New-CsAutoAttendantPrompt -TextToSpeechPrompt "To reach your party by name, enter it now, followed by the pound sign."
@@ -58,7 +58,7 @@ $callFlowId = $callFlow.Id
5858
$disabledCallHandlingAssociation = New-CsAutoAttendantCallHandlingAssociation -Type AfterHours -ScheduleId $scheduleId -CallFlowId $callFlowId -Disable
5959
```
6060

61-
This example creates the following
61+
This example creates the following:
6262

6363
- a new after-hours schedule
6464
- a new after-hours call flow
@@ -79,7 +79,7 @@ $callFlowId = $callFlow.Id
7979
$callHandlingAssociation = New-CsAutoAttendantCallHandlingAssociation -Type Holiday -ScheduleId $scheduleId -CallFlowId $callFlowId
8080
```
8181

82-
This example creates the following
82+
This example creates the following:
8383

8484
- a new holiday schedule
8585
- a new holiday call flow
@@ -94,7 +94,7 @@ You can create a call flow by using the [`New-CsAutoAttendantCallFlow`](New-CsAu
9494

9595

9696
```yaml
97-
Type: System.String
97+
Type: String
9898
Parameter Sets: (All)
9999
Aliases:
100100
Applicable: Skype for Business Online
@@ -162,9 +162,18 @@ Accept wildcard characters: False
162162
```
163163

164164
### -Tenant
165+
Globally unique identifier (GUID) of the tenant account whose external user communication policy are being created. For example:
166+
167+
-Tenant "38aad667-af54-4397-aaa7-e94c79ec2308"
168+
169+
You can return your tenant ID by running this command:
170+
171+
Get-CsTenant | Select-Object DisplayName, TenantID
172+
173+
If you are using a remote session of Windows PowerShell and are connected only to Skype for Business Online you do not have to include the Tenant parameter. Instead, the tenant ID will automatically be filled in for you based on your connection information. The Tenant parameter is primarily for use in a hybrid deployment.
165174

166175
```yaml
167-
Type: System.Guid
176+
Type: Guid
168177
Parameter Sets: (All)
169178
Aliases:
170179
Applicable: Skype for Business Online

skype/skype-ps/skype/New-CsCallingLineIdentity.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,21 @@ Note:
3939
New-CsCallingLineIdentity -Identity Anonymous -Description "anonymous policy" -CallingIDSubstitute Anonymous -EnableUserOverride $false
4040
```
4141

42-
The following example creates a new Caller ID policy that sets the Caller ID to Anonymous.
42+
This example creates a new Caller ID policy that sets the Caller ID to Anonymous.
4343

4444
### -------------------------- Example 2 --------------------------
4545
```
4646
New-CsCallingLineIdentity -Identity "UKOrgAA" -CallingIdSubstitute "Service" -ServiceNumber "14258828080" -EnableUserOverride $false -Verbose
4747
```
4848

49-
The following example creates a new Caller ID policy that sets the Caller ID to a specified service number.
49+
This example creates a new Caller ID policy that sets the Caller ID to a specified service number.
5050

5151
### -------------------------- Example 3 --------------------------
5252
```
5353
New-CsCallingLineIdentity -Identity Anonymous -Description "anonymous policy" -CallingIDSubstitute Anonymous -EnableUserOverride $false -BlockIncomingPstnCallerID $true
5454
```
5555

56-
The following example creates a new Caller ID policy that blocks the incoming Caller ID.
56+
This example creates a new Caller ID policy that blocks the incoming Caller ID.
5757

5858
## PARAMETERS
5959

skype/skype-ps/skype/Remove-CsTeamsMeetingPolicy.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.reviewer:
1111
# Remove-CsTeamsMeetingPolicy
1212

1313
## SYNOPSIS
14-
Remove-CsTeamsMeetingPolicy \[-Identity\] \<XdsIdentity\> \[-Tenant \<guid\>\] \[-Force\] \[-WhatIf\] \[-Confirm\] \[\<CommonParameters\>\]
14+
The `CsTeamsMeetingPolicy` cmdlets removes a previously created TeamsMeetingPolicy.
1515

1616
## SYNTAX
1717

@@ -21,7 +21,7 @@ Remove-CsTeamsMeetingPolicy [-Tenant <Guid>] [-Identity] <XdsIdentity> [-Force]
2121
```
2222

2323
## DESCRIPTION
24-
Deletes a previously created TeamsMeetingPolicy. Any users with no explicitly assigned policies will then fall back to the default policy in the organization. You cannot delete the global policy from the organization.
24+
Deletes a previously created TeamsMeetingPolicy. Any users with no explicitly assigned policies will then fall back to the default policy in the organization. You cannot delete the global policy from the organization. If you want to remove policies currently assigned to one or more users, you should assign a different policy to them before.
2525

2626
## EXAMPLES
2727

@@ -50,6 +50,7 @@ Accept wildcard characters: False
5050
```
5151
5252
### -Force
53+
The Force switch specifies whether to suppress warning and confirmation messages. It can be useful in scripting to suppress interactive prompts. If the Force switch isn't provided in the command, you're prompted for administrative input if required.
5354
5455
```yaml
5556
Type: SwitchParameter
@@ -64,7 +65,7 @@ Accept wildcard characters: False
6465
```
6566
6667
### -Identity
67-
Unique identifier for the teams meeting policy to be removed. To remove the global policy, use this syntax: -Identity global. (Note that the global policy cannot actually be removed. Instead, all the policy properties will be reset to their default values.) To remove a custom policy, use this syntax: -Identity StudentMeetingPolicy .
68+
Unique identifier for the teams meeting policy to be removed. To remove the global policy, use this syntax: -Identity global. (Note that the global policy cannot actually be removed. Instead, all the policy properties will be reset to their default values.) To remove a custom policy, use this syntax: -Identity StudentMeetingPolicy.
6869
6970
```yaml
7071
Type: XdsIdentity
@@ -79,6 +80,15 @@ Accept wildcard characters: False
7980
```
8081
8182
### -Tenant
83+
Globally unique identifier (GUID) of the tenant account whose external user communication policy are being created. For example:
84+
85+
-Tenant "38aad667-af54-4397-aaa7-e94c79ec2308"
86+
87+
You can return your tenant ID by running this command:
88+
89+
Get-CsTenant | Select-Object DisplayName, TenantID
90+
91+
If you are using a remote session of Windows PowerShell and are connected only to Skype for Business Online you do not have to include the Tenant parameter. Instead, the tenant ID will automatically be filled in for you based on your connection information. The Tenant parameter is primarily for use in a hybrid deployment.
8292
8393
```yaml
8494
Type: Guid

skype/skype-ps/skype/Reset-CsRoutingGroup.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,11 @@ Accept wildcard characters: False
140140
Type of reset to be performed.
141141
Allowed values are:
142142
143-
Invalid
144-
145143
Permanent
146144
147145
Transient
148146
147+
Recreate
149148
```yaml
150149
Type: RgResetType
151150
Parameter Sets: (All)

staffhub/staffhub-ps/staffhub/Get-StaffHubTeamsForTenant.md

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Note: This cmdlet is currently in Beta.
2020
## SYNTAX
2121

2222
```
23-
Get-StaffHubTeamsForTenant [[-ContinuationToken] <String>] [[-Top] <Int32>]
23+
Get-StaffHubTeamsForTenant [[-ContinuationToken] <String>] [[-Top] <Int32>] [[-ManagedBy] <StaffHub|Teams>]
2424
```
2525

2626
## DESCRIPTION
@@ -47,6 +47,13 @@ Get-StaffHubTeamsForTenant
4747

4848
Get all teams in the tenant with page size restricted to 1000 by default.
4949

50+
### -------------------------- Example 3 --------------------------
51+
```
52+
Get-StaffHubTeamsForTenant -ManagedBy Teams
53+
```
54+
55+
Return Teams that have not been created using StaffHub.
56+
5057
## PARAMETERS
5158

5259
### -ContinuationToken
@@ -73,7 +80,24 @@ Parameter Sets: (All)
7380
Aliases:
7481
Applicable: Microsoft StaffHub
7582
Required: False
76-
Position: 0
83+
Position: 2
84+
Default value: None
85+
Accept pipeline input: False
86+
Accept wildcard characters: False
87+
```
88+
89+
### -ManagedBy
90+
Get Teams of a specific type. Valid values are:
91+
- StaffHub
92+
- Teams
93+
94+
```yaml
95+
Type: StaffHub | Teams
96+
Parameter Sets: (All)
97+
Aliases:
98+
Applicable: Microsoft StaffHub
99+
Required: False
100+
Position: 3
77101
Default value: None
78102
Accept pipeline input: False
79103
Accept wildcard characters: False

teams/teams-ps/teams/New-Team.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ New-Team -DisplayName "Tech Reads" -Description "Team to post technical articles
6060
### Example 3
6161
```
6262
Connect-MicrosoftTeams -AccountId [email protected]
63-
$group = New-Team -alias "TestTeam" -displayname "Test Teams" -Visibility "private"
63+
$group = New-Team -MailNickname "TestTeam" -displayname "Test Teams" -Visibility "private"
6464
Add-TeamUser -GroupId $group.GroupId -User "[email protected]"
6565
Add-TeamUser -GroupId $group.GroupId -User "[email protected]"
6666
Add-TeamUser -GroupId $group.GroupId -User "[email protected]"

whiteboard/docs-conceptual/LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
------------------------------------------- START OF LICENSE -----------------------------------------
22

3-
Microsoft Whiteboard Admin PowerShell Cmdlets
3+
Microsoft Whiteboard Admin PowerShell Cmdlets
44

55
Copyright (c) Microsoft Corporation. All rights reserved.
66

whiteboard/docs-conceptual/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
Welcome to the Microsoft Whiteboard PowerShell cmdlet help references. The Microsoft Whiteboard cmdlets provide the command line interface for service administration and management.
44

5-
Here you will find all of the Microsoft Whiteboard PowerShell help topics. These topics are 'open source' and open for contributions. If you are interested in contributing to this content head over to the source GitHub repo and look through the README.
5+
Here you will find all of the Microsoft Whiteboard PowerShell help topics. These topics are 'open source' and open for contributions. If you are interested in contributing to this content head over to the source GitHub repo and look through the README.
66

77
The repo is located here: https://github.com/microsoftdocs/office-docs-powershell and you can find the README displayed at the bottom of the page.

whiteboard/docs-conceptual/overview.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,18 @@ To install and use the Microsoft Whiteboard cmdlets:
88
2. Right-click on Windows PowerShell and choose Run As Administrator
99
3. Type or copy this command into the window and press the Enter key: Install-Module -Name WhiteboardAdmin
1010

11-
You may need to update your execution policy, which you can do by typing or copying this command into the window and pressing the Enter key: Set-ExecutionPolicy RemoteSigned
11+
You may need to update your execution policy, which you can do by typing or copying this command into the window and pressing the Enter key: Set-ExecutionPolicy RemoteSigned
1212

1313
Note: For more information on Execution_Policies, go to https://go.microsoft.com/fwlink/?LinkID=135170
1414

1515
## User IDs
1616

1717
Cmdlets taking user IDs use the ID from Azure Active Directory. To get a user ID, you can use the Microsoft Graph Explorer. For more information, go to https://developer.microsoft.com/en-us/graph/docs/api-reference/v1.0/api/user_get
1818

19+
## Exporting Whiteboard Content
20+
21+
The Microsoft Whiteboard cmdlets are often used to facilate the export of Whiteboard content for users that no longer have access to whiteboard. To accomplish this you must first transfer the whiteboard owner to someone who has access to Whiteboard. Then the user who now owns the whiteboard can sign into the app and export the content.
22+
1923
## Common Cmdlets
2024

2125
* [Get-Whiteboard](../whiteboard-ps/whiteboard/Get-Whiteboard.md)

whiteboard/mapping/monikerMapping.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"referenceTocUrl": "/powershell/module/whiteboard-ps/toc.json",
66
"packageRoot": "whiteboard-ps",
77
"modules": {
8-
"whiteboard": {}
8+
"whiteboard": {}
99
}
1010
}
1111
}

whiteboard/whiteboard-ps/whiteboard/Get-Whiteboard.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ external help file: Microsoft.Whiteboard.PowerShell.Custom.dll-Help.xml
33
Module Name: MicrosoftWhiteboard
44
applicable: Microsoft Whiteboard
55
title: Get-Whiteboard
6-
online version:
6+
online version:
77
schema: 2.0.0
88
author: kenwith
99
ms.author: kenwith
@@ -54,7 +54,7 @@ The Azure AD bearer token corresponding to the specified credentials. If unspeci
5454
Type: Microsoft.IdentityModel.Clients.ActiveDirectory.AuthenticationResult
5555
Required: false
5656
Position: named
57-
Default value: None
57+
Default value: None
5858
Accept pipeline input: false
5959
Accept wildcard characters: false
6060
Applicable: Microsoft Whiteboard
@@ -81,7 +81,7 @@ Optional. The ID of a specific Whiteboard.
8181
Type: Guid
8282
Required: true
8383
Position: named
84-
Default value: None
84+
Default value: None
8585
Accept pipeline input: false
8686
Accept wildcard characters: false
8787
Applicable: Microsoft Whiteboard
@@ -95,7 +95,7 @@ Optional. Always prompt for auth. Use to ignore cached credentials.
9595
Type: SwitchParameter
9696
Required: false
9797
Position: named
98-
Default value: false
98+
Default value: false
9999
Accept pipeline input: false
100100
Accept wildcard characters: false
101101
Applicable: Microsoft Whiteboard

whiteboard/whiteboard-ps/whiteboard/Invoke-TransferAllWhiteboards.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ external help file: Microsoft.Whiteboard.PowerShell.Custom.dll-Help.xml
33
Module Name: MicrosoftWhiteboard
44
applicable: Microsoft Whiteboard
55
title: Set-WhiteboardOwner
6-
online version:
6+
online version:
77
schema: 2.0.0
88
author: kenwith
99
ms.author: kenwith
@@ -55,7 +55,7 @@ The Azure AD bearer token corresponding to the specified credentials. If unspeci
5555
Type: Microsoft.IdentityModel.Clients.ActiveDirectory.AuthenticationResult
5656
Required: false
5757
Position: 1
58-
Default value: None
58+
Default value: None
5959
Accept pipeline input: false
6060
Accept wildcard characters: false
6161
Applicable: Microsoft Whiteboard
@@ -97,7 +97,7 @@ Optional. Always prompt for auth. Use to ignore cached credentials.
9797
Type: SwitchParameter
9898
Required: false
9999
Position: named
100-
Default value: false
100+
Default value: false
101101
Accept pipeline input: false
102102
Accept wildcard characters: false
103103
Applicable: Microsoft Whiteboard

whiteboard/whiteboard-ps/whiteboard/Set-WhiteboardOwner.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ external help file: Microsoft.Whiteboard.PowerShell.Custom.dll-Help.xml
33
Module Name: MicrosoftWhiteboard
44
applicable: Microsoft Whiteboard
55
title: Set-WhiteboardOwner
6-
online version:
6+
online version:
77
schema: 2.0.0
88
author: kenwith
99
ms.author: kenwith
@@ -46,7 +46,7 @@ The Azure AD bearer token corresponding to the specified credentials. If unspeci
4646
Type: Microsoft.IdentityModel.Clients.ActiveDirectory.AuthenticationResult
4747
Required: false
4848
Position: 1
49-
Default value: None
49+
Default value: None
5050
Accept pipeline input: false
5151
Accept wildcard characters: false
5252
Applicable: Microsoft Whiteboard
@@ -60,7 +60,7 @@ The Whiteboard for which the owner is being changed.
6060
Type: Guid
6161
Required: true
6262
Position: 2
63-
Default value: None
63+
Default value: None
6464
Accept pipeline input: false
6565
Accept wildcard characters: false
6666
Applicable: Microsoft Whiteboard
@@ -102,7 +102,7 @@ Optional. Always prompt for auth. Use to ignore cached credentials.
102102
Type: SwitchParameter
103103
Required: false
104104
Position: named
105-
Default value: false
105+
Default value: false
106106
Accept pipeline input: false
107107
Accept wildcard characters: false
108108
Applicable: Microsoft Whiteboard

0 commit comments

Comments
 (0)