4615 Commits

Author SHA1 Message Date
LizRoss
66eeb1c38e Fixed formatting 2016-09-02 12:13:12 -07:00
LizRoss
17dee7a098 Merge remote-tracking branch 'refs/remotes/origin/vs-8493293' 2016-09-02 11:58:54 -07:00
LizRoss
a0c7b7a332 Adding steps for editing content 2016-09-02 11:58:24 -07:00
LizRoss
399a752b2e Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8493293 2016-09-02 10:57:47 -07:00
LizRoss
6ee3089aef Adding edit steps with images 2016-09-02 10:57:42 -07:00
Elizabeth Ross
5b01a18020 Merge pull request #168 from JanKeller1/7707381
New content about Enterprise E3 - ready to publish
2016-09-02 10:49:17 -07:00
JanKeller1
0a075af9ef Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs into 7707381 2016-09-02 10:44:57 -07:00
Brian Lich
88aa33bc2a added September table 2016-09-02 10:23:14 -07:00
LizRoss
d45f17b261 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8493293 2016-09-02 10:02:44 -07:00
Brian Lich
790d99a8b4 fix broken link 2016-09-02 09:02:35 -07:00
Brian Lich
adb86af426 tech review feedback 2016-09-02 08:52:54 -07:00
Joey Caparas
a70c202e5c Merge remote-tracking branch 'refs/remotes/origin/e5' 2016-09-02 13:55:36 +10:00
Joey Caparas
a114840b7c Add blurb on Windows Enterprise 2016-09-02 13:54:52 +10:00
JanKeller1
c592b895c7 Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs into 7707381 2016-09-01 19:04:42 -07:00
Joey Caparas
5fe3bbbaef Merge remote-tracking branch 'refs/remotes/origin/master' into e5 2016-09-02 11:43:14 +10:00
Greg Lindsay
93d5448f52 update 2016-09-01 17:15:39 -07:00
Brian Lich
5a49fd6600 Merge pull request #166 from Microsoft/revert-165-justinha-8431244
Revert "Justinha 8431244"
2016-09-01 16:30:06 -07:00
Brian Lich
11768fe5af Revert "Justinha 8431244" 2016-09-01 16:27:15 -07:00
Justin Hall
92cae8691c Merge pull request #165 from Justinha/justinha-8431244
Justinha 8431244
2016-09-01 16:24:58 -07:00
Brian Lich
ea72becdd1 tech review feedback 2016-09-01 16:24:37 -07:00
Justinha
ebb5d53999 moved details about setting IEDataOptIn 2016-09-01 16:20:30 -07:00
Brian Lich
1fd22c8953 merging master branch 2016-09-01 16:20:00 -07:00
Justinha
9672a1d9f4 Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs into justinha-8431244 2016-09-01 15:58:33 -07:00
Brian Lich
76a47e3f13 Merge branch 'master' of https://github.com/Microsoft/windows-itpro-docs 2016-09-01 15:25:16 -07:00
Brian Lich
0e37e2316d Merge pull request #14 from GITMichiko/patch-1
Update credential-guard.md
2016-09-01 15:20:10 -07:00
GITMichiko
e48dca7420 Update credential-guard.md
testing editing with pulling out the NTLM stuff like we did Kerberos and added missing DES info
2016-09-01 13:50:39 -07:00
Justinha
79a2a2948e added feedback from engineering 2016-09-01 12:11:53 -07:00
LizRoss
245905722f Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8493293 2016-09-01 09:54:22 -07:00
JanKeller1
5c7204fda8 Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs into 7707381 2016-09-01 09:49:19 -07:00
JanKeller1
e65f66a201 Added Enterprise E3 topic to TOC 2016-09-01 09:48:12 -07:00
JanKeller1
91ac445064 Link fixes 2016-09-01 09:39:02 -07:00
LizRoss
d075214e59 updated branding 2016-09-01 09:32:31 -07:00
LizRoss
19ebc65392 Tweaked verbiage 2016-09-01 09:28:44 -07:00
LizRoss
11bcfdf89b Added aka EDP 2016-09-01 09:28:03 -07:00
Justinha
30ceec9ab3 Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs into justinha-8431244 2016-09-01 09:17:42 -07:00
LizRoss
decfdeec43 Merge remote-tracking branch 'refs/remotes/origin/vs-8493293' 2016-09-01 09:09:38 -07:00
JanKeller1
51fd136271 Added new md file and png files for Enterprise E3 2016-09-01 09:07:41 -07:00
LizRoss
1037a9a2f4 Fixed typo 2016-09-01 08:54:19 -07:00
JanKeller1
aa307a8515 Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs into 7707381 2016-09-01 08:45:21 -07:00
LizRoss
72c0f8f5ff Moved the why before the how section 2016-09-01 08:29:24 -07:00
LizRoss
54109a4245 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8493293 2016-08-31 17:12:38 -07:00
Brian Lich
1995a493f8 Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs 2016-08-31 14:26:22 -07:00
Brian Lich
db6cf16936 fixing merge conflict and merging pull request #12 2016-08-31 14:26:07 -07:00
Brian Lich
8a4c51fba9 Merge remote-tracking branch 'refs/remotes/origin/master' into pr/12
# Conflicts:
#	windows/deploy/deploy-windows-to-go.md
#	windows/keep-secure/windows-10-security-guide.md
2016-08-31 14:21:30 -07:00
Justinha
7952e08ac7 fixed typo 2016-08-31 14:06:35 -07:00
Justinha
62d01a3eaa revised list 2016-08-31 13:43:02 -07:00
LizRoss
946279706f Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8493293 2016-08-31 13:24:14 -07:00
LizRoss
dcb5a84605 Merge remote-tracking branch 'refs/remotes/origin/vs-8493293' 2016-08-31 13:23:03 -07:00
LizRoss
d6f9ad4ec9 Updated to fix loc issues 2016-08-31 13:22:33 -07:00
LizRoss
713fa131a3 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8493293 2016-08-31 13:05:00 -07:00