Commit Graph

4881 Commits

Author SHA1 Message Date
57b4dcc2ad A few more technical changes from Tommy 2016-07-29 12:39:43 -07:00
c214229576 untag edu for loc 2016-07-29 12:31:02 -07:00
d06290d1ae Merge branch 'rs1' of https://github.com/Microsoft/win-cpub-itpro-docs into rs1 2016-07-29 12:28:41 -07:00
a773494d95 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1 2016-07-29 12:28:22 -07:00
e0a796e38f Content updates we've pulled together so far 2016-07-29 11:53:09 -07:00
ebd1b53c15 Merge branch '6675772' of https://github.com/Microsoft/win-cpub-itpro-docs into 6675772d 2016-07-29 11:45:53 -07:00
bcb35455eb Merge branch 'rs1' into 6675772 2016-07-29 11:45:21 -07:00
dfbe0619c8 Merge branch '6675772' of https://github.com/Microsoft/win-cpub-itpro-docs into 6675772d 2016-07-29 11:42:14 -07:00
1ac37ac16b added links to the readiness tool and added all of the registry settings for removing Credential Guard 2016-07-29 11:26:45 -07:00
8c03109556 Fixed a copy-paste error in second to last line of table 2016-07-29 11:15:17 -07:00
ec996b6bcc Merge remote-tracking branch 'refs/remotes/origin/master' into live 2016-07-29 10:40:27 -07:00
33e2b5257f Merge branch 'rs1' of https://github.com/Microsoft/win-cpub-itpro-docs into rs1 2016-07-29 10:29:14 -07:00
0640eaa451 bug# 8300761 2016-07-29 10:28:55 -07:00
5d5b13e849 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1 2016-07-29 10:26:06 -07:00
2618cca1d6 Merge remote-tracking branch 'refs/remotes/origin/vs-8094158' 2016-07-29 10:25:37 -07:00
f89a2565e4 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8094158 2016-07-29 10:25:01 -07:00
eb35d74df0 Merge remote-tracking branch 'refs/remotes/origin/vs-8094158' 2016-07-29 10:23:23 -07:00
4366aa58ac Fixed formatting, typo, and incorrect applies to 2016-07-29 10:23:10 -07:00
68aa15818d fix link 2016-07-29 10:18:23 -07:00
44df70ade4 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8094158 2016-07-29 10:13:29 -07:00
2e8984e019 Merge pull request #87 from JanKeller1/6641851a
Various fixes
2016-07-29 10:09:38 -07:00
ffd45fd77e Merge remote-tracking branch 'refs/remotes/origin/jdrs' into rs1 2016-07-29 10:09:07 -07:00
bb43e39ce1 Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs 2016-07-29 10:08:39 -07:00
801f7d1e16 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1 2016-07-29 10:00:36 -07:00
427afe8861 Merge remote-tracking branch 'refs/remotes/origin/master' into live 2016-07-29 09:59:38 -07:00
c7f38c150e notes, formatting 2016-07-29 09:58:38 -07:00
3c3c7ec6ec fix headings 2016-07-29 09:41:40 -07:00
1b1209e873 moving SCM 4.0 link up 2016-07-29 09:38:43 -07:00
41489f7234 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8094158 2016-07-29 09:36:22 -07:00
eefb19b9a6 grammar 2016-07-29 09:35:25 -07:00
8ef691fd62 Merge branch 'rs1' of https://github.com/Microsoft/win-cpub-itpro-docs into rs1 2016-07-29 09:32:14 -07:00
40f332c78e Merge remote-tracking branch 'refs/remotes/origin/wn-8316244' into rs1 2016-07-29 09:31:55 -07:00
fa4b5ff14f Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs 2016-07-29 09:29:08 -07:00
4fd426c058 Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs 2016-07-29 09:28:41 -07:00
d849de10d2 fix notes, add screenshot 2016-07-29 09:28:24 -07:00
6d592961df comment out phone sign-in 2016-07-29 09:09:15 -07:00
3c6c6a4ade adding link to SCM 4.0 2016-07-29 09:02:15 -07:00
c06d65f494 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8094158 2016-07-29 08:52:16 -07:00
cb8d3cb4a1 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1 2016-07-29 08:50:08 -07:00
3edbcde270 Updated change history to be more clear about what changed 2016-07-29 08:37:10 -07:00
3ca9220194 Pulled beta slug and added server 2016 to parent topic 2016-07-29 08:30:53 -07:00
db6bdac6a7 Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs 2016-07-29 07:31:09 -07:00
a87e9817a6 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1 2016-07-29 07:03:11 -07:00
3205217230 add alon/tomer NW bandwidth feedback 2016-07-29 16:50:28 +10:00
9521333bf2 Added missing spaces 2016-07-29 16:49:26 +10:00
e90f609e2a rs1 changes 2016-07-29 16:30:34 +10:00
35507b2ecc revert back images with endpoint mgt, resolve conflicts 2016-07-29 16:20:01 +10:00
1ef74488de from rs1 2016-07-29 15:54:21 +10:00
d18148961f Merge remote-tracking branch 'refs/remotes/origin/rs1' into Aug2
# Conflicts:
#	windows/keep-secure/TOC.md

#	windows/keep-secure/implement-microsoft-passport-in-your-organization.md
#	windows/keep-secure/index.md
#	windows/keep-secure/prepare-people-to-use-microsoft-passport.md
#	windows/keep-secure/windows-hello-in-enterprise.md
2016-07-29 15:50:07 +10:00
9891b674be from master 2016-07-29 15:25:57 +10:00