Merge remote-tracking branch 'refs/remotes/origin/master' into atp-tomeralpert

education/get-started/get-started-with-microsoft-education.md

@@ -174,20 +174,22 @@ To learn more about the CSV files that are required and the info you need to inc
 
 **<a name="assignclassroom"></a>Assign Classroom license**
 
-The Classroom application is retired, but you will need to assign the Classroom Preview license to yourself and other global admins so that you can access the services. The single license will allow global admins to access both Classroom Preview and School Data Sync.
+The Classroom application is retired, but you will need to assign the Classroom Preview license to global admin accounts that will be used to administer SDS. The single license allows global admins to access both Classroom Preview and School Data Sync.
 
 1. In the <a href="https://portal.office.com/adminportal" target="_blank">Office 365 admin center</a>, select **Users > Active users**.
 2. Select the checkbox for your global admin account.
 3. In the account details window, under **Product licenses**, click **Edit**.
 4. In the **Product licenses** page, turn on **Microsoft Classroom** and then click **Save**.
-5. Confirm that you can access SDS. To do this, log in to <a href="http://sds.microsoft.com" target="_blank">https://sds.microsoft.com</a>.
+5. Confirm that you can access SDS. To do this:
+  - Navigate to <a href="http://sds.microsoft.com" target="_blank">https://sds.microsoft.com</a> and click **Sign in**. When prompted, enter your global admin username and password to access the SDS portal. Or,
+  - From the Office 365 admin portal, go to **Admin centers** and click on **School Data Sync** to go to the SDS portal.
 
   > [!NOTE]
   > Only global admins can access SDS.
 
 **<a name="usesdstoimportdata"></a>Use SDS to import student data**
 
-1. If you haven't done so already, To do this, go to <a href="http://sds.microsoft.com" target="_blank">https://sds.microsoft.com</a>.
+1. If you haven't done so already, go to the SDS portal, <a href="http://sds.microsoft.com" target="_blank">https://sds.microsoft.com</a>.
 2. Click **Sign in**. You will see the **Settings** option for **Manage School Data Sync**.
 
   **Figure 6** - Settings for managing SDS
@@ -211,7 +213,7 @@ The Classroom application is retired, but you will need to assign the Classroom
   ![New SDS profile setup wizard](images/sds_updated_addnewprofile.png)
 
 6. For the new profile, in the **Before you begin...** screen:
-  1. Enter a name for your profile, such as *ContosoElementarySchool*.
+  1. Enter a name for your profile, such as *Contoso_Profile_1*.
   2. Select a sync method for your profile. For this walkthrough, select **CSV Files**.
 
     Note that for any sync method that you choose, you can click the **View steps** link to get more information about the steps you need to take depending on the sync method of your choosing.
@@ -223,7 +225,8 @@ The Classroom application is retired, but you will need to assign the Classroom
   2. In the **Select school and section properties** section, select the properties you want to sync. If you select additional properties, make sure you have these properties and values added in the CSV files. For the walkthrough, we're not changing the default values. These are:
     - **School properties:** SIS ID, Name
     - **Section properties:** SIS ID, School SIS ID, Section Name
