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

This commit is contained in:
jdeckerMS
2017-09-26 06:19:20 -07:00
10 changed files with 495 additions and 54 deletions

59
bcs/images/icon_video.svg Normal file
View File

@ -0,0 +1,59 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 105">
<defs>
<style>
.cls-1 {
fill: #556a8a;
}
.cls-2 {
fill: #fff;
}
.cls-3 {
fill: none;
stroke: #556a8a;
stroke-miterlimit: 10;
stroke-width: 2px;
}
.cls-4 {
fill: #2bc7f4;
}
.cls-5 {
fill: #e5e5e5;
}
</style>
</defs>
<title> 5</title>
<g id="Illustrations">
<g>
<g>
<g>
<rect class="cls-1" x="34" y="22" width="82" height="61" rx="2" ry="2"/>
<g>
<rect class="cls-2" x="36" y="24" width="7" height="7"/>
<rect class="cls-2" x="36" y="34" width="7" height="7"/>
<rect class="cls-2" x="36" y="44" width="7" height="7"/>
<rect class="cls-2" x="36" y="54" width="7" height="7"/>
<rect class="cls-2" x="36" y="64" width="7" height="7"/>
<rect class="cls-2" x="36" y="74" width="7" height="7"/>
</g>
<g>
<rect class="cls-2" x="107" y="24" width="7" height="7"/>
<rect class="cls-2" x="107" y="34" width="7" height="7"/>
<rect class="cls-2" x="107" y="44" width="7" height="7"/>
<rect class="cls-2" x="107" y="54" width="7" height="7"/>
<rect class="cls-2" x="107" y="64" width="7" height="7"/>
<rect class="cls-2" x="107" y="74" width="7" height="7"/>
</g>
<rect class="cls-2" x="45" y="24" width="60" height="57"/>
<path class="cls-3" d="M91.18,51.7A16.19,16.19,0,0,1,75,67.89a15.91,15.91,0,0,1-5-.79A16.18,16.18,0,1,1,91.18,51.7Z"/>
</g>
<polygon class="cls-4" points="69 62.15 69 41.26 87 51.7 69 62.15"/>
</g>
<rect class="cls-5" x="45" y="24" width="60" height="7"/>
<rect class="cls-5" x="45" y="74" width="60" height="7"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@ -786,7 +786,7 @@ description: Learn about the product documentation and resources available for M
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="/media/common/i_video.svg" alt="Set up Microsoft 365 Business" />
<img src="images/icon_video.svg" alt="Set up Microsoft 365 Business" />
</div>
</div>
<div class="cardText">
@ -805,7 +805,7 @@ description: Learn about the product documentation and resources available for M
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="/media/common/i_video.svg" alt="Secure Windows 10 devices with Microsoft 365 Business" />
<img src="images/icon_video.svg" alt="Secure Windows 10 devices with Microsoft 365 Business" />
</div>
</div>
<div class="cardText">
@ -824,7 +824,7 @@ description: Learn about the product documentation and resources available for M
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="/media/common/i_video.svg" alt="Secure Microsoft Office apps on iOS devices with Microsoft 365 Business" />
<img src="images/icon_video.svg" alt="Secure Microsoft Office apps on iOS devices with Microsoft 365 Business" />
</div>
</div>
<div class="cardText">
@ -843,7 +843,7 @@ description: Learn about the product documentation and resources available for M
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="/media/common/i_video.svg" alt="Set up Windows devices for Microsoft 365 Business" />
<img src="images/icon_video.svg" alt="Set up Windows devices for Microsoft 365 Business" />
</div>
</div>
<div class="cardText">
@ -862,7 +862,7 @@ description: Learn about the product documentation and resources available for M
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="/media/common/i_video.svg" alt="Demo: Microsoft 365 Business first run experience" />
<img src="images/icon_video.svg" alt="Demo: Microsoft 365 Business first run experience" />
</div>
</div>
<div class="cardText">
@ -881,7 +881,7 @@ description: Learn about the product documentation and resources available for M
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="/media/common/i_video.svg" alt="Demo: Secure data and end user devices with Microsoft 365 Business" />
<img src="images/icon_video.svg" alt="Demo: Secure data and end user devices with Microsoft 365 Business" />
</div>
</div>
<div class="cardText">

View File

