sync to stage

education/windows/TOC.md

@@ -1,7 +1,10 @@
 # [Windows 10 for education](index.md)
 ## [Change history for Windows 10 for Education](change-history-edu.md)
-## [Use the Set up School PCs app (Preview)](use-set-up-school-pcs-app.md)
+## [Setup options for Windows 10](set-up-windows-10.md)
-## [Technical reference for the Set up School PCs app (Preview)](set-up-school-pcs-technical.md)
+### [Use the Set up School PCs app (Preview)](use-set-up-school-pcs-app.md)
+### [Technical reference for the Set up School PCs app (Preview)](set-up-school-pcs-technical.md)
+### [Set up student PCs to join domain](set-up-students-pcs-to-join-domain.md)
+### [Set up student PCs with apps](set-up-students-pcs-with-apps.md)
 ## [Take tests in Windows 10 (Preview)](take-tests-in-windows-10.md)
 ### [Set up Take a Test on a single PC (Preview)](take-a-test-single-pc.md)
 ### [Set up Take a Test on multiple PCs (Preview)](take-a-test-multiple-pcs.md)

education/windows/set-up-students-pcs-to-join-domain.md

@@ -0,0 +1,69 @@
+---
+title: Set up student PCs to join domain
+description: Learn how to use Configuration Designer to easily provision student devices to join Active Directory.
+keywords: ["shared cart", "shared PC", "school"]
+ms.prod: W10
+ms.mktglfcycl: plan
+ms.sitesec: library
+author: jdeckerMS
+---
+
+# Set up student PCs to join domain
+**Applies to:**
+
+-   Windows 10  
+
+
+> <span style="color:#ED1C24;">[Some information relates to pre-released 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. ]</span>
+
+If your school uses Active Directory, use the Windows Imaging and Configuration Designer (ICD) tool included in the Windows Assessment and Deployment Kit (ADK) for Windows 10 to create a runtime provisioning package that will configure the PC for student use that is joined to the Active Directory domain. [Install the ADK.](http://go.microsoft.com/fwlink/p/?LinkId=526740)
+
+
+
+##Create the provisioning package
+
+1. Open Windows ICD (by default, %windir%\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Imaging and Configuration Designer\x86\ICD.exe).
+
+2. Click **Simple provisioning**.
+
+3. Name your project and click **Finish**.
+
+4. In the **Set up device** step, enter a unique 15-character name for the device. For help generating a unique name, you can use %SERIAL%, which includes a hardware-specific serial number, or you can use %RAND:x%, which generates random characters of x length.
+
+5. (Optional) You can upgrade the following editions of Windows 10 by providing a product key for the edition to upgrade to.
+    - Home to Education
+    - Pro to Education
+    - Pro to Enterprise
+    - Enterprise to Education
+    - Mobile to Mobile Enterprise
+
+
+6. Click **Set up network**.
+
+7. Toggle **On** or **Off** for wireless network connectivity. If you select **On**, enter the SSID, type, and (if required) password for the wireless network.
+
+8. Click **Enroll into Active Directory**.
+
+9. Toggle **Yes** or **No** for Active Directory enrollment. If you select **Yes**, enter the credentials for an account with permissions to enroll the device. (Optional) Enter a user name and password to create a local administrator account.
+
+    > **Warning**: If you don't create a local administrator account and the device fails to enroll in Active Directory for any reason, you will have to reimage the device and start over. As a best practice, we recommend:
+      - Use a least-privileged domain account to join the device to the domain.
+      - Create a temporary administrator account to use for debugging or reprovisioning if the device fails to enroll successfully.
+      - [Use Group Policy to delete the temporary administrator account](https://blogs.technet.microsoft.com/canitpro/2014/12/10/group-policy-creating-a-standard-local-admin-account/) after the device is enrolled in Active Directory.
+
+
+10. Click **Finish**.
+
+11. Review your settings in the summary. You can return to previous pages to change your selections. Then, under Protect your package, toggle **Yes** or **No** to encrypt the provisioning package. If you select **Yes**, enter a password. This password must be entered to apply the encrypted provisioning package.
+
+12. Click **Create**.
+
+> **Important**  When you build a provisioning package, you may include sensitive information in the project files and in the provisioning package (.ppkg) file. Although you have the option to encrypt the .ppkg file, project files are not encrypted. You should store the project files in a secure location and delete the project files when they are no longer needed.
+
+## Apply package
+
+
+Go to **Settings** &gt; **Accounts** &gt; **Work access** &gt; **Add or remove a management package** &gt; **Add a package**, and select the package to install. 
+
+![add a package option](images/package.png)
+

education/windows/set-up-students-pcs-with-apps.md

@@ -0,0 +1,18 @@
+---
+title: Set up student PCs with apps
+description: Learn how to use Configuration Designer to easily provision student devices to join Active Directory.
+keywords: ["shared cart", "shared PC", "school"]
+ms.prod: W10
+ms.mktglfcycl: plan
+ms.sitesec: library
+author: jdeckerMS
+---
+
+# Set up student PCs with apps
+**Applies to:**
+
+-   Windows 10  
+
+
+
+

education/windows/set-up-windows-10.md

@@ -0,0 +1,27 @@
+---
+title: Setup options for Windows 10
+description: Decide which option for setting up Windows 10 is right for you.
+keywords: shared cart, shared PC, school
+ms.prod: w10
+ms.mktglfcycl: plan
+ms.sitesec: library
+ms.pagetype: edu
+author: jdeckerMS
+---
+
+# Setup options for Windows 10
+**Applies to:**
+
+-   Windows 10 
+
+
+![Which tool to use to setup Windows 10](images/setup-options.png)
+
+
+
+## Related topics
+
+
+
+
+

windows/deploy/provision-pcs-for-initial-deployment.md

@@ -42,6 +42,7 @@ In a simple provisioning package, you can configure:
 Provisioning packages can include management instructions and policies, installation of specific apps, customization of network connections and policies, and more. To learn about provisioning packages that include more than the settings in a simple provisioning package, see [Provision PCs with apps and certificates](provision-pcs-with-apps-and-certificates.md). 
 
 > **Tip!**  Use simple provisioning to create a package with the common settings, then switch to the advanced editor to add other settings, apps, policies, etc.
+
 ![open advanced editor](images/icd-simple-edit.png)
 
 ## Create the provisioning package