6248 Commits

Author SHA1 Message Date
LizRoss
c4f24bc964 Removed text 2017-01-09 13:13:19 -08:00
LizRoss
8586de3695 Updated topic title 2017-01-09 12:15:50 -08:00
LizRoss
d11f74b061 Updated text 2017-01-09 11:05:46 -08:00
LizRoss
7140585fb0 Renaming file 2017-01-09 10:53:45 -08:00
LizRoss
c1996494b0 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-10202987 2017-01-09 10:50:53 -08:00
Greg Lindsay
310c015f32 bbb 2017-01-09 10:24:08 -08:00
Brian Lich
f33df1bd8c Merge pull request #311 from karthikaraman/karaman-ua-getstarted
fixing typo in the column
2017-01-09 09:27:52 -08:00
Karthika Raman
fa6f1b0bcf fixing typo in the column 2017-01-09 09:17:22 -08:00
LizRoss
f58ff390d9 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-10202987 2017-01-09 07:16:14 -08:00
Brian Lich
875ceb9080 Merge pull request #310 from karthikaraman/karaman-ua-getstarted
Karaman ua getstarted (for review before merge)
2017-01-06 16:43:29 -08:00
Karthika Raman
a1794620b9 merging conflicts 2017-01-06 16:13:51 -08:00
Karthika Raman
0847b63aac adding fix for exit codes 2017-01-06 16:03:09 -08:00
LizRoss
3dc9420566 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-10202987 2017-01-06 14:57:48 -08:00
Elizabeth Ross
0d756a2785 Merge pull request #309 from JanKeller1/v-jak-tpm
Publish overhauled TPM content - has been reviewed and signed off
2017-01-06 13:49:21 -08:00
JanKeller1
d481358d9a Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs into v-jak-tpm 2017-01-06 12:14:49 -08:00
jdeckerMS
88cf4ee541 correction 2017-01-06 10:28:42 -08:00
LizRoss
d57caba8e6 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-10202987 2017-01-06 10:24:17 -08:00
jdeckerMS
cef79f8950 Squashed commit of the following:
commit d315408203221903b5e4838fa2a4decfe8770ef9
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Jan 6 08:50:26 2017 -0800

    studio

commit 3500acb02f6da57a571b18451349ed3b23bdcaeb
Merge: fc068ea c053cb6
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Jan 6 07:43:46 2017 -0800

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

commit fc068ea61fc0c49920f49d20e83992612f9d7028
Merge: e1c8ede 00309f9
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Nov 30 13:13:08 2016 -0800

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

    # Conflicts:

    #	devices/surface/deploy-the-latest-firmware-and-drivers-for-surface-devices.md
    #	devices/surface/deploy-windows-10-to-surface-devices-with-mdt.md
    #	devices/surface/manage-surface-dock-firmware-updates.md
    #	devices/surface/upgrade-surface-devices-to-windows-10-with-mdt.md

commit e1c8edeea312d28967310ffccd9c0f21e0cf07f6
Merge: 7dddf47 01ec7e8
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Nov 14 11:13:33 2016 -0800

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

commit 7dddf47011049742be2d53a455f6507d9a3eba28
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Nov 3 10:07:35 2016 -0700

    initial updates for Studio plus note format