@ -0,0 +1,171 @@
<svg id="ICONS" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 140">
<defs>
<style>
.cls-1 {
fill: #80def9;
}
.cls-14, .cls-2 {
fill: none;
}
.cls-3 {
fill: #556a8a;
}
.cls-4 {
fill: #868787;
}
.cls-5 {
fill: #e5e5e5;
}
.cls-6 {
fill: #b72b2b;
}
.cls-7 {
fill: #a80000;
}
.cls-15, .cls-8, .cls-9 {
fill: #fff;
}
.cls-9 {
stroke: #5b7484;
}
.cls-14, .cls-15, .cls-9 {
stroke-miterlimit: 10;
stroke-width: 2px;
}
.cls-10 {
fill: #e6e6e6;
}
.cls-11 {
fill: #b8c1ce;
}
.cls-12 {
fill: #ccc;
}
.cls-13 {
fill: #5b7484;
}
.cls-14 {
stroke: #556a8a;
}
.cls-15 {
stroke: #00bcf2;
}
.cls-16 {
fill: #008272;
}
.cls-17 {
fill: #bad80a;
}
</style>
</defs>
<title>M365-education</title>
<g>
<g>
<g>
<path class="cls-1" d="M113.2,39.53v-.35a13.84,13.84,0,0,0-.29-3.47,12.49,12.49,0,0,0-20.56-8.94A14.53,14.53,0,0,0,80.18,21C71,21,64,29,63.88,38.09c0,.62.16,1.09.16,1.72-4.84,2.34-7.64,6.4-7.64,11.55,0,7.36,5.79,13.26,13.46,13.69.71,5.11,5.29,9.86,13.14,9.86,6.62,0,10.57.54,15.4-4.9a16.27,16.27,0,0,0,7.7,2.1c9.28,0,16.64-8.22,16.64-17.5A16.19,16.19,0,0,0,113.2,39.53Z"/>
<path class="cls-1" d="M293,56.2a15.9,15.9,0,0,1,8.13,2.24A21,21,0,0,1,340,56.25c.34,0,.68-.05,1-.05a17.91,17.91,0,0,1,18,17.9C359,84,350.94,91,341,91H297c-8.84,0-20-3.9-20-18.9A15.91,15.91,0,0,1,293,56.2Z"/>
<rect class="cls-2" x="64.2" y="3" width="271" height="148"/>
<g>
<polygon class="cls-3" points="264.39 25 129.4 25 79 53 313 53 264.39 25"/>
<polygon class="cls-4" points="86.72 52 129.92 27 263.85 27 305.52 52 86.72 52"/>
<rect class="cls-3" x="79" y="53" width="234" height="68"/>
<rect class="cls-5" x="163.5" y="-28.5" width="65" height="230" transform="translate(282.5 -109.5) rotate(90)"/>
<polygon class="cls-3" points="196.5 16.5 195.5 16.5 145 53 145 121 247 121 247 53 196.5 16.5"/>
<polygon class="cls-6" points="147 121 147 54.03 196 18.6 245 53 245 121 147 121"/>
<rect class="cls-7" x="185.2" y="91" width="22" height="30"/>
<rect class="cls-8" x="187" y="93" width="18" height="28"/>
<circle class="cls-9" cx="195.9" cy="35" r="11"/>
</g>
<rect class="cls-3" x="89" y="61" width="19" height="22"/>
<rect class="cls-10" x="89.5" y="64.5" width="18" height="15" transform="translate(170.5 -26.5) rotate(90)"/>
<rect class="cls-11" x="91" y="63" width="15" height="4"/>
<rect class="cls-11" x="91" y="72" width="15" height="4"/>
<rect class="cls-7" x="154" y="61" width="22" height="32"/>
<rect class="cls-12" x="151" y="68" width="28" height="18" transform="translate(242 -88) rotate(90)"/>
<rect class="cls-3" x="91" y="71" width="15" height="2"/>
<g>
<rect class="cls-3" x="118" y="61" width="19" height="22"/>
<rect class="cls-10" x="118.5" y="64.5" width="18" height="15" transform="translate(199.5 -55.5) rotate(90)"/>
<rect class="cls-11" x="120" y="63" width="15" height="4"/>
<rect class="cls-11" x="120" y="72" width="15" height="4"/>
<rect class="cls-3" x="120" y="71" width="15" height="2"/>
</g>
<rect class="cls-3" x="89" y="88" width="19" height="22"/>
<rect class="cls-10" x="89.5" y="91.5" width="18" height="15" transform="translate(197.5 0.5) rotate(90)"/>
<rect class="cls-11" x="91" y="90" width="15" height="4"/>
<rect class="cls-11" x="91" y="99" width="15" height="4"/>
<rect class="cls-3" x="91" y="98" width="15" height="2"/>
<g>
<rect class="cls-3" x="118" y="88" width="19" height="22"/>
<rect class="cls-10" x="118.5" y="91.5" width="18" height="15" transform="translate(226.5 -28.5) rotate(90)"/>
<rect class="cls-11" x="120" y="90" width="15" height="4"/>
<rect class="cls-11" x="120" y="99" width="15" height="4"/>
<rect class="cls-3" x="120" y="98" width="15" height="2"/>
</g>
<rect class="cls-13" x="255" y="61" width="19" height="22"/>
<rect class="cls-10" x="255.5" y="64.5" width="18" height="15" transform="translate(336.5 -192.5) rotate(90)"/>
<rect class="cls-11" x="257" y="63" width="15" height="4"/>
<rect class="cls-11" x="257" y="72" width="15" height="4"/>
<rect class="cls-13" x="257" y="71" width="15" height="2"/>
<g>
<rect class="cls-13" x="284" y="61" width="19" height="22"/>
<rect class="cls-10" x="284.5" y="64.5" width="18" height="15" transform="translate(365.5 -221.5) rotate(90)"/>
<rect class="cls-11" x="286" y="63" width="15" height="4"/>
<rect class="cls-11" x="286" y="73" width="15" height="4"/>
<rect class="cls-13" x="286" y="71" width="15" height="2"/>
</g>
<rect class="cls-13" x="255" y="88" width="19" height="22"/>
<rect class="cls-10" x="255.5" y="91.5" width="18" height="15" transform="translate(363.5 -165.5) rotate(90)"/>
<rect class="cls-11" x="257" y="90" width="15" height="4"/>
<rect class="cls-11" x="257" y="99" width="15" height="4"/>
<rect class="cls-13" x="257" y="98" width="15" height="2"/>
<g>
<rect class="cls-13" x="284" y="88" width="19" height="22"/>
<rect class="cls-10" x="284.5" y="91.5" width="18" height="15" transform="translate(392.5 -194.5) rotate(90)"/>
<rect class="cls-11" x="286" y="90" width="15" height="4"/>
<rect class="cls-11" x="286" y="99" width="15" height="4"/>
<rect class="cls-13" x="286" y="98" width="15" height="2"/>
</g>
<rect class="cls-7" x="156" y="66" width="18" height="2"/>
<rect class="cls-7" x="156.2" y="86" width="18" height="2"/>
<rect class="cls-7" x="164" y="68" width="2" height="19"/>
<rect class="cls-8" x="156" y="88" width="18" height="3"/>
<rect class="cls-8" x="156" y="63" width="18" height="3"/>
<rect class="cls-7" x="185" y="61" width="22" height="26"/>
<rect class="cls-12" x="185" y="65" width="22" height="18" transform="translate(270 -122) rotate(90)"/>
<rect class="cls-7" x="187" y="66" width="18" height="2"/>
<rect class="cls-7" x="195" y="67" width="2" height="19"/>
<rect class="cls-8" x="187" y="63" width="18" height="3"/>
<rect class="cls-7" x="217" y="61" width="22" height="32"/>
<rect class="cls-12" x="214" y="68" width="28" height="18" transform="translate(305 -151) rotate(90)"/>
<rect class="cls-7" x="219" y="66" width="18" height="2"/>
<rect class="cls-7" x="219" y="86" width="18" height="2"/>
<rect class="cls-7" x="227" y="68" width="2" height="19"/>
<rect class="cls-8" x="219" y="88" width="18" height="3"/>
<rect class="cls-8" x="219" y="63" width="18" height="3"/>
<rect class="cls-11" x="187" y="93" width="18" height="5"/>
<polyline class="cls-14" points="203 35 196 35 196 28"/>
</g>
<path class="cls-15" d="M342.2,80.16v-.22a9,9,0,0,0-.4-2.19,8,8,0,0,0-13.15-5.64,9.23,9.23,0,0,0-7.71-3.64c-5.82,0-10.21,5.07-10.31,10.79,0,.39.1.69.1,1.08a7.89,7.89,0,0,0-4.83,7.29,8.74,8.74,0,0,0,8.5,8.65c.45,3.23,3.34,6.23,8.3,6.23,4.18,0,6.68.34,9.73-3.09a10.28,10.28,0,0,0,4.86,1.33c5.86,0,10.72-5.19,10.72-11.05A11.52,11.52,0,0,0,342.2,80.16Z"/>
</g>
<path class="cls-16" d="M102.69,111.2a7.84,7.84,0,0,0,1.31-4.37,7.4,7.4,0,0,0-5.64-7.37A9.1,9.1,0,0,0,99,96.1c0-4.74-3.58-8.59-8-8.59a7.5,7.5,0,0,0-3.27.76A10.17,10.17,0,0,0,78,80c-5.52,0-10,4.8-10,10.73,0,.39,0,.77.06,1.15A7.35,7.35,0,0,0,62,99.32a7.87,7.87,0,0,0,1.09,4c-4.74,1.6-8.09,5.44-8.09,9.93C55,119.2,60.82,124,68,124H99c3,0,6.85-4.3,6.85-7.51A5.86,5.86,0,0,0,102.69,111.2Z"/>
<path class="cls-17" d="M83.64,107A6,6,0,0,0,76,99.36a6,6,0,0,0-11.83-.61,7,7,0,0,0-9.81,8.36A8.94,8.94,0,0,0,44,116c0,5,4,8,9,8H82c4.42,0,9-4.58,9-9A8,8,0,0,0,83.64,107Z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 8.1 KiB

