deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-05-16 07:17:24 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merged PR 3416: 9/25 PM Publish

Browse Source
This commit is contained in:
Alma Jenks 2017-09-25 22:31:12 +00:00
commit d220819779
20 changed files with 523 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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>
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

12
bcs/index.md
View File

@ -786,7 +786,7 @@ description: Learn about the product documentation and resources available for M
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <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> </div>
<div class="cardText"> <div class="cardText">
@ -805,7 +805,7 @@ description: Learn about the product documentation and resources available for M
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <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> </div>
<div class="cardText"> <div class="cardText">
@ -824,7 +824,7 @@ description: Learn about the product documentation and resources available for M
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <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> </div>
<div class="cardText"> <div class="cardText">
@ -843,7 +843,7 @@ description: Learn about the product documentation and resources available for M
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <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> </div>
<div class="cardText"> <div class="cardText">
@ -862,7 +862,7 @@ description: Learn about the product documentation and resources available for M
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <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> </div>
<div class="cardText"> <div class="cardText">
@ -881,7 +881,7 @@ description: Learn about the product documentation and resources available for M
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <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> </div>
<div class="cardText"> <div class="cardText">

15
devices/surface-hub/appendix-a-powershell-scripts-for-surface-hub.md
View File

@ -9,7 +9,7 @@ ms.sitesec: library
ms.pagetype: surfacehub ms.pagetype: surfacehub
author: jdeckerms author: jdeckerms
ms.author: jdecker ms.author: jdecker
ms.date: 08/16/2017 ms.date: 09/25/2017
ms.localizationpriority: medium ms.localizationpriority: medium
--- ---
@ -298,11 +298,6 @@ PrintSuccess "Connected to Lync Server Remote PowerShell"
Import-PSSession $sessExchange -AllowClobber -WarningAction SilentlyContinue Import-PSSession $sessExchange -AllowClobber -WarningAction SilentlyContinue
Import-PSSession $sessLync -AllowClobber -WarningAction SilentlyContinue Import-PSSession $sessLync -AllowClobber -WarningAction SilentlyContinue
# In case there was any uncaught errors
ExitIfError("Remote connections failed. Please check your credentials and try again.")
## Create the Exchange mailbox ## ## Create the Exchange mailbox ##
# Note: These exchange commandlets do not always throw their errors as exceptions # Note: These exchange commandlets do not always throw their errors as exceptions
@ -669,11 +664,6 @@ catch
Import-PSSession $sessExchange -AllowClobber -WarningAction SilentlyContinue Import-PSSession $sessExchange -AllowClobber -WarningAction SilentlyContinue
Import-PSSession $sessCS -AllowClobber -WarningAction SilentlyContinue Import-PSSession $sessCS -AllowClobber -WarningAction SilentlyContinue
# In case there was any uncaught errors
ExitIfError "Remote connection failed. Please check your credentials and try again."
## Create the Exchange mailbox ## ## Create the Exchange mailbox ##
# Note: These exchange commandlets do not always throw their errors as exceptions # Note: These exchange commandlets do not always throw their errors as exceptions
@ -1571,8 +1561,7 @@ catch
Import-PSSession $sessCS -AllowClobber Import-PSSession $sessCS -AllowClobber
# In case there was any uncaught errors
ExitIfError("Remote connection failed. Please check your credentials and try again.")
Write-Host "--------------------------------------------------------------." -foregroundcolor "magenta" Write-Host "--------------------------------------------------------------." -foregroundcolor "magenta"
# Getting registrar pool # Getting registrar pool

3
devices/surface-hub/change-history-surface-hub.md
View File

