155 Commits

Author SHA1 Message Date
LizRoss
ff592de366 Updated for new topic 2016-07-26 11:47:08 -07:00
LizRoss
0815ce717d Fixing issues 2016-07-26 10:33:30 -07:00
LizRoss
2d86808029 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1
# Conflicts:
#	.gitignore
#	windows/deploy/change-history-for-deploy-windows-10.md
#	windows/plan/TOC.md
2016-07-26 10:12:23 -07:00
Joey Caparas
c8887217a4 add SIEM content 2016-07-26 15:39:04 +10:00
Brian Lich
5c5677c1f5 Merge branch 'rs1' into bl-7475998 2016-07-25 16:08:03 -07:00
LizRoss
24d37403b6 Replaced remaining EDP references with WIP 2016-07-22 11:08:44 -07:00
LizRoss
46c1eb6fa7 Updated branding 2016-07-21 18:04:17 -07:00
jdeckerMS
ca2c69b30e Merge remote-tracking branch 'refs/remotes/origin/master' into rs1 2016-07-21 10:47:14 -07:00
LizRoss
56f2bb27c9 Fixed typo 2016-07-20 14:22:07 -07:00
Brian Lich
97c40f1136 task# 6907269 2016-07-20 11:45:31 -07:00
Brian Lich
aadfd5abfb Merge branch 'master' into bl-7475998 2016-07-19 10:58:40 -07:00
Brian Lich
2dbf414f14 Merge branch 'master' into rs1 2016-07-18 12:09:43 -07:00
LizRoss
401cb6a038 Moved topic in TOC 2016-07-18 07:32:56 -07:00
LizRoss
7df7f72ddd Added DRA topic to TOC 2016-07-18 07:22:50 -07:00
LizRoss
71310e4818 Removed incorrect topic from TOC 2016-07-18 07:18:36 -07:00
jdeckerMS
58e4b6feb7 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1 2016-07-18 07:18:31 -07:00
LizRoss
ccc2f09262 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7955147 2016-07-18 06:59:55 -07:00
Joey Caparas
f64c00660e Merge remote-tracking branch 'refs/remotes/origin/july18' 2016-07-18 23:01:03 +10:00
Joey Caparas
a1772b7bc3 updates based on Naama's feedback 2016-07-18 21:28:46 +10:00
Joey Caparas
430159e514 add anchor, update TOC 2016-07-18 20:42:02 +10:00
Joey Caparas
3ae5868b0b fixing link 2016-07-18 19:56:00 +10:00
Joey Caparas
f25776cd8b update anchor, update toc, update title 2016-07-18 19:46:31 +10:00
Joey Caparas
61b75109aa fixing anchor link 2016-07-18 19:11:25 +10:00
Joey Caparas
503fcca706 fixing anchor links 2016-07-18 18:37:45 +10:00
Joey Caparas
1a852d7c04 fix extension names 2016-07-18 17:51:45 +10:00
Joey Caparas
6ba7e97cc9 add new topics in TOC 2016-07-18 16:28:50 +10:00
LizRoss
51e968fc48 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7955147 2016-07-15 16:08:27 -07:00
jdeckerMS
126e3b2015 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1
# Conflicts:
#	windows/keep-secure/TOC.md
#	windows/keep-secure/index.md
2016-07-15 14:05:55 -07:00
LizRoss
8798d0cc07 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8163833 2016-07-15 10:18:37 -07:00
LizRoss
c6ffb2a972 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7955147 2016-07-15 10:17:44 -07:00
LizRoss
5210b9c667 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7955147 2016-07-15 09:49:57 -07:00
JanKeller1
e0196fb516 Tidying TOC & parent topics for Device Guard content 2016-07-15 09:35:38 -07:00
LizRoss
1d62e414db Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8163833 2016-07-14 13:35:40 -07:00
JanKeller1
245f1ee853 Added Device Guard subtopics to TOC 2016-07-14 12:57:47 -07:00
jdeckerMS
71ba3d80a1 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1 2016-07-14 09:51:49 -07:00
Brian Lich
770368e347 Merge branch 'master' into bl-7475998 2016-07-13 10:04:56 -07:00
LizRoss
be179441ec Added new topic for mandatory tasks 2016-07-13 09:25:45 -07:00
Joey Caparas
7427edaa5a add topic in TOC assign user access 2016-07-13 17:03:43 +10:00
LizRoss
4573ff486c Pulled content out of topics and into its own to better address customer questions 2016-07-12 09:55:00 -07:00
jdeckerMS
d5308df6a8 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1 2016-07-08 08:14:41 -07:00
Iaan D'Souza-Wiltshire
b6082efdd1 Merge pull request #56 from Microsoft/WinDefMay2016-iw
Win def may2016 iw
2016-07-07 14:39:01 -07:00
jdeckerMS
73451ec0c8 move changelog 2016-07-07 13:14:27 -07:00
jdeckerMS
d99781ecaf Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdngcrs 2016-06-28 13:48:08 -07:00
jdeckerMS
684d151a07 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1
# Conflicts:
#	windows/deploy/index.md
2016-06-27 07:07:28 -07:00
Brian Lich
31b12ea579 Merge branch 'master' into 7518206 2016-06-24 09:25:10 -07:00
jdeckerMS
a465c8d3d8 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1 2016-06-24 09:06:40 -07:00
Brian Lich
1a4e41844e stubbing topic for Remote Credential Guard 2016-06-23 09:56:11 -07:00
JanKeller1
91589baa40 Added Access Control topics to TOC 2016-06-22 18:14:35 -07:00
jdeckerMS
2293ea2b62 missed one 2016-06-15 12:51:08 -07:00
jdeckerMS
7c5237b453 renaming 2016-06-15 12:39:00 -07:00