Merge pull request MicrosoftDocs#2275 from MicrosoftDocs/master

Merges master to live. see commits.

Author: kenwith

exchange/exchange-ps/exchange/users-and-groups/New-UnifiedGroup.md

@@ -557,7 +557,7 @@ Accept wildcard characters: False
 ```
 
 ### -Owner
-The Owner parameter specifies one or more owners for the Office 365 Group. Owners are group members who have certain privileges, such as the ability to edit group properties.
+The Owner parameter specifies the for the Office 365 Group. An owner is a group member who has certain privileges, such as the ability to edit group properties.
 
 The owner you specify for this parameter must be a mailbox or mail user (a mail-enabled security principal that can have permissions assigned). You can use any value that uniquely identifies the owner. For example:
 
@@ -585,8 +585,6 @@ For example:
 
 - User ID or user principal name (UPN)
 
-You can specify multiple owners separated by commas
-
 ```yaml
 Type: RecipientIdParameter
 Parameter Sets: (All)

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

@@ -40,13 +40,15 @@ This example lists all hub sites in the tenant.
 ```
 Get-SPOHubSite https://contoso.sharepoint.com/sites/online-marketing
 
-ID          : 44252d09-62c4-4913-9eb0-a2a8b8d7f863
-Title       : Marketing Hub
-SiteId      : 44252d09-62c4-4913-9eb0-a2a8b8d7f863
-SiteUrl     : https://contoso.sharepoint.com/sites/Marketing
-LogoUrl     : https://contoso.sharepoint.com/sites/Marketing/SiteAssets/hublogo.png
-Description : Hub for the Marketing division
-Rights     : [email protected]
+ID                   : 44252d09-62c4-4913-9eb0-a2a8b8d7f863
+Title                : Marketing Hub
+SiteId               : 44252d09-62c4-4913-9eb0-a2a8b8d7f863
+SiteUrl              : https://contoso.sharepoint.com/sites/Marketing
+LogoUrl              : https://contoso.sharepoint.com/sites/Marketing/SiteAssets/hublogo.png
+Description          : Hub for the Marketing division
+Permissions          : {Wilke, Nestor}
+SiteDesignId         : 00000000-0000-0000-0000-000000000000
+RequiresJoinApproval : False
 ```
 
 This example begins with the online-marketing site. The cmdlet finds the associated hub site, which is marketing. Then it lists all the details about the marketing hub site.

skype/skype-ps/skype/Disable-CsOnlineSipDomain.md

@@ -8,8 +8,7 @@ schema: 2.0.0
 # Disable-CsOnlineSipDomain
 
 ## SYNOPSIS
