Commit Graph

11125 Commits

Author SHA1 Message Date
0d9776bc65 Merge remote-tracking branch 'refs/remotes/origin/master' into atp-siem 2017-05-31 13:13:21 -07:00
7c456e59ae re-order iamge 2017-05-31 13:06:59 -07:00
a9b3c917a3 image 5 2017-05-31 13:06:06 -07:00
74ec47d91b Merge pull request #802 from Microsoft/maricia-11719368
Maricia 11719368
2017-05-31 13:04:12 -07:00
9c05fa8bd2 Merge branch 'master' into maricia-11719368 2017-05-31 12:55:45 -07:00
3eae1ddf2d fix numbers 2017-05-31 12:55:28 -07:00
566dc18c44 still trying to fix invalid link warning 2017-05-31 12:40:09 -07:00
acee2cddaf resize 2017-05-31 12:36:03 -07:00
c70575e526 image resize 2017-05-31 12:34:44 -07:00
51a934532d fixed href name causing a warning in the build 2017-05-31 12:30:54 -07:00
b2d4020517 add intro, update image 2017-05-31 12:04:56 -07:00
a532a95978 udpate images 2017-05-31 11:45:53 -07:00
ebfbd91777 test image 2017-05-31 11:10:57 -07:00
8f13ff4584 TFS 11719368, added Firewall CSP to the TOC 2017-05-31 11:00:40 -07:00
30de8af7cc TFS 11719368, Firewall CSP added in RS3 2017-05-31 10:47:33 -07:00
afd24f521e Merge remote-tracking branch 'refs/remotes/origin/master' into atp-siem 2017-05-31 10:22:02 -07:00
fa1d1327f4 Merge pull request #801 from Microsoft/jd-sandbox
merge jd-sandbox to master
2017-05-31 08:19:19 -07:00
b045f28920 tweak note per Akshatha 2017-05-31 07:48:21 -07:00
239f41aedf Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox 2017-05-31 07:45:18 -07:00
c169818633 Merge pull request #800 from Justinha/vsts11339947
fixed table formatting
2017-05-30 20:45:13 -07:00
d5214402b6 fixed tables 2017-05-30 16:40:56 -07:00
1c6012937d fixed table formatting 2017-05-30 16:29:50 -07:00
5c66370edd Merge pull request #799 from Microsoft/maricia-11881906
Maricia 11881906
2017-05-30 16:03:30 -07:00
aee40708f3 fixed table formatting 2017-05-30 16:01:42 -07:00
b23bc70c9e TFS 11881906, fixed typo and fixed change history table 2017-05-30 15:39:49 -07:00
a1e8502ea9 TFS 11881906, Policy CSP and Configuration service provider topics, support for Windows 10 S 2017-05-30 15:25:19 -07:00
946cc396e5 Merge pull request #797 from Microsoft/atp-luba
event 15 error
2017-05-30 11:28:13 -07:00
e21b370b6f Merge pull request #796 from Microsoft/nibr-CSPref-reformat
Removed ms.date property from all MDM topics.
2017-05-30 11:12:48 -07:00
042130f30b removed ms.date property from all mdm topics 2017-05-30 10:22:35 -07:00
b0253df761 removed ms.date meta data to test default behavior 2017-05-30 09:37:01 -07:00
7fb7ff58aa Merge pull request #202 from yusufozturk/patch-1
Typo fix for ICMP DoS Attack
2017-05-30 08:28:53 -07:00
9c884932a8 Merge pull request #203 from yusufozturk/patch-2
Typo fix for ICMP DoS Attack
2017-05-30 08:28:34 -07:00
5afb21da35 Merge pull request #204 from yusufozturk/patch-3
Typo fix for ICMP DoS Attack
2017-05-30 08:28:15 -07:00
c8182dad77 Typo fix for ICMP DoS Attack
Additional ICMP typo fix
2017-05-29 11:47:07 +02:00
73bba26fd1 Typo fix for ICMP DoS Attack
Additional ICMP typo fix
2017-05-29 11:46:03 +02:00
227049635a Typo fix for ICMP DoS Attack
It is ICMP (Internet Control Message Protocol) DoS Attack.
2017-05-29 11:40:46 +02:00
43834c2ad7 Merge pull request #795 from Microsoft/nibr-CSPref-reformat
Nibr meta data replacement round 2
2017-05-26 15:04:36 -07:00
9c45d6ac8d removed extra newline character added in meta data replacement 2017-05-26 14:13:44 -07:00
232846e290 attempt 2 at meta data replacement 2017-05-26 14:02:24 -07:00
d3920ae05f fix hyperlink 2017-05-26 13:59:54 -07:00
4698873507 update image 2017-05-26 13:44:56 -07:00
b374357880 images 2017-05-26 13:37:13 -07:00
2f6df02098 Merge remote-tracking branch 'origin/atp-siem' into atp-siem
# Conflicts:

#	windows/threat-protection/windows-defender-atp/images/atp-siem-mapping3.png

#	windows/threat-protection/windows-defender-atp/images/atp-siem-mapping4.png
2017-05-26 13:30:30 -07:00
b472ee0beb update image label sizes 2017-05-26 13:30:06 -07:00
a46967700e add image 2017-05-26 13:22:52 -07:00
1575465fea fix number size 2017-05-26 13:21:21 -07:00
043bf25678 Merge remote-tracking branch 'refs/remotes/origin/master' into atp-siem 2017-05-26 13:08:30 -07:00
62f5569966 fix table 2017-05-26 13:07:52 -07:00
3a6e0771f5 Merge pull request #794 from Microsoft/nibr-CSPref-reformat
Nibr metadata commit reverts
2017-05-26 12:58:36 -07:00
180fe56e77 Update api-portal-mapping-windows-defender-advanced-threat-protection.md 2017-05-26 12:52:05 -07:00