@ -8,7 +8,7 @@ ms.sitesec: library
ms.pagetype: surfacehub ms.pagetype: surfacehub
author: jdeckerms author: jdeckerms
ms.author: jdecker ms.author: jdecker
ms.date: 08/17/2017 ms.date: 09/25/2017
ms.localizationpriority: medium ms.localizationpriority: medium
--- ---
@ -21,6 +21,7 @@ This topic lists new and updated topics in the [Surface Hub Admin Guide]( surfac
New or changed topic | Description New or changed topic | Description
--- | --- --- | ---
[Top support solutions for Surface Hub](support-solutions-surface-hub.md) | New [Top support solutions for Surface Hub](support-solutions-surface-hub.md) | New
[PowerShell for Surface Hub](appendix-a-powershell-scripts-for-surface-hub.md) | Updated account creation scripts
## August 2017 ## August 2017

171
education/images/M365-education.svg Normal file
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>
Side by Side

After

Width:  |  Height:  |  Size: 8.1 KiB

85
education/index.md
View File

@ -1,7 +1,7 @@
--- ---
layout: HubPage layout: HubPage
hide_bc: true 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. description: Learn about product documentation and resources available for school IT administrators, teachers, students, and education app developers.
author: CelesteDG author: CelesteDG
ms.author: celested ms.author: celested
@ -10,7 +10,7 @@ ms.author: celested
<div class="container"> <div class="container">
<ul class="cardsY panelContent featuredContent"> <ul class="cardsY panelContent featuredContent">
<li> <li>
<a href="http://www.microsoft.com/education"> <a href="http://www.microsoft.com/education" target="_blank">
<div class="cardSize"> <div class="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -28,7 +28,7 @@ ms.author: celested
</a> </a>
</li> </li>
<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="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -46,7 +46,7 @@ ms.author: celested
</a> </a>
</li> </li>
<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="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -75,7 +75,26 @@ ms.author: celested
<a href="#itpro-all"></a> <a href="#itpro-all"></a>
<ul id="itpro-all" class="cardsC"> <ul id="itpro-all" class="cardsC">
<li> <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="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -94,7 +113,7 @@ ms.author: celested
</a> </a>
</li> </li>
<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="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -113,7 +132,7 @@ ms.author: celested
</a> </a>
</li> </li>
<li> <li>
<a href="/intune-education"> <a href="/intune-education" target="_blank">
<div class="cardSize"> <div class="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -132,7 +151,7 @@ ms.author: celested
</a> </a>
</li> </li>
<li> <li>
<a href="/education/windows"> <a href="/education/windows" target="_blank">
<div class="cardSize"> <div class="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -151,7 +170,7 @@ ms.author: celested
</a> </a>
</li> </li>
<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="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -170,7 +189,7 @@ ms.author: celested
</a> </a>
</li> </li>
<li> <li>
<a href="/azure/active-directory/"> <a href="/azure/active-directory/" target="_blank">
<div class="cardSize"> <div class="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -189,7 +208,7 @@ ms.author: celested
</a> </a>
</li> </li>
<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="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -208,7 +227,7 @@ ms.author: celested
</a> </a>
</li> </li>
<li> <li>
<a href="/education/windows/school-get-minecraft"> <a href="/education/windows/school-get-minecraft" target="_blank">
<div class="cardSize"> <div class="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -227,7 +246,7 @@ ms.author: celested
</a> </a>
</li> </li>
<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="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -246,7 +265,7 @@ ms.author: celested
</a> </a>
</li> </li>
<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="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -275,7 +294,7 @@ ms.author: celested
<a href="#teachers-all"></a> <a href="#teachers-all"></a>
<ul id="teachers-all" class="cardsC"> <ul id="teachers-all" class="cardsC">
<li> <li>
<a href="http://support.microsoft.com/products/education"> <a href="http://support.microsoft.com/products/education" target="_blank">
<div class="cardSize"> <div class="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -294,7 +313,7 @@ ms.author: celested
</a> </a>
</li> </li>
<li> <li>
<a href="http://support.office.com"> <a href="http://support.office.com" target="_blank">
<div class="cardSize"> <div class="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -313,7 +332,7 @@ ms.author: celested
</a> </a>
</li> </li>
<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="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -332,7 +351,7 @@ ms.author: celested
</a> </a>
</li> </li>
<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="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -351,7 +370,7 @@ ms.author: celested
</a> </a>
</li> </li>
<li> <li>
<a href="/education/windows/teacher-get-minecraft"> <a href="/education/windows/teacher-get-minecraft" target="_blank">
<div class="cardSize"> <div class="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -370,7 +389,7 @@ ms.author: celested
</a> </a>
</li> </li>
<li> <li>
<a href="http://education.microsoft.com"> <a href="http://education.microsoft.com" target="_blank">
<div class="cardSize"> <div class="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -389,7 +408,7 @@ ms.author: celested
</a> </a>
</li> </li>
<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="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -408,7 +427,7 @@ ms.author: celested
</a> </a>
</li> </li>
<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="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -437,7 +456,7 @@ ms.author: celested
<a href="#students-all"></a> <a href="#students-all"></a>
<ul id="students-all" class="cardsC"> <ul id="students-all" class="cardsC">
<li> <li>
<a href="http://support.microsoft.com/products/education"> <a href="http://support.microsoft.com/products/education" target="_blank">
<div class="cardSize"> <div class="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -456,7 +475,7 @@ ms.author: celested
</a> </a>
</li> </li>
<li> <li>
<a href="http://support.office.com"> <a href="http://support.office.com" target="_blank">
<div class="cardSize"> <div class="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -475,7 +494,7 @@ ms.author: celested
</a> </a>
</li> </li>
<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="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -494,7 +513,7 @@ ms.author: celested
</a> </a>
</li> </li>
<li> <li>
<a href="http://imagine.microsoft.com"> <a href="http://imagine.microsoft.com" target="_blank">
<div class="cardSize"> <div class="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -523,7 +542,7 @@ ms.author: celested
<a href="#developer-all"></a> <a href="#developer-all"></a>
<ul id="developer-all" class="cardsC"> <ul id="developer-all" class="cardsC">
<li> <li>
<a href="/windows/uwp/apps-for-education/"> <a href="/windows/uwp/apps-for-education/" target="_blank">
<div class="cardSize"> <div class="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -542,7 +561,7 @@ ms.author: celested
</a> </a>
</li> </li>
<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="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -561,7 +580,7 @@ ms.author: celested
</a> </a>
</li> </li>
<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="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -590,7 +609,7 @@ ms.author: celested
<a href="#partner-all"></a> <a href="#partner-all"></a>
<ul id="partner-all" class="cardsC"> <ul id="partner-all" class="cardsC">
<li> <li>
<a href="https://www.mepn.com"> <a href="https://www.mepn.com" target="_blank">
<div class="cardSize"> <div class="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -609,7 +628,7 @@ ms.author: celested
</a> </a>
</li> </li>
<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="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -628,7 +647,7 @@ ms.author: celested
</a> </a>
</li> </li>
<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="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
@ -647,7 +666,7 @@ ms.author: celested
</a> </a>
</li> </li>
<li> <li>
<a href="https://www.yammer.com/mepn/"> <a href="https://www.yammer.com/mepn/" target="_blank">
<div class="cardSize"> <div class="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">

16
education/windows/education-scenarios-store-for-business.md
View File

@ -23,9 +23,9 @@ Applies to: IT admins
By default, when a teacher with a work or school account acquires Minecraft: Education Edition,they are automatically signed up for Window Store for Business, and the **Basic Purchaser** role is assigned to them. **Basic Purchaser** role allows teachers to acquire Minecraft: Education Edition and to distribute it to students. By default, when a teacher with a work or school account acquires Minecraft: Education Edition,they are automatically signed up for Window Store for Business, and the **Basic Purchaser** role is assigned to them. **Basic Purchaser** role allows teachers to acquire Minecraft: Education Edition and to distribute it to students.
However, tenant admins can control whether or not teachers automatically sign up for Windows Store for Business, and get the **Basic Purchaser** role. You can configure this with **Allow educators in my organization to sign up for the Windows Store for Business.** You'll find this on the **Permissions** page. However, tenant admins can control whether or not teachers automatically sign up for Microsoft Store for Business, and get the **Basic Purchaser** role. You can configure this with **Allow educators in my organization to sign up for the Microsoft Store for Business.** You'll find this on the **Permissions** page.
**To manage educator access to Windows Store for Business** **To manage educator access to Microsoft Store for Education**
1. Sign in to [Microsoft Store for Education](https://educationstore.microsoft.com) 1. Sign in to [Microsoft Store for Education](https://educationstore.microsoft.com)
2. Click **Manage**, and then click **Permissions**. 2. Click **Manage**, and then click **Permissions**.
3. Select, or clear **Allow teachers in my organization to sign up for the Microsoft Store for Education**. 3. Select, or clear **Allow teachers in my organization to sign up for the Microsoft Store for Education**.
@ -50,7 +50,7 @@ Applies to: IT admins
2. Click **Settings**, and then choose **Permissions**. 2. Click **Settings**, and then choose **Permissions**.
3. Click **Add people**, type a name, select the correct person, choose the role you want to assign, and click **Save**. 3. Click **Add people**, type a name, select the correct person, choose the role you want to assign, and click **Save**.
![Permission page for Windows Store for Business](images/sfe-roles.png) ![Permission page for Microsoft Store for Business](images/sfe-roles.png)
Micrososft Store updates the list of people and permissions. Micrososft Store updates the list of people and permissions.
@ -84,7 +84,7 @@ For education organizations, domain verification ensures you are on the academic
## Acquire apps ## Acquire apps
Applies to: IT admins and teachers Applies to: IT admins and teachers
Find apps for your school using Windows Store for Business. Admins in an education setting can use the same processes as Admins in an enterprise setting to find and acquire apps. Find apps for your school using Microsoft Store for Business. Admins in an education setting can use the same processes as Admins in an enterprise setting to find and acquire apps.
**To acquire apps** **To acquire apps**
- For info on how to acquire apps, see [Acquire apps in Microsoft Store for Business](https://docs.microsoft.com/microsoft-store/acquire-apps-windows-store-for-business#acquire-apps) - For info on how to acquire apps, see [Acquire apps in Microsoft Store for Business](https://docs.microsoft.com/microsoft-store/acquire-apps-windows-store-for-business#acquire-apps)
@ -99,7 +99,7 @@ For more information on payment options, see [payment options](https://docs.micr
For more information on tax rates, see [tax information](https://docs.microsoft.com/microsoft-store/update-windows-store-for-business-account-settings#organization-tax-information). For more information on tax rates, see [tax information](https://docs.microsoft.com/microsoft-store/update-windows-store-for-business-account-settings#organization-tax-information).
### Get started with Minecraft: Education Edition ### Get started with Minecraft: Education Edition
Teachers and IT administrators can now get trials or subscriptions to Minecraft: Education Edition and add it to Windows Store for Business for distribution. Teachers and IT administrators can now get trials or subscriptions to Minecraft: Education Edition and add it to Microsoft Store for Business for distribution.
- [Get started with Minecraft: Education Edition](https://docs.microsoft.com/education/windows/get-minecraft-for-education) - [Get started with Minecraft: Education Edition](https://docs.microsoft.com/education/windows/get-minecraft-for-education)
- [For IT admins – Minecraft: Education Edition](https://docs.microsoft.com/education/windows/school-get-minecraft) - [For IT admins – Minecraft: Education Edition](https://docs.microsoft.com/education/windows/school-get-minecraft)
- [For teachers – Minecraft: Education Edition](https://docs.microsoft.com/education/windows/teacher-get-minecraft) - [For teachers – Minecraft: Education Edition](https://docs.microsoft.com/education/windows/teacher-get-minecraft)
@ -161,14 +161,14 @@ You'll have a summary of current license availability.
**Minecraft: Education Edition subscriptions** **Minecraft: Education Edition subscriptions**
Similarly, you can purchase additional subscriptions of **Minecraft: Education Edition** through Windows Store for Business. Find **Minecraft: Education Edition** in your inventory and use the previous steps for purchasing additional app licenses. Similarly, you can purchase additional subscriptions of **Minecraft: Education Edition** through Microsoft Store for Business. Find **Minecraft: Education Edition** in your inventory and use the previous steps for purchasing additional app licenses.
## Manage order history ## Manage order history
Applies to: IT admins and teachers Applies to: IT admins and teachers
You can manage your orders through Windows Store for Business. For info on order history and how to refund an order, see [Manage app orders in Windows Store for Business](https://technet.microsoft.com/itpro/windows/manage/manage-orders-windows-store-for-business). You can manage your orders through Microsoft Store for Business. For info on order history and how to refund an order, see [Manage app orders in Microsoft Store for Business](https://technet.microsoft.com/itpro/windows/manage/manage-orders-windows-store-for-business).
It can take up to 24 hours after a purchase, before a receipt is available on your **Order history page**. It can take up to 24 hours after a purchase, before a receipt is available on your **Order history page**.
> [!NOTE] > [!NOTE]
For **Minecraft: Education Edition**, you can request a refund through Windows Store for Business for two months from the purchase date. After two months, refunds require a support call. For **Minecraft: Education Edition**, you can request a refund through Microsoft Store for Business for two months from the purchase date. After two months, refunds require a support call.

2
education/windows/index.md
View File

@ -26,7 +26,7 @@ ms.author: celested
<li><a href="https://technet.microsoft.com/en-us/windows/mt723346" target="_blank">Deploy a custom Windows 10 Start menu</a></li> <li><a href="https://technet.microsoft.com/en-us/windows/mt723346" target="_blank">Deploy a custom Windows 10 Start menu</a></li>
<li><a href="https://technet.microsoft.com/en-us/windows/mt723347" target="_blank">Manage Windows 10 updates and upgrades</a></li> <li><a href="https://technet.microsoft.com/en-us/windows/mt723347" target="_blank">Manage Windows 10 updates and upgrades</a></li>
<li><a href="https://technet.microsoft.com/en-us/windows/mt723344" target="_blank">Reprovision devices at the end of the school year</a></li> <li><a href="https://technet.microsoft.com/en-us/windows/mt723343" target="_blank">Use MDT to deploy Windows 10</a></li> <li><a href="https://technet.microsoft.com/en-us/windows/mt723344" target="_blank">Reprovision devices at the end of the school year</a></li> <li><a href="https://technet.microsoft.com/en-us/windows/mt723343" target="_blank">Use MDT to deploy Windows 10</a></li>
<li><a href="https://technet.microsoft.com/en-us/windows/mt723348" target="_blank">Use Windows Store for Business</a></li> <li><a href="https://technet.microsoft.com/en-us/windows/mt723348" target="_blank">Use Microsoft Store for Business</a></li>
</ul> </ul>
</p> </p>

171
microsoft-365/images/M365-education.svg Normal file
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>
Side by Side

After

Width:  |  Height:  |  Size: 8.1 KiB

30
microsoft-365/index.md
View File

@ -4,7 +4,7 @@ hide_bc: true
author: CelesteDG author: CelesteDG
ms.author: celested ms.author: celested
ms.topic: hub-page 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 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. 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 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>
<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="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <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> </div>
<div class="cardText"> <div class="cardText">
@ -41,13 +41,13 @@ description: Find documentation and resources for Microsoft 365--a complete, int
</a> </a>
</li> </li>
<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="cardSize">
<div class="cardPadding"> <div class="cardPadding">
<div class="card"> <div class="card">
<div class="cardImageOuter"> <div class="cardImageOuter">
<div class="cardImage bgdAccent1"> <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> </div>
<div class="cardText"> <div class="cardText">
@ -60,6 +60,26 @@ description: Find documentation and resources for Microsoft 365--a complete, int
</div> </div>
</a> </a>
</li> </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> </ul>
</li> </li>
</ul> </ul>

2
store-for-business/app-inventory-management-windows-store-for-business.md
View File

@ -22,7 +22,7 @@ You can manage all apps that you've acquired on your **Apps & software** page. T
All of these apps are treated the same once they are in your inventory and you can perform app lifecycle tasks for them: distribute apps, add apps to private store, review license details, and reclaim app licenses. All of these apps are treated the same once they are in your inventory and you can perform app lifecycle tasks for them: distribute apps, add apps to private store, review license details, and reclaim app licenses.
<!--- ![Image shows Inventory page in Windows Store for Business with status status options for an app.](images/wsfb-inventoryaddprivatestore.png) --> <!--- ![Image shows Inventory page in Microsoft Store for Business with status status options for an app.](images/wsfb-inventoryaddprivatestore.png) -->
Microsoft Store for Business and Education shows this info for each app in your inventory: Microsoft Store for Business and Education shows this info for each app in your inventory:
- Name - Name

8
store-for-business/configure-mdm-provider-windows-store-for-business.md
View File

@ -1,6 +1,6 @@
--- ---
title: Configure an MDM provider (Windows 10) title: Configure an MDM provider (Windows 10)
description: For companies or organizations using mobile device management (MDM) tools, those tools can synchronize with Windows Store for Business inventory to manage apps with offline licenses. description: For companies or organizations using mobile device management (MDM) tools, those tools can synchronize with Microsoft Store for Business inventory to manage apps with offline licenses.
ms.assetid: B3A45C8C-A96C-4254-9659-A9B364784673 ms.assetid: B3A45C8C-A96C-4254-9659-A9B364784673
ms.prod: w10 ms.prod: w10
ms.mktglfcycl: manage ms.mktglfcycl: manage
@ -16,7 +16,7 @@ ms.localizationpriority: high
- Windows 10 - Windows 10
- Windows 10 Mobile - Windows 10 Mobile
For companies or organizations using mobile device management (MDM) tools, those tools can synchronize with Windows Store for Business inventory to manage apps with offline licenses. Store for Business management tool services work with your third-party management tool to manage content. For companies or organizations using mobile device management (MDM) tools, those tools can synchronize with Microsoft Store for Business inventory to manage apps with offline licenses. Store for Business management tool services work with your third-party management tool to manage content.
Your management tool needs to be installed and configured with Azure AD, in the same directory that you are using for Store for Business. Once that's done, you can configure it to work with Store for Business Your management tool needs to be installed and configured with Azure AD, in the same directory that you are using for Store for Business. Once that's done, you can configure it to work with Store for Business
@ -35,7 +35,7 @@ After your management tool is added to your Azure AD directory, you can configur
3. From the list of MDM tools, select the one you want to synchronize with Microsoft Store, and then click **Activate.** 3. From the list of MDM tools, select the one you want to synchronize with Microsoft Store, and then click **Activate.**
Your MDM tool is ready to use with Microsoft Store. To learn how to configure synchronization and deploy apps, see these topics: Your MDM tool is ready to use with Microsoft Store. To learn how to configure synchronization and deploy apps, see these topics:
- [Manage apps you purchased from Windows Store for Business with Microsoft Intune](https://technet.microsoft.com/library/mt676514.aspx) - [Manage apps you purchased from Microsoft Store for Business with Microsoft Intune](https://technet.microsoft.com/library/mt676514.aspx)
- [Manage apps from Windows Store for Business with System Center Configuration Manager](https://docs.microsoft.com/sccm/apps/deploy-use/manage-apps-from-the-windows-store-for-business) - [Manage apps from Microsoft Store for Business with System Center Configuration Manager](https://docs.microsoft.com/sccm/apps/deploy-use/manage-apps-from-the-windows-store-for-business)
For third-party MDM providers or management servers, check your product documentation. For third-party MDM providers or management servers, check your product documentation.

4
store-for-business/distribute-apps-from-your-private-store.md
View File

@ -28,7 +28,7 @@ You can make an app available in your private store when you acquire the app, or
2. Click an app, choose the license type, and then click **Get the app** to acquire the app for your organization. 2. Click an app, choose the license type, and then click **Get the app** to acquire the app for your organization.
<!--- ![Image showing Distribute options for app in the Windows Store for Business.](images/wsfb-distribute.png) --> <!--- ![Image showing Distribute options for app in the Microsoft Store for Business.](images/wsfb-distribute.png) -->
Microsoft Store adds the app to **Apps & software**. Click **Manage**, **Apps & software** for app distribution options. Microsoft Store adds the app to **Apps & software**. Click **Manage**, **Apps & software** for app distribution options.
@ -37,7 +37,7 @@ Microsoft Store adds the app to **Apps & software**. Click **Manage**, **Apps &
1. Sign in to [Microsoft Store for Business](https://businessstore.microsoft.com) or [Microsoft Store for Education](https://educationstore.microsoft.com). 1. Sign in to [Microsoft Store for Business](https://businessstore.microsoft.com) or [Microsoft Store for Education](https://educationstore.microsoft.com).
2. Click **Manage**, and then choose **Apps & software**. 2. Click **Manage**, and then choose **Apps & software**.
<!--- ![Image showing Manage menu in Windows Store for Business.](images/wsfb-manageinventory.png) --> <!--- ![Image showing Manage menu in Microsoft Store for Business.](images/wsfb-manageinventory.png) -->
3. Use **Refine results** to search for online-licensed apps under **License type**. 3. Use **Refine results** to search for online-licensed apps under **License type**.
4. From the list of online-licensed apps, click the ellipses for the app you want, and then choose **Add to private store**. 4. From the list of online-licensed apps, click the ellipses for the app you want, and then choose **Add to private store**.

17
store-for-business/distribute-apps-with-management-tool.md
View File

@ -22,7 +22,7 @@ You can configure a mobile device management (MDM) tool to synchronize your Micr
Your MDM tool needs to be installed and configured in Azure AD, in the same Azure AD directory used with Microsoft Store. Your MDM tool needs to be installed and configured in Azure AD, in the same Azure AD directory used with Microsoft Store.
In Azure AD management portal, find the MDM application, and then add it to your directory. Once the MDM has been configured in Azure AD, you can authorize the tool to work with the Microsoft Store for Business or Microsoft Store for Education. This allows the MDM tool to call Microsoft Store management tool services. For more information, see [Configure MDM provider](configure-mdm-provider-windows-store-for-business.md) and [Manage apps you purchased from the Windows Store for Business with Microsoft Intune](https://docs.microsoft.com/intune/deploy-use/manage-apps-you-purchased-from-the-windows-store-for-business-with-microsoft-intune). In Azure AD management portal, find the MDM application, and then add it to your directory. Once the MDM has been configured in Azure AD, you can authorize the tool to work with the Microsoft Store for Business or Microsoft Store for Education. This allows the MDM tool to call Microsoft Store management tool services. For more information, see [Configure MDM provider](configure-mdm-provider-windows-store-for-business.md) and [Manage apps you purchased from the Microsoft Store for Business with Microsoft Intune](https://docs.microsoft.com/intune/deploy-use/manage-apps-you-purchased-from-the-windows-store-for-business-with-microsoft-intune).
Microsoft Store services provide: Microsoft Store services provide:
@ -44,11 +44,11 @@ MDM tool requirements:
## Distribute offline-licensed apps ## Distribute offline-licensed apps
If your vendor doesn’t support the ability to synchronize applications from the management tool services, or can't connect to the management tool services, your vendor may support the ability to deploy offline licensed applications by downloading the application and license from the store and then deploying the app through your MDM. For more information on online and offline licensing with Store for Business, see [Apps in the Windows Store for Business.](apps-in-windows-store-for-business.md#licensing-model) If your vendor doesn’t support the ability to synchronize applications from the management tool services, or can't connect to the management tool services, your vendor may support the ability to deploy offline licensed applications by downloading the application and license from the store and then deploying the app through your MDM. For more information on online and offline licensing with Store for Business, see [Apps in the Microsoft Store for Business.](apps-in-windows-store-for-business.md#licensing-model)
This diagram shows how you can use a management tool to distribute offline-licensed app to employees in your organization. Once synchronized from Store for Business, management tools can use the Windows Management framework to distribute applications to devices. This diagram shows how you can use a management tool to distribute offline-licensed app to employees in your organization. Once synchronized from Store for Business, management tools can use the Windows Management framework to distribute applications to devices.
![Image showing flow for distributing offline-licensed app from Windows Store for Business to employees in your organization.](images/wsfb-offline-distribute-mdm.png) ![Image showing flow for distributing offline-licensed app from Microsoft Store for Business to employees in your organization.](images/wsfb-offline-distribute-mdm.png)
## Distribute online-licensed apps ## Distribute online-licensed apps
@ -59,13 +59,4 @@ This diagram shows how you can use a management tool to distribute an online-lic
## Related topics ## Related topics
[Configure MDM Provider](configure-mdm-provider-windows-store-for-business.md) [Configure MDM Provider](configure-mdm-provider-windows-store-for-business.md)
[Manage apps you purchased from the Microsoft Store for Business and Education with Microsoft Intune](https://technet.microsoft.com/library/mt676514.aspx) [Manage apps you purchased from the Microsoft Store for Business and Education with Microsoft Intune](https://technet.microsoft.com/library/mt676514.aspx)
 
 

2
store-for-business/roles-and-permissions-windows-store-for-business.md
View File

@ -89,7 +89,7 @@ These permissions allow people to:
3. Click **Add people**, type a name, choose the role you want to assign, and click **Save** . 3. Click **Add people**, type a name, choose the role you want to assign, and click **Save** .
<!--- ![Image showing Assign roles to people box in Windows Store for Business.](images/wsfb-permissions-assignrole.png) --> <!--- ![Image showing Assign roles to people box in Microsoft Store for Business.](images/wsfb-permissions-assignrole.png) -->
4. If you don't find the name you want, you might need to add people to your Azure AD directory. For more information, see [Manage user accounts in Microsoft Store for Business and Education](manage-users-and-groups-windows-store-for-business.md). 4. If you don't find the name you want, you might need to add people to your Azure AD directory. For more information, see [Manage user accounts in Microsoft Store for Business and Education](manage-users-and-groups-windows-store-for-business.md).

4
store-for-business/working-with-line-of-business-apps.md
View File

@ -49,7 +49,7 @@ Admins need to invite developer or ISVs to become an LOB publisher.
**To invite a developer to become an LOB publisher** **To invite a developer to become an LOB publisher**
1. Sign in to the [Windows Store for Business]( https://go.microsoft.com/fwlink/p/?LinkId=623531). 1. Sign in to the [Microsoft Store for Business]( https://go.microsoft.com/fwlink/p/?LinkId=623531).
2. Click **Manage**, click **Permissions**, and then choose **Line-of-business publishers**. 2. Click **Manage**, click **Permissions**, and then choose **Line-of-business publishers**.
3. On the Line-of business publishers page, click **Invite** to send an email invitation to a developer. 3. On the Line-of business publishers page, click **Invite** to send an email invitation to a developer.
>[!Note] >[!Note]
@ -98,7 +98,7 @@ After an ISV submits the LOB app for your company or school, someone with Micros
After you add the app to your inventory, you can choose how to distribute the app. For more information, see: After you add the app to your inventory, you can choose how to distribute the app. For more information, see:
- [Distribute apps to your employees from the Windows Store for Business](distribute-apps-to-your-employees-windows-store-for-business.md) - [Distribute apps to your employees from the Microsoft Store for Business](distribute-apps-to-your-employees-windows-store-for-business.md)
- [Distribute apps from your private store](distribute-apps-from-your-private-store.md) - [Distribute apps from your private store](distribute-apps-from-your-private-store.md)

BIN
windows/configuration/images/package.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 11 KiB

10
windows/device-security/bitlocker/bitlocker-frequently-asked-questions.md
View File

@ -151,7 +151,15 @@ The following types of system changes can cause an integrity check failure and p
### <a href="" id="bkmk-examplesosrec"></a>What causes BitLocker to start into recovery mode when attempting to start the operating system drive? ### <a href="" id="bkmk-examplesosrec"></a>What causes BitLocker to start into recovery mode when attempting to start the operating system drive?
Because BitLocker is designed to protect your computer from numerous attacks, there are numerous reasons why BitLocker could start in recovery mode. In BitLocker, recovery consists of decrypting a copy of the volume master key using either a recovery key stored on a USB flash drive or a cryptographic key derived from a recovery password. The TPM is not involved in any recovery scenarios, so recovery is still possible if the TPM fails boot component validation, malfunctions, or is removed. Because BitLocker is designed to protect your computer from numerous attacks, there are numerous reasons why BitLocker could start in recovery mode.
For example:
- Changing the BIOS boot order to boot another drive in advance of the hard drive.
- Adding or removing hardware, such as inserting a new card in the computer, including some PCMIA wireless cards.
- Removing, inserting, or completely depleting the charge on a smart battery on a portable computer.
In BitLocker, recovery consists of decrypting a copy of the volume master key using either a recovery key stored on a USB flash drive or a cryptographic key derived from a recovery password.
The TPM is not involved in any recovery scenarios, so recovery is still possible if the TPM fails boot component validation, malfunctions, or is removed.
### <a href="" id="bkmk-driveswap"></a>Can I swap hard disks on the same computer if BitLocker is enabled on the operating system drive? ### <a href="" id="bkmk-driveswap"></a>Can I swap hard disks on the same computer if BitLocker is enabled on the operating system drive?

4
windows/device-security/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md
View File

@ -41,7 +41,9 @@ A good practice when using manage-bde is to determine the volume status on the t
``` syntax ``` syntax
manage-bde -status manage-bde -status
``` ```
This command returns the volumes on the target, current encryption status and volume type (operating system or data) for each volume. This command returns the volumes on the target, current encryption status, encryption method, and volume type (operating system or data) for each volume:
![Using manage-bde to check encryption status](images/manage-bde-status.png)
The following example illustrates enabling BitLocker on a computer without a TPM chip. Before beginning the encryption process you must create the startup key needed for BitLocker and save it to the USB drive. When BitLocker is enabled for the operating system volume, the BitLocker will need to access the USB flash drive to obtain the encryption key (in this example, the drive letter E represents the USB drive). You will be prompted to reboot to complete the encryption process. The following example illustrates enabling BitLocker on a computer without a TPM chip. Before beginning the encryption process you must create the startup key needed for BitLocker and save it to the USB drive. When BitLocker is enabled for the operating system volume, the BitLocker will need to access the USB flash drive to obtain the encryption key (in this example, the drive letter E represents the USB drive). You will be prompted to reboot to complete the encryption process.

BIN
windows/device-security/bitlocker/images/manage-bde-status.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB