Merged PR 5205: 1/8 PM Publish

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**.
+1. Set up **Device A** first.  Setup **Device B** after you have completed setup of **Device A**.
-2. Connect **Device A** to your school's Wi-Fi network.
+2. Turn on **Device A**.
-3. Log in using the **Administrator Username** and **Administrator Password** included in the **Credentials Sheet** located in your kit.
+3. Connect **Device A** to your school's Wi-Fi network or connect with a local Ethernet connection.
-4. Click the IT Administrator image or follow the instructions in [Get started for IT Admins](itadmin-tib-get-started.md).
+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).
 
     [![Get started for IT Admins](images/itadmin_rotated.png)](itadmin-tib-get-started.md)
 

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
 <dd>
     <a href="./policy-csp-search.md#search-allowcloudsearch" id="search-allowcloudsearch">Search/AllowCloudSearch</a>
   </dd>
+  <dd>
+    <a href="./policy-csp-search.md#search-allowcortanainaad" id="search-allowcortanainaad">Search/AllowCortanaInAAD</a>
+  </dd>
   <dd>
     <a href="./policy-csp-search.md#search-allowindexingencryptedstoresoritems" id="search-allowindexingencryptedstoresoritems">Search/AllowIndexingEncryptedStoresOrItems</a>
   </dd>
@@ -2506,6 +2509,10 @@ The following diagram shows the Policy configuration service provider in tree fo
   <dd>
     <a href="./policy-csp-search.md#search-disableremovabledriveindexing" id="search-disableremovabledriveindexing">Search/DisableRemovableDriveIndexing</a>
   </dd>
+  <dd>
+    <a href="./policy-csp-search.md#search-donotusewebresults" id="search-donotusewebresults">Search/DoNotUseWebResults</a>
+  </dd>
+
   <dd>
     <a href="./policy-csp-search.md#search-preventindexinglowdiskspacemb" id="search-preventindexinglowdiskspacemb">Search/PreventIndexingLowDiskSpaceMB</a>
   </dd>

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.
 
 
 <hr/>
@@ -37,9 +39,15 @@ ms.date: 12/14/2017
   <dd>
     <a href="#experience-allowsimerrordialogpromptwhennosim">Experience/AllowSIMErrorDialogPromptWhenNoSIM</a>
   </dd>
+  <dd>
+    <a href="#experience-allowsaveasofofficefiles">Experience/AllowSaveAsOfOfficeFiles</a>
+  </dd>
   <dd>
     <a href="#experience-allowscreencapture">Experience/AllowScreenCapture</a>
   </dd>
+  <dd>
+    <a href="#experience-allowsharingofofficefiles">Experience/AllowSharingOfOfficeFiles</a>
+  </dd>
   <dd>
     <a href="#experience-allowsyncmysettings">Experience/AllowSyncMySettings</a>
   </dd>
@@ -393,6 +401,14 @@ The following list shows the supported values:
 <!--EndPolicy-->
 <hr/>
 <!--StartPolicy-->
+<a href="" id="experience-allowsaveasofofficefiles"></a>**Experience/AllowSaveAsOfOfficeFiles**  
+
+<!--StartDescription-->
+This policy is deprecated.
+<!--EndDescription-->
+<!--EndPolicy-->
+<hr/>
+<!--StartPolicy-->
 <a href="" id="experience-allowscreencapture"></a>**Experience/AllowScreenCapture**  
 
 <!--StartSKU-->
@@ -447,6 +463,14 @@ The following list shows the supported values:
 <!--EndPolicy-->
 <hr/>
 <!--StartPolicy-->
+<a href="" id="experience-allowsharingofofficefiles"></a>**Experience/AllowSharingOfOfficeFiles**  
+
+<!--StartDescription-->
+This policy is deprecated.
+<!--EndDescription-->
+<!--EndPolicy-->
+<hr/>
+<!--StartPolicy-->
 <a href="" id="experience-allowsyncmysettings"></a>**Experience/AllowSyncMySettings**  
 
 <!--StartSKU-->

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.
 
 
 <hr/>
@@ -22,6 +24,9 @@ ms.date: 12/14/2017
   <dd>
     <a href="#search-allowcloudsearch">Search/AllowCloudSearch</a>
   </dd>
+  <dd>
+    <a href="#search-allowcortanainaad">Search/AllowCortanaInAAD</a>
+  </dd>
   <dd>
     <a href="#search-allowindexingencryptedstoresoritems">Search/AllowIndexingEncryptedStoresOrItems</a>
   </dd>
@@ -46,6 +51,9 @@ ms.date: 12/14/2017
   <dd>
     <a href="#search-disableremovabledriveindexing">Search/DisableRemovableDriveIndexing</a>
   </dd>
+  <dd>
+    <a href="#search-donotusewebresults">Search/DoNotUseWebResults</a>
+  </dd>
   <dd>
     <a href="#search-preventindexinglowdiskspacemb">Search/PreventIndexingLowDiskSpaceMB</a>
   </dd>
@@ -105,6 +113,61 @@ ms.date: 12/14/2017
 <!--EndPolicy-->
 <hr/>
 <!--StartPolicy-->
+<a href="" id="search-allowcortanainaad"></a>**Search/AllowCortanaInAAD**  
+
+<!--StartSKU-->
+<table>
+<tr>
+	<th>Home</th>
+	<th>Pro</th>
+	<th>Business</th>
+	<th>Enterprise</th>
+	<th>Education</th>
+	<th>Mobile</th>
+	<th>Mobile Enterprise</th>
+</tr>
+<tr>
+	<td><img src="images/crossmark.png" alt="cross mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
+	<td><img src="images/crossmark.png" alt="cross mark" /></td>
+	<td><img src="images/crossmark.png" alt="cross mark" /></td>
+</tr>
+</table>
+
+<!--EndSKU-->
+<!--StartScope-->
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+<hr/>
+
+<!--EndScope-->
+<!--StartDescription-->
+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..
+
+<!--EndDescription-->
+<!--SupportedValues-->
+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.
+
+
+<!--/SupportedValues-->
+<!--Example-->
+
+<!--/Example-->
+<!--Validation-->
+
+<!--/Validation-->
+<!--EndPolicy-->
+<hr/>
+<!--StartPolicy-->
 <a href="" id="search-allowindexingencryptedstoresoritems"></a>**Search/AllowIndexingEncryptedStoresOrItems**  
 
 <!--StartSKU-->
@@ -460,6 +523,65 @@ The following list shows the supported values:
 <!--EndPolicy-->
 <hr/>
 <!--StartPolicy-->
+<a href="" id="search-donotusewebresults"></a>**Search/DoNotUseWebResults**  
+
+<!--StartSKU-->
+<table>
+<tr>
+	<th>Home</th>
+	<th>Pro</th>
+	<th>Business</th>
+	<th>Enterprise</th>
+	<th>Education</th>
+	<th>Mobile</th>
+	<th>Mobile Enterprise</th>
+</tr>
+<tr>
+	<td><img src="images/crossmark.png" alt="cross mark" /></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
+	<td><img src="images/checkmark.png" alt="check mark" /><sup>4</sup></td>
+	<td><img src="images/crossmark.png" alt="cross mark" /></td>
+	<td><img src="images/crossmark.png" alt="cross mark" /></td>
+</tr>
+</table>
+
+<!--EndSKU-->
+<!--StartScope-->
+[Scope](./policy-configuration-service-provider.md#policy-scope):
+
+> [!div class = "checklist"]
+> * Device
+
+<hr/>
+
+<!--EndScope-->
+<!--StartDescription-->
+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.
+
+<!--EndDescription-->
+<!--SupportedValues-->
+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.
+
+<!--/SupportedValues-->
+<!--Example-->
+
+<!--/Example-->
+<!--Validation-->
+
+<!--/Validation-->
+<!--EndPolicy-->
+<hr/>
+<!--StartPolicy-->
 <a href="" id="search-preventindexinglowdiskspacemb"></a>**Search/PreventIndexingLowDiskSpaceMB**  
 
 <!--StartSKU-->