commit 298bf1691cab578d63577c6477d5456a48a205d7
Merge: be6cb8d 46d5daa
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Nov 3 09:31:50 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdstudio
2017-01-06 10:23:47 -08:00
LizRoss
a3f18e3732 Merge branch 'master' of https://github.com/Microsoft/windows-itpro-docs 2017-01-06 10:22:47 -08:00
Elizabeth Ross
cd1ef880cf Merge pull request #308 from JanKeller1/master
Based on customer fdbk, added a link; also added missing periods
2017-01-06 10:06:16 -08:00
JanKeller1
4bf704f287 Based on customer fdbk, added a link; also added missing periods 2017-01-05 18:55:00 -08:00
Brian Lich
ddfe1ae454 Merge pull request #98 from zdvorak/patch-8
Update upgrade-analytics-requirements.md
2017-01-05 16:28:21 -08:00
Karthika Raman
ac09296fa1 more changes 2017-01-05 15:38:45 -08:00
JanKeller1
e0cbe5be75 Small fixes, improvemts for consistency 2017-01-05 15:25:32 -08:00
Brian Lich
5ea6761dc0 Merge pull request #97 from zdvorak/patch-6
Update upgrade-analytics-get-started.md
2017-01-05 13:55:37 -08:00
Zach Dvorak
32d4d2afd2 Update upgrade-analytics-requirements.md 2017-01-05 13:51:09 -08:00
Zach Dvorak
f515ef0796 Update upgrade-analytics-get-started.md 2017-01-05 13:48:21 -08:00
Greg Lindsay
c053cb6c70 Merge branch 'minortypos' 2017-01-05 13:37:19 -08:00
Greg Lindsay
8b1ac60f05 related topics bug 2017-01-05 13:36:46 -08:00
Greg Lindsay
3fdfc4040c Merge branch 'minortypos' 2017-01-05 13:34:08 -08:00
Greg Lindsay
d9c548b944 fixed import-topic 2017-01-05 13:33:12 -08:00
JanKeller1
5b75bb4536 Folded in changes from Gabe Stocco and Chris Riggs 2017-01-05 13:12:01 -08:00
jdeckerMS
29d7dc2358 Merge remote-tracking branch 'refs/remotes/origin/jd-sandbox' 2017-01-05 13:08:07 -08:00
jdeckerMS
3ade50d2e0 clarify client 2017-01-05 12:49:59 -08:00
jdeckerMS
8e97a15956 Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox 2017-01-05 12:48:50 -08:00
Greg Lindsay
f3ff67d315 Merge branch 'minortypos' 2017-01-05 12:28:12 -08:00
Greg Lindsay
ebe1ee2f0a edited image 2017-01-05 12:27:11 -08:00
LizRoss
a1915ab0fe Merge remote-tracking branch 'refs/remotes/origin/master' into vs-10202987 2017-01-05 09:52:46 -08:00
jdeckerMS
0d1aefe9ec Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox 2017-01-05 07:21:00 -08:00
Brian Lich
b3af374f31 removed domain and user names from default setting 2017-01-04 15:14:28 -08:00
Karthika Raman
62a58189d8 adding new exit codes +link to auth proxy blog post 2017-01-04 14:54:26 -08:00
LizRoss
1641b0f36a Merge remote-tracking branch 'refs/remotes/origin/master' into vs-10202987 2017-01-04 14:42:59 -08:00
Justin Hall
334908f58c Merge pull request #305 from Justinha/patch-2
Patch 2
2017-01-04 14:41:16 -08:00
Justinha
5dd5b86bb1 consolidated rows for Windows Server 2017-01-04 14:38:37 -08:00
Justinha
b716b1bfb6 added Windows 10 Education to list of supported Windows versions for AppLocker 2017-01-04 14:33:24 -08:00
LizRoss
8ec3efa3bb Merge remote-tracking branch 'refs/remotes/origin/master' into vs-10202987 2017-01-04 14:10:40 -08:00
jdeckerMS
98ad70f64c Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox 2017-01-04 13:37:30 -08:00
jdeckerMS
02f18f934a Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox 2017-01-04 13:26:20 -08:00
Celeste de Guzman
757d6d6cf9 Merge pull request #304 from Microsoft/vso-10403132
highlighted some UI elements in 3 screenshots in pro to pro edu topic…
2017-01-04 13:24:34 -08:00
Celeste de Guzman
e588daff1f highlighted some UI elements in 3 screenshots in pro to pro edu topic and made policheck fixes in the deploy win10 to school district topic 2017-01-04 13:10:39 -08:00