Skip to content

Commit 8e859d2

Browse files
authored
Merge branch 'master' into patch-3
2 parents 67d43c7 + ed607f0 commit 8e859d2

File tree

6 files changed

+20
-46
lines changed

6 files changed

+20
-46
lines changed

exchange/exchange-ps/exchange/policy-and-compliance-dlp/Get-PolicyTipConfig.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ For information about the parameter sets in the Syntax section below, see Exchan
1717

1818
## SYNTAX
1919

20-
### Paramters
20+
### Parameters
2121
```
2222
Get-PolicyTipConfig [-Action <NotifyOnly | RejectOverride | Reject | Url>] [-Locale <CultureInfo>] [-Original]
2323
[-DomainController <Fqdn>] [<CommonParameters>]
@@ -72,7 +72,7 @@ You can't use the Action parameter with the Identity parameter.
7272

7373
```yaml
7474
Type: NotifyOnly | RejectOverride | Reject | Url
75-
Parameter Sets: Paramters
75+
Parameter Sets: Parameters
7676
Aliases:
7777
Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
7878
Required: False
@@ -133,7 +133,7 @@ You can't use the Locale parameter with the Identity parameter.
133133
134134
```yaml
135135
Type: CultureInfo
136-
Parameter Sets: Paramters
136+
Parameter Sets: Parameters
137137
Aliases:
138138
Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
139139
Required: False
@@ -148,7 +148,7 @@ The Original switch includes built-in Policy Tips in the results. You don't spec
148148
149149
```yaml
150150
Type: SwitchParameter
151-
Parameter Sets: Paramters
151+
Parameter Sets: Parameters
152152
Aliases:
153153
Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
154154
Required: False

skype/skype-ps/skype/Get-CsTeamsUpgradePolicy.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ NOTES:
3131
- If you are using Skype for Business Server, there are no built-in instances and you'll need to create one. Also, only the NotifySfBUsers property is available. Mode is not present
3232
- Instances with mode set to SfBWithTeamsCollab and SfBWithTeamsCollabAndMeetings are not yet fully functional. From a routing perspective, they will behave like SfBOnly mode.
3333

34-
IMPORTANT: TeamsUpgradePolicy has replaced TeamsInteropPolicy. Components that previously honored TeamsInteropPolicy have been updated to honor TeamsUpgradePolicy instead. Do not use TeamsInteropPolicy.
34+
IMPORTANT: TeamsUpgradePolicy has replaced TeamsInteropPolicy. Components that previously honored TeamsInteropPolicy have been updated to honor TeamsUpgradePolicy instead. Do not use TeamsInteropPolicy. In addition, Legacy mode in TeamsUpgradePolicy has been retired.
3535

3636

3737
## EXAMPLES
@@ -45,16 +45,6 @@ Description : Users can use either Skype for Business client or Teams client
4545
Mode : Islands
4646
NotifySfbUsers : False
4747
48-
Identity : Tag:NoUpgrade
49-
Description : Users can use either Skype for Business client or Teams client
50-
Mode : Legacy
51-
NotifySfbUsers : False
52-
53-
Identity : Tag:NotifyForTeams
54-
Description : Show notification of pending upgrade in Skype for Business client
55-
Mode : Legacy
56-
NotifySfbUsers : True
57-
5848
Identity : Tag:UpgradeToTeams
5949
Description : Use Teams Only
6050
Mode : TeamsOnly

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ TeamsUpgradePolicy allows administrators to manage the transition from Skype for
2323
This cmdlet enables admins to apply TeamsUpgradePolicy to either individual users or to set the default for the entire organization. TeamsUpgradePolicy can be granted either on a per user basis or on a tenant-wide basis.
2424

2525

26-
IMPORTANT: TeamsUpgradePolicy has replaced TeamsInteropPolicy. Components that previously honored TeamsInteropPolicy have been fully updated to honor TeamsUpgradePolicy instead. TeamsInteropPolicy is not honored, except if TeamsUpgradePolicy mode=Legacy. However, Legacy mode has been deprecated and it is no longer possible to grant TeamsUpgradePolicy with mode=Legacy. Organizations with users in Legacy mode must update their configurations to use a different mode.
26+
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 been deprecated. Organizations with users in Legacy mode must update their configurations to use a different mode.
2727

2828

2929

