Merge pull request MicrosoftDocs#2254 from MicrosoftDocs/master

Merges Master to Live. See commits for details.

Author: kenwith

exchange/exchange-ps/exchange/devices/Get-MobileDeviceStatistics.md

@@ -59,7 +59,7 @@ This example retrieves the statistics for the mobile phone configured to synchro
 
 ### -------------------------- Example 2 --------------------------
 ```
-$UserList = Get-CASMailbox -Filter {HasActiveSyncDevicePartnership -eq $true -and -not DisplayName -like "CAS_{*"} | Get-Mailbox; $UserList | foreach {Get-MobileDeviceStatistics -Mailbox $_}
+$UserList = Get-CASMailbox -Filter {HasActiveSyncDevicePartnership -eq $true -and -not DisplayName -like "CAS_{*"} | Get-Mailbox; $UserList | foreach {Get-MobileDeviceStatistics -Mailbox $_.Identity}
 ```
 
 This example uses the Get-CASMailbox cmdlet to determine who in the organization has an Exchange ActiveSync mobile device. For each mobile device, the Exchange ActiveSync device statistics are retrieved.

sharepoint/sharepoint-ps/sharepoint-online/Connect-SPOService.md

@@ -53,7 +53,7 @@ For permissions and the most current information about Windows PowerShell for Sh
 Connect-SPOService -Url https://contoso-admin.sharepoint.com -credential [email protected]
 ```
 
-Example 1 shows how a SharePoint Online global administrator with credential [email protected] connects to a SharePoint Online Administration Center that has the URL http://contoso-admin.sharepoint.com/.
+Example 1 shows how a SharePoint Online global administrator with credential [email protected] connects to a SharePoint Online Administration Center that has the URL http://contoso-admin.sharepoint.com.
 
 
 ### -----------------------EXAMPLE 2-----------------------------
@@ -62,11 +62,18 @@ Example 1 shows how a SharePoint Online global administrator with credential adm
 $username = "[email protected]"
 $password = "password"
 $cred = New-Object -TypeName System.Management.Automation.PSCredential -argumentlist $userName, $(convertto-securestring $Password -asplaintext -force)
-Connect-SPOService -Url https://contoso-admin.sharepoint.com/ -Credential $cred
+Connect-SPOService -Url https://contoso-admin.sharepoint.com -Credential $cred
 ```
 
-Example 2 shows how a SharePoint Online global administrator with a username and password connects to a SharePoint Online Administration Center that has the URL http://contoso-admin.sharepoint.com/.
+Example 2 shows how a SharePoint Online global administrator with a username and password connects to a SharePoint Online Administration Center that has the URL http://contoso-admin.sharepoint.com.
 
+### -----------------------EXAMPLE 3-----------------------------
+
+```
+Connect-SPOService -Url https://contoso-admin.sharepoint.com
+```
+
+Prompts for credentials. This is required if the account is using multi-factor authentication.
 
 ## PARAMETERS
 