View File

@ -1,7 +1,7 @@
---
layout: HubPage
hide_bc: true
title: Microsoft Education documentation and resources | Microsoft Docs
title: Microsoft 365 Education documentation and resources | Microsoft Docs
description: Learn about product documentation and resources available for school IT administrators, teachers, students, and education app developers.
author: CelesteDG
ms.author: celested
@ -10,7 +10,7 @@ ms.author: celested
<div class="container">
<ul class="cardsY panelContent featuredContent">
<li>
<a href="http://www.microsoft.com/education">
<a href="http://www.microsoft.com/education" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -28,7 +28,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="https://docs.microsoft.com/education/get-started/get-started-with-microsoft-education">
<a href="https://docs.microsoft.com/education/get-started/get-started-with-microsoft-education" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -46,7 +46,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="/education/windows/test-windows10s-for-edu">
<a href="/education/windows/test-windows10s-for-edu" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -75,7 +75,26 @@ ms.author: celested
<a href="#itpro-all"></a>
<ul id="itpro-all" class="cardsC">
<li>
<a href="https://docs.microsoft.com/education/get-started/get-started-with-microsoft-education">
<a href="https://www.microsoft.com/en-us/education/buy-license/microsoft365/default.aspx" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="images/M365-education.svg" alt="Learn about Microsoft 365 Education" />
</div>
</div>
<div class="cardText">
<h3>Microsoft 365 Education</h3>
<p>Find out how to empower educators to unlock creativity, promote teamwork, and provide a simple and safe experience in a single, affordable solution built for education.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="https://docs.microsoft.com/education/get-started/get-started-with-microsoft-education" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -94,7 +113,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="https://support.office.com/en-us/article/Set-up-Office-365-for-business-6a3a29a0-e616-4713-99d1-15eda62d04fa?ui=en-US&amp;rs=en-US&amp;ad=US&amp;fromAR=1#ID0EAAAAEAAA=Education">
<a href="https://support.office.com/en-us/article/Set-up-Office-365-for-business-6a3a29a0-e616-4713-99d1-15eda62d04fa?ui=en-US&amp;rs=en-US&amp;ad=US&amp;fromAR=1#ID0EAAAAEAAA=Education" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -113,7 +132,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="/intune-education">
<a href="/intune-education" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -132,7 +151,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="/education/windows">
<a href="/education/windows" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -151,7 +170,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="https://support.office.com/article/Overview-of-School-Data-Sync-f3d1147b-4ade-4905-8518-508e729f2e91">
<a href="https://support.office.com/article/Overview-of-School-Data-Sync-f3d1147b-4ade-4905-8518-508e729f2e91" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -170,7 +189,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="/azure/active-directory/">
<a href="/azure/active-directory/" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -189,7 +208,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="/microsoft-store/index?toc=/microsoft-store/education/toc.json">
<a href="/microsoft-store/index?toc=/microsoft-store/education/toc.json" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -208,7 +227,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="/education/windows/school-get-minecraft">
<a href="/education/windows/school-get-minecraft" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -227,7 +246,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="/education/windows/use-set-up-school-pcs-app">
<a href="/education/windows/use-set-up-school-pcs-app" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -246,7 +265,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="https://onedrive.live.com/view.aspx?resid=91F4E618548FC604!2261&ithint=file%2cdocx&app=Word&authkey=!AOgLvpbaerOOfwM">
<a href="https://onedrive.live.com/view.aspx?resid=91F4E618548FC604!2261&ithint=file%2cdocx&app=Word&authkey=!AOgLvpbaerOOfwM" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -275,7 +294,7 @@ ms.author: celested
<a href="#teachers-all"></a>
<ul id="teachers-all" class="cardsC">
<li>
<a href="http://support.microsoft.com/products/education">
<a href="http://support.microsoft.com/products/education" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -294,7 +313,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="http://support.office.com">
<a href="http://support.office.com" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -313,7 +332,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="http://support.microsoft.com/products/windows">
<a href="http://support.microsoft.com/products/windows" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -332,7 +351,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="/microsoft-store/index?toc=/microsoft-store/education/toc.json">
<a href="/microsoft-store/index?toc=/microsoft-store/education/toc.json" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -351,7 +370,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="/education/windows/teacher-get-minecraft">
<a href="/education/windows/teacher-get-minecraft" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -370,7 +389,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="http://education.microsoft.com">
<a href="http://education.microsoft.com" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -389,7 +408,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="https://education.microsoft.com/courses-and-resources/resources/meet-microsoft-teams">
<a href="https://education.microsoft.com/courses-and-resources/resources/meet-microsoft-teams" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -408,7 +427,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="/education/windows/use-set-up-school-pcs-app">
<a href="/education/windows/use-set-up-school-pcs-app" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -437,7 +456,7 @@ ms.author: celested
<a href="#students-all"></a>
<ul id="students-all" class="cardsC">
<li>
<a href="http://support.microsoft.com/products/education">
<a href="http://support.microsoft.com/products/education" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -456,7 +475,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="http://support.office.com">
<a href="http://support.office.com" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -475,7 +494,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="http://support.microsoft.com/products/windows">
<a href="http://support.microsoft.com/products/windows" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -494,7 +513,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="http://imagine.microsoft.com">
<a href="http://imagine.microsoft.com" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -523,7 +542,7 @@ ms.author: celested
<a href="#developer-all"></a>
<ul id="developer-all" class="cardsC">
<li>
<a href="/windows/uwp/apps-for-education/">
<a href="/windows/uwp/apps-for-education/" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -542,7 +561,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="/windows/uwp/apps-for-education/take-a-test-api">
<a href="/windows/uwp/apps-for-education/take-a-test-api" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -561,7 +580,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="https://dev.office.com/industry-verticals/edu">
<a href="https://dev.office.com/industry-verticals/edu" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -590,7 +609,7 @@ ms.author: celested
<a href="#partner-all"></a>
<ul id="partner-all" class="cardsC">
<li>
<a href="https://www.mepn.com">
<a href="https://www.mepn.com" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -609,7 +628,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="https://www.mepn.com/MEPN/AEPHome.aspx">
<a href="https://www.mepn.com/MEPN/AEPHome.aspx" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -628,7 +647,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="https://www.mepn.com/MEPN/AEPSearch.aspx">
<a href="https://www.mepn.com/MEPN/AEPSearch.aspx" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
@ -647,7 +666,7 @@ ms.author: celested
</a>
</li>
<li>
<a href="https://www.yammer.com/mepn/">
<a href="https://www.yammer.com/mepn/" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">

