From e4bf22b5634b63e469ba3bbbef333bf3836bd5cd Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Thu, 27 Apr 2017 11:27:54 -0700 Subject: [PATCH 1/3] remove hybrid voice --- devices/surface-hub/TOC.md | 1 - ...e-and-test-a-device-account-surface-hub.md | 2 +- devices/surface-hub/skype-hybrid-voice.md | 20 ------------------- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 devices/surface-hub/skype-hybrid-voice.md diff --git a/devices/surface-hub/TOC.md b/devices/surface-hub/TOC.md index 742423081c..a9cde81f15 100644 --- a/devices/surface-hub/TOC.md +++ b/devices/surface-hub/TOC.md @@ -8,7 +8,6 @@ ##### [On-premises deployment (single forest)](on-premises-deployment-surface-hub-device-accounts.md) ##### [On-premises deployment (multiple forests)](on-premises-deployment-surface-hub-multi-forest.md) ##### [Hybrid deployment](hybrid-deployment-surface-hub-device-accounts.md) -##### [Online or hybrid deployment using Skype Hybrid Voice environment](skype-hybrid-voice.md) ##### [Create a device account using UI](create-a-device-account-using-office-365.md) ##### [Microsoft Exchange properties](exchange-properties-for-surface-hub-device-accounts.md) ##### [Applying ActiveSync policies to device accounts](apply-activesync-policies-for-surface-hub-device-accounts.md) diff --git a/devices/surface-hub/create-and-test-a-device-account-surface-hub.md b/devices/surface-hub/create-and-test-a-device-account-surface-hub.md index c01273b24e..353d6cf6fd 100644 --- a/devices/surface-hub/create-and-test-a-device-account-surface-hub.md +++ b/devices/surface-hub/create-and-test-a-device-account-surface-hub.md @@ -49,7 +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). diff --git a/devices/surface-hub/skype-hybrid-voice.md b/devices/surface-hub/skype-hybrid-voice.md deleted file mode 100644 index 82a57d1aee..0000000000 --- a/devices/surface-hub/skype-hybrid-voice.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -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. \ No newline at end of file From 0bcee57418036da8bf3bf90e387785c59b2550dc Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Thu, 27 Apr 2017 11:31:05 -0700 Subject: [PATCH 2/3] add link to edu topic --- windows/configuration/set-up-shared-or-guest-pc.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/configuration/set-up-shared-or-guest-pc.md b/windows/configuration/set-up-shared-or-guest-pc.md index e93bdd976e..d89c6c3063 100644 --- a/windows/configuration/set-up-shared-or-guest-pc.md +++ b/windows/configuration/set-up-shared-or-guest-pc.md @@ -69,7 +69,7 @@ Shared PC mode exposes a set of customizations to tailor the behavior to your re | Customization: MaintenanceStartTime | By default, the maintenance start time (which is when automatic maintenance tasks run, such as Windows Update) is midnight. You can adjust the start time in this setting by entering a new start time in minutes from midnight. For example, if you want maintenance to begin at 2 AM, enter `120` as the value. | | Customization: MaxPageFileSizeMB | Adjusts the maximum page file size in MB. This can be used to fine-tune page file behavior, especially on low end PCs. | | Customization: RestrictLocalStorage | Set as **True** to restrict the user from saving or viewing local storage when using File Explorer. This setting controls this API: [ShouldAvoidLocalStorage](https://docs.microsoft.com/uwp/api/windows.system.profile.sharedmodesettings) | -| Customization: SetEduPolicies | Set to **True** for PCs that will be used in a school. This setting controls this API: [IsEducationEnvironment](https://docs.microsoft.com/uwp/api/windows.system.profile.educationsettings) | +| Customization: SetEduPolicies | Set to **True** for PCs that will be used in a school. For more information, see [Windows 10 configuration recommendations for education customers](https://docs.microsoft.com/education/windows/configure-windows-for-education). This setting controls this API: [IsEducationEnvironment](https://docs.microsoft.com/uwp/api/windows.system.profile.educationsettings) | | Customization: SetPowerPolicies | When set as **True**:
- Prevents users from changing power settings
- Turns off hibernate
- Overrides all power state transitions to sleep (e.g. lid close) | | Customization: SignInOnResume | This setting specifies if the user is required to sign in with a password when the PC wakes from sleep. | | Customization: SleepTimeout | Specifies all timeouts for when the PC should sleep. Enter the amount of idle time in seconds. If you don't set sleep timeout, the default of 1 hour applies. | From 98e1dcb845a3576da79ed0c7dc69499fe2669e16 Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Thu, 27 Apr 2017 12:11:54 -0700 Subject: [PATCH 3/3] sync --- .../surface-hub/create-and-test-a-device-account-surface-hub.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devices/surface-hub/create-and-test-a-device-account-surface-hub.md b/devices/surface-hub/create-and-test-a-device-account-surface-hub.md index 353d6cf6fd..b06c909230 100644 --- a/devices/surface-hub/create-and-test-a-device-account-surface-hub.md +++ b/devices/surface-hub/create-and-test-a-device-account-surface-hub.md @@ -51,7 +51,7 @@ For detailed steps using PowerShell to provision a device account, choose an opt | [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. | -If you prefer to use a graphical user interface, some steps can be done using UI instead of PowerShell. +If you prefer to use a graphical user interface (UI), 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).