@@ -43,8 +43,6 @@ Office 365 provides all relevant instances of TeamsUpgradePolicy via built-in, r
4343
|SfBWithTeamsCollabWithNotify|SfBWithTeamsCollabAndMeetings|True|This mode exists at the PowerShell layer but is not yet exposed in the admin user experience. From a routing perspective, this is the same as SfBOnly mode. When TeamsAppPermissionsPolicy is available, this will allow Channels and meeting scheduling in Teams app.|
4444
|UpgradeToTeams|TeamsOnly|False|Use this mode to upgrade users to Teams and to prevent chat, calling, and meeting scheduling in Skype for Business.|
4545
|Global|Islands|False||
46-
|NoUpgrade|Legacy|False|This instance is deprecated and it is no longer possible to grant this. Organizations that have already granted this instance must update their configuration to use a difference policy instance.|
47-
|NotifyForTeams|Legacy|True|This instance is deprecated and it is no longer possible to grant this. Organizations that have already granted this instance must update their configuration to use a difference policy instance.|
4846
|||||
4947

5048

@@ -57,7 +55,7 @@ NOTES:
5755
- Coexistence mode is honored by users homed on-premises, however on-premises users cannot be granted the UpgradeToTeams instance (mode=TeamsOnly) of TeamsUpgradePolicy. Users must be either homed in Skype for Business Online or have no Skype account anywhere to be upgraded to TeamsOnly mode.
5856
- The NotifySfBUsers setting of Office 365 TeamsUpgradePolicy is not honored by users homed on-premises. Instead, the on-premises version of TeamsUpgradePolicy must be used.
5957
- In Office 365, all relevant instances of TeamsUpgradePolicy are built into the system, so there is no corresponding New cmdlet available. In contrast, Skype for Business Server does not contain built-in instances, so the New cmdlet is available on-premises. Only NotifySfBUsers property is available in on-premises.
60-
- Instances with mode set to SfBWithTeamsCollab and SfBWithTeamsCollabAndMeetings are not yet functional. From a routing perspective, this will behave like SfBOnly mode.
58+
- Instances with mode set to SfBWithTeamsCollab and SfBWithTeamsCollabAndMeetings are not yet fully functional in terms of changing Teams client UX. From a routing perspective, this will behave like SfBOnly mode.
6159

6260

6361
## EXAMPLES
@@ -159,9 +157,10 @@ Accept wildcard characters: False
159157
160158
## NOTES
161159
162-
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.
160+
Legacy mode in TeamsUprgradePolicy 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.
161+
162+
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.
163163
164-
Microsoft previously introduced the “Legacy” mode in TeamsUpgradePolicy to facilitate the transition from TeamsInteropPolicy to TeamsUpgradePolicy. In Legacy mode, routing components that understood TeamsUpgradePolicy would revert back to TeamsInteropPolicy. Routing now fully supports TeamsUpgradePolicy and there is no further need to use Legacy mode. Legacy mode in TeamsUprgradePolicy 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.
165164
166165
167166

skype/skype-ps/skype/Set-CsAuthConfig.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Use the Set-CsAuthConfig cmdlet to modify the authentication configuration for y
3131

3232
This cmdlet sets configuration on both the Registrar and the Web Services roles.
3333

34-
It is only meant to be run at the global level (and not at the pool level), and we highly recommend that you only use it in this manner. However, technically it can be run at a pool level. But realize that if the pool only has one of the roles needed (say, Registrar and not Web Services), then only the settings for Registrar will be set and the Web Services settings will come from the global setting. No special warning will be given because some settings were not set. If a client uses the Registrar settings from one pool and the Web Services settings from another pool and the authentication settings are in an inconsistent state, the client may be unable to log on. If neither role is present for a pool, both Get will return an error message. If both roles are present for a pool but policies aren't defined at the pool level, Get will return an error message.
34+
It is only meant to be run at the global level (and not at the pool level), and we highly recommend that you only use it in this manner. However, technically it can be run at a pool level. But realize that if the pool only has one of the roles needed (say, Registrar and not Web Services), then only the settings for Registrar will be set and the Web Services settings will come from the global setting. No special warning will be given because some settings were not set. If a client uses the Registrar settings from one pool and the Web Services settings from another pool and the authentication settings are in an inconsistent state, the client may be unable to log on. If neither role is present for a pool, Get will return an error message. If both roles are present for a pool but policies aren't defined at the pool level, Get will return an error message.
3535

3636

3737
## EXAMPLES
@@ -117,7 +117,7 @@ Accept wildcard characters: False
117117
118118
### CommonParameters
119119
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable.
120-
For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
120+
For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
121121
122122
## INPUTS
123123