View File

@ -0,0 +1,171 @@
<svg id="ICONS" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 140">
<defs>
<style>
.cls-1 {
fill: #80def9;
}
.cls-14, .cls-2 {
fill: none;
}
.cls-3 {
fill: #556a8a;
}
.cls-4 {
fill: #868787;
}
.cls-5 {
fill: #e5e5e5;
}
.cls-6 {
fill: #b72b2b;
}
.cls-7 {
fill: #a80000;
}
.cls-15, .cls-8, .cls-9 {
fill: #fff;
}
.cls-9 {
stroke: #5b7484;
}
.cls-14, .cls-15, .cls-9 {
stroke-miterlimit: 10;
stroke-width: 2px;
}
.cls-10 {
fill: #e6e6e6;
}
.cls-11 {
fill: #b8c1ce;
}
.cls-12 {
fill: #ccc;
}
.cls-13 {
fill: #5b7484;
}
.cls-14 {
stroke: #556a8a;
}
.cls-15 {
stroke: #00bcf2;
}
.cls-16 {
fill: #008272;
}
.cls-17 {
fill: #bad80a;
}
</style>
</defs>
<title>M365-education</title>
<g>
<g>
<g>
<path class="cls-1" d="M113.2,39.53v-.35a13.84,13.84,0,0,0-.29-3.47,12.49,12.49,0,0,0-20.56-8.94A14.53,14.53,0,0,0,80.18,21C71,21,64,29,63.88,38.09c0,.62.16,1.09.16,1.72-4.84,2.34-7.64,6.4-7.64,11.55,0,7.36,5.79,13.26,13.46,13.69.71,5.11,5.29,9.86,13.14,9.86,6.62,0,10.57.54,15.4-4.9a16.27,16.27,0,0,0,7.7,2.1c9.28,0,16.64-8.22,16.64-17.5A16.19,16.19,0,0,0,113.2,39.53Z"/>
<path class="cls-1" d="M293,56.2a15.9,15.9,0,0,1,8.13,2.24A21,21,0,0,1,340,56.25c.34,0,.68-.05,1-.05a17.91,17.91,0,0,1,18,17.9C359,84,350.94,91,341,91H297c-8.84,0-20-3.9-20-18.9A15.91,15.91,0,0,1,293,56.2Z"/>
<rect class="cls-2" x="64.2" y="3" width="271" height="148"/>
<g>
<polygon class="cls-3" points="264.39 25 129.4 25 79 53 313 53 264.39 25"/>
<polygon class="cls-4" points="86.72 52 129.92 27 263.85 27 305.52 52 86.72 52"/>
<rect class="cls-3" x="79" y="53" width="234" height="68"/>
<rect class="cls-5" x="163.5" y="-28.5" width="65" height="230" transform="translate(282.5 -109.5) rotate(90)"/>
<polygon class="cls-3" points="196.5 16.5 195.5 16.5 145 53 145 121 247 121 247 53 196.5 16.5"/>
<polygon class="cls-6" points="147 121 147 54.03 196 18.6 245 53 245 121 147 121"/>
<rect class="cls-7" x="185.2" y="91" width="22" height="30"/>
<rect class="cls-8" x="187" y="93" width="18" height="28"/>
<circle class="cls-9" cx="195.9" cy="35" r="11"/>
</g>
<rect class="cls-3" x="89" y="61" width="19" height="22"/>
<rect class="cls-10" x="89.5" y="64.5" width="18" height="15" transform="translate(170.5 -26.5) rotate(90)"/>
<rect class="cls-11" x="91" y="63" width="15" height="4"/>
<rect class="cls-11" x="91" y="72" width="15" height="4"/>
<rect class="cls-7" x="154" y="61" width="22" height="32"/>
<rect class="cls-12" x="151" y="68" width="28" height="18" transform="translate(242 -88) rotate(90)"/>
<rect class="cls-3" x="91" y="71" width="15" height="2"/>
<g>
<rect class="cls-3" x="118" y="61" width="19" height="22"/>
<rect class="cls-10" x="118.5" y="64.5" width="18" height="15" transform="translate(199.5 -55.5) rotate(90)"/>
<rect class="cls-11" x="120" y="63" width="15" height="4"/>
<rect class="cls-11" x="120" y="72" width="15" height="4"/>
<rect class="cls-3" x="120" y="71" width="15" height="2"/>
</g>
<rect class="cls-3" x="89" y="88" width="19" height="22"/>
<rect class="cls-10" x="89.5" y="91.5" width="18" height="15" transform="translate(197.5 0.5) rotate(90)"/>
<rect class="cls-11" x="91" y="90" width="15" height="4"/>
<rect class="cls-11" x="91" y="99" width="15" height="4"/>
<rect class="cls-3" x="91" y="98" width="15" height="2"/>
<g>
<rect class="cls-3" x="118" y="88" width="19" height="22"/>
<rect class="cls-10" x="118.5" y="91.5" width="18" height="15" transform="translate(226.5 -28.5) rotate(90)"/>
<rect class="cls-11" x="120" y="90" width="15" height="4"/>
<rect class="cls-11" x="120" y="99" width="15" height="4"/>
<rect class="cls-3" x="120" y="98" width="15" height="2"/>
</g>
<rect class="cls-13" x="255" y="61" width="19" height="22"/>
<rect class="cls-10" x="255.5" y="64.5" width="18" height="15" transform="translate(336.5 -192.5) rotate(90)"/>
<rect class="cls-11" x="257" y="63" width="15" height="4"/>
<rect class="cls-11" x="257" y="72" width="15" height="4"/>
<rect class="cls-13" x="257" y="71" width="15" height="2"/>
<g>
<rect class="cls-13" x="284" y="61" width="19" height="22"/>
<rect class="cls-10" x="284.5" y="64.5" width="18" height="15" transform="translate(365.5 -221.5) rotate(90)"/>
<rect class="cls-11" x="286" y="63" width="15" height="4"/>
<rect class="cls-11" x="286" y="73" width="15" height="4"/>
<rect class="cls-13" x="286" y="71" width="15" height="2"/>
</g>
<rect class="cls-13" x="255" y="88" width="19" height="22"/>
<rect class="cls-10" x="255.5" y="91.5" width="18" height="15" transform="translate(363.5 -165.5) rotate(90)"/>
<rect class="cls-11" x="257" y="90" width="15" height="4"/>
<rect class="cls-11" x="257" y="99" width="15" height="4"/>
<rect class="cls-13" x="257" y="98" width="15" height="2"/>
<g>
<rect class="cls-13" x="284" y="88" width="19" height="22"/>
<rect class="cls-10" x="284.5" y="91.5" width="18" height="15" transform="translate(392.5 -194.5) rotate(90)"/>
<rect class="cls-11" x="286" y="90" width="15" height="4"/>
<rect class="cls-11" x="286" y="99" width="15" height="4"/>
<rect class="cls-13" x="286" y="98" width="15" height="2"/>
</g>
<rect class="cls-7" x="156" y="66" width="18" height="2"/>
<rect class="cls-7" x="156.2" y="86" width="18" height="2"/>
<rect class="cls-7" x="164" y="68" width="2" height="19"/>
<rect class="cls-8" x="156" y="88" width="18" height="3"/>
<rect class="cls-8" x="156" y="63" width="18" height="3"/>
<rect class="cls-7" x="185" y="61" width="22" height="26"/>
<rect class="cls-12" x="185" y="65" width="22" height="18" transform="translate(270 -122) rotate(90)"/>
<rect class="cls-7" x="187" y="66" width="18" height="2"/>
<rect class="cls-7" x="195" y="67" width="2" height="19"/>
<rect class="cls-8" x="187" y="63" width="18" height="3"/>
<rect class="cls-7" x="217" y="61" width="22" height="32"/>
<rect class="cls-12" x="214" y="68" width="28" height="18" transform="translate(305 -151) rotate(90)"/>
<rect class="cls-7" x="219" y="66" width="18" height="2"/>
<rect class="cls-7" x="219" y="86" width="18" height="2"/>
<rect class="cls-7" x="227" y="68" width="2" height="19"/>
<rect class="cls-8" x="219" y="88" width="18" height="3"/>
<rect class="cls-8" x="219" y="63" width="18" height="3"/>
<rect class="cls-11" x="187" y="93" width="18" height="5"/>
<polyline class="cls-14" points="203 35 196 35 196 28"/>
</g>
<path class="cls-15" d="M342.2,80.16v-.22a9,9,0,0,0-.4-2.19,8,8,0,0,0-13.15-5.64,9.23,9.23,0,0,0-7.71-3.64c-5.82,0-10.21,5.07-10.31,10.79,0,.39.1.69.1,1.08a7.89,7.89,0,0,0-4.83,7.29,8.74,8.74,0,0,0,8.5,8.65c.45,3.23,3.34,6.23,8.3,6.23,4.18,0,6.68.34,9.73-3.09a10.28,10.28,0,0,0,4.86,1.33c5.86,0,10.72-5.19,10.72-11.05A11.52,11.52,0,0,0,342.2,80.16Z"/>
</g>
<path class="cls-16" d="M102.69,111.2a7.84,7.84,0,0,0,1.31-4.37,7.4,7.4,0,0,0-5.64-7.37A9.1,9.1,0,0,0,99,96.1c0-4.74-3.58-8.59-8-8.59a7.5,7.5,0,0,0-3.27.76A10.17,10.17,0,0,0,78,80c-5.52,0-10,4.8-10,10.73,0,.39,0,.77.06,1.15A7.35,7.35,0,0,0,62,99.32a7.87,7.87,0,0,0,1.09,4c-4.74,1.6-8.09,5.44-8.09,9.93C55,119.2,60.82,124,68,124H99c3,0,6.85-4.3,6.85-7.51A5.86,5.86,0,0,0,102.69,111.2Z"/>
<path class="cls-17" d="M83.64,107A6,6,0,0,0,76,99.36a6,6,0,0,0-11.83-.61,7,7,0,0,0-9.81,8.36A8.94,8.94,0,0,0,44,116c0,5,4,8,9,8H82c4.42,0,9-4.58,9-9A8,8,0,0,0,83.64,107Z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 8.1 KiB

