Commit Graph

4103 Commits

Author SHA1 Message Date
8a4c51fba9 Merge remote-tracking branch 'refs/remotes/origin/master' into pr/12
# Conflicts:
#	windows/deploy/deploy-windows-to-go.md
#	windows/keep-secure/windows-10-security-guide.md
2016-08-31 14:21:30 -07:00
c25b09afb5 Merge remote-tracking branch 'refs/remotes/origin/jd-sandbox' 2016-08-30 07:27:28 -07:00
dd395a0269 GP terminology 2016-08-30 07:26:52 -07:00
4b4045c5e5 Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox 2016-08-30 07:23:38 -07:00
f4bb542824 Update fwlink to use HTTPS
In this patch, I replaced all occurrences of http://go.microsoft.com with https://go.microsoft.com
2016-08-30 03:02:30 -04:00
099a085707 removed line 2016-08-30 13:23:35 +10:00
e9e97ad453 Merge remote-tracking branch 'refs/remotes/origin/janb-win10secureguide' 2016-08-29 19:22:23 -07:00
641ccf4868 added figure; fixed 2016-08-29 19:09:41 -07:00
249f5cc725 Merge remote-tracking branch 'refs/remotes/origin/janb-win10secureguide' 2016-08-29 18:43:26 -07:00
a884c0f10e headings 2016-08-29 18:35:23 -07:00
7796a8887d headings 2016-08-29 18:22:33 -07:00
f040c3360a spacing 2016-08-29 18:10:12 -07:00
5a9af63d55 fix spacing issues; add note tagging 2016-08-29 17:49:19 -07:00
a30beb3487 Merge remote-tracking branch 'refs/remotes/origin/janb-wtgo-formatfix' 2016-08-29 16:53:36 -07:00
44ec3e412f spacing 2016-08-29 16:53:15 -07:00
b411979abf spacing 2016-08-29 16:38:01 -07:00
fd771a1105 Merge pull request #155 from JanKeller1/8442312
A few more sm chgs from visual test pass
2016-08-29 12:34:05 -07:00
55b0466f35 spacing 2016-08-29 11:50:31 -07:00
c7b22a5d5b spacing 2016-08-29 11:29:58 -07:00
589c7207e3 Small changes that came out of visual test pass 2016-08-29 10:46:53 -07:00
801dce723c Merge remote-tracking branch 'refs/remotes/origin/master' into janb-wtgo-formatfix 2016-08-29 10:45:37 -07:00
1f6700ee2f Small changes that came out of visual test pass 2016-08-29 10:45:01 -07:00
47c3a03ad2 Merge branch 'master' of https://github.com/Microsoft/windows-itpro-docs 2016-08-29 09:09:27 -07:00
f8d9b180b8 Merge pull request #10 from xiaoyinl/patch-1
[reset-a-windows-10-mobile-device.md] add Recovery Tool
2016-08-29 09:09:03 -07:00
87229972b2 Merge remote-tracking branch 'refs/remotes/origin/jd-sandbox' 2016-08-29 07:48:15 -07:00
56c70b0bb6 remove from index 2016-08-29 07:46:11 -07:00
3ccbee37c2 redirect app dev for WaaS to MSDN 2016-08-29 07:30:07 -07:00
67d4f57c82 Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox 2016-08-29 07:23:15 -07:00
c573a774a3 Merge pull request #9 from gastocco/master
Additional detail regarding the Reset Lockout button in TPM.msc
2016-08-28 21:28:10 -07:00
5073730288 Merge pull request #11 from xiaoyinl/patch-2
[README.md] Fix typo
2016-08-28 21:27:24 -07:00
717f77c318 Merge remote-tracking branch 'refs/remotes/origin/vso8610988' 2016-08-29 10:47:01 +10:00
02fb1be30f Merge remote-tracking branch 'refs/remotes/origin/master' into vso8610988 2016-08-29 10:44:57 +10:00
ab82672d22 [README.md] Fix typo 2016-08-27 02:31:21 -04:00
094d6db9ae [reset-a-windows-10-mobile-device.md] add Recovery Tool
I think it is helpful to tell users how to flash Windows 10 Mobile with the original factory image. So I add a link to the Windows Device Recovery Tool.
2016-08-27 02:29:49 -04:00
762b73610b Merge pull request #1 from gastocco/patch-1
Extra Clarification around The use of the "Reset Lockout" button
2016-08-26 12:11:40 -07:00
463e001ed3 Update manage-tpm-lockout.md 2016-08-26 12:10:46 -07:00
0693291fe7 Update manage-tpm-lockout.md 2016-08-26 12:09:05 -07:00
4e219b5d3b Merge branch 'master' of https://github.com/Microsoft/windows-itpro-docs 2016-08-25 19:35:20 -07:00
f50be747fd Merge pull request #6 from NaamaSc/patch-1
Update windows-defender-advanced-threat-protection.md
2016-08-25 19:34:45 -07:00
997ce150e4 Merge pull request #7 from tommytn/patch-1
Update uev-whats-new-in-uev-for-windows.md
2016-08-25 19:34:15 -07:00
5b6a5d1151 Merge pull request #154 from JanKeller1/8442312
Formatting fixes & typo fixes from visual test pass
2016-08-25 19:32:02 -07:00
fb15f34c31 Fixes to fmts and typos from visual test pass 2016-08-25 18:28:46 -07:00
53dbf987a3 Small fixes that came from visual test pass 2016-08-25 16:47:20 -07:00
956c51c776 Merge pull request #149 from gastocco/patch-2
Update to Describe Windows 10 Lockout Behavior
2016-08-25 16:36:31 -07:00
d9e9f475ce Update manage-tpm-lockout.md 2016-08-25 16:35:33 -07:00
7922b49429 Update manage-tpm-lockout.md 2016-08-25 16:34:41 -07:00
19d477fa75 Copyedits 2016-08-25 16:34:02 -07:00
17b78020a2 Merge pull request #150 from gastocco/patch-3
Update with behavior from Anniversary Edition
2016-08-25 16:30:50 -07:00
b5875f06fb made owner apssword lower case 2016-08-25 16:30:32 -07:00
34f37f2577 changed anniversary edition to version 1607 2016-08-25 16:28:57 -07:00