42974 Commits

Author SHA1 Message Date
jdeckerMS
1482c6e6f7 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1
# Conflicts:
#	windows/deploy/update-windows-10-images-with-provisioning-packages.md
2016-06-14 10:36:41 -07:00
jdeckerMS
f1ef06a05a match table to edu 2016-06-14 10:33:58 -07:00
Brian Lich
d01d59f8d5 Merge branch 'master' into live 2016-06-14 10:00:33 -07:00
LizRoss
ca0e3d57b7 Committing for merge 2016-06-14 09:59:06 -07:00
jdeckerMS
0df0ebc62e Merge remote-tracking branch 'refs/remotes/origin/jd-sandbox' 2016-06-14 08:39:05 -07:00
jdeckerMS
aba42e515c hopefully fix table whitespace 2016-06-14 08:28:19 -07:00
jdeckerMS
c985b3ac1c tweak table settings 2016-06-14 08:19:18 -07:00
Trudy Hakala
1b6b32dbe1 Merge remote-tracking branch 'refs/remotes/origin/master' into wsfb-7611326 2016-06-14 07:44:01 -07:00
jdeckerMS
6ca7cd0518 remove br after table 2016-06-14 07:13:54 -07:00
jdeckerMS
e8006405e1 Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox 2016-06-14 07:12:27 -07:00
LizRoss
656dae5cbe Merge remote-tracking branch 'refs/remotes/origin/vs-7825061' 2016-06-14 06:53:01 -07:00
LizRoss
10884be1c8 Merge remote-tracking branch 'refs/remotes/origin/vs-7610616' 2016-06-14 06:52:14 -07:00
Trudy Hakala
7ba1bcbd93 fixing table missing heading from migration 2016-06-13 19:33:25 -07:00
Trudy Hakala
174e429926 Merge remote-tracking branch 'refs/remotes/origin/master' into wsfb-7611326 2016-06-13 13:29:35 -07:00
LizRoss
bc3ebb7e5f Updated for new security topic 2016-06-13 12:46:58 -07:00
LizRoss
9623644ed3 Updated based on final feedback and sign off 2016-06-13 12:37:11 -07:00
LizRoss
49fdfb2e94 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7610616 2016-06-13 12:14:39 -07:00
LizRoss
cb706d59fb Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7825061 2016-06-13 12:10:02 -07:00
LizRoss
4b340638f0 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7781347 2016-06-13 12:09:02 -07:00
jdeckerMS
91082c751d Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs 2016-06-13 12:04:20 -07:00
jdeckerMS
3d7b3501a1 Merge remote-tracking branch 'refs/remotes/origin/jd-sandbox' 2016-06-13 12:04:11 -07:00
jdeckerMS
416d66f272 tweak account language 2016-06-13 12:03:38 -07:00
jdeckerMS
b6c1738a23 remove link to add take test app 2016-06-13 12:01:32 -07:00
Jan Backstrom
33ea1494cd Merge remote-tracking branch 'refs/remotes/origin/jan-tagging-cleanup-windowsmobile' 2016-06-13 11:38:06 -07:00
Jan Backstrom
e988cd9bb2 update tagging
add ms.pagetype: mobile
2016-06-13 11:23:49 -07:00
LizRoss
0d99b4d473 Merge remote-tracking branch 'refs/remotes/origin/master' into live 2016-06-13 10:00:08 -07:00
LizRoss
1968c0319c Updated to add a border to the image 2016-06-13 09:52:39 -07:00
LizRoss
9a84164f71 Updated image to reflect recommended choices 2016-06-13 09:10:10 -07:00
LizRoss
505edd0e0d Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7781347 2016-06-13 07:42:20 -07:00
jdeckerMS
ebf14863da Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox 2016-06-13 07:03:39 -07:00
Trudy Hakala
028e6dcc16 updates 2016-06-10 15:56:31 -07:00
Trudy Hakala
92e498a784 add Troubleshoot section 2016-06-10 15:28:10 -07:00
Trudy Hakala
a783b2a3c8 Merge remote-tracking branch 'refs/remotes/origin/master' into wsfb-7611326 2016-06-10 14:24:04 -07:00
jdeckerMS
7d3ab77f54 update prov procedures 2016-06-10 14:08:21 -07:00
jdeckerMS
6df45ed08a fix link typo 2016-06-10 13:56:14 -07:00
jdeckerMS
4c251d3f5e add minecraft to change log 2016-06-10 13:28:26 -07:00
jdeckerMS
6c9cc743a2 Merge remote-tracking branch 'refs/remotes/origin/jd-sandbox' 2016-06-10 13:25:29 -07:00
jdeckerMS
ec670a10dc add minecraft to parent topic 2016-06-10 13:24:54 -07:00
jdeckerMS
00d06f3f09 Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox 2016-06-10 13:22:51 -07:00
jdeckerMS
99c7d49321 add minecraft 2016-06-10 12:45:08 -07:00
jdeckerMS
c3707d3728 Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdprov
# Conflicts:
#	education/windows/TOC.md
2016-06-10 12:44:58 -07:00
jdeckerMS
8623311edd Merge remote-tracking branch 'refs/remotes/origin/master' into rs1 2016-06-10 12:41:47 -07:00
LizRoss
7869bbcfed Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7781347 2016-06-10 12:21:53 -07:00
LizRoss
a6e9c10ea8 Fixing broken formatting 2016-06-10 12:02:06 -07:00
Brian Lich
b93bdff813 tech review feedback 2016-06-10 11:03:32 -07:00
LizRoss
48c519535e Updated to change marketing attribute from IE11 to ie11 2016-06-10 10:48:38 -07:00
Brian Lich
db46837fcf Merge branch 'master' into 7518206 2016-06-10 10:46:19 -07:00
LizRoss
0164c7a315 Changed metadata from IE11 to ie11 2016-06-10 10:46:12 -07:00
LizRoss
b77c2ecadb Trying to get fix to save properly 2016-06-10 10:27:47 -07:00
LizRoss
c1c8dd0565 Merge remote-tracking branch 'refs/remotes/origin/master' into live 2016-06-10 09:59:40 -07:00