View File

@ -4,7 +4,7 @@ hide_bc: true
author: CelesteDG
ms.author: celested
ms.topic: hub-page
keywords: Microsoft 365, Microsoft 365 documentation, Microsoft 365 for business, Microsoft 365 for enterprise, enterprise, business, docs, documentation
keywords: Microsoft 365, Microsoft 365 documentation, Microsoft 365 for business, Microsoft 365 for enterprise, Microsoft 365 for education, enterprise, business, education, docs, documentation
title: Microsoft 365 Documentation
description: Find documentation and resources for Microsoft 365--a complete, intelligent solution, including Office 365, Windows 10, and Enterprise Mobility + Security, that empowers everyone to be creative and work together, securely.
---
@ -21,13 +21,13 @@ description: Find documentation and resources for Microsoft 365--a complete, int
<li class="fullSpan intro">[Microsoft 365](https://www.microsoft.com/microsoft-365/default.aspx) is a complete, intelligent solution, including Office 365, Windows 10, and Enterprise Mobility + Security, that empowers everyone to be creative and work together, securely.
</li>
<li>
<a href="https://docs.microsoft.com/microsoft-365-enterprise/">
<a href="https://docs.microsoft.com/microsoft-365-enterprise/" target="blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="/media/hubs/microsoft365/M365-enterprise.svg" alt="" />
<img src="/media/hubs/microsoft365/M365-enterprise.svg" alt="Microsoft 365 Enterprise documentation and resources" />
</div>
</div>
<div class="cardText">
@ -41,13 +41,13 @@ description: Find documentation and resources for Microsoft 365--a complete, int
</a>
</li>
<li>
<a href="https://docs.microsoft.com/microsoft-365-business/">
<a href="https://docs.microsoft.com/microsoft-365-business/" target="blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="/media/hubs/microsoft365/M365-business.svg" alt="" />
<img src="/media/hubs/microsoft365/M365-business.svg" alt="Microsoft 365 Business documentation and resources" />
</div>
</div>
<div class="cardText">
@ -60,6 +60,26 @@ description: Find documentation and resources for Microsoft 365--a complete, int
</div>
</a>
</li>
<li>
<a href="https://docs.microsoft.com/education/" target="blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="/media/hubs/microsoft365/M365-education.svg" alt="Microsoft 365 Education documentation and resources" />
</div>
</div>
<div class="cardText">
<br />
<h3>Microsoft 365 Education</h3>
<p>Microsoft 365 Education empowers educators to unlock creativity, promote teamwork, and provide a simple and safe experience in a single, affordable solution built for education.</p>
</div>
</div>
</div>
</div>
</a>
</li>
</ul>
</li>
</ul>

View File

@ -101,6 +101,7 @@
#### [Running a Locally Installed Application Inside a Virtual Environment with Virtualized Applications](app-v/appv-running-locally-installed-applications-inside-a-virtual-environment.md)
## [Service Host process refactoring](svchost-service-refactoring.md)
## [Per-user services in Windows](per-user-services-in-windows.md)
## [Disabling System Services in Windows Server](https://docs.microsoft.com/windows-server/security/windows-services/security-guidelines-for-disabling-system-services-in-windows-server)
## [Understand apps in Windows 10](apps-in-windows-10.md)
## [Deploy app upgrades on Windows 10 Mobile](deploy-app-upgrades-windows-10-mobile.md)
## [Change history for Application management](change-history-for-application-management.md)

View File

@ -71,7 +71,7 @@ See the following table for a summary of the management settings for Windows 10
| Setting | UI | Group Policy | MDM policy | Registry | Command line |
| - | :-: | :-: | :-: | :-: | :-: |
| [1. Certificate trust lists](#certificate-trust-lists) | | ![Check mark](images/checkmark.png) | | | |
| [1. Automatic Root Certificates Update](#automatic-root-certificates-update) | | ![Check mark](images/checkmark.png) | | | |
| [2. Cortana and Search](#bkmk-cortana) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) |
| [3. Date & Time](#bkmk-datetime) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | |
| [4. Device metadata retrieval](#bkmk-devinst) | | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | |
@ -124,7 +124,7 @@ See the following table for a summary of the management settings for Windows Ser
| Setting | UI | Group Policy | Registry | Command line |
| - | :-: | :-: | :-: | :-: |
| [1. Certificate trust lists](#certificate-trust-lists) | | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | |
| [1. Automatic Root Certificates Update](#automatic-root-certificates-update) | | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | |
| [2. Cortana and Search](#bkmk-cortana) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | |
| [3. Date & Time](#bkmk-datetime) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | |
| [4. Device metadata retrieval](#bkmk-devinst) | | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | |
@ -150,7 +150,7 @@ See the following table for a summary of the management settings for Windows Ser
| Setting | Group Policy | Registry | Command line |
| - | :-: | :-: | :-: | :-: | :-: |
| [1. Certificate trust lists](#certificate-trust-lists) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | |
| [1. Automatic Root Certificates Update](#automatic-root-certificates-update) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | |
| [3. Date & Time](#bkmk-datetime) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | |
| [6. Font streaming](#font-streaming) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | |
| [13. Network Connection Status Indicator](#bkmk-ncsi) | ![Check mark](images/checkmark.png) | | |
@ -165,7 +165,7 @@ See the following table for a summary of the management settings for Windows Ser
| Setting | Registry | Command line |
| - | :-: | :-: | :-: | :-: | :-: |
| [1. Certificate trust lists](#certificate-trust-lists) | ![Check mark](images/checkmark.png) | |
| [1. Automatic Root Certificates Update](#automatic-root-certificates-update) | ![Check mark](images/checkmark.png) | |
| [3. Date & Time](#bkmk-datetime) | ![Check mark](images/checkmark.png) | |
| [20. Teredo](#bkmk-teredo) | | ![Check mark](images/checkmark.png) |
| [27. Windows Update](#bkmk-wu) | ![Check mark](images/checkmark.png) | |
@ -174,16 +174,15 @@ See the following table for a summary of the management settings for Windows Ser
Use the following sections for more information about how to configure each setting.
### <a href="" id="certificate-trust-lists"></a>1. Certificate trust lists
### <a href="" id="automatic-root-certificates-update"></a>1. Automatic Root Certificates Update
A certificate trust list is a predefined list of items, such as a list of certificate hashes or a list of file name, that are signed by a trusted entity. Windows automatically downloads an updated certificate trust list when it is available.
To turn off the automatic download of an updated certificate trust list, you can turn off automatic root updates, which also includes the disallowed certificate list and the pin rules list.
The Automatic Root Certificates Update component is designed to automatically check the list of trusted authorities on Windows Update to see if an update is available.
For more information, see [Automatic Root Certificates Update Configuration](https://technet.microsoft.com/library/cc733922.aspx).
Although not recommended, you can turn off Automatic Root Certificates Update, which also prevents updates to the disallowed certificate list and the pin rules list.
> [!CAUTION]
> By not automatically downloading the root certificates, the device might have not be able to connect to some websites.
For Windows 10, Windows Server 2016 with Desktop Experience, and Windows Server 2016 Server Core:
- Enable the Group Policy: **Computer Configuration** > **Administrative Templates** > **System** > **Internet Communication Management** > **Internet Communication Settings** > **Turn off Automatic Root Certificates Update**

View File

@ -80,5 +80,6 @@ When installing the BitLocker optional component on a server you will also need
| [BitLocker Recovery Guide](bitlocker-recovery-guide-plan.md)| This topic for IT professionals describes how to recover BitLocker keys from AD DS. |
| [Protect BitLocker from pre-boot attacks](protect-bitlocker-from-pre-boot-attacks.md)| This detailed guide will help you understand the circumstances under which the use of pre-boot authentication is recommended for devices running Windows 10, Windows 8.1, Windows 8, or Windows 7; and when it can be safely omitted from a devices configuration. |
| [Protecting cluster shared volumes and storage area networks with BitLocker](protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md)| This topic for IT pros describes how to protect CSVs and SANs with BitLocker.|
| [Enabling Secure Boot and BitLocker Device Encryption on Windows 10 IoT Core](https://developer.microsoft.com/windows/iot/docs/securebootandbitlocker) | This topic covers how to use BitLocker with Windows 10 IoT Core |
If you're looking for info on how to use it with Windows 10 IoT Core, see [Enabling Secure Boot and BitLocker Device Encryption on Windows 10 IoT Core](https://developer.microsoft.com/windows/iot/docs/securebootandbitlocker).
Not finding the content you need? Windows 10 users can tell us what content they need using [Feedback Hub](http://userfeedback/UserFeedback/Home/EditContext/897).

Binary file not shown.

After

Width:  |  Height:  |  Size: 933 B