Skip to content

Commit 512824e

Browse files
committed
Merge branch 'master' into chrisda
2 parents 37672c3 + 695c0e5 commit 512824e

File tree

4 files changed

+85
-8
lines changed

4 files changed

+85
-8
lines changed

exchange/exchange-ps/exchange/Set-OrganizationConfig.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2352,8 +2352,6 @@ Accept wildcard characters: False
23522352
```
23532353

23542354
### -PublicFolderShowClientControl
2355-
This parameter is available only in the cloud-based service.
2356-
23572355
The PublicFolderShowClientControl parameter enables or disables access to public folders in Microsoft Outlook. Valid values are:
23582356

23592357
- $true: Users can access public folders in Outlook if the PublicFolderClientAccess parameter on the Set-CASMailbox cmdlet is set to the value $true (the default value is $false).
@@ -2364,7 +2362,7 @@ The PublicFolderShowClientControl parameter enables or disables access to public
23642362
Type: Boolean
23652363
Parameter Sets: Default
23662364
Aliases:
2367-
Applicable: Exchange Online
2365+
Applicable: Exchange Server 2016, Exchange 2019, Exchange Online
23682366
23692367
Required: False
23702368
Position: Named

skype/skype-ps/skype/New-CsTeamsIPPhonePolicy.md

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ New-CsTeamsIPPhonePolicy allows you to create a policy to manage features relate
2020
## SYNTAX
2121

2222
```
23-
New-CsTeamsIPPhonePolicy [-Description <String>] [-HotDeskingIdleTimeoutInMinutes <Int>]
23+
New-CsTeamsIPPhonePolicy [-AllowHomeScreen <String>] [-AllowBetterTogether <String>] [-Description <String>] [-HotDeskingIdleTimeoutInMinutes <Int>]
2424
2525
[-AllowHotDesking <Boolean>] [[-Identity] <XdsIdentity>] [-Tenant <Guid>] [-InMemory] [-SignInMode <String>]
2626
@@ -41,6 +41,45 @@ This example shows a new policy being created called "CommonAreaPhone" setting t
4141

4242
## PARAMETERS
4343

44+
### -AllowBetterTogether
45+
Determines whether Better Together mode is enabled, phones can lock and unlock in an integrated fashion when connected to their Windows PC running a 64-bit Teams desktop client.
46+
Possible values this parameter can take:
47+
48+
- Enabled
49+
- Disabled
50+
51+
```yaml
52+
Type: String
53+
Parameter Sets: (All)
54+
Aliases:
55+
56+
Required: False
57+
Position: Named
58+
Default value: Enabled
59+
Accept pipeline input: False
60+
Accept wildcard characters: False
61+
```
62+
63+
### -AllowHomeScreen
64+
Determines whether the Home Screen feature of the Teams IP Phones is enabled.
65+
Possible values this parameter can take:
66+
67+
- Enabled
68+
- EnabledUserOverride
69+
- Disabled
70+
71+
```yaml
72+
Type: String
73+
Parameter Sets: (All)
74+
Aliases:
75+
76+
Required: False
77+
Position: Named
78+
Default value: EnabledUserOverride
79+
Accept pipeline input: False
80+
Accept wildcard characters: False
81+
```
82+
4483
### -AllowHotDesking
4584
Determines whether hot desking mode is enabled. Set this to TRUE to enable. Set this to FALSE to disable hot desking mode.
4685

skype/skype-ps/skype/Set-CsAutoAttendant.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ $autoAttendant.CallHandlingAssociations
9494
# CallFlowId : e7dd255b-ee20-57f0-8a2b-fc403321e284
9595
# Enabled : True
9696
97-
$autoAttendant.CallHandlingAssociations = $autoAttendant.CallHandlingAssociations | Where-Object {$_.ScheduleId -ne "578745b2-1f94-4a38-844c-6bf6996463ee"}
97+
$autoAttendant.CallHandlingAssociations.Remove(($autoAttendant.CallHandlingAssociations | where-object {$_.ScheduleId -eq "578745b2-1f94-4a38-844c-6bf6996463ee"}))
9898
9999
$autoAttendant.CallFlows
100100
@@ -108,7 +108,7 @@ $autoAttendant.CallFlows
108108
# Greetings :
109109
# Menu : Christmas Menu
110110
111-
$autoAttendant.CallFlows = $autoAttendant.CallFlows | Where-Object {$_.Id -ne "8ab460f0-770c-4d30-a2ff-a6469718844f"}
111+
$autoAttendant.CallFlows.Remove(($autoAttendant.CallFlows | where-object {$_.Id -eq "8ab460f0-770c-4d30-a2ff-a6469718844f"}))
112112
113113
Set-CsAutoAttendant -Instance $autoAttendant
114114
```

skype/skype-ps/skype/Set-CsTeamsIPPhonePolicy.md

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Set-CsTeamsIPPhonePolicy enables you to modify the properties of an existing Tea
2121

2222
```
2323
Set-CsTeamsIPPhonePolicy [-Description <String>] [-HotDeskingIdleTimeoutInMinutes <Int>]
24-
[-SearchOnCommonAreaPhoneMode <String>] [-AllowHotDesking <Boolean>] [[-Identity] <XdsIdentity>] [-Tenant <Guid>]
24+
[-SearchOnCommonAreaPhoneMode <String>] [-AllowHotDesking <Boolean>] [-AllowHomeScreen <String>] [-AllowBetterTogether <String>] [[-Identity] <XdsIdentity>] [-Tenant <Guid>]
2525
[-SignInMode <String>] [-WhatIf] [-Confirm] [-Force] [-Instance <Object>]
2626
```
2727

@@ -39,6 +39,46 @@ This example shows the SignInMode "CommonAreaPhoneSignIn" being set against the
3939

4040
## PARAMETERS
4141

42+
### -AllowBetterTogether
43+
Determines whether Better Together mode is enabled, phones can lock and unlock in an integrated fashion when connected to their Windows PC running a 64-bit Teams desktop client.
44+
Possible values this parameter can take:
45+
46+
- Enabled
47+
- Disabled
48+
49+
```yaml
50+
Type: String
51+
Parameter Sets: (All)
52+
Aliases:
53+
54+
Required: False
55+
Position: Named
56+
Default value: Enabled
57+
Accept pipeline input: False
58+
Accept wildcard characters: False
59+
```
60+
61+
### -AllowHomeScreen
62+
Determines whether the Home Screen feature of the Teams IP Phones is enabled.
63+
Possible values this parameter can take:
64+
65+
- Enabled
66+
- EnabledUserOverride
67+
- Disabled
68+
69+
```yaml
70+
Type: String
71+
Parameter Sets: (All)
72+
Aliases:
73+
74+
Required: False
75+
Position: Named
76+
Default value: EnabledUserOverride
77+
Accept pipeline input: False
78+
Accept wildcard characters: False
79+
```
80+
81+
4282
### -AllowHotDesking
4383
Determines if the hot desking feature is enabled or not. Set this to TRUE to enable. Set this to FALSE to disable hot desking mode.
4484
@@ -203,4 +243,4 @@ Accept wildcard characters: False
203243
204244
## NOTES
205245
206-
## RELATED LINKS
246+
## RELATED LINKS

0 commit comments

Comments
 (0)