Merge branch 'master' into patch-1

chrisda · web-flow · commit 8aa867e7f68d · 2018-12-26T12:44:47.000-08:00
diff --git a/exchange/exchange-ps/exchange/policy-and-compliance-dlp/Get-PolicyTipConfig.md b/exchange/exchange-ps/exchange/policy-and-compliance-dlp/Get-PolicyTipConfig.md
@@ -17,7 +17,7 @@ For information about the parameter sets in the Syntax section below, see Exchan
 
 ## SYNTAX
 
-### Paramters
+### Parameters
 ```
 Get-PolicyTipConfig [-Action <NotifyOnly | RejectOverride | Reject | Url>] [-Locale <CultureInfo>] [-Original]
  [-DomainController <Fqdn>] [<CommonParameters>]
@@ -72,7 +72,7 @@ You can't use the Action parameter with the Identity parameter.
 
 ```yaml
 Type: NotifyOnly | RejectOverride | Reject | Url
-Parameter Sets: Paramters
+Parameter Sets: Parameters
 Aliases:
 Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
 Required: False
@@ -133,7 +133,7 @@ You can't use the Locale parameter with the Identity parameter.
 
 ```yaml
 Type: CultureInfo
-Parameter Sets: Paramters
+Parameter Sets: Parameters
 Aliases:
 Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
 Required: False
@@ -148,7 +148,7 @@ The Original switch includes built-in Policy Tips in the results. You don't spec
 
 ```yaml
 Type: SwitchParameter
-Parameter Sets: Paramters
+Parameter Sets: Parameters
 Aliases:
 Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
 Required: False
diff --git a/skype/skype-ps/skype/Get-CsTeamsUpgradePolicy.md b/skype/skype-ps/skype/Get-CsTeamsUpgradePolicy.md
@@ -31,7 +31,7 @@ NOTES:
   - 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
   - Instances with mode set to SfBWithTeamsCollab and SfBWithTeamsCollabAndMeetings are not yet fully functional. From a routing perspective, they will behave like SfBOnly mode.
 
-IMPORTANT: TeamsUpgradePolicy has replaced TeamsInteropPolicy. Components that previously honored TeamsInteropPolicy have been updated to honor TeamsUpgradePolicy instead. Do not use TeamsInteropPolicy.
+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.
 
 
 ## EXAMPLES
@@ -45,16 +45,6 @@ Description    : Users can use either Skype for Business client or Teams client
 Mode           : Islands
 NotifySfbUsers : False
 
-Identity       : Tag:NoUpgrade
-Description    : Users can use either Skype for Business client or Teams client
-Mode           : Legacy
-NotifySfbUsers : False
-
-Identity       : Tag:NotifyForTeams
-Description    : Show notification of pending upgrade in Skype for Business client
-Mode           : Legacy
-NotifySfbUsers : True
-
 Identity       : Tag:UpgradeToTeams
 Description    : Use Teams Only
 Mode           : TeamsOnly
diff --git a/skype/skype-ps/skype/Grant-CsTeamsUpgradePolicy.md b/skype/skype-ps/skype/Grant-CsTeamsUpgradePolicy.md
@@ -23,7 +23,7 @@ TeamsUpgradePolicy allows administrators to manage the transition from Skype for
 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.  
 
 
-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.
+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.
 
 
 
@@ -43,8 +43,6 @@ Office 365 provides all relevant instances of TeamsUpgradePolicy via built-in, r
 |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.|
 |UpgradeToTeams|TeamsOnly|False|Use this mode to upgrade users to Teams and to prevent chat, calling, and meeting scheduling in Skype for Business.|
 |Global|Islands|False||
-|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.|
-|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.|
 |||||
 
 
@@ -57,7 +55,7 @@ NOTES:
     - 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.    
     - 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. 
 - 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.
-- Instances with mode set to SfBWithTeamsCollab and SfBWithTeamsCollabAndMeetings are not yet functional. From a routing perspective, this will behave like SfBOnly mode.
+- 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.
 
 
 ## EXAMPLES
@@ -159,9 +157,10 @@ Accept wildcard characters: False
 
 ## NOTES
 
-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.
+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.
+
+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.
 
-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.
 
 
 
diff --git a/skype/skype-ps/skype/Set-CsAuthConfig.md b/skype/skype-ps/skype/Set-CsAuthConfig.md
@@ -31,7 +31,7 @@ Use the Set-CsAuthConfig cmdlet to modify the authentication configuration for y
 
 This cmdlet sets configuration on both the Registrar and the Web Services roles.
 
-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.
+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.
 
 
 ## EXAMPLES
@@ -117,7 +117,7 @@ Accept wildcard characters: False
 
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable.
-For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
+For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
 
 ## INPUTS
 
diff --git a/skype/skype-ps/skype/Set-CsTeamsCallingPolicy.md b/skype/skype-ps/skype/Set-CsTeamsCallingPolicy.md
@@ -10,38 +10,44 @@ schema: 2.0.0
 # Set-CsTeamsCallingPolicy
 
 ## SYNOPSIS
-
 Use this cmdlet to update values in existing Teams Calling Policies.
 
 ## SYNTAX
 
 ### Identity (Default)
 ```
-Set-CsTeamsCallingPolicy [-Tenant <Guid>] [-AllowCalling <Boolean>] [-AllowPrivateCalling <Boolean>]
- [[-Identity] <XdsIdentity>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
+Set-CsTeamsCallingPolicy [-Tenant <System.Guid>] [-AllowCalling <Boolean>] [-AllowPrivateCalling <Boolean>]
+ [-AllowVoicemail <String>] [-AllowCallGroups <Boolean>] [-AllowDelegation <Boolean>]
+  [-AllowCallForwardingToUser <Boolean>] [-AllowCallForwardingToPhone <Boolean>]
+ [-PreventTollBypass <Boolean>] [[-Identity] <XdsIdentity>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### Instance
 ```
