Merge remote-tracking branch 'refs/remotes/origin/master' into jdshrs2

devices/surface-hub/create-and-test-a-device-account-surface-hub.md

@@ -49,6 +49,7 @@ For detailed steps using PowerShell to provision a device account, choose an opt
 | [On-premises deployment (single-forest)](on-premises-deployment-surface-hub-device-accounts.md) | Your organization has servers that it controls and uses to host Active Directory, Exchange, and Skype for Business (or Lync) in a single-forest environment. |
 | [On-premises deployment (multiple forests)](on-premises-deployment-surface-hub-multi-forest.md) | Your organization has servers that it controls and uses to host Active Directory, Exchange, and Skype for Business (or Lync) in a multi-forest environment. |
 | [Hybrid deployment](hybrid-deployment-surface-hub-device-accounts.md) | Your organization has a mix of services, with some hosted on-premises and some hosted online through Office 365. |
+| [Online or hybrid deployment using Skype Hybrid Voice environment](skype-hybrid-voice.md) | Your organization has Skype for Business home pools and Exchange servers in the cloud, and uses an on-premises pool of Skype for Business 2015 or Cloud Connector edition connected via Public Switched Telephone Network (PSTN).  |
 
 If you prefer to use a graphical user interface, some steps can be done using UI instead of PowerShell. 
 For more information, see [Creating a device account using UI](create-a-device-account-using-office-365.md).

devices/surface-hub/skype-hybrid-voice.md

@@ -0,0 +1,20 @@
+---
+title: Online or hybrid deployment using Skype Hybrid Voice environment (Surface Hub)
+description: A Skype Hybrid Voice deployment requires special processing to set up a device account for your Microsoft Surface Hub.
+keywords: hybrid deployment, Skype Hybrid Voice, Skype for Business Cloud PBX
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.pagetype: surfacehub
+author: jdeckerms
+localizationpriority: medium
+---
+
+# Online or hybrid deployment using Skype Hybrid Voice environment (Surface Hub)
+
+This topic explains how to enable Skype for Business Cloud PBX with on premises PSTN connectivity via Cloud Connector Edition or Skype for Business 2015 pool. In this option your Skype for Business home pools and Exchange servers are in the Cloud, however PSTN connected via on premises pool of Skype for Business 2015 or via a Cloud Connector edition. More about different Cloud PBX options is here https://technet.microsoft.com/en-us/library/mt612869.aspx 
+
+If you deployed Skype for Business Cloud PBX with one of the hybrid voice options, please follow the steps below to enable the room account.  It is important to create a regular user account first, assign all hybrid voice options and phone numbers and only after this convert the account to a room account. If you do not follow this order you will not be able to assign a hybrid phone number. 
+
+
+1.	Create a new user account for Surface Hub. In this example, I will use surfacehub2@adatum.biz account. The account can be created in local active directory and synchronized to the cloud or created directly in the cloud. 

education/breadcrumb/toc.yml

@@ -2,6 +2,6 @@
   tocHref: /
   topicHref: /
   items:
-    - name: Education
+    - name: Windows
-      tocHref: /education
+      tocHref: /education/windows
-      topicHref: /education/index
+      topicHref: /education/windows/index

store-for-business/breadcrumb/toc.yml

@@ -2,6 +2,6 @@
   tocHref: /
   topicHref: /
   items:
-    - name: Windows
+    - name: Windows Store for Business
-      tocHref: /windows
+      tocHref: /microsoft-store
-      topicHref: /windows/windows-10
+      topicHref: /microsoft-store/index

windows/client-management/TOC.md

@@ -1,4 +1,5 @@
 # [Manage clients in Windows 10](index.md)
+## [Administrative Tools in Windows 10](administrative-tools-in-windows-10.md)
 ## [Create mandatory user profiles](mandatory-user-profile.md)
 ## [Connect to remote Azure Active Directory-joined PC](connect-to-remote-aadj-pc.md)
 ## [Join Windows 10 Mobile to Azure Active Directory](join-windows-10-mobile-to-azure-active-directory.md)

windows/client-management/index.md

@@ -17,7 +17,7 @@ Learn about the administrative tools, tasks and best practices for managing Wind
 
 | Topic | Description |
 |---|---|
-|[Administrative tools in Windows 10](administrative-tools-in-windows-10.md)| Listing of administrative tools useful for ITPros and advanced users in managing Windows client.|
+|[Administrative Tools in Windows 10](administrative-tools-in-windows-10.md)| Links to documentation for tools for IT pros and advanced users in the Administrative Tools folder.|
 |[Connect to remote AADJ PCs](connect-to-remote-aadj-pc.md)| Instructions for connecting to a remote PC joined to Azure Active Directory (Azure AD)|
 |[Group policies for enterprise and education editions](group-policies-for-enterprise-and-education-editions.md)| Listing of all group policy settings that apply specifically to Windows 10 Enterprise and Education editions|
 |[Join Windows 10 Mobile to AAD](join-windows-10-mobile-to-azure-active-directory.md)| Describes the considerations and options for using Windows 10 Mobile with Azure AD in your organization.|