Commit Graph

49080 Commits

Author SHA1 Message Date
e2ea684a4e updated exclusions section 2020-09-21 14:52:49 -04:00
6eaf1edc82 Fixed merge conflict 2020-09-21 11:43:29 -07:00
963bf3b3e7 Merge branch 'master' into ios 2020-09-21 11:18:21 -07:00
5f0058c887 Merge branch 'ios' of https://github.com/MicrosoftDocs/windows-docs-pr into ios 2020-09-21 11:16:29 -07:00
babd32ac73 Merge pull request #3821 from sunasing/patch-7
Minor fix
2020-09-21 11:10:22 -07:00
cbf6dce38c Merge pull request #3820 from sunasing/patch-6
Minor fixes
2020-09-21 11:05:25 -07:00
d71dde7786 Merge pull request #3823 from MicrosoftDocs/master
Publish 9/21/2020 10:30 AM PT
2020-09-21 10:37:50 -07:00
b42ae4f82c adding a note on privacy for MDATP iOS 2020-09-21 18:08:55 +05:30
4e548e9171 Minor fix 2020-09-21 17:33:16 +05:30
8642d4b32f Minor fixes 2020-09-21 17:15:24 +05:30
f4066b92aa Update windows/security/threat-protection/microsoft-defender-atp/get-started-partner-integration.md
Co-authored-by: JohanFreelancer9 <48568725+JohanFreelancer9@users.noreply.github.com>
2020-09-20 21:58:27 +05:00
e386450aee Update microsoft-defender-antivirus-compatibility.md
When using DLP, RTP will be enabled even in Passive mode.

> [!IMPORTANT]
> If you are using [Microsoft endpoint data loss prevention (Endpoint DLP)](https://docs.microsoft.com/windows/security/threat-protection/microsoft-defender-atp/information-protection-in-windows-overview), Microsoft Defender Antivirus Real-time protection feature will be enabled even when Microsoft Defender Antivirus is running in Passive mode. Endpoint DLP depends on Real-time protection (RTP) to operate.
2020-09-20 12:14:17 +02:00
6509fb24ee Update review-scan-results-microsoft-defender-antivirus.md 2020-09-19 19:57:17 +05:00
6ec1b8e99e Update get-started-partner-integration.md 2020-09-19 19:35:30 +05:00
960fbf56b9 Merge pull request #3819 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/windows-itpro-docs (branch public)
2020-09-18 16:58:56 -07:00
42ad59d518 Merge pull request #3817 from MicrosoftDocs/MDBranchRemoveDeprecatedDWMADMXPolicies
Removed content of three ADMX_DWM deprecated policies
2020-09-18 15:57:07 -07:00
b62946e61d Merge pull request #3818 from MicrosoftDocs/master
Publish 09/18/2020, 3:40 PM
2020-09-18 15:49:11 -07:00
e23f4a9cc7 Merge branch 'master' into ios 2020-09-18 15:48:22 -07:00
972f3f8b26 Merge branch 'master' into android-privacy 2020-09-18 15:47:37 -07:00
56c5d12546 Merge branch 'master' into android-images 2020-09-18 15:47:20 -07:00
c2c9043ae7 Removed content for three DWM deprecated policies 2020-09-18 15:30:31 -07:00
9c46ede755 Merge pull request #3816 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/windows-itpro-docs (branch public)
2020-09-18 15:21:47 -07:00
50a3bcec24 Added Setup policy 2020-09-18 14:59:46 -07:00
7cf1a45fe4 Merge pull request #8308 from MicrosoftDocs/ManikaDhiman-patch-1-1
Update configuration-service-provider-reference.md
2020-09-18 14:26:15 -07:00
d286708dd5 Update configuration-service-provider-reference.md
Updated the link in Home SKU for EnterpriseDataProtection CSP
2020-09-18 14:24:49 -07:00
4ec1c5ddb2 Merge pull request #3815 from MicrosoftDocs/optionalcontent
Optionalcontent
2020-09-18 13:54:20 -07:00
d4b78d19ed Fixed build warning 2020-09-18 13:50:26 -07:00
b402e95efb Added three new policies 2020-09-18 13:45:50 -07:00
1caa0dfd05 adding closing backticks 2020-09-18 12:42:15 -07:00
dea6677b0c fixing typos 2020-09-18 12:05:39 -07:00
9ee77f7d16 fixing TOC entry 2020-09-18 11:40:27 -07:00
a5741b4ad8 Merge branch 'master' of https://github.com/MicrosoftDocs/windows-docs-pr into optionalcontent 2020-09-18 11:33:45 -07:00
118d8b1060 typos, adding links 2020-09-18 11:33:39 -07:00
b8d28adca8 Merge pull request #3814 from MicrosoftDocs/updatebaseline
Updatebaseline
2020-09-18 11:18:28 -07:00
c519317a8d chars 2020-09-18 11:06:24 -07:00
ed435e081b troubleshooting page and images 2020-09-18 11:01:12 -07:00
2a18bb8fa2 fixing TOC 2020-09-18 10:48:19 -07:00
1c5a751935 connect to TOC 2020-09-18 10:46:29 -07:00
cbe0067fc2 Merge branch 'master' of https://github.com/MicrosoftDocs/windows-docs-pr into optionalcontent 2020-09-18 10:43:49 -07:00
5f98ead2fb corrections 2020-09-18 10:42:14 -07:00
3a840169d5 Merge pull request #3813 from MicrosoftDocs/master
Publish 09/18/2020, 10:30 AM
2020-09-18 10:32:32 -07:00
3bd68e4a56 tweaks; connect to TOC 2020-09-18 10:26:23 -07:00
2da1c95164 metadata in a nother file 2020-09-18 10:17:30 -07:00
cae52b2821 Merge branch 'master' of https://github.com/MicrosoftDocs/windows-docs-pr into updatebaseline 2020-09-18 10:08:01 -07:00
57575c4f8e import 2020-09-18 10:07:47 -07:00
ab0a0bd09c Merge branch 'master' into android-privacy 2020-09-18 10:06:14 -07:00
93d1038740 updated images 2020-09-18 10:05:29 -07:00
d54dad0949 Merge pull request #3812 from MicrosoftDocs/MDBranchTask4348215EDPCSPSKUUpdate
Updated Home SKU for EnterpriseDataProtection CSP
2020-09-18 09:34:12 -07:00
20cbb024df minor update to trigger build 2020-09-18 08:40:26 -07:00
36ccc0ec42 Merge branch 'master' into MDBranchTask4348215EDPCSPSKUUpdate 2020-09-18 08:38:45 -07:00