skype/skype-ps/skype/Set-CsTeamsCallingPolicy.md

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ Use this cmdlet to update values in existing Teams Calling Policies.
1818
```
1919
Set-CsTeamsCallingPolicy [-Tenant <System.Guid>] [-AllowCalling <Boolean>] [-AllowPrivateCalling <Boolean>]
2020
[-AllowVoicemail <String>] [-AllowCallGroups <Boolean>] [-AllowDelegation <Boolean>]
21-
[-AllowUserControl <Boolean>] [-AllowCallForwardingToUser <Boolean>] [-AllowCallForwardingToPhone <Boolean>]
21+
[-AllowCallForwardingToUser <Boolean>] [-AllowCallForwardingToPhone <Boolean>]
2222
[-PreventTollBypass <Boolean>] [[-Identity] <XdsIdentity>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
2323
```
2424

2525
### Instance
2626
```
2727
Set-CsTeamsCallingPolicy [-Tenant <System.Guid>] [-AllowCalling <Boolean>] [-AllowPrivateCalling <Boolean>]
2828
[-AllowVoicemail <String>] [-AllowCallGroups <Boolean>] [-AllowDelegation <Boolean>]
29-
[-AllowUserControl <Boolean>] [-AllowCallForwardingToUser <Boolean>] [-AllowCallForwardingToPhone <Boolean>]
29+
[-AllowCallForwardingToUser <Boolean>] [-AllowCallForwardingToPhone <Boolean>]
3030
[-PreventTollBypass <Boolean>] [-Instance <PSObject>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
3131
```
3232

@@ -185,7 +185,7 @@ Accept wildcard characters: False
185185
```
186186
187187
### -AllowCallForwardingToUser
188-
{{Fill AllowCallForwardingToUser Description}}
188+
Enables call forwarding or simultaneous ringing of inbound calls to other users
189189
190190
```yaml
191191
Type: Boolean
@@ -200,7 +200,7 @@ Accept wildcard characters: False
200200
```
201201
202202
### -AllowCallGroups
203-
{{Fill AllowCallGroups Description}}
203+
Enables inbound calls to be routed to call groups
204204
205205
```yaml
206206
Type: Boolean
@@ -215,22 +215,7 @@ Accept wildcard characters: False
215215
```
216216
217217
### -AllowDelegation
218-
{{Fill AllowDelegation Description}}
219-
220-
```yaml
221-
Type: Boolean
222-
Parameter Sets: (All)
223-
Aliases:
224-
225-
Required: False
226-
Position: Named
227-
Default value: None
228-
Accept pipeline input: False
229-
Accept wildcard characters: False
230-
```
231-
232-
### -AllowUserControl
233-
{{Fill AllowUserControl Description}}
218+
Enables inbound calls to be routed to delegates; allows delegates to make outbound calls on behalf of the users for whom they have delegated permissions.
234219
235220
```yaml
236221
Type: Boolean
@@ -245,7 +230,7 @@ Accept wildcard characters: False
245230
```
246231
247232
### -AllowVoicemail
248-
{{Fill AllowVoicemail Description}}
233+
Enables inbound calls to be routed to voice mail. Valid options are: AlwaysEnabled, AlwaysDisabled, UserOverride
249234
250235
```yaml
251236
Type: String
@@ -260,7 +245,7 @@ Accept wildcard characters: False
260245
```
261246
262247
### -PreventTollBypass
263-
{{Fill PreventTollBypass Description}}
248+
Setting this parameter to True will send calls through PSTN and incur charges rather than going through the network and bypassing the tolls.
264249
265250
```yaml
266251
Type: Boolean

skype/skype-ps/skype/skype.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ zh-TW Version: 17.0.15229.2100
2020

2121
# Skype for Business PowerShell
2222
## Description
23-
The following cmdlet references are for Skype for Business and Microsoft Teams.
23+
The following cmdlet references are for Skype for Business and Microsoft Teams. You can find information on installing the module for Skype for Business Online here: https://docs.microsoft.com/office365/enterprise/powershell/manage-skype-for-business-online-with-office-365-powershell. If you are using Skype for Business Server then the cmdlets are available in the Skype for Business Server Management Shell and you can find information about it here: https://docs.microsoft.com/skypeforbusiness/manage/management-shell.
2424

2525
## Skype for Business Cmdlets
2626
### [New-CSOnlinePSTNGateway](New-CSOnlinePSTNGateway.md)

0 commit comments

Comments
 (0)