-**THIS IS PRELIMINARY DOCUMENTATION OF UPCOMING FUNCTIONALITY**</br>
-This cmdlet prevents provisioning of users in Skype for Business Online for the specified ___domain. This cmdlet allows organizations with multiple on-premises deployments of Skype For Business Server or Lync Server to safely synchronize users from multiple forests into a single Office 365 tenant. **IMPORTANT:** Only 1 Skype for Business forest can be in hybrid mode at a given time.
+This cmdlet prevents provisioning of users in Skype for Business Online for the specified ___domain. This cmdlet allows organizations with multiple on-premises deployments of Skype For Business Server or Lync Server to safely synchronize users from multiple forests into a single Office 365 tenant. **IMPORTANT:** Only 1 Skype for Business forest can be in hybrid mode at a given time. For full details on this scenario, including step-by-step instructions, see [Cloud consolidation for Teams and Skype for Business](https://docs.microsoft.com/skypeforbusiness/hybrid/cloud-consolidation).
 
 ## SYNTAX
 

skype/skype-ps/skype/Enable-CsOnlineSipDomain.md

@@ -8,8 +8,6 @@ schema: 2.0.0
 # Enable-CsOnlineSipDomain
 
 ## SYNOPSIS
-THIS IS PRELIMINARY DOCUMENTATION OF UPCOMING FUNCTIONALITY</br>
-
 This cmdlet enables provisioning of users in Skype for Business Online for the specified ___domain. This cmdlet is only necessary to run if you previously disabled a ___domain using Disable-CsOnlineSipDomain. Enable-CsOnlineSipDomain is used to facilitate consolidation of separate Skype for Business deployments into a single Office 365 tenant.
 
 ## SYNTAX
@@ -25,48 +23,11 @@ This cmdlet enables online provisioning of users in the specified SIP ___domain.  I
  - If 1 deployment is in hybrid mode, all online SIP domains from any other SfB forests must be disabled before they can be synchronized into the tenant with Azure AD Connect. Users in all SfB forests other than the hybrid forest must remain on-premises. 
  - Organizations must fully migrate (e.g move all users to the cloud) each SfB forest individually into the O365 tenant using hybrid mode (Shared Sip Address Space), and then detach the “hybrid” deployment, *before* moving on to migrate the next on-premise SfB deployment.    
 
-Before running this cmdlet for any SIP ___domain in a Skype for Business Server deployment, you must complete migration of any other existing hybrid SfB deployment that is in progress. All users in an existing hybrid deployment must be moved to the cloud, and that existing hybrid deployment must be detached from Office 365, as described below.
+Before running this cmdlet for any SIP ___domain in a Skype for Business Server deployment, you must complete migration of any other existing hybrid SfB deployment that is in progress. All users in an existing hybrid deployment must be moved to the cloud, and that existing hybrid deployment must be detached from Office 365, as described in this article: [Disable hybrid to complete migration to the cloud](https://docs.microsoft.com/skypeforbusiness/hybrid/cloud-consolidation-disabling-hybrid).
 
 **IMPORTANT**
 If you have more than one on-premises deployment of Skype for Business Server, you *must* ensure SharedSipAddressSpace is disabled in all other Skype for Business Server deployments except the deployment containing the SIP ___domain that is being enabled. 
 
-**HOW TO DETACH A HYBRID DEPLOYMENT FROM OFFICE 365**
-
-Once you have moved all users from on-premises into the cloud, you can decommission the on-premises Skype for Business deployment. Aside from removing any hardware, a critical step is to logically detach that on-premises deployment from Office 365. Detaching hybrid consists of 3 steps, which are detailed below:
- -	Disable shared sip address space in the O365 tenant.
- - Disable the ability in the on-premises environment to communicate with O365
- - Update DNS records to point to Office 365. </br> 
-
-These steps should be done together as a unit. 
-
-> [!NOTE]
-> Any federated organizations that are using the older Direct Federation model (also known as Allowed Partner Server) will need to update their allowed ___domain entries for your organization to remove the proxy FQDN. This legacy federation model is not based on DNS SRV records, so such a config will become out of date, once your organization moves to the cloud. If you suspect any of your federated partners may be using Direct Federation, we suggest you send them a communication about this as you prepare to complete your migration to the cloud.
-
-The steps are:
-</br>
-1. **Disable shared sip address space in the Office 365 tenant**
-   The command below needs to be done from a Skype for Business Online PowerShell window. 
-
-   `PS C:\> Set-CsTenantFederationConfiguration -SharedSipAddressSpace $false`</br>
-
-1. **Disable ability in on-premise to communicate with Office 365** 
-   The command below needs to be done from an on-premises PowerShell window.  If you have previously imported an Office 365 session, start a new Skype for Business PowerShell session.
-
-   `Get-CsHostingProvider|Set-CsHostingProvider -Enabled $false`</br>
-
-1. **Update DNS to point to O365**
-   The organization’s external DNS for the former on-premises deployment needs to be updated so that Skype for Business records point to Office 365 instead of Onprem. Specifically:
-
-
-| Record Type   | Name                     | TTL  | Value                             |
-|:--------------|:-------------------------|:----:|:----------------------------------|
-| SRV           | \_sipfederationtls.\_tcp | 3600 | 100 1 5061 sipfed.online.lync.com |
-| SRV           | \_sip.\_tls              | 3600 | 100 1 443 sipdir.online.lync.com  |
-| CNAME         | lyncdiscover             | 3600 | webdir.online.lync.com            |
-| CNAME         | sip                      | 3600 | sipdir.online.lync.com            |
-| CNAME         | meet                     | 3600 | webdir.online.lync.com            |
-| CNAME         | dialin                   | 3600 | webdir.online.lync.com            |
-
 
 
 ## EXAMPLES

skype/skype-ps/skype/Get-CsOnlineSipDomain.md

@@ -8,18 +8,16 @@ schema: 2.0.0
 # Get-CsOnlineSipDomain
 
 ## SYNOPSIS
-**THIS IS PRELIMINARY DOCUMENTATION OF UPCOMING FUNCTIONALITY**</br> 
-
 This cmdlet lists online sip domains and their enabled/disabled status. In a disabled ___domain, provisioning of users is blocked. Once a ___domain is re-enabled, provisioning of users in that ___domain will happen.  
 
 ## SYNTAX
 
 ```
-Get-CsOnlineSipDomain [-Domain <String>] [-DomainType <DomainStatus>] [<CommonParameters>]
+Get-CsOnlineSipDomain [-Domain <String>] [-DomainStatus <DomainStatus>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
-This cmdlet is useful for organizations consolidating multiple on-premises deployments of Skype for Business Server into a single Office 365 tenant. During consolidation, sip domains for all forests hosting Skype for Business Server - other than the forest currently in hybrid mode -  must be disabled. Once a hybrid deployment is fully migrated to the cloud and detached from Office 365, the next forest can start migration to the cloud. This cmdlet allows administrators to view the status of  sip domains in their Office 365 tenant.
+This cmdlet is useful for organizations consolidating multiple on-premises deployments of Skype for Business Server into a single Office 365 tenant. During consolidation, sip domains for all forests hosting Skype for Business Server - other than the forest currently in hybrid mode -  must be disabled. Once a hybrid deployment is fully migrated to the cloud and detached from Office 365, the next forest can start migration to the cloud. This cmdlet allows administrators to view the status of  sip domains in their Office 365 tenant. For full details on cloud consolidation scenarios, see [Cloud consolidation for Teams and Skype for Business](https://docs.microsoft.com/skypeforbusiness/hybrid/cloud-consolidation).
 
 ## EXAMPLES
 
@@ -32,7 +30,7 @@ List all online SIP domains in the tenant and show their enabled/disabled status
 
 ### Example 2
 ```powershell
-PS C:\> Get-CsOnlineSipDomain -DomainType Disabled
+PS C:\> Get-CsOnlineSipDomain -DomainStatus Disabled
 ```
 
 List all disabled online SIP domains in the tenant.
@@ -55,7 +53,7 @@ Accept wildcard characters: False
 ```
 
 
-### -DomainType
+### -DomainStatus
 This indicates the status of an online sip ___domain, which can be either enabled or disabled.
 
 ```yaml
@@ -89,3 +87,4 @@ For more information, see about_CommonParameters (http://go.microsoft.com/fwlink
 
 [Disable-CsOnlineSipDomain](Disable-CsOnlineSipDomain.md)
 [Enable-CsOnlineSipDomain](Enable-CsOnlineSipDomain.md) 
+[Cloud consolidation for Teams and Skype for Business](https://docs.microsoft.com/en-us/skypeforbusiness/hybrid/cloud-consolidation)

skype/skype-ps/skype/Set-CsBusyOptions.md

@@ -92,7 +92,7 @@ Accept wildcard characters: False
 ### -Identity
 Indicates the Identity of the user account to be modified. User Identities can be specified using one of four formats: 1) the user's SIP address; 2) the user's user principal name (UPN); 3) the user's ___domain name and logon name, in the form ___domain\logon (for example, litwareinc\kenmyer) and 4) the user's Active Directory display name (for example, Ken Myer). User Identities can also be referenced by using the user's Active Directory distinguished name.
 
-You can use the asterisk (*) wildcard character when using the display name as the user Identity. For example, the Identity "*Smith" returns all the users who have a display name that ends with the string value "Smith".
+You can use the asterisk (\*) wildcard character when using the display name as the user Identity. For example, the Identity "*Smith" returns all the users who have a display name that ends with the string value "Smith".
 
 ```yaml
 Type: UserIdParameter

skype/skype-ps/skype/Set-CsCallViaWorkPolicy.md

@@ -8,7 +8,7 @@ schema: 2.0.0
 # Set-CsCallViaWorkPolicy
 
 ## SYNOPSIS
-Use the `Set-CsCallViaWorkPolicy` to modify an existing call via work policy that enables and manages the characteristics of outbound calls placed through the Skype for Business client.
+Use the `Set-CsCallViaWorkPolicy` cmdlet to modify an existing call via work policy that enables and manages the characteristics of outbound calls placed through the Skype for Business client.
 
 ## SYNTAX
 
@@ -28,7 +28,7 @@ Set-CsCallViaWorkPolicy [-AdminCallbackNumber <String>] [-Confirm] [-Enabled <Bo
 ## DESCRIPTION
 To return a list of all the Role-Based Access Control (RBAC) roles a cmdlet has been assigned to (including any custom RBAC roles you have created), run the following command from the Windows PowerShell prompt.
 
-`Get-CsAdminRole | Where-Object {$_.Cmdlets -Match "\<DesiredCmdletName\>"}`
+`Get-CsAdminRole | Where-Object {$_.Cmdlets -Match "<DesiredCmdletName>"}`
 
 ## EXAMPLES
 

skype/skype-ps/skype/Set-CsTenantFederationConfiguration.md

@@ -249,7 +249,7 @@ Accept wildcard characters: False
 
 ### -SharedSipAddressSpace
 When set to True, indicates that the users homed on Skype for Business Online use the same SIP ___domain as users homed on the on-premises version of Skype for Business Server.
-The default value is False, meaning that the two sets of users gave have different SIP domains.
+The default value is False, meaning that the two sets of users have different SIP domains.
 
 ```yaml
 Type: Boolean