Merge remote-tracking branch 'refs/remotes/origin/sh-7964738'

This commit is contained in:
Trudy Hakala 2016-08-01 07:03:45 -07:00
commit 026e2be0c4

View File

@ -116,8 +116,6 @@ You can check online for updated versions at [Surface Hub device account scripts
Your infrastructure will likely fall into one of three configurations. Which configuration you have will affect how you prepare for device setup. Your infrastructure will likely fall into one of three configurations. Which configuration you have will affect how you prepare for device setup.
![Image showing deployment options: online, on-premises, or hybrid.](images/deploymentoptions-01.png)
- [Online deployment (Office 365)](online-deployment-surface-hub-device-accounts.md): Your organizations environment is deployed entirely on Office 365. - [Online deployment (Office 365)](online-deployment-surface-hub-device-accounts.md): Your organizations environment is deployed entirely on Office 365.
- [On-premises deployment](on-premises-deployment-surface-hub-device-accounts.md): Your organization has servers that it controls, where Active Directory, Exchange, and Skype for Business (or Lync) are hosted. - [On-premises deployment](on-premises-deployment-surface-hub-device-accounts.md): Your organization has servers that it controls, where Active Directory, Exchange, and Skype for Business (or Lync) are hosted.
- [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. - [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.