Commit Graph

8524 Commits

Author SHA1 Message Date
d4ce4019f8 Merge remote-tracking branch 'refs/remotes/origin/master' into rs2 2017-03-23 12:48:37 -07:00
b96ba3aadd fix note 2017-03-23 11:48:56 -07:00
9b9f9760d8 Merge remote-tracking branch 'refs/remotes/origin/atp-customti-update' 2017-03-23 11:34:01 -07:00
4da7b60efa Merge remote-tracking branch 'refs/remotes/origin/master' into atp-customti-update 2017-03-23 11:33:25 -07:00
1e8fa115b9 Merge branch 'upgrade-readiness' 2017-03-23 10:45:27 -07:00
a1485e6398 1607 not 1610 2017-03-23 10:44:25 -07:00
8568e8c749 fix user guide link 2017-03-23 10:39:34 -07:00
323b29e556 Squashed commit of the following:
commit d6a8bce79e491a8a245a37a9e20e6a6bec4d325b
Merge: 0ab4e4e1 a7c70ad4
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Mar 23 10:35:16 2017 -0700

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh

commit 0ab4e4e119590e0e8cef691eee2b87180b07c5b3
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Mar 23 10:29:48 2017 -0700

    Jordan feedback

commit 4454eeadbebb5fccdbfb3b1d07e87d708fefbe87
Merge: 03444e15 ef670cb5
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Mar 23 09:26:54 2017 -0700

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh

commit 03444e15f5b51bd1bdf1e76745f62cbbed3b529d
Merge: 603408f3 660a6984
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Mar 22 11:00:46 2017 -0700

    Merge branch 'rs2' into jdrs2sh

commit 603408f38ecd99e6f7fce1f61a4f199918fd67c4
Merge: 6821f22f b96e1555
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 21 13:54:33 2017 -0700

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh

commit 6821f22f07f1864bb0a5c8eda33f7daf4f9531bc
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 21 13:41:44 2017 -0700

    change ICD references

commit 5804bc18db376fba16e8c863f5af8ffdd965359a
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 21 13:39:55 2017 -0700

    rename file

commit 9268142c9b881b0e0ad4fc2a0d4dcfddc180a1b3
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 21 13:32:31 2017 -0700

    update what's new

commit 503be68ec3a731434ca789df2da1f1c4783fdca7
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 21 13:30:48 2017 -0700

    art

commit 93914a2cf2aef9622b172c8ea97a3c1d72544c6a
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 21 13:30:43 2017 -0700

    Jordan updates

commit 27b1445ba4149fa78b7ec628870b19933307ba38
Merge: 9578dffe 6f0a1f7f
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 21 08:19:27 2017 -0700

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh

commit 9578dffee198b0be16992368f571eed81f261818
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Mar 20 09:09:56 2017 -0700

    new oobe image

commit 616c10e4e404574ecce7726fc76d7582c56b318e
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Mar 20 08:23:53 2017 -0700

    get bulk token warning

commit 5600a6c7b320c4968686c07df90c62d8110764c9
Merge: cf29bb53 4b34636b
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Mar 20 08:22:02 2017 -0700

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh

commit cf29bb53ec1c6e45e068219a796b2a5b04347b15
Merge: 695ec39f a5ec4c4d
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Mar 17 09:42:51 2017 -0700

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh

commit 695ec39f81b6da46b442ce8e52c9d9b28d65434a
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Mar 16 12:25:06 2017 -0700

    delete

    # Conflicts:
    #	devices/surface-hub/TOC.md
    #	devices/surface-hub/intro-to-surface-hub.md
    #	devices/surface-hub/surface-hub-administrators-guide.md

commit cc123f7aa0718efaa7cd355df4e3693afb073b9c
Merge: 6b7ddf3e 3c12e864
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Mar 16 12:23:40 2017 -0700

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh

commit 6b7ddf3e498d541c2dbb531dd132e7ec0f45eb9d
Merge: 278d14c4 032c25d4
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Mar 16 11:34:53 2017 -0700

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh

commit 278d14c462fa386e8979c4e998c464f2cdbf6a6c
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Mar 15 10:26:22 2017 -0700

    get bulk token

