d591722d51
Resolved merge conflicts
2020-12-14 10:37:39 -08:00
069f95ac21
Merge pull request #4378 from MicrosoftDocs/edr-blockmode
...
Update microsoft-defender-antivirus-compatibility.md
2020-12-11 14:23:01 -08:00
c39fee16cb
Merge branch 'edr-blockmode' of https://github.com/MicrosoftDocs/windows-docs-pr into edr-blockmode
2020-12-11 14:19:32 -08:00
063e30cc42
Update microsoft-defender-antivirus-compatibility.md
2020-12-11 14:19:20 -08:00
52c5db211d
Merge branch 'master' into edr-blockmode
2020-12-11 14:10:11 -08:00
90051194a0
Update microsoft-defender-antivirus-compatibility.md
2020-12-11 14:09:39 -08:00
66545cfa04
Merge pull request #4376 from MicrosoftDocs/20h2
...
ltsc name fix
2020-12-11 10:15:09 -08:00
d8be4c67ad
correction
2020-12-11 10:10:58 -08:00
135f088281
ltsc name fix
2020-12-11 10:06:51 -08:00
64220fc7e6
Merge pull request #4372 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-12-10 15:40:34 -08:00
d1577bc9ed
Merge branch 'master' into repo_sync_working_branch
2020-12-10 15:37:40 -08:00
8e977e097a
Merge pull request #4373 from MicrosoftDocs/edr-blockmode
...
EDR in block mode - quick fix
2020-12-10 15:24:32 -08:00
9822f130a8
Update edr-in-block-mode.md
2020-12-10 13:48:26 -08:00
dd00929c5f
Update edr-in-block-mode.md
2020-12-10 13:31:58 -08:00
8d11e69b34
Merge pull request #8791 from sunasing/patch-3
...
Minor fix
2020-12-10 12:57:56 -08:00
6d5fbada41
Merge pull request #4371 from MicrosoftDocs/master
...
Publish 12/10/2020 10:30 AM PT
2020-12-10 10:33:55 -08:00
7cdd64fa2e
Merge pull request #4370 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-12-10 10:20:23 -08:00
2cf62ea324
Merge branch 'master' into repo_sync_working_branch
2020-12-10 10:16:51 -08:00
c0e895acb7
Merge pull request #4369 from MicrosoftDocs/10dec20
...
EDR in block mode - quick fix
2020-12-10 10:09:00 -08:00
e6014e57d4
Update edr-in-block-mode.md
2020-12-10 10:05:34 -08:00
2a2a2ed6cc
Merge pull request #8786 from sazankha/patch-12
...
Update md-app-guard-overview.md
2020-12-10 10:01:27 -08:00
daf4cb028f
Update md-app-guard-overview.md
2020-12-10 10:00:48 -08:00
1865a9df9f
Merge pull request #8793 from joinimran/patch-111
...
minor corrections
2020-12-10 09:53:45 -08:00
dbaf7752a9
Update windows/client-management/troubleshoot-tcpip-netmon.md
...
Co-authored-by: Trond B. Krokli <38162891+illfated@users.noreply.github.com >
2020-12-10 20:15:05 +05:00
9d0d547de7
minor corrections
...
did cosmetic changes to the document.
Problem: https://github.com/MicrosoftDocs/windows-itpro-docs/issues/8282
2020-12-10 19:45:48 +05:00
802643f805
Minor fix as suggested
2020-12-10 15:27:16 +05:30
8d2c3cf205
Minor fix
2020-12-10 12:17:06 +05:30
1b38d3de84
Update windows/security/threat-protection/microsoft-defender-application-guard/md-app-guard-overview.md
...
Co-authored-by: Trond B. Krokli <38162891+illfated@users.noreply.github.com >
2020-12-09 17:31:54 -08:00
f0bad00692
Merge pull request #4368 from MicrosoftDocs/20h2
...
grammar fix
2020-12-09 16:59:12 -08:00
e5686c79e5
grammar fix
2020-12-09 16:52:27 -08:00
36f1406f05
Update windows/security/threat-protection/microsoft-defender-application-guard/md-app-guard-overview.md
...
Co-authored-by: Trond B. Krokli <38162891+illfated@users.noreply.github.com >
2020-12-09 16:36:10 -08:00
f8147a96a8
Update md-app-guard-overview.md
2020-12-09 16:04:54 -08:00
a5a71c5e83
Merge pull request #4367 from MicrosoftDocs/master
...
Publish 12/09/2020, 3:30 PM
2020-12-09 15:50:24 -08:00
47829a1c84
Merge pull request #4365 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-12-09 14:59:35 -08:00
49dd127c03
Merge pull request #8782 from illfated/patch-2
...
Update customize-exploit-protection.md
2020-12-09 11:57:35 -08:00
741f4f56ff
Merge pull request #4363 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-12-09 10:55:19 -08:00
f44ad173b8
Merge pull request #8761 from illfated/patch-1
...
MarkDown syntax highlighting, whitespace cleanup
2020-12-09 10:10:10 -08:00
95910d97fd
Update ts-bitlocker-cannot-encrypt-tpm-issues.md
2020-12-09 10:09:00 -08:00
b6eefa3718
Update customize-exploit-protection.md
...
- MarkDown table restoration (the table is broken on GitHub due to non-standard table divider indicators)
- Whitespace formatting corrections (end-of-line blank space removal, redundant leading whitespace removal)
Ref. #8765 (md_cleanup / follow-up)
2020-12-09 18:43:49 +01:00
d768b929fe
Merge pull request #8777 from sunasing/sunasing-ios
...
Adding VPN configuration details
2020-12-09 08:25:22 -08:00
dc9c61f71f
Update windows/security/threat-protection/microsoft-defender-atp/ios-configure-features.md
...
Co-authored-by: Trond B. Krokli <38162891+illfated@users.noreply.github.com >
2020-12-09 08:25:11 -08:00
a9192908d3
Update windows/security/threat-protection/microsoft-defender-atp/ios-configure-features.md
...
Co-authored-by: Trond B. Krokli <38162891+illfated@users.noreply.github.com >
2020-12-09 08:24:39 -08:00
03679ef550
Update windows/security/threat-protection/microsoft-defender-atp/ios-configure-features.md
...
Co-authored-by: Trond B. Krokli <38162891+illfated@users.noreply.github.com >
2020-12-09 08:24:30 -08:00
f78bcd2e48
Merge pull request #4362 from MicrosoftDocs/master
...
Publish 12/08/2020, 3:30 PM
2020-12-08 15:49:23 -08:00
b82cdd3274
Merge pull request #4361 from MicrosoftDocs/1736662
...
updating antivirus compatibility per PM request
2020-12-08 13:24:04 -08:00
ffadba6883
Update microsoft-defender-antivirus-compatibility.md
2020-12-08 11:59:31 -08:00
8d9ca432a1
Update microsoft-defender-antivirus-compatibility.md
2020-12-08 11:56:24 -08:00
0dfc27f6e2
Merge pull request #4360 from MicrosoftDocs/master
...
Publish 12/8/2020 10:30 AM PT
2020-12-08 10:34:11 -08:00
1a9739e2bd
Merge pull request #4359 from MicrosoftDocs/MDBranchCFADocUpdates
...
Md branch cfa doc updates
2020-12-08 08:14:54 -08:00
1eee176e0e
Merge branch 'master' into MDBranchCFADocUpdates
2020-12-08 08:08:07 -08:00
