diff --git a/education/trial-in-a-box/index.md b/education/trial-in-a-box/index.md
index 8c336aa231..1325664e46 100644
--- a/education/trial-in-a-box/index.md
+++ b/education/trial-in-a-box/index.md
@@ -42,7 +42,7 @@ Trial in a Box puts the Microsoft education technology into an easy package so y
**If you want to try the Educator Experience**
1. Turn on **Device A**.
-2. Connect **Device A** to your school's Wi-Fi network.
+2. Connect **Device A** to your school's Wi-Fi network or connect with a local Ethernet connection.
3. Log in using the **Teacher Username** and **Teacher Password** included in the **Credentials Sheet** located in your kit.
4. Click the Educator image or follow the instructions in [Get started for Educators](educator-tib-get-started.md).
@@ -50,10 +50,12 @@ Trial in a Box puts the Microsoft education technology into an easy package so y
**If you want to try the IT Administrator Experience**
-1. Turn on **Device A**.
-2. Connect **Device A** to your school's Wi-Fi network.
-3. Log in using the **Administrator Username** and **Administrator Password** included in the **Credentials Sheet** located in your kit.
-4. Click the IT Administrator image or follow the instructions in [Get started for IT Admins](itadmin-tib-get-started.md).
+1. Set up **Device A** first. Setup **Device B** after you have completed setup of **Device A**.
+2. Turn on **Device A**.
+3. Connect **Device A** to your school's Wi-Fi network or connect with a local Ethernet connection.
+4. Log in using the **Administrator Username** and **Administrator Password** included in the **Credentials Sheet** located in your kit.
+5. Please immediately register both devices with your hardware manufacturer to activate the manufacturer's warranty.
+6. Click the IT Administrator image or follow the instructions in [Get started for IT Admins](itadmin-tib-get-started.md).
[](itadmin-tib-get-started.md)
diff --git a/windows/client-management/mdm/policy-configuration-service-provider.md b/windows/client-management/mdm/policy-configuration-service-provider.md
index 5b84c2bf80..49edda7d65 100644
--- a/windows/client-management/mdm/policy-configuration-service-provider.md
+++ b/windows/client-management/mdm/policy-configuration-service-provider.md
@@ -2482,6 +2482,9 @@ The following diagram shows the Policy configuration service provider in tree fo
Search/AllowCloudSearch
+
+ Search/AllowCortanaInAAD
+
Search/AllowIndexingEncryptedStoresOrItems
@@ -2506,6 +2509,10 @@ The following diagram shows the Policy configuration service provider in tree fo
Search/DisableRemovableDriveIndexing
+
+ Search/DoNotUseWebResults
+
+
Search/PreventIndexingLowDiskSpaceMB
diff --git a/windows/client-management/mdm/policy-csp-experience.md b/windows/client-management/mdm/policy-csp-experience.md
index 5d6b2b663b..8d3786e647 100644
--- a/windows/client-management/mdm/policy-csp-experience.md
+++ b/windows/client-management/mdm/policy-csp-experience.md
@@ -6,11 +6,13 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
-ms.date: 12/14/2017
+ms.date: 12/19/2017
---
# Policy CSP - Experience
+> [!WARNING]
+> Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
@@ -37,9 +39,15 @@ ms.date: 12/14/2017
Experience/AllowSIMErrorDialogPromptWhenNoSIM
+
+ Experience/AllowSaveAsOfOfficeFiles
+
Experience/AllowScreenCapture
+
+ Experience/AllowSharingOfOfficeFiles
+
Experience/AllowSyncMySettings
@@ -393,6 +401,14 @@ The following list shows the supported values:
+**Experience/AllowSaveAsOfOfficeFiles**
+
+
+This policy is deprecated.
+
+
+
+
**Experience/AllowScreenCapture**
@@ -447,6 +463,14 @@ The following list shows the supported values:
+**Experience/AllowSharingOfOfficeFiles**
+
+
+This policy is deprecated.
+
+
+
+
**Experience/AllowSyncMySettings**
diff --git a/windows/client-management/mdm/policy-csp-search.md b/windows/client-management/mdm/policy-csp-search.md
index e9f8199032..204a76ade1 100644
--- a/windows/client-management/mdm/policy-csp-search.md
+++ b/windows/client-management/mdm/policy-csp-search.md
@@ -6,11 +6,13 @@ ms.topic: article
ms.prod: w10
ms.technology: windows
author: nickbrower
-ms.date: 12/14/2017
+ms.date: 01/08/2018
---
# Policy CSP - Search
+> [!WARNING]
+> Some information relates to prereleased product which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.
@@ -22,6 +24,9 @@ ms.date: 12/14/2017
Search/AllowCloudSearch
+
+ Search/AllowCortanaInAAD
+
Search/AllowIndexingEncryptedStoresOrItems
@@ -46,6 +51,9 @@ ms.date: 12/14/2017
Search/DisableRemovableDriveIndexing
+
+ Search/DoNotUseWebResults
+
Search/PreventIndexingLowDiskSpaceMB
@@ -105,6 +113,61 @@ ms.date: 12/14/2017
+**Search/AllowCortanaInAAD**
+
+
+
+
+ | Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+  |
+  4 |
+ 4 |
+ 4 |
+ 4 |
+ |
+ |
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+Added in Windows 10, next major update. This specifies whether the Cortana consent page can appear in the Azure Active Directory (AAD) device out-of-box-experience (OOBE) flow. If this policy is left in its default state, Cortana will not be shown in the AAD OOBE flow. If you opt-in to this policy, then the Cortana consent page will appear in the AAD OOBE flow..
+
+
+
+The following list shows the supported values:
+
+- 0 (default) - Not allowed. The Cortana consent page will not appear in AAD OOBE during setup.
+- 1 - Allowed. The Cortana consent page will appear in Azure AAD OOBE during setup.
+
+
+
+
+
+
+
+
+
+
+
+
**Search/AllowIndexingEncryptedStoresOrItems**
@@ -460,6 +523,65 @@ The following list shows the supported values:
+**Search/DoNotUseWebResults**
+
+
+
+
+ | Home |
+ Pro |
+ Business |
+ Enterprise |
+ Education |
+ Mobile |
+ Mobile Enterprise |
+
+
+ |
+ 4 |
+ 4 |
+ 4 |
+ 4 |
+ |
+ |
+
+
+
+
+
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+
+
+
+
+Added in Windows 10, next major update. Don't search the web or display web results in Search.
+
+This policy setting allows you to control whether or not Search can perform queries on the web, and if the web results are displayed in Search.
+If you enable this policy setting, queries won't be performed on the web and web results won't be displayed when a user performs a query in Search.
+
+If you disable this policy setting, queries will be performed on the web and web results will be displayed when a user performs a query in Search.
+
+
+
+The following list shows the supported values:
+
+- 0 - Not allowed. Queries won't be performed on the web and web results won't be displayed when a user performs a query in Search.
+- 1 (default) - Allowed. Queries will be performed on the web and web results will be displayed when a user performs a query in Search.
+
+
+
+
+
+
+
+
+
+
+
**Search/PreventIndexingLowDiskSpaceMB**