commit 005f12e3939f8134143314e95e6bc9f76db8c3de
Merge: 410e7508 1bff6ddd
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Mar 15 10:25:19 2017 -0700

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh

commit 410e750850a5037d843fe9d9c64a477d252ff10e
Merge: d2f94c8f 8eed0956
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 14 13:51:32 2017 -0700

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh

commit d2f94c8f9d73868dec86e472fe5ace87b7370ac3
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 14 13:27:23 2017 -0700

    tweak

commit f629b4f1fd27fad24c258a7de903e6c18e85ec8c
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 14 12:44:21 2017 -0700

    fix mdm enrollment

commit 1dd74f9e7e353ba9ce5e71c8797cfa8cd02342a7
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 14 12:33:24 2017 -0700

    add proxy

commit c71e5af71bc866f1a5fe9abefb82b5124fb957fd
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 14 12:03:09 2017 -0700

    add install link

commit 0344deee4c68ae3c81529dc9cb602eec2af0b5c3
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 14 11:57:43 2017 -0700

    stick

commit be7ed51e1fb7b1a578c8e843b56e701bcf90be9d
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 14 11:56:52 2017 -0700

    resize art

commit 857be3cdfca07da3c5dfb470b3a3a3aee290a07c
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 14 11:55:09 2017 -0700

    moved note to correct cell

commit a91ca3943b8c0454549a1c0c5455b919ed46de8c
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 14 11:52:21 2017 -0700

    sync

commit 5bcf3c1db3c97d87ca60bfd4d688b908d4d9e518
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 14 11:43:25 2017 -0700

    fix link

commit de7d60524a2e1ba0d5e1bc1074da9bf887fa6457
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 14 11:42:46 2017 -0700

    add apps to provisioning

commit 67e14be35b30f4bfa45fb79815c25ef2317a171c
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 14 11:37:27 2017 -0700

    sync to switch branches

commit c6b9d8dae5d29f441ea262323baaad5e41b2bc9f
Merge: 3260248b 4b13310a
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Mar 14 08:35:04 2017 -0700

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh

commit 3260248b8a0511c081a5547419109f9380ea9b26
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Mar 13 08:56:25 2017 -0700

    fix table for non-IE browsers

    # Conflicts:
    #	windows/whats-new/images/wcd-options.png

commit a3ece5c8d4a6c37645f4aa5b39b582be855b98b9
Merge: 4ed80574 759b4a41
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Mar 13 08:53:34 2017 -0700

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh

commit 4ed80574020c1291ba4e853553330a7b84f21657
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Mar 8 12:00:27 2017 -0800

    fix typo

commit 7541a4507508822dcd51da773536b89a5a49f305
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Mar 8 11:53:38 2017 -0800

    fix table

commit 37254f098396342dd23115ea10885f121f5b9371
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Mar 8 11:51:48 2017 -0800

    resize art

commit a936a6c4768729fec66775528a31c64132fa4f8e
Merge: a217a9ae 9786c53a
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Mar 8 11:50:43 2017 -0800

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh

commit a217a9ae8e48af3b533eb421a716b5a580daecba
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Mar 8 11:45:55 2017 -0800

    sync

commit f09e8ae9e87db16b7ee6982864a1c4c2fc8ebcdc
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Mar 8 11:39:34 2017 -0800

    add image to index

commit 80a133370000b2b7ff8c9e1383aca7eb1769258a
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Mar 8 11:30:34 2017 -0800

    fix link

commit d8aa55211a62fecf56e6404146917b8e84b3c296
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Mar 8 11:25:33 2017 -0800

    tweak TOC, get rid of intro

commit 6415e3739e13f47f2d3a6355066015d0bcd4cc7a
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Mar 8 11:16:33 2017 -0800

    remove admin guide level from toc

commit 0d016720488e8aa1e3e0621b50596a66db8d232f
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Mar 8 07:53:03 2017 -0800

    release in change history

commit 67a8f585dd788db1a18247827b1f9d22378d5b9f
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Mar 8 07:50:20 2017 -0800

    add what's new