-Set-CsTeamsCallingPolicy [-Tenant <Guid>] [-AllowCalling <Boolean>] [-AllowPrivateCalling <Boolean>]
- [-Instance <PSObject>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
+Set-CsTeamsCallingPolicy [-Tenant <System.Guid>] [-AllowCalling <Boolean>] [-AllowPrivateCalling <Boolean>]
+ [-AllowVoicemail <String>] [-AllowCallGroups <Boolean>] [-AllowDelegation <Boolean>]
+  [-AllowCallForwardingToUser <Boolean>] [-AllowCallForwardingToPhone <Boolean>]
+ [-PreventTollBypass <Boolean>] [-Instance <PSObject>] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
-The Teams Calling Policies designate which users are able to use calling functionality within teams and determine the interopability state with Skype for Business.  This cmdlet allows admins to set values in a given calling policy
+The Teams Calling Policies designate which users are able to use calling functionality within teams and determine the interopability state with Skype for Business. 
+This cmdlet allows admins to set values in a given calling policy
 
 ## EXAMPLES
 
 ### Example 1
-```powershell
+```
 PS C:\> Set-CsTeamsCallingPolicy -Identity Global -AllowPrivateCalling $true
 ```
 
-Sets the value of the parameter AllowPrivateCalling, which controls whether or not users can leverage calling functionality in Microsoft Teams, in the global (default) tenant CallingPolicy 
+Sets the value of the parameter AllowPrivateCalling, which controls whether or not users can leverage calling functionality in Microsoft Teams, in the global (default) tenant CallingPolicy
+
 ## PARAMETERS
 
 ### -AllowCalling
-Controls interop calling capabilities. Turning this on will allow Skype for Business users to have one-on-one calls with Teams users and vice-versa. 
+Controls interop calling capabilities.
+Turning this on will allow Skype for Business users to have one-on-one calls with Teams users and vice-versa.
 
 ```yaml
 Type: Boolean
@@ -56,7 +62,9 @@ Accept wildcard characters: False
 ```
 
 ### -AllowPrivateCalling
-controls all calling capabilities in Teams. Turning this off will turn off all calling functionality in Teams. If you use Skype for Business for calling, this policy will not affect calling functionality in Skype for Business.
+controls all calling capabilities in Teams.
+Turning this off will turn off all calling functionality in Teams.
+If you use Skype for Business for calling, this policy will not affect calling functionality in Skype for Business.
 
 ```yaml
 Type: Boolean
@@ -80,7 +88,7 @@ Aliases: cf
 
 Required: False
 Position: Named
-Default value: None
+Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
@@ -95,7 +103,7 @@ Aliases:
 
 Required: False
 Position: Named
-Default value: None
+Default value: False
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
@@ -105,7 +113,7 @@ Name of the policy being modified.
 
 ```yaml
 Type: XdsIdentity
-Parameter Sets: (All)
+Parameter Sets: Identity
 Aliases:
 
 Required: False
@@ -116,25 +124,25 @@ Accept wildcard characters: False
 ```
 
 ### -Instance
-Internal Microsoft use
+Use this to pipe a specific calling policy to be set.  You can only modify the global policy, so can only pass the global instance of the Calling Policy.
 
 ```yaml
 Type: PSObject
-Parameter Sets: (All)
+Parameter Sets: Instance
 Aliases:
 
 Required: False
 Position: Named
 Default value: None
-Accept pipeline input: False
+Accept pipeline input: True (ByValue)
 Accept wildcard characters: False
 ```
 
 ### -Tenant
 Internal Microsoft use
 
 ```yaml
-Type: Guid
+Type: System.Guid
 Parameter Sets: (All)
 Aliases:
 
@@ -154,6 +162,96 @@ Type: SwitchParameter
 Parameter Sets: (All)
 Aliases: wi
 
+Required: False
+Position: Named
+Default value: False
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -AllowCallForwardingToPhone
+Determines whether or not the a user can leverage the call park functionality to 
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -AllowCallForwardingToUser
+Enables call forwarding or simultaneous ringing of inbound calls to other users
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -AllowCallGroups
+Enables inbound calls to be routed to call groups 
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -AllowDelegation
+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.
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -AllowVoicemail
+Enables inbound calls to be routed to voice mail.  Valid options are: AlwaysEnabled, AlwaysDisabled, UserOverride
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -PreventTollBypass
+Setting this parameter to True will send calls through PSTN and incur charges rather than going through the network and bypassing the tolls. 
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+
 Required: False
 Position: Named
 Default value: None
@@ -168,9 +266,11 @@ For more information, see about_CommonParameters (http://go.microsoft.com/fwlink
 ## INPUTS
 
 ### System.Management.Automation.PSObject
+
 ## OUTPUTS
 
 ### System.Object
+
 ## NOTES
 
 ## RELATED LINKS
diff --git a/skype/skype-ps/skype/skype.md b/skype/skype-ps/skype/skype.md
@@ -20,7 +20,7 @@ zh-TW Version: 17.0.15229.2100
 
 # Skype for Business PowerShell
 ## Description
-The following cmdlet references are for Skype for Business and Microsoft Teams.
+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.
 
 ## Skype for Business Cmdlets
 ### [New-CSOnlinePSTNGateway](New-CSOnlinePSTNGateway.md)
