Merge branch 'master' into live

This commit is contained in:
Brian Lich 2017-05-23 16:02:20 -07:00
commit d9489a0c31
6 changed files with 19 additions and 5 deletions

View File

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

View File

@ -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. * 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. * 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 ## Related topics

View File

@ -20,6 +20,21 @@ localizationpriority: high
- Windows 10 Pro Education - Windows 10 Pro Education
- Windows Defender Advanced Threat Protection (Windows Defender ATP) - 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**. 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**. 2. Select the advanced feature you want to configure and toggle the setting between **On** and **Off**.
3. Click **Save preferences**. 3. Click **Save preferences**.

View File

@ -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. 3. Copy the individual values or select **Save details to file** to download a file that contains all the values.
WARNING:<br> >[!WARNING]
The client secret is only displayed once. Make sure you keep a copy of it in a safe place. <br> >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). 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. 4. Select **Generate tokens** to get an access and refresh token.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 KiB

After

Width:  |  Height:  |  Size: 141 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 146 KiB

After

Width:  |  Height:  |  Size: 155 KiB