301 Commits

Author SHA1 Message Date
LizRoss
2d86808029 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1
# Conflicts:
#	.gitignore
#	windows/deploy/change-history-for-deploy-windows-10.md
#	windows/plan/TOC.md
2016-07-26 10:12:23 -07:00
Brian Lich
9cd12df968 removing en-us from redirected links 2016-07-21 16:38:04 -07:00
Trudy Hakala
ba15030bda redirect 2016-07-21 13:41:20 -07:00
Trudy Hakala
c219db57dd fixing file name error with new file and adding redirect 2016-07-21 13:26:26 -07:00
Trudy Hakala
bf5d33eeb6 fixing links for loc and removing content from redirected topics 2016-07-21 11:05:35 -07:00
LizRoss
6c16831ff5 Updated 2016-07-21 07:30:54 -07:00
Trudy Hakala
775dc2aa2d Merge remote-tracking branch 'refs/remotes/origin/master' into trudyha-loc-tagging 2016-07-19 09:50:51 -07:00
Brian Lich
579ec690c2 fixing loc metadata name 2016-07-19 09:43:28 -07:00
Trudy Hakala
2465c74107 Merge remote-tracking branch 'refs/remotes/origin/master' into trudyha-loc-tagging 2016-07-18 16:02:23 -07:00
Trudy Hakala
69853cf9df adding metadata for loc work on surface hub and wsfb 2016-07-18 16:01:02 -07:00
Brian Lich
1a990a6c0b fixing metadata casing 2016-07-18 15:24:45 -07:00
Brian Lich
0406ff5c22 fixed typo 2016-07-18 15:17:36 -07:00
Brian Lich
6396c279ee Merge branch 'master' into bl-7767954 2016-07-18 09:06:59 -07:00
Brian Lich
8b94e572c5 added localization priority 2016-07-16 20:15:59 -07:00
Brian Lich
59be37e069 added localization priority 2016-07-16 20:14:38 -07:00
Brian Lich
50d15e5cbd Merge branch 'master' into bl-7767954 2016-07-16 20:13:25 -07:00
jdeckerMS
449a3c7ff9 actually commit the example 2016-07-14 12:08:10 -07:00
jdeckerMS
21e3ae4163 add lockdown.xml example 2016-07-14 11:25:18 -07:00
jdeckerMS
10be617038 Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs
# Conflicts:
#	windows/whats-new/whats-new-windows-10-version-1511.md
2016-07-14 08:13:00 -07:00
jdeckerMS
eb0e451475 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1
# Conflicts:
#	windows/manage/change-history-for-manage-and-update-windows-10.md
#	windows/plan/change-history-for-plan-for-windows-10-deployment.md
2016-07-14 08:10:14 -07:00
jdeckerMS
e4889ac9a8 sync 2016-07-13 14:57:56 -07:00
Greg Lindsay
756172996b Merge branch 'vso-8117726' 2016-07-13 13:53:58 -07:00
Greg Lindsay
8f1b6eeeb8 updated changelog 2016-07-13 13:53:36 -07:00
jdeckerMS
4b217cd742 tweak language 2016-07-13 13:31:15 -07:00
Greg Lindsay
c288a76956 Merge branch 'vso-8117726' 2016-07-13 13:20:45 -07:00
Greg Lindsay
a3df99fa44 updated changelog 2016-07-13 13:19:40 -07:00
jdeckerMS
d74df4506b add images for new lockdown content 2016-07-13 13:09:32 -07:00
jdeckerMS
92ad400e2a overwrite with walkthrough content 2016-07-13 12:55:04 -07:00
jdeckerMS
460ff7a988 tweaks and remove diagnostics 2016-07-13 12:49:01 -07:00
Brian Lich
5af8c8697c Merge branch 'master' into bl-7767954 2016-07-12 14:29:46 -07:00
Brian Lich
2d47c556fc PR feedback 2016-07-12 11:16:46 -07:00
Brian Lich
273e49e5d7 pulling upgrade analytics section for now 2016-07-12 09:48:14 -07:00
jdeckerMS
036ce43f71 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1 2016-07-12 09:03:13 -07:00
jdeckerMS
7e1af01bb3 refix link 2016-07-12 08:40:27 -07:00
jdeckerMS
8ff9ebc8d7 update link 2016-07-12 07:38:46 -07:00
Brian Lich
7a9f6cb26e tech review feedback 2016-07-11 16:49:47 -07:00
jdeckerMS
1bde875988 updates 2016-07-11 14:15:05 -07:00
Brian Lich
a9c621ce22 typos 2016-07-11 12:52:50 -07:00
Brian Lich
c0ad9f87a6 decision maker audience addition 2016-07-11 12:11:44 -07:00
jdeckerMS
b3357dacc9 typo 2016-07-11 08:07:53 -07:00
jdeckerMS
c07624e268 8079497 2016-07-11 07:48:49 -07:00
jdeckerMS
c770a094ee Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs 2016-07-11 07:37:58 -07:00
jdeckerMS
697f982197 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1
# Conflicts:
#	windows/deploy/index.md
#	windows/plan/TOC.md
#	windows/plan/index.md
2016-07-11 07:31:00 -07:00
Greg Lindsay
047839b4b8 Merge branch 'vso-8117726' 2016-07-08 17:47:38 -07:00
Greg Lindsay
8428a8640a minor fixes 2016-07-08 17:44:33 -07:00
Greg Lindsay
b520ad2b67 major changes to two topics, consolidation 2016-07-08 17:13:23 -07:00
jdeckerMS
4b2c9f3e52 move 3 from what's new 2016-07-08 11:04:55 -07:00
jdeckerMS
73451ec0c8 move changelog 2016-07-07 13:14:27 -07:00
jdeckerMS
37d77a142b add RS1 to change logs 2016-07-07 11:49:48 -07:00
jdeckerMS
238dd6f8d2 Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdngcrs 2016-07-06 13:11:51 -07:00