@@ -178,4 +185,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 [Getting started with SharePoint Online Management Shell](https://docs.microsoft.com/en-us/powershell/sharepoint/sharepoint-online/connect-sharepoint-online?view=sharepoint-ps)
 
-[Disconnect-SPOService](Disconnect-SPOService.md)
+[Disconnect-SPOService](Disconnect-SPOService.md)

sharepoint/sharepoint-ps/sharepoint-online/Get-SPOExternalUser.md

@@ -8,7 +8,7 @@ schema: 2.0.0
 # Get-SPOExternalUser
 
 ## SYNOPSIS
-Returns external users in the tenant's folder.
+Returns external users in the tenant.
 
 
 ## SYNTAX
@@ -20,7 +20,7 @@ Get-SPOExternalUser [[-Position] <Int32>] [[-PageSize] <Int32>] [[-Filter] <Stri
 ```
 
 ## DESCRIPTION
-The `Get-SPOExternalUser` cmdlet returns external users that are located in the tenant's folder based on specified criteria.
+The `Get-SPOExternalUser` cmdlet returns external users that are located in the tenant based on specified criteria.
 
 For permissions and the most current information about Windows PowerShell for SharePoint Online, see the online documentation at http://go.microsoft.com/fwlink/p/?LinkId=251832 (http://go.microsoft.com/fwlink/p/?LinkId=251832).
 
@@ -43,14 +43,14 @@ Example 2 returns two external users from the third page of the collection.
 
 ### -----------------------EXAMPLE 3-----------------------------
 ```
-Get-SPOExternalUser -Position 0 -PageSize 30 -Filter https://contosoe.testsite.com
+Get-SPOExternalUser -Position 0 -PageSize 30 -Filter https://contoso.sharepoint.com
 ```
-Example 3 returns the first 30 users that match the filter, https://contosoe.testsite.com.
+Example 3 returns the first 30 users that match the filter https://contoso.sharepoint.com.
 
 ## PARAMETERS
 
 ### -Filter
-Limits the results to only those users whose first name, last name or email address begins with the text in the string, using a case-insensitive comparison
+Limits the results to only those users whose first name, last name, or email address begins with the text in the string using a case-insensitive comparison.
 
 
 ```yaml
@@ -104,6 +104,7 @@ Accept wildcard characters: False
 
 ### -SiteUrl
 Specifies the site to retrieve external users for.
+
 If no site is specified, the external users for all sites are returned.
 
 
@@ -138,7 +139,7 @@ Accept wildcard characters: False
 ```
 
 ### -ShowOnlyUsersWithAcceptingAccountNotMatchInvitedAccount
-System.Boolean
+Shows users who have accepted an invite but not using the account the invite was sent to.
 
 
 ```yaml

sharepoint/sharepoint-ps/sharepoint-online/Get-SPOHubSite.md

@@ -22,6 +22,9 @@ Lists all hub sites found on the SharePoint tenant. If you provide **-Identity**
 
 If the hub site doesn’t exist, this cmdlet returns a “File not found” error.
 
+> [!NOTE]
+> If a deleted hub site appears in the output of this cmdlet you may not have run [Unregister-SPOHubSite](https://docs.microsoft.com/en-us/powershell/module/sharepoint-online/unregister-spohubsite) on the deleted hub site.
+
 ## EXAMPLES
 
 ### Example 1

sharepoint/sharepoint-ps/sharepoint-online/Get-SPOUserOneDriveLocation.md

@@ -8,7 +8,7 @@ schema: 2.0.0
 # Get-SPOUserOneDriveLocation
 
 ## SYNOPSIS
-This cmdlet will return the UPN of a user, current location this user locates, user’s corresponding MySite(ODB) Url and the site id.
+This cmdlet will return the user principal name, current location, and corresponding OneDrive for Business url, and the site ID. This cmdlet only supports Multi-Geo OneDrive sites.
 
 ## SYNTAX
 
@@ -17,15 +17,15 @@ Get-SPOUserOneDriveLocation -UserPrincipalName <String> [<CommonParameters>]
 ```
 
 ## DESCRIPTION
-This command will return information about the onedrive location from the current user
+This command will return information about the OneDrive location for the specified user.
 
 ## EXAMPLES
 
 ### -----------------------EXAMPLE 1-----------------------------
 ```powershell
 Get-SPOUserOneDriveLocation -UserPrincipalName [email protected]
 ```
-Get the current location this user locates, user's corresponding MySite(ODB) Url and site ID.
+Get the current location the user's OneDrive location, url, and site ID.
 
 ## PARAMETERS
 

skype/skype-ps/skype/Get-CsTeamsInteropPolicy.md

@@ -11,13 +11,13 @@ schema: 2.0.0
 
 IMPORTANT: TeamsInteropPolicy has been replaced by TeamsUpgradePolicy. Please read description for more details. You can also find more guidance here: [Migration and interoperability guidance for organizations using Teams together with Skype for Business](https://docs.microsoft.com/en-us/microsoftteams/migration-interop-guidance-for-teams-with-skype).
 
-If TeamsUpgradePolicy has mode=Legacy, TeamsInteropPolicy  determines how calls are routed between Skype for Business and Microsoft Teams. Otherwise it is ignored.
+If TeamsUpgradePolicy has mode=Legacy, TeamsInteropPolicy  determines how calls are routed between Skype for Business and Microsoft Teams. *Otherwise TeamsInteropPolicy is ignored.* Granting TeamsUpgradePolicy with mode=Legacy is now blocked. Customers with exisitng configurations using Legacy mode must update their configuration to use a mode other than Legacy.
 
 
 ## SYNTAX
 
 ```
-Get-CsTeamsInteropPolicy [-LocalStore] [[-Identity] <Object>] [-Tenant <Object>] [-Filter <Object>] [-AsJob]
+Get-CsTeamsInteropPolicy  [-Identity] <Object>] [-Tenant <Object>] [-Filter <Object>] [-AsJob]
 ```
 
 ## DESCRIPTION
@@ -26,31 +26,7 @@ IMPORTANT: TeamsInteropPolicy has been replaced by TeamsUpgradePolicy. TeamsInte
 
 For any user that is still assigned TeamsInteropPolicy and in Legacy mode, these users must be assigned only one of these three built-in instances for which CallingDefaultClient = ChatDefaultClient, and for which AllowEndUserClientOverride = false. The other instances are not longer valid configurations, are not supported and will be removed. 
 
-The valid instances are:
 
-
-**Identity: DisallowOverrideCallingDefaultChatDefault**   
-**AllowEndUserClientOverride: False**   
-**CallingDefaultClient: Default**   
-**ChatDefaultClient: Default**
-
-**Identity: DisallowOverrideCallingSfbChatSfb**   
-**AllowEndUserClientOverride: False**   
-**CallingDefaultClient: Sfb**   
-**ChatDefaultClient: Sfb**
-
-**Identity: DisallowOverrideCallingTeamsChatTeams**   
-**AllowEndUserClientOverride: False**   
-**CallingDefaultClient: Teams**     
-**ChatDefaultClient: Teams**
-
-
-Use the following cmdlet syntax, where $policy is one of the above values of identity:
-`Grant-CsTeamsInteropPolicy -PolicyName $policy -Identity $SipAddress`
-
-
-If you customized the built-in global policy, undo this by running `Remove-CsTeamsInteropPolicy`. This will remove the tenant-specific global policy and revert back to the system-wide built-in policy (which cannot be removed). Use the following syntax:
-Remove-CsTeamsInteropPolicy -Identity Global
 
 For comprehensive documentation on this policy and its settings, see [Migration and interoperability guidance for organizations using Teams together with Skype for Business](https://docs.microsoft.com/en-us/microsoftteams/migration-interop-guidance-for-teams-with-skype).
 
@@ -59,10 +35,10 @@ For comprehensive documentation on this policy and its settings, see [Migration
 
 ### -------------------------- Example 1 --------------------------
 ```
-PS C:\> {{ Add example code here }}
+PS C:\> Get-CsTeamsInteropPolicy
 ```
 
-{{ Add example description here }}
+List all available instances of TeamsInteropPolicy.
 
 ## PARAMETERS
 
@@ -83,7 +59,7 @@ Accept wildcard characters: False
 ```
 
 ### -Identity
-{{Fill Identity Description}}
+The name of the policy instance
 
 ```yaml
 Type: Object
@@ -98,21 +74,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -LocalStore
-{{Fill LocalStore Description}}
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases: 
-Applicable: Skype for Business Online 
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
 
 ### -Tenant
 {{Fill Tenant Description}}

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

@@ -29,10 +29,9 @@ TeamsUpgradePolicy allows administrators to manage the transition from Skype for
 NOTES: 
   - Except for on-premise versions of Skype for Business Server, all relevant instances of TeamsUpgradePolicy are built into the system, so there is no corresponding New cmdlet. 
   - 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 are not yet functional. From a routing perspective, this will behave like SfBOnly mode.
-  - Action property is redundnant with the combination of NotifySfBUsers and Mode. It will eventually be removed.  
+  - 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.
+IMPORTANT: TeamsUpgradePolicy has replaced TeamsInteropPolicy. Components that previously honored TeamsInteropPolicy have been updated to honor TeamsUpgradePolicy instead. Do not use TeamsInteropPolicy.
 
 
 ## EXAMPLES
@@ -45,25 +44,21 @@ Identity       : Global
 Description    : Users can use either Skype for Business client or Teams client
 Mode           : Islands
 NotifySfbUsers : False
-Action         : None
 
 Identity       : Tag:NoUpgrade
 Description    : Users can use either Skype for Business client or Teams client
 Mode           : Legacy
 NotifySfbUsers : False
-Action         : None
 
 Identity       : Tag:NotifyForTeams
 Description    : Show notification of pending upgrade in Skype for Business client
 Mode           : Legacy
 NotifySfbUsers : True
-Action         : Notify
 
 Identity       : Tag:UpgradeToTeams
 Description    : Use Teams Only
 Mode           : TeamsOnly
 NotifySfbUsers : False
-Action         : Upgrade
 
 Identity       : Tag:Islands
 Description    : Use either Skype for Business client or Teams client
@@ -75,32 +70,36 @@ Identity       : Tag:IslandsWithNotify
 Description    : Use either Skype for Business client or Teams client
 Mode           : Islands
 NotifySfbUsers : True
-Action         : Notify
 
 Identity       : Tag:SfBOnly
 Description    : Use only Skype for Business
 Mode           : SfBOnly
 NotifySfbUsers : False
-Action         : None
 
 Identity       : Tag:SfBOnlyWithNotify
 Description    : Use only Skype for Business
 Mode           : SfBOnly
 NotifySfbUsers : True
-Action         : Notify
 
 Identity       : Tag:SfBWithTeamsCollab
 Description    : Use Skype for Business and use Teams only for group collaboration
 Mode           : SfBWithTeamsCollab
 NotifySfbUsers : False
-Action         : None
 
 Identity       : Tag:SfBWithTeamsCollabWithNotify
 Description    : Use Skype for Business and use Teams only for group collaboration
 Mode           : SfBWithTeamsCollab
 NotifySfbUsers : True
-Action         : Notify
 
+Identity       : Tag:SfBWithTeamsCollabAndMeetings
+Description    : Use Skype for Business and use Teams only for group collaboration
+Mode           : SfBWithTeamsCollabAndMeetings
+NotifySfbUsers : False
+
+Identity       : Tag:SfBWithTeamsCollabAndMeetingsWithNotify
+Description    : Use Skype for Business and use Teams only for group collaboration
+Mode           : SfBWithTeamsCollabAndMeetings
+NotifySfbUsers : True
 ```
 
 List all instances of TeamsUpgradePolicy
@@ -114,7 +113,6 @@ Identity       : Global
 Description    : Users can use either Skype for Business client or Teams client
 Mode           : Islands
 NotifySfbUsers : False
-Action         : None
 
 ```
 
@@ -165,21 +163,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -LocalStore
-Do Not Use
-
-```yaml
-Type: SwitchParameter
-Parameter Sets: (All)
-Aliases: 
-Applicable: Skype for Business Online, Skype for Business Server 2019
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
 
 ### -Tenant
 {{Fill Tenant Description}}