commit be5e195fc41d9ce94cd1b6189f0da25e9e50b9f2
Merge: e3e75663 8e80f0e1
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Mar 8 07:40:34 2017 -0800

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh

commit e3e756632b462d8a110b0538782bc22487e96d4b
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Feb 28 13:46:55 2017 -0800

    end session

    # Conflicts:
    #	windows/configure/windows-10-start-layout-options-and-policies.md

commit 0a9b86a2f6b69e5883fcdab48bb22f19cf1e6c32
Merge: 13e94977 4530d39f
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Feb 28 13:42:38 2017 -0800

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh

commit 13e9497711b34daab936735edcfa87f13c89d006
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Feb 27 11:29:01 2017 -0800

    resize art

commit 17d830dfde1174c95cb2bde7018fa1c85b8dcacc
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Feb 27 10:59:56 2017 -0800

    delete file from images

commit 395946c6c9b54516461e79a232525e965632686d
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Feb 27 10:50:39 2017 -0800

    fix link

commit c328942818f6e4b5d2bd2062724a90687b85926e
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Feb 27 10:40:29 2017 -0800

    set up wizard table

commit 942af3c56e6e6f7736e1ea03d6801633237a9311
Merge: 6ce5c31d 819ba842
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Feb 27 10:03:16 2017 -0800

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh

commit 6ce5c31d127662010841791aa6498cd1606ed31e
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Feb 27 09:55:32 2017 -0800

    change branches

commit a3c28ae9e83bde3c97dd2d9232ad430e08ae972b
Merge: b794a681 0a914cf9
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Feb 27 08:31:41 2017 -0800

    Merge remote-tracking branch 'refs/remotes/origin/jdrs2icd' into jdrs2sh

commit b794a6819b1a3ad9deb834986a184f6b488497fa
Merge: af38dabf 2d1267b5
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Feb 27 07:37:48 2017 -0800

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh

commit af38dabf79f6b51971fbf3891d72be73f0f9035a
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Feb 24 11:25:09 2017 -0800

    changed all to End Session

    # Conflicts:
    #	devices/surface-hub/index.md

commit 4e124566f0a01017232d6c2c6be95db15abf5db3
Merge: d07431ae 4b1663d8
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Feb 24 11:18:06 2017 -0800

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh

commit d07431ae706af0af4c6c44909c4e08b16b904ccc
Merge: 237cb29c 8bfa038e
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Feb 14 13:48:31 2017 -0800

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh

commit 237cb29ce337e73ab6d707c1c06eaa89f5b49f3b
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Feb 7 15:06:27 2017 -0800

    undo all

commit 5461ccb226a5ee079f07c59d719c52f3fefe2343
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Feb 7 07:53:02 2017 -0800

    sync

commit 1e56393ac1a33ff3d1b5eb2183e1ece4e776a9a6
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Feb 7 07:41:45 2017 -0800

    sync

commit 25ad8424a8f0dff551367cebedad18563e9d1081
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Feb 7 07:32:18 2017 -0800

    iframe

commit 114cccfb75b3f27f46b67b5577d05a5de55662c1
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Feb 7 07:22:49 2017 -0800

    try span

commit 03c4b1bb5aad5871b6808c2b7c48e0e71b6c10c7
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Feb 7 07:10:29 2017 -0800

    remove test

commit 8a55ced11b6e8d4117d940ec73e2b045a0d7cf24
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Feb 7 06:59:19 2017 -0800

    test compass video

commit f4ae742993fa9892f4d7c411fa87683697849cf7
Merge: dd9a3df0 94b855cd
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Feb 7 06:55:10 2017 -0800

    Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2sh