-  3. In the **Select new or existing users** section, select either **New users** or **Existing users** based on the scenaro that applies to you.
+  3. In the **Select new or existing users** section, you can select either **New users** or **Existing users** based on the scenaro that applies to you. For this walkthrough, select **New users**.
+  <!--
     - Choose **New users** if this is a brand new tenant and this is the first time that you're adding users.
 
         Choose the **New users** option if you are using an unaltered version of the sample CSV files from [Download sample school data](#downloadcsvsamples) or if you created your own CSV files with new users.
@@ -231,36 +234,45 @@ The Classroom application is retired, but you will need to assign the Classroom
     - Choose **Existing users** if you already have a live production tenant, with teachers and students that already have active accounts in Office 365 (cloud only or synced from on-premise Active Directory).
 
         Using the **Existing users** option, SDS will not attempt to create new users. Instead, it uses the identity matching options in the next section of the setup wizard to match the students and teachers in your CSV files to the user accounts that already exist in Azure. All additiional details for the students and teachers contained within the CSV files will be written as extension attributes on top of the already existing user objects. You can find more information about these settings on the main SDS deployment page for CSV-based deployments in <a href="http://aka.ms/sdscsv" target="_blank">How to deploy School Data Sync by using CSV files</a>.
+  -->
+  4. In the **Import data** section:
+    1. Click **Upload Files** to bring up the **Select data files to be uploaded** window.
+    2. In the **Select data files to be uploaded** window, click **+ Add Files** and navigate to the directory where you saved the six CSV files required for data import.
+    3. In the File Explorer window, you will see a folder for the sample CSV files for the UK and six sample CSV files for the US. Select the CSV files that match your region/locale, and then click **Open**.
+    4. In the **Select data files to be uploaded** window, confirm that all six CSV files (School.csv, Section.csv, Student.csv, StudentEnrollment.csv, Teacher.csv, and TeacherRoster.csv) are listed and then click **Upload**.
+    4. After all the files are successfully uploaded, click **OK**. 
 
-  4. In the **Sync option for Section Group Display Name**, check the box if you want to allow teachers to overwrite the section names.
+  5. In **Select domain for schools/sections**, confirm that your domain is selected.
+  6. In the **Select school and section properties** section, check the properties. Properties are automatically selected based on the information from the files you uploaded during the **Import data** step.
+  6. In the **Sync option for Section Group Display Name** section, check the box if you want to allow teachers to overwrite the section names.
   5. In the **License Options** section, check the box to select the option.
   6. Click **Next**.
 
     **Figure 9** - Sync options for the new profile
 
-    ![Specify sync options for the new SDS profile](images/sds_addnewprofile_syncoptions.png)
+    ![Specify sync options for the new SDS profile](images/sds_profile_syncoptions.png)
 
 8. In the **Teacher options** screen:
-  1. Select the domain for the teachers. SDS uses this to match teachers from your source data to their existing accounts in Office 365/Azure Active Directory. In the walkthrough, the CSV files are our source data.
-  2. In the **Select teacher properties** section, you can add optional teacher properties to sync. For this walkthrough, you don't have to change the default.
+  1. Select the domain for the students. SDS appends the selected domain suffix to the teacher's username attribute contained in the CSV file, to build the UserPrincipalName for each user in Office 365/Azure Active Directory during the account creation process. The teacher will log in to Office 365 with the UserPrincipalName once the account is created.
+  2. In the **Select teacher properties** section, make sure the attributes that have been automatically selected for you align to your CSV files. If you select additional properties or deselect any properties, make sure you have the corresponding properties and values contained within the CSV files. For this walkthrough, you don't have to change the default.
   3. In the **Teacher licenses** section, choose the SKU to assign licenses for teachers. For this walkthrough, choose **STANDARDWOFFPACK_FACULTY**.
   4. Click **Next**.
 
     **Figure 10** - Specify options for teacher mapping
 
-    ![Specify options for teacher mapping](images/sds_addnewprofile_teacheroptions.png)
+    ![Specify options for teacher mapping](images/sds_profile_teacheroptions.png)
 
 9. In the **Student options** screen:
-  1. Select the domain for the students. SDS uses this to match students from your source data to their existing accounts in Office 365/Azure Active Directory. In the walkthrough, the CSV files are our source data.
-  2. In the **Select student properties** section, you can add optional student properties to sync. For this walkthrough, you don't have to change the default.
+  1. Select the domain for the students. SDS appends the selected domain suffix to the student's username attribute contained in the CSV file, to build the UserPrincipalName for each user in Office 365/Azure Active Directory during the account creation process. The student will log in to Office 365 with the UserPrincipalName once the account is created.
+  2. In the **Select student properties** section, make sure the attributes that have been automatically selected for you align to your CSV files. If you select additional properties or deselect any properties, make sure you have the corresponding properties and values contained within the CSV files. For this walkthrough, you don't have to change the default.
   3. In the **Student licenses** section, choose the SKU to assign licenses for students. For this walkthrough, choose **STANDARDWOFFPACK_STUDENT**.
   4. Click **Next**.
 
     **Figure 11** - Specify options for student mapping
 
-    ![Specify options for student mapping](images/sds_addnewprofile_studentoptions.png)
+    ![Specify options for student mapping](images/sds_profile_studentoptions.png)
 
-10. In the profile **Review** page, review the summary and confirm that the values matches with the data you entered. Click **Create profile**.
+10. In the profile **Review** page, review the summary and confirm that the options selected are correct. Click **Create profile**.
 
   You will see a notification that your profile is being created.
 
@@ -268,24 +280,19 @@ The Classroom application is retired, but you will need to assign the Classroom
 
   **Figure 12** - SDS profile page
 
-  ![SDS profile page](images/sds_profilepage.png)
+  ![SDS profile page](images/sds_profile_profilepage.png)
 
-12. After the profile name at the top, confirm that the status for your profile now says **Ready to sync**.
+12. After the profile is created and finished **Setting up**, confirm that the status for your profile now says **Sync enabled**.
 
-  If the status still indicates that the profile is being set up, try refreshing the page until you see the status change to **Ready to sync**.
+  If the status still indicates that the profile is being set up, try refreshing the page until you see the status change to **Sync enabled**.
 
-  **Figure 13** - New profile is ready to sync
+  **Figure 13** - New profile is sync enabled
 
-  ![Confirm that the new profile is ready](images/sds_profile_readytosync.png)
+  ![Confirm that the new profile is sync enabled](images/sds_profile_syncenabled.png)
+
+  > [!TIP]
+  > If you get errors during the pre-sync validation process, your profile status will change to **x Error**. To continue, review or resolve any pre-sync validation errors, and then click **Resume Sync** to start the synchronization cycle.
 
-11. On the profile page, below the profile name and profile status, there are four options: **Upload Files**, **Start Sync**, **Edit**, and **Delete**. Click **Upload Files** and then follow these steps:
-  1. In the **Select data files to be uploaded** window, click **+ Add Files** and navigate to the directory where you saved the six CSV files required for data import.
-  2. In the File Explorer window, you will see a folder for the sample CSV files for the UK and six sample CSV files for the US. Select the CSV files that match your region/locale, and then click **Open**.
-  3. In the **Select data files to be uploaded** window, confirm that all six CSV files (School.csv, Section.csv, Student.csv, StudentEnrollment.csv, Teacher.csv, and TeacherRoster.csv) are listed and then click **Upload**.
-  4. After all the files are successfully uploaded, click **OK**.
-12. On the profile page, click **Start Sync** and then follow these steps:
-  1. In the **Would you like to start sync for *Profile_Name?*** window, click **Start Sync**. *Profile_Name* should match the name you entered for your profile in the **Before you begin...** screen.
-  2. Confirm that sync successfully started for the file and then click **OK**.
 
   > [!NOTE]
   > Sync times, like file download times, can vary widely depending on when you start the sync, how much data you are syncing, the complexity of your data (such as the number of users, schools, and class enrollments), overall system/network load, and other factors. Two people who start a sync at the same time may not have their syncs complete at the same time.
@@ -401,15 +408,15 @@ Intune for Education provides an **Express configuration** option so you can get
 
   **Figure 22** - Expand the settings group to get more details
 
-  ![Expand the settings group to get more info](images/i4e_expressconfiguration_choosesettings_expandcollapse_cropped.png)
+  ![Expand the settings group to get more info](images/i4e_expressconfiguration_choosesettings_expandcollapse_cropped_052217.png)
 
 9. For this walkthrough, set the following settings:
-  - In the **Internet browser settings** group, change the **Send Do Not Track requests to help protect users' privacy** setting to **Block**.
-  - In the **App settings** group, change the **Microsoft Store for Business apps** setting to **Block**, and then set the **Private Microsoft Store for Business apps** to **Allow**.
+  - In the **Microsoft Edge settings** group, change the **Do-Not-Track headers** setting to **Require**.
+  - In the **App settings** group, change the **Microsoft Store for Business apps** setting to **Block**, and then set the **Require Microsoft Store for Business apps to be installed from private store** to **Require**.
 
   **Figure 23** - Set some additional settings
 
-  ![Set some additional settings](images/i4e_expressconfiguration_choosesettings_additionalsettingsconfigured_cropped.png)
+  ![Set some additional settings](images/i4e_expressconfiguration_choosesettings_additionalsettings_cropped.png)
 
 10. Click **Next**. In the **Review** screen, you will see a summary of the apps and settings you selected to apply.
 
@@ -606,8 +613,8 @@ When a device is owned by the school, you may need to have a single persion addi
 Follow the steps in this section to enable a single person to add many devices to your cloud infrastructure.
 
 1. Sign in to the <a href="https://portal.office.com" target="_blank">Office 365 admin center</a>.
-2. Click **Admin centers** and select **Azure AD** to go to the Azure portal.
-3. Configure the device settings for the school's Active Directory. From the new Azure portal, <a href="https://portal.azure.com" target="_blank">https://portal.azure.com</a>, select **Azure Active Directory > Users and groups > Device settings**.
+2. Configure the device settings for the school's Active Directory. To do this, go to the new Azure portal, <a href="https://portal.azure.com" target="_blank">https://portal.azure.com</a>.
+3. Select **Azure Active Directory > Users and groups > Device settings**.
 
   **Figure 40** - Device settings in the new Azure portal
 
@@ -622,8 +629,8 @@ When students move from using one device to another, they may need to have their
 Follow the steps in this section to ensure that settings for the each user follow them when they move from one device to another.
 
 1. Sign in to the <a href="https://portal.office.com" target="_blank">Office 365 admin center</a>.
-2. Click **Admin centers** and select **Azure AD** to go to the Azure portal.
-3. Configure the device settings for the school's Active Directory. From the new Azure portal, <a href="https://portal.azure.com" target="_blank">https://portal.azure.com</a>, select **Azure Active Directory > Users and groups > Device settings**.
+3. Go to the new Azure portal, <a href="https://portal.azure.com" target="_blank">https://portal.azure.com</a>.
+3. Select **Azure Active Directory > Users and groups > Device settings**.
 4. Find the setting **Users may sync settings and enterprise app data** and change the value to **All**.
 
   **Figure 41** - Enable settings to roam with users

education/windows/use-set-up-school-pcs-app.md

@@ -132,13 +132,21 @@ The **Set up School PCs** app guides you through the configuration choices for t
 
       **Figure 2** - Verify that the account you selected shows up
 
-      ![Verify that the account you selected shows up](images/suspc_choosesettings_signin_final.png)
+      ![Verify that the account you selected shows up](images/suspc_createpackage_signin.png)
 
     5. Click **Next**.
   
 4. To allow the student PCs to automatically connect to your school's wireless network, in the **Select the school's wireless network** page:
   1. Select the school's Wi-Fi network from the list of available wireless networks or manually add a wireless network. 
-  2. Click **Next**.
+  2. Click **Next** if you added or selected a wireless network, or **Skip** to skip configuring a wireless network.
+
+    If you click **Skip**, you will see the following dialog. 
+    * If you select **Got it**, you will go to the next page without Wi-Fi set up. 
+    * If you select **Add Wi-Fi**, you will go back to the Wi-Fi page to add a wireless network.
+
+    **Figure 3** - Only skip Wi-Fi if you have a wired Ethernet connection
+
+    ![Only skip Wi-Fi if you have a wired Ethernet connection](images/suspc_createpackage_skipwifi_modaldialog.png)
 
 5. To assign a name to the student PCs, in the **Assign a name to these student PCs** page:
   1. Add a short name that Set up School PCs will use as a prefix to identify and easily manage the group of devices, apps, and other settings through your device management client. 
@@ -168,9 +176,9 @@ The **Set up School PCs** app guides you through the configuration choices for t
 
   - To change the default lock screen background or to use your school's custom lock screen background, click **Browse** to select a new lock screen background.
 
-    **Figure 3** - Configure student PC settings
+    **Figure 4** - Configure student PC settings
 
-    ![Configure student PC settings](images/suspc_createpackage_settingspage.png)
+    ![Configure student PC settings](images/suspc_createpackage_configurestudentpcsettings.png)
 
  When you're doing configuring the student PC settings, click **Next**.
 
@@ -180,50 +188,49 @@ The **Set up School PCs** app guides you through the configuration choices for t
 
     If you set up Take a Test, this adds a **Take a Test** button on the student PC's sign-in screen. Windows will also lock down the student PC so that students can't access anything else while taking the test.
 
-    **Figure 4** - Configure the Take a Test app
+    **Figure 5** - Configure the Take a Test app
 
-    ![Configure the Take a Test app](images/suspc_createpackage_takeatestpage.png)
+    ![Configure the Take a Test app](images/suspc_createpackage_takeatest.png)
 
   3. Click **Next** or **Skip** depending on whether you want to set up Take a Test.
 
-<!-- comment out
-7. If you want to add Microsoft Store for Education apps to the student PCs, you can select from the list of recommended apps in the **Add STEM and Makerspace apps to Student PCs** page.
-  1. Select the apps that you want to add. You'll see a checkmark on apps that you select.
-  2. Click **Next**.
+8. In the **Add recommended apps** page, you can choose from a set of recommended Microsoft Store apps to provision. The recommended apps include Minecraft: Education Edition and several STEM and Makerspace apps.
+  1. Select the apps that you would like to provision and then click **Next** when you're done.
+  2. Click **Skip** if you don't want to provision any apps.
 
-    **Figure 4** - Select Microsoft Store apps to add to student PCs
+    **Figure 6** - Select from a set of recommended Microsoft Store apps
 
-    ![Select Microsoft Store apps to add to student PCs](images/suspc_choosesettings_apps.png)
+    ![Select from a set of recommended Microsoft Store apps](images/suspc_createpackage_recommendedapps.png)
+    
+    The set of recommended Microsoft Store for Education apps may vary from what we show here.
 
--->
-
-8. In the **Review package summary** page, make sure that all the settings you configured appear correctly.
+9. In the **Review package summary** page, make sure that all the settings you configured appear correctly.
   1. If you need to change any of the settings, you can on the sections to go back to that page and make your changes.
 
-      **Figure 5** - Review your settings and change them as needed
+      **Figure 7** - Review your settings and change them as needed
 
       ![Review your settings and change them as needed](images/suspc_createpackage_summary.png)
 
   2. Click **Accept**.
 
-9. In the **Insert a USB drive now** page:
+10. In the **Insert a USB drive now** page:
   1. Insert a USB drive to save your settings and create a provisioning package on the USB drive.
   2. Set up School PCs will automatically detect the USB drive after it's inserted. Choose the USB drive from the list.
   3. Click **Save** to save the provisioning package to the USB drive.
 
-      **Figure 6** - Select the USB drive and save the provisioning package
+      **Figure 8** - Select the USB drive and save the provisioning package
 
-      ![Select the USB drive and save the provisioning package](images/suspc_savepackage_insertusb_050817.png)
+      ![Select the USB drive and save the provisioning package](images/suspc_savepackage_insertusb.png)
 
-10. When the provisioning package is ready, you will see the name of the file and you can remove the USB drive. Click **Next** if you're done, or click **Add a USB** to save the same provisioning package to another USB drive.
+11. When the provisioning package is ready, you will see the name of the file and you can remove the USB drive. Click **Next** if you're done, or click **Add a USB** to save the same provisioning package to another USB drive.
 
-  **Figure 7** - Provisioning package is ready
+  **Figure 9** - Provisioning package is ready
 
-  ![Provisioning package is ready](images/suspc_ppkgisready_050817.png)
+  ![Provisioning package is ready](images/suspc_savepackage_ppkgisready.png)
 
 12. Follow the instructions in the **Get the student PCs ready** page to start setting up the student PCs. 
 
-  **Figure 8** - Line up the student PCs and get them ready for setup
+  **Figure 10** - Line up the student PCs and get them ready for setup
 
   ![Line up the student PCs and get them ready for setup](images/suspc_runpackage_getpcsready.png)
 
@@ -232,7 +239,7 @@ The **Set up School PCs** app guides you through the configuration choices for t
 
   Select **Create new package** if you need to create a new provisioning package. Otherwise, you can remove the USB drive if you're completely done creating the package.
 
-  **Figure 9** - Install the provisioning package on the student PCs
+  **Figure 11** - Install the provisioning package on the student PCs
 
   ![Install the provisioning package on the student PCs](images/suspc_runpackage_installpackage.png)
 
@@ -250,19 +257,19 @@ The provisioning package on your USB drive is named `Set up School PCs.ppkg`. A
 
     If the PC has gone past the account setup screen, reset the PC to start over. To reset the PC, go to **Settings** > **Update & security** > **Recovery** > **Reset this PC**.
 
-    **Figure 10** - The first screen during first-run setup in Windows 10 Creators Update (version 1703)
+    **Figure 12** - The first screen during first-run setup in Windows 10 Creators Update (version 1703)
 
     ![The first screen to set up a new PC in Windows 10 Creators Update](images/win10_1703_oobe_firstscreen.png)
 
 2. Insert the USB drive. Windows will recognize the drive and automatically install the provisioning package. 
 
-    **Figure 11** - Windows automatically detects the provisioning package and installs it
+    **Figure 13** - Windows automatically detects the provisioning package and installs it
 
     ![Windows automatically detects the provisioning package and installs it](images/suspc_studentpcsetup_installingsetupfile.png)
 
 3. You can remove the USB drive when you see the message that you can remove the removable media. You can then use the USB drive to start provisioning another student PC.
 
-    **Figure 12** - Remove the USB drive when you see the message that the media can be removed
+    **Figure 14** - Remove the USB drive when you see the message that the media can be removed
 
     ![You can remove the USB drive when you see the message that the media can be removed](images/suspc_setup_removemediamessage.png)
    

education/windows/windows-editions-for-education-customers.md

@@ -39,7 +39,7 @@ Existing devices running Windows 10 Pro, currently activated with the original O
 
 Customers with Academic Volume Licensing agreements with rights for Windows can get Windows 10 Pro Education through the [Volume Licensing Service Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx).
 
-Customers who deploy Windows 10 Pro are able to configure the product to have similar feature settings to Windows 10 Pro Education using policies. More detailed information on these policies and the configuration steps required is available in Manage Windows 10 and Microsoft Store tips, tricks, and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627). We recommend that K-12 customers using commercial Windows 10 Pro read the [document](https://go.microsoft.com/fwlink/?LinkId=822627) and apply desired settings for your environment.
+Customers who deploy Windows 10 Pro are able to configure the product to have similar feature settings to Windows 10 Pro Education using policies. More detailed information on these policies and the configuration steps required is available in [Manage Windows 10 and Microsoft Store tips, tricks, and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627). We recommend that K-12 customers using commercial Windows 10 Pro read the [document](https://go.microsoft.com/fwlink/?LinkId=822627) and apply desired settings for your environment.
 
 ## Windows 10 Education