183 Commits

Author SHA1 Message Date
jdeckerMS
6c4e74f391 high traffic loc tags 2016-08-08 07:49:31 -07:00
jdeckerMS
141010b46c Santhosh feedback 2016-07-29 17:29:24 -07:00
jdeckerMS
c214229576 untag edu for loc 2016-07-29 12:31:02 -07:00
Trudy Hakala
ec2142f336 fixing merge conflicts 2016-07-28 14:54:31 -07:00
jdeckerMS
ed816c18bb fix typo 2016-07-28 14:12:31 -07:00
jdeckerMS
e17a63c328 edu loc tags 2016-07-28 12:37:15 -07:00
jdeckerMS
13d1384341 Andy Fu feedback 2016-07-28 12:12:52 -07:00
jdeckerMS
6e21c93633 add vpn stuff 2016-07-27 13:58:21 -07:00
jdeckerMS
66c0c1044b resolve merge conflicts
# Conflicts:
#	education/windows/TOC.md
#	education/windows/index.md
2016-07-27 12:43:27 -07:00
Jan Backstrom
7f01a8877d Merge remote-tracking branch 'refs/remotes/origin/janb-winedu-deployschooldistrict'
# Conflicts:
#	education/windows/change-history-edu.md
2016-07-27 12:06:51 -07:00
Jan Backstrom
466b32d0ef spacing 2016-07-27 11:04:38 -07:00
Jan Backstrom
90c7dca608 tables 2016-07-27 10:50:40 -07:00
jdeckerMS
633d1018bc add Celeste's topic to changelog 2016-07-27 10:32:19 -07:00
jdeckerMS
c42b3f0809 Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs 2016-07-27 09:44:13 -07:00
jdeckerMS
4c6e88944c Merge remote-tracking branch 'origin/rs1' into rs1
# Conflicts:
#	education/windows/TOC.md
#	education/windows/change-history-edu.md
#	education/windows/index.md
2016-07-27 09:42:09 -07:00
jdeckerMS
618531377e Merge remote-tracking branch 'refs/remotes/origin/master' into rs1
# Conflicts:
#	education/windows/TOC.md
#	education/windows/change-history-edu.md
#	education/windows/index.md
#	windows/manage/TOC.md
2016-07-27 09:40:35 -07:00
LizRoss
021c31b4af Merged from master and fixed conflicts 2016-07-27 09:39:55 -07:00
Jan Backstrom
3120a0e66b fix table 2016-07-27 09:28:46 -07:00
jdeckerMS
55ad41b421 fix links in edu 2016-07-27 08:20:31 -07:00
jdeckerMS
cb4091c607 new version 2016-07-27 07:52:35 -07:00
Jan Backstrom
0a7daa10f3 spacing 2016-07-26 23:10:17 -07:00
Jan Backstrom
3771eeb0b2 spacing 2016-07-26 21:44:31 -07:00
Jan Backstrom
8db399661a spacing 2016-07-26 20:07:12 -07:00
Jan Backstrom
c66df99e99 spacing 2016-07-26 19:01:51 -07:00
Jan Backstrom
556b0cf7c7 fix spacing 2016-07-26 17:57:16 -07:00
Jan Backstrom
6bdf4e91cf Merge branch 'janb-winedu-deployschooldistrict' of https://github.com/Microsoft/win-cpub-itpro-docs into janb-winedu-deployschooldistrict 2016-07-26 14:03:32 -07:00
Jan Backstrom
6c75b6ff0b edits 2016-07-26 14:03:24 -07:00
Jan Backstrom
15169d737f edits 2016-07-26 11:51:23 -07:00
Jan Backstrom
f71bdffd87 edits 2016-07-25 15:58:02 -07:00
Celeste de Guzman
798e86f72e Updated index.md to include link and description for deployment recommendations article 2016-07-25 15:51:55 -07:00
Celeste de Guzman
508d57f983 updated TOC to include deployment recommendations for school IT admins topic 2016-07-25 13:43:32 -07:00
LizRoss
6975c0b236 Trying to fix wonky formatting 2016-07-25 12:57:56 -07:00
LizRoss
4ed3f71f45 Trying to make sure there's no hidden, problematic formatting 2016-07-25 12:57:05 -07:00
Jan Backstrom
6261e43080 remove semicolons 2016-07-25 12:29:37 -07:00
Jan Backstrom
2af863200d add Applies to section 2016-07-25 12:00:01 -07:00
Jan Backstrom
06808e745d edits; add figures 2016-07-22 19:14:31 -07:00
Jan Backstrom
b201a26b59 Add to TOC, Index, Change History 2016-07-22 18:03:23 -07:00
Jan Backstrom
c04e17f0dc add images 2016-07-22 17:23:00 -07:00
Jan Backstrom
cc0165e737 more content 2016-07-22 17:07:28 -07:00
jdeckerMS
21ffd08a51 fix typo 2016-07-22 12:47:35 -07:00
jdeckerMS
e160514d23 format tweaks 2016-07-22 12:03:00 -07:00
jdeckerMS
f7989f0d91 Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs 2016-07-22 10:05:17 -07:00
Jan Backstrom
600acc8fb1 more new content 2016-07-21 17:34:25 -07:00
Celeste de Guzman
fe7ca9cb1b added missing # to fix broken link 2016-07-21 15:35:25 -07:00
Celeste de Guzman
134fed705e initial draft for edu deployment recommendations 2016-07-21 14:23:03 -07:00
jdeckerMS
dd4057e69b un-en-us'd links 2016-07-21 11:55:40 -07:00
Jan Backstrom
69b2a2657d add new content 2016-07-20 15:37:15 -07:00
jdeckerMS
5eaf0abef6 update ADK link 2016-07-20 07:27:29 -07:00
jdeckerMS
f700490ed6 fix typo 2016-07-19 06:58:02 -07:00
jdeckerMS
bd5a800a77 fix links 2016-07-18 14:21:18 -07:00