2017-03-23 10:36:02 -07:00
a7c70ad483 Merge remote-tracking branch 'refs/remotes/origin/vs-whatsnewappv' into rs2 2017-03-23 10:30:35 -07:00
0c1f409336 Added App-V content 2017-03-23 10:25:19 -07:00
ef670cb596 Merge remote-tracking branch 'refs/remotes/origin/jdrs2icd' into rs2 2017-03-23 08:54:16 -07:00
a3a6b49082 bulk aad 2017-03-23 08:47:08 -07:00
e06fdfbf94 Merge remote-tracking branch 'refs/remotes/origin/rs2' into jdrs2icd 2017-03-23 08:28:33 -07:00
2fee460601 Merge branch 'rs2' of https://github.com/Microsoft/win-cpub-itpro-docs into rs2 2017-03-23 08:12:22 -07:00
d55ceba018 Win32 note 2017-03-23 07:46:11 -07:00
46d089a63f add link to mobile 2017-03-23 07:41:52 -07:00
542b8237c1 resize art 2017-03-23 07:40:03 -07:00
79399d2fe3 Merge remote-tracking branch 'refs/remotes/origin/master' into RS2 2017-03-23 07:06:22 -07:00
afed3da2b1 tip format 2017-03-22 17:51:31 -07:00
ffc5594895 tip format 2017-03-22 17:43:56 -07:00
4fbe1e496b format 2017-03-22 17:31:27 -07:00
9541784c64 Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs 2017-03-22 16:53:41 -07:00
6e3afb6f3b Merge remote-tracking branch 'refs/remotes/origin/atp-fixes' 2017-03-22 16:53:28 -07:00
eabf6114be fix title typo 2017-03-22 16:49:43 -07:00
b302fe5e40 fix advacned file names 2017-03-22 16:38:48 -07:00
33b484a609 more machines list updates 2017-03-22 16:34:44 -07:00
0a24c5ea4f update to machines list from view 2017-03-22 16:32:10 -07:00
b5d7af8a9f update image to reflect machine list 2017-03-22 16:29:25 -07:00
aec485291e add related topics links 2017-03-22 16:14:56 -07:00
0712779aa1 udpate note 2017-03-22 16:08:37 -07:00
45cbd98322 fix 2017-03-22 16:00:52 -07:00
fd2fc7a44f remove note and warning style 2017-03-22 15:35:54 -07:00
c5e0342956 fix notes and warnings 2017-03-22 15:25:07 -07:00
2ea83aa868 Merge pull request #459 from JasonGerend/patch-4
Added link; shortened headings
2017-03-22 13:48:36 -07:00
56d865a38a Added link; shortened headings
-Shortened Windows Defender headings by removing the acronyms and adding them to the body
-Added a link to the deprecated features topic
- Changed the More information heading to Related topics
2017-03-22 13:23:29 -07:00
9d07105974 removed blog link 2017-03-22 11:49:07 -07:00
1c0143cad1 Merge remote-tracking branch 'origin/rs2' into rs2 2017-03-22 11:25:10 -07:00
8415288d0d arch diagram update 2017-03-22 11:19:44 -07:00
688c752d2d Merge remote-tracking branch 'refs/remotes/origin/master' into upgrade-readiness 2017-03-22 11:15:14 -07:00
cffdd3ce58 Merge pull request #458 from Justinha/VSTS10438614
Vsts10438614
2017-03-22 11:12:15 -07:00
b70e2f6a1c Merge remote-tracking branch 'refs/remotes/origin/master' into atp-customti-update 2017-03-22 11:01:57 -07:00
af5677fc17 added links to enterprise certificate pinning and others 2017-03-22 11:01:28 -07:00
ae0db8ec8a Merge pull request #457 from Taojunshen/CELA-updates
Legal updates from CELA
2017-03-22 10:05:37 -07:00
7a14dde652 resolving merge conflict 2017-03-22 09:11:51 -07:00
660a69848c Merge remote-tracking branch 'refs/remotes/origin/master' into rs2 2017-03-22 09:07:00 -07:00
6401a9f225 New license files from CELA. 2017-03-22 08:48:21 -07:00
4e8e01e2b1 Update from CELA.
CELA has provided replacement licence files which include separate licenses for CC and code snippets. The Content Engineering Team has been tasked with replacing the license files on all existing repos. The changes to the ReadMe file must be at the top of the file to be recognized by license scanners.
2017-03-22 08:47:43 -07:00
0808264977 Merge remote-tracking branch 'refs/remotes/origin/jd-sandbox' 2017-03-22 08:46:34 -07:00
5f94e9acea This license file is being replaced. 2017-03-22 08:45:41 -07:00
d1bafd0ffc replace image 2017-03-22 08:38:56 -07:00