4131 Commits

Author SHA1 Message Date
Greg Lindsay
cd6e2d9f6a Merge branch 'minortypos' 2016-11-09 10:45:56 -08:00
Greg Lindsay
de709b6c74 fixed image bug 2016-11-09 10:45:11 -08:00
Greg Lindsay
44d2cf13b5 rework client procedure 2016-11-09 10:38:50 -08:00
LizRoss
146716f606 Merge remote-tracking branch 'refs/remotes/origin/master' into live 2016-11-09 10:10:48 -08:00
Brian Lich
4a90c924ec Merge pull request #283 from JanKeller1/5102073
Improved some links
2016-11-09 09:24:46 -08:00
LizRoss
f23b1317ab Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs 2016-11-09 09:19:25 -08:00
LizRoss
ac5685c57d Moved from Oct to Nov 2016-11-09 09:17:22 -08:00
Andreas Stenhall
b938378cbf Update windows-defender-block-at-first-sight.md 2016-11-09 18:12:26 +01:00
Joey Caparas
86dc2f3fc8 Merge branch 'atp-14Nov' of https://github.com/Microsoft/win-cpub-itpro-docs into atp-14Nov 2016-11-09 14:21:35 +11:00
JanKeller1
b36a60f903 Improved some links 2016-11-08 17:27:13 -08:00
JanKeller1
ca638652c9 Added topics for smart card & virt smart card 2016-11-08 15:34:32 -08:00
Brian Lich
e5640edd62 adding TPM 2.0 requirement 2016-11-08 15:17:45 -08:00
Brian Lich
50cff51332 typo 2016-11-08 13:53:12 -08:00
Brian Lich
9d7a00524f changed text that Credential Guard can run within a virtual machine on Windows 10, version 1607 2016-11-08 13:31:09 -08:00
LizRoss
f53d560108 Merge remote-tracking branch 'refs/remotes/origin/master' into live 2016-11-08 13:30:25 -08:00
Brian Lich
575bf73f77 feedback 2016-11-08 13:27:23 -08:00
LizRoss
c7f36a67d9 Updated to include changes to WIP content 2016-11-08 13:18:31 -08:00
LizRoss
06cb833797 Merge remote-tracking branch 'refs/remotes/origin/master' into live 2016-11-08 13:11:21 -08:00
LizRoss
5705ff205a Updated with more details about turning WIP off 2016-11-08 10:56:05 -08:00
LizRoss
f91097176f Replacing WIP with EDP 2016-11-08 10:29:52 -08:00
LizRoss
040c63c112 Fixing formatting 2016-11-08 10:12:37 -08:00
LizRoss
2e8aa10591 Updated to fix VPN topic back to EDP from WIP 2016-11-08 10:06:20 -08:00
fattala
14262ec09b Update configure-endpoints-sccm-windows-defender-advanced-threat-protection.md 2016-11-08 15:17:03 +02:00
LizRoss
5fbcf9dcf2 Merge remote-tracking branch 'refs/remotes/origin/master' into live 2016-11-07 10:07:41 -08:00
Joey Caparas
ed00798f72 fixed typos 2016-11-07 22:41:22 +11:00
Joey Caparas
0fa313a7dd Merge remote-tracking branch 'refs/remotes/origin/master' into atp-feedback 2016-11-07 08:33:44 +11:00
LizRoss
6562d2bd7a Merge remote-tracking branch 'refs/remotes/origin/master' into live 2016-11-04 10:02:29 -07:00
jdeckerMS
679e844615 Squashed commit of the following:
commit 450cbe6a4d82b8d2f1687eb5d36543de462e0da8
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Nov 3 19:28:40 2016 -0700

    change hsitory

commit 06e9f88c85c1a5ca1eb0ce717c71a313284ccb6c
Merge: d42a249 647f496
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Nov 3 19:26:01 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdiot

commit d42a249facb717001b732ffa89b38d0b4a085e66
Merge: f11b0d7 28f2065
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Oct 31 07:27:12 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdiot

commit f11b0d7447d187f5023e9b81ac66fae727705d12
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 28 11:03:21 2016 -0700

    add edition

commit acd1bc5a42026ebff8fb4de8f1b00db6b1c159a6
Merge: 9e426e3 339f8ae
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 28 11:02:35 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdiot

commit 9e426e37a769264dd8a3e5fada6826c9627f1d30
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 28 09:45:22 2016 -0700

    title

commit 212e72f583c1ba66f6c7400256666a865c1af605
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 28 09:26:21 2016 -0700

    link

commit 95701be7182acd1cee497afc0fd87fda14cb64bd
Merge: 36da55d 89c8614
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 28 09:11:54 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdiot

commit 36da55dfdda6f0c40151e5324ab07f963f4594ee
Merge: b473758 be6cb8d
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Oct 27 12:57:30 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdiot

commit b473758421b75355c6d3e10d32301d14ec8b3e24
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Oct 27 12:54:12 2016 -0700

    iot
2016-11-03 19:30:46 -07:00
jdeckerMS
94a68957be fix bookmark links 2016-11-03 10:17:09 -07:00
LizRoss
4965c0c330 Merge remote-tracking branch 'refs/remotes/origin/master' into live 2016-11-03 10:00:47 -07:00
jdeckerMS
6898506927 Merge remote-tracking branch 'refs/remotes/origin/master' into jdhello
# Conflicts:
#	windows/keep-secure/change-history-for-keep-windows-10-secure.md
2016-11-03 09:24:37 -07:00
Joey Caparas
8edc44c727 fix link 2016-11-03 17:20:33 +11:00
Joey Caparas
a0fc00f094 fix links 2016-11-03 17:20:20 +11:00
Joey Caparas
f0d3eb8840 Merge remote-tracking branch 'refs/remotes/origin/master' into atp-links 2016-11-03 17:02:07 +11:00
Joey Caparas
0892cc33c4 fix links 2016-11-03 17:01:40 +11:00
LizRoss
6015639a10 Merge remote-tracking branch 'refs/remotes/origin/master' into live 2016-11-02 12:12:27 -07:00
jdeckerMS
e483298345 fix bookmark link 2016-11-02 11:57:16 -07:00
LizRoss
e50bda5462 Merge remote-tracking branch 'refs/remotes/origin/master' into live 2016-11-02 11:56:27 -07:00
jdeckerMS
6bf039a6de fix bookmark links 2016-11-02 11:42:54 -07:00
Greg Lindsay
575d58dd6a link fix 2016-11-02 10:51:17 -07:00
Justin Hall
3a4201f44a Merge pull request #275 from Justinha/bookmark
fixed bookmarks in deploy
2016-11-02 10:11:08 -07:00
Justinha
b5de5bdf93 fixed bookmarks in deploy 2016-11-02 10:09:22 -07:00
Justin Hall
b146535815 Merge pull request #274 from Justinha/bookmark
fixed bookmark links
2016-11-02 09:59:36 -07:00
Justinha
54eabe7cdb fixed bbookmark links 2016-11-02 09:56:10 -07:00
LizRoss
dd1fe00ec6 Fixing broken bookmark 2016-11-02 09:21:51 -07:00
LizRoss
38247c9d88 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-9329193 2016-11-02 09:08:34 -07:00
LizRoss
a766bb298d Fixing broken bookmarks 2016-11-02 09:08:31 -07:00
Brian Lich
38e4be63a8 fixing link 2016-11-02 09:02:01 -07:00
Brian Lich
77ffc8cc17 Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs 2016-11-02 08:57:09 -07:00
Brian Lich
e04ebe84a4 fixed broken link 2016-11-02 08:56:50 -07:00