Commit Graph

5715 Commits

Author SHA1 Message Date
93d5448f52 update 2016-09-01 17:15:39 -07:00
736a8abe2b Merge pull request #167 from Justinha/justinha-8431244
Justinha 8431244
2016-09-01 16:32:00 -07:00
5a49fd6600 Merge pull request #166 from Microsoft/revert-165-justinha-8431244
Revert "Justinha 8431244"
2016-09-01 16:30:06 -07:00
11768fe5af Revert "Justinha 8431244" 2016-09-01 16:27:15 -07:00
92cae8691c Merge pull request #165 from Justinha/justinha-8431244
Justinha 8431244
2016-09-01 16:24:58 -07:00
ea72becdd1 tech review feedback 2016-09-01 16:24:37 -07:00
ebb5d53999 moved details about setting IEDataOptIn 2016-09-01 16:20:30 -07:00
1fd22c8953 merging master branch 2016-09-01 16:20:00 -07:00
9672a1d9f4 Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs into justinha-8431244 2016-09-01 15:58:33 -07:00
76a47e3f13 Merge branch 'master' of https://github.com/Microsoft/windows-itpro-docs 2016-09-01 15:25:16 -07:00
0e37e2316d Merge pull request #14 from GITMichiko/patch-1
Update credential-guard.md
2016-09-01 15:20:10 -07:00
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
8ebd853f0a Merge pull request #164 from Justinha/justinha-8431244
Justinha 8431244
2016-09-01 12:15:01 -07:00
79a2a2948e added feedback from engineering 2016-09-01 12:11:53 -07:00
245905722f Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8493293 2016-09-01 09:54:22 -07:00
5c7204fda8 Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs into 7707381 2016-09-01 09:49:19 -07:00
e65f66a201 Added Enterprise E3 topic to TOC 2016-09-01 09:48:12 -07:00
91ac445064 Link fixes 2016-09-01 09:39:02 -07:00
d075214e59 updated branding 2016-09-01 09:32:31 -07:00
19ebc65392 Tweaked verbiage 2016-09-01 09:28:44 -07:00
11bcfdf89b Added aka EDP 2016-09-01 09:28:03 -07:00
30ceec9ab3 Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs into justinha-8431244 2016-09-01 09:17:42 -07:00
decfdeec43 Merge remote-tracking branch 'refs/remotes/origin/vs-8493293' 2016-09-01 09:09:38 -07:00
51fd136271 Added new md file and png files for Enterprise E3 2016-09-01 09:07:41 -07:00
1037a9a2f4 Fixed typo 2016-09-01 08:54:19 -07:00
aa307a8515 Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs into 7707381 2016-09-01 08:45:21 -07:00
72c0f8f5ff Moved the why before the how section 2016-09-01 08:29:24 -07:00
54109a4245 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8493293 2016-08-31 17:12:38 -07:00
1995a493f8 Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs 2016-08-31 14:26:22 -07:00
db6cf16936 fixing merge conflict and merging pull request #12 2016-08-31 14:26:07 -07:00
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
977dc7b5e7 Merge pull request #163 from Justinha/justinha-8431244
fixed typo
2016-08-31 14:08:57 -07:00
7952e08ac7 fixed typo 2016-08-31 14:06:35 -07:00
e0d0c97278 Merge pull request #162 from Justinha/justinha-8431244
revised list
2016-08-31 13:47:16 -07:00
62d01a3eaa revised list 2016-08-31 13:43:02 -07:00
946279706f Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8493293 2016-08-31 13:24:14 -07:00
dcb5a84605 Merge remote-tracking branch 'refs/remotes/origin/vs-8493293' 2016-08-31 13:23:03 -07:00
d6f9ad4ec9 Updated to fix loc issues 2016-08-31 13:22:33 -07:00
713fa131a3 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8493293 2016-08-31 13:05:00 -07:00
0c45a83c9e Merge remote-tracking branch 'refs/remotes/origin/vs-8493293' 2016-08-31 12:40:10 -07:00
65b0ad6636 Updated to remove OneDrive universal app and add OneDrive desktop app 2016-08-31 12:32:01 -07:00
1365774733 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8493293 2016-08-31 12:31:39 -07:00
360ea4e07b Merge pull request #161 from Justinha/justinha-8431244
Justinha 8431244
2016-08-31 12:26:50 -07:00
c69be0d228 revised table and added ToC entry 2016-08-31 12:23:24 -07:00
9f5311aeca fixed formatting 2016-08-31 12:12:00 -07:00
7efc6d5018 Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs into justinha-8431244 2016-08-31 12:09:54 -07:00
c8b61a6a70 fixed links 2016-08-31 11:19:05 -07:00
7cec582eab updated change history 2016-08-31 10:58:27 -07:00
85917dae7b Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs into 7707381 2016-08-31 10:53:15 -07:00
cf4045c7fb Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8493293 2016-08-31 10:50:11 -07:00