6562 Commits

Author SHA1 Message Date
Joey Caparas
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
Joey Caparas
b472ee0beb update image label sizes 2017-05-26 13:30:06 -07:00
Joey Caparas
a46967700e add image 2017-05-26 13:22:52 -07:00
jcaparas
1575465fea fix number size 2017-05-26 13:21:21 -07:00
Joey Caparas
043bf25678 Merge remote-tracking branch 'refs/remotes/origin/master' into atp-siem 2017-05-26 13:08:30 -07:00
Joey Caparas
62f5569966 fix table 2017-05-26 13:07:52 -07:00
jcaparas
180fe56e77 Update api-portal-mapping-windows-defender-advanced-threat-protection.md 2017-05-26 12:52:05 -07:00
Nick Brower
a379dd8f30 Merge branch 'master' into nibr-CSPref-reformat 2017-05-26 12:33:20 -07:00
Nick Brower
18096c7b89 Revert "updated metadata to get data metrics from new repo"
This reverts commit 60360eb6c5cf0dda13179cc134da0fde40ca447b.
2017-05-26 12:32:16 -07:00
Nick Brower
6c4a468436 Revert "fixed missing 'author' metadata"
This reverts commit 7c9b4c17cab01253bff8afcf5ab4a4615dcd1f72.
2017-05-26 12:30:48 -07:00
Nick Brower
9fcc111874 Revert "fixing metadata fields that I updated incorrectly yesterday"
This reverts commit ce5b70c070956476d0a5b9e917887807f967680c.
2017-05-26 12:26:13 -07:00
Nick Brower
be2bfdad88 Revert "fixing broken bookmark links"
This reverts commit e87874a72dd83400b112bc31ab3c46c4c5cca52b.
2017-05-26 12:24:41 -07:00
Nick Brower
9310cbdd85 Revert "trying author meta data with double quotes as it contains a space"
This reverts commit 27a2b316164622f2015597f544dd8d5559e5db8f.
2017-05-26 12:23:49 -07:00
Nick Brower
b513c1d41b Revert "fixing author meta data with my actual git hub ID this time"
This reverts commit a613122982306156ebade12b4ec9d5eff5721914.
2017-05-26 12:22:35 -07:00
Joey Caparas
4f73d2d810 Merge branch 'atp-siem' of https://github.com/Microsoft/win-cpub-itpro-docs into atp-siem 2017-05-26 11:53:33 -07:00
jcaparas
33ca215148 Update api-portal-mapping-windows-defender-advanced-threat-protection.md 2017-05-26 11:53:23 -07:00
Joey Caparas
81695b062f Merge remote-tracking branch 'refs/remotes/origin/master' into atp-siem 2017-05-26 11:50:02 -07:00
Nick Brower
a613122982 fixing author meta data with my actual git hub ID this time 2017-05-26 11:42:28 -07:00
jcaparas
bcf6924308 Update api-portal-mapping-windows-defender-advanced-threat-protection.md 2017-05-26 11:39:37 -07:00
Joey Caparas
d4fca23583 Merge remote-tracking branch 'refs/remotes/origin/master' into atp-siem 2017-05-26 11:36:35 -07:00
Nick Brower
27a2b31616 trying author meta data with double quotes as it contains a space 2017-05-26 11:29:45 -07:00
Nick Brower
e87874a72d fixing broken bookmark links 2017-05-26 10:53:52 -07:00
Justin Hall
c0498d53d1 fixed path name 2017-05-26 10:52:07 -07:00
Nick Brower
ce5b70c070 fixing metadata fields that I updated incorrectly yesterday 2017-05-26 10:49:28 -07:00
LizRoss
a8efc3f51f Merge branch 'master' of https://github.com/Microsoft/windows-itpro-docs 2017-05-26 09:09:27 -07:00
Elizabeth Ross
4c8ea908ad Merge pull request #789 from Justinha/VSTS2109066
Vsts2109066
2017-05-25 17:32:50 -07:00
Justin Hall
d430423d1a revised reg info 2017-05-25 17:13:14 -07:00
Justin Hall
18a836504c revised reg info 2017-05-25 16:59:11 -07:00
Justin Hall
39f6ca2232 revised reg info 2017-05-25 16:56:32 -07:00
Justin Hall
c54c150a82 revised table 2017-05-25 16:46:24 -07:00
Justin Hall
b22ecac4fb revised policy info 2017-05-25 16:43:30 -07:00
Brian Lich
c4b88eaaff Merge pull request #785 from Microsoft/nibr-CSPref-reformat
Nibr CSP ref table reformat, and meta data changes.
2017-05-25 16:00:12 -07:00
mestresemhd
60a2bbe5db Update create-wmi-filters-for-the-gpo.md 2017-05-25 19:11:54 -03:00
Nick Brower
7c9b4c17ca fixed missing 'author' metadata 2017-05-25 11:52:28 -07:00
Justin Hall
8f7924dfe9 added member server 2017-05-25 11:46:41 -07:00
Nick Brower
60360eb6c5 updated metadata to get data metrics from new repo 2017-05-25 11:23:57 -07:00
Nick Brower
97f9370038 reformatting CSP ref table 2017-05-25 09:36:12 -07:00
jcaparas
9f20c1eb20 update on images 2017-05-24 20:12:15 -07:00
jcaparas
3b84235f42 resize images 2017-05-24 19:57:13 -07:00
jcaparas
7d6c5eddea html table 2017-05-24 19:55:05 -07:00
jcaparas
174e938e0c fix table 2017-05-24 19:14:01 -07:00
jcaparas
226c375d50 resize image 2017-05-24 19:12:21 -07:00
jcaparas
99ef3b0274 resize images 2017-05-24 18:41:53 -07:00
jcaparas
b1a2c9fc0f update table and images 2017-05-24 18:18:44 -07:00
jcaparas
6e1752d460 update table and add images 2017-05-24 17:39:58 -07:00
jcaparas
831a21c3d7 add table 2017-05-24 16:24:36 -07:00
Brian Lich
7d4320b4af adding global metadata 2017-05-24 12:34:28 -07:00
Justin Hall
20b62c3044 added recommendation to set this on uplevel 2017-05-24 10:37:44 -07:00
Justin Hall
76729ea0a4 copyedit 2017-05-24 10:24:01 -07:00
Elizabeth Ross
daedb787be Merge pull request #770 from jotob-msft/Wifi_VPN_considerations
Changed NTLM and CHAP Considerations title/text
2017-05-24 10:21:58 -07:00