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

.openpublishing.publish.config.json

@@ -398,8 +398,7 @@
   "branches_to_filter": [
     ""
   ],
-  "git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/windows-itpro-docs",
-  "git_repository_branch_open_to_public_contributors": "master",
+  "git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/win-cpub-itpro-docs",
   "skip_source_output_uploading": false,
   "need_preview_pull_request": true,
   "dependent_repositories": [

.openpublishing.redirection.json

@@ -62,27 +62,27 @@
 },
 {
 "source_path": "devices/surface-hub/i-am-done-finishing-your-surface-hub-meeting.md",
-"redirect_url": "/itpro/surface-hub/finishing-your-surface-hub-meeting",
+"redirect_url": "/surface-hub/finishing-your-surface-hub-meeting",
 "redirect_document_id": true
 },
 {
 "source_path": "devices/surface-hub/provisioning-packages-for-certificates-surface-hub.md",
-"redirect_url": "/itpro/surface-hub/provisioning-packages-for-surface-hub",
+"redirect_url": "/surface-hub/provisioning-packages-for-surface-hub",
 "redirect_document_id": true
 },
 {
 "source_path": "devices/surface-hub/manage-settings-with-local-admin-account-surface-hub.md",
-"redirect_url": "/itpro/surface-hub/admin-group-management-for-surface-hub",
+"redirect_url": "/surface-hub/admin-group-management-for-surface-hub",
 "redirect_document_id": true
 },
 {
 "source_path": "devices/surface-hub/surface-hub-administrators-guide.md",
-"redirect_url": "/itpro/surface-hub/index",
+"redirect_url": "/surface-hub/index",
 "redirect_document_id": true
 },
 {
 "source_path": "devices/surface-hub/intro-to-surface-hub.md",
-"redirect_url": "/itpro/surface-hub/index",
+"redirect_url": "/surface-hub/index",
 "redirect_document_id": false
 },
 {

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

@@ -221,11 +221,7 @@ The Classroom application is retired, but you will need to assign the Classroom
   3. Click **Start**.
 
 7. In the **Sync options** screen:
-  1. Select the domain for the schools/sections. If you have more than one domain, make sure you select the domain that corresponds to the profile you're creating.
-  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, you can select either **New users** or **Existing users** based on the scenaro that applies to you. For this walkthrough, select **New users**.
+  1. 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.
 
@@ -235,25 +231,25 @@ The Classroom application is retired, but you will need to assign the Classroom
 
         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:
+  2. 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**. 
-
-  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**.
+  3. Select the domain for the schools/sections. This domain will be used for the Section email addresses created during setup. If you have more than one domain, make sure you select the appropriate domain for the sync profile and subsequent sections being created.
+  4. In the **Select school and section properties** section, ensure 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 properties and values contained within the CSV files. For the walkthrough, you don't have to change the default.
+  5. In the **Sync option for Section Group Display Name**, check the box if you want to allow teachers to overwrite the section names. Otherwise, SDS will always reset the display name value for sections to the value contained within the CSV files.
+  6. In the **License Options** section, check the box to allow users being created to receive an Office 365 license.
+  7. Check the **Intune for Education** checkbox to allow users to receive the Intune for Education license and to create the SDS dynamic groups and security groups, which be used within Intune for Education.
+  8. Click **Next**.
 
     **Figure 9** - Sync options for the new profile
 
     ![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 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.
+  1. Select the domain for the teachers. 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**.
@@ -293,11 +289,9 @@ The Classroom application is retired, but you will need to assign the Classroom
   > [!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.
 
+  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.
 
-  > [!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.
-  >
-  > You can refresh the page to confirm that your profile synced successfully.
+  You can refresh the page to confirm that your profile synced successfully.
 
 That's it for importing sample school data using SDS.
 

windows/configuration/windows-10-start-layout-options-and-policies.md

@@ -97,7 +97,7 @@ The new taskbar layout for upgrades to Windows 10, version 1607 or later, will a
 * If the user didn't pin the app and the app is in the updated layout file, the app will be pinned to the right.
 * New apps specified in updated layout file are pinned to right of user's pinned apps.
   
-[Learn how to onfigure Windows 10 taskbar](configure-windows-10-taskbar.md).
+[Learn how to configure Windows 10 taskbar](configure-windows-10-taskbar.md).
 
 ## Related topics
 

windows/threat-protection/windows-defender-atp/advanced-features-windows-defender-advanced-threat-protection.md

@@ -20,6 +20,21 @@ localizationpriority: high
 - Windows 10 Pro Education
 - Windows Defender Advanced Threat Protection (Windows Defender ATP)
 
+Depending on the Microsoft security products that you use, some advanced features might be available for you to integrate Windows Defender ATP with.
+
+Turn on the following advanced features to get better protected from potentially malicious files and gain better insight during security investigations:
+
+## Block file
+This feature is only available if your organization uses Windows Defender Antivirus as the active antimalware solution and that the cloud-based protection feature is enabled.
+
+If your organization satisfies this condition, the feature is enabled by default. This feature enables you to block potentially malicious files in your network. This operation will prevent it from being read, written, or executed on machines in your organization.
+
+## Office 365 Security Center integration
+This feature is only available if you have an active Office 365 E5 or the Threat Intelligence add-on. For more information, see the Office 365 Enterprise E5 product page.
+
+When you enable this feature, you'll be able to incorporate data from Office 365 Advanced Threat Protection into the Windows Defender ATP portal to conduct a holistic security investigation across Office 365 mailboxes and Windows machines.
+
+
 1. In the navigation pane, select **Preferences setup** > **Advanced features**.
 2. Select the advanced feature you want to configure and toggle the setting between **On** and **Off**.
 3. Click **Save preferences**.

windows/threat-protection/windows-defender-atp/enable-custom-ti-windows-defender-advanced-threat-protection.md

@@ -31,8 +31,8 @@ Before you can create custom threat intelligence (TI) using REST API, you'll nee
 
 3. Copy the individual values or select **Save details to file** to download a file that contains all the values.
 
-  WARNING:<br>
-  The client secret is only displayed once. Make sure you keep a copy of it in a safe place. <br>
+  >[!WARNING]
+  >The client secret is only displayed once. Make sure you keep a copy of it in a safe place. <br>
   For more information about getting a new secret see, [Learn how to get a new secret](troubleshoot-custom-ti-windows-defender-advanced-threat-protection.md#learn-how-to-get-a-new-client-secret).
 
 4. Select **Generate tokens** to get an access and refresh token.