Merged PR 8552: merging master

This commit is contained in:
Justin Hall 2018-05-25 18:39:47 +00:00 committed by Patti Short
commit 42d9876bde
4 changed files with 60 additions and 45 deletions

View File

@ -9,46 +9,6 @@ ms.author: celested
ms.date: 10/30/2017 ms.date: 10/30/2017
--- ---
<div id="main" class="v2"> <div id="main" class="v2">
<div class="container">
<ul class="cardsY panelContent featuredContent">
<li>
<a href="https://www.microsoft.com/education" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage">
<img data-hoverimage="https://docs.microsoft.com/en-us/media/common/i_advanced.svg" src="https://docs.microsoft.com/en-us/media/common/i_advanced.svg" alt="" />
</div>
</div>
<div class="cardText">
<span class="likeAnH3">Learn about Microsoft Education</span>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="/microsoft-365/education/index?branch=m365-integration" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage">
<img data-hoverimage="https://docs.microsoft.com/en-us/media/common/i_get-started.svg" src="https://docs.microsoft.com/en-us/media/common/i_get-started.svg" alt="" />
</div>
</div>
<div class="cardText">
<span class="likeAnH3">Deploy Microsoft 365 Education</span>
</div>
</div>
</div>
</div>
</a>
</li>
</ul>
</div>
<div class="container"> <div class="container">
<h1>Microsoft Education documentation and resources</h1> <h1>Microsoft Education documentation and resources</h1>
<ul class="pivots"> <ul class="pivots">
@ -63,6 +23,46 @@ ms.date: 10/30/2017
<p>Get started with deploying and managing a full cloud IT solution for your school, and follow the links for in-depth information about the technologies and features.</p> <p>Get started with deploying and managing a full cloud IT solution for your school, and follow the links for in-depth information about the technologies and features.</p>
</div> </div>
</li> </li>
<li>
<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="https://docs.microsoft.com/en-us/media/hubs/microsoft365/M365-education.svg" alt="" />
</div>
</div>
<div class="cardText">
<h3>Learn Why 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="/microsoft-365/education/deploy/" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="https://docs.microsoft.com/en-us/media/hubs/education/education-pro-get-started.svg" alt="" />
</div>
</div>
<div class="cardText">
<h3>Deploy Overview</h3>
<p>Learn how to deploy our suite of education offerings. Set up a cloud infrastructure for your school, acquire apps, and configure and manage Windows 10 devices.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
</li>
<li> <li>
<a href="/microsoft-365/education/index?branch=m365-integration#pivot=itpro&amp;panel=itpro-scd" target="_blank"> <a href="/microsoft-365/education/index?branch=m365-integration#pivot=itpro&amp;panel=itpro-scd" target="_blank">
<div class="cardSize"> <div class="cardSize">
@ -74,7 +74,7 @@ ms.date: 10/30/2017
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
<h3>Cloud deployment</h3> <h3>1. Cloud deployment</h3>
<p>Get started by creating your Office 365 tenant, setting up a cloud infrastructure for your school, and creating, managing, and syncing user accounts.</p> <p>Get started by creating your Office 365 tenant, setting up a cloud infrastructure for your school, and creating, managing, and syncing user accounts.</p>
</div> </div>
</div> </div>
@ -93,7 +93,7 @@ ms.date: 10/30/2017
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
<h3>Device Management</h3> <h3>2. Device Management</h3>
<p>Improve student learning outcomes through connected classrooms and engaging new technologies with streamlined device management.</p> <p>Improve student learning outcomes through connected classrooms and engaging new technologies with streamlined device management.</p>
</div> </div>
</div> </div>
@ -112,7 +112,7 @@ ms.date: 10/30/2017
</div> </div>
</div> </div>
<div class="cardText"> <div class="cardText">
<h3>Tools for Teachers</h3> <h3>3. Tools for Teachers</h3>
<p>The latest classroom resources at teachers fingertips when you deploy Learning Tools, OneNote Class Notebooks, Teams, and more.</p> <p>The latest classroom resources at teachers fingertips when you deploy Learning Tools, OneNote Class Notebooks, Teams, and more.</p>
</div> </div>
</div> </div>

View File

@ -23,6 +23,7 @@ New or changed topic | Description
--- | --- --- | ---
[Manage Wi-Fi Sense in your company](manage-wifi-sense-in-enterprise.md) | Added note that Wi-Fi Sense is no longer available. [Manage Wi-Fi Sense in your company](manage-wifi-sense-in-enterprise.md) | Added note that Wi-Fi Sense is no longer available.
Topics about Windows 10 diagnostic data | Moved to [Windows Privacy](https://docs.microsoft.com/windows/privacy/). Topics about Windows 10 diagnostic data | Moved to [Windows Privacy](https://docs.microsoft.com/windows/privacy/).
[Manage Windows 10 Start and taskbar layout](windows-10-start-layout-options-and-policies.md) | Added details of event log entries to check for when customization is not applied as expected.
## RELEASE: Windows 10, version 1803 ## RELEASE: Windows 10, version 1803

View File

@ -10,7 +10,7 @@ author: jdeckerms
ms.author: jdecker ms.author: jdecker
ms.topic: article ms.topic: article
ms.localizationpriority: high ms.localizationpriority: high
ms.date: 10/31/2017 ms.date: 05/24/2018
--- ---
# Manage Windows 10 Start and taskbar layout # Manage Windows 10 Start and taskbar layout
@ -109,6 +109,16 @@ The new taskbar layout for upgrades to Windows 10, version 1607 or later, will a
[Learn how to configure Windows 10 taskbar](configure-windows-10-taskbar.md). [Learn how to configure Windows 10 taskbar](configure-windows-10-taskbar.md).
## Start layout configuration errors
If your Start layout customization is not applied as expected, open **Event Viewer** and navigate to **Applications and Services Log** > **Microsoft** > **Windows** > **ShellCommon-StartLayoutPopulation** > **Operational**, and check for one of the following events:
- **Event 22** is logged when the xml is malformed, meaning the specified file simply isnt valid xml. This can occur if the file has extra spaces or unexpected characters, or if the file is not saved in the UTF8 format.
- **Event 64** is logged when the xml is valid, but has unexpected values. This can happen when the desired configuration is not understood or source is not found such as a missing or misspelled .lnk.
## Related topics ## Related topics

View File

@ -87,7 +87,11 @@ Yes. However, shadow copies made prior to enabling BitLocker will be automatical
## Does BitLocker support virtual hard disks (VHDs)? ## Does BitLocker support virtual hard disks (VHDs)?
BitLocker is not supported on bootable VHDs, but BitLocker is supported on data volume VHDs, such as those used by clusters, if you are running Windows 10, Windows 8.1, Windows 8, Windows Server 2012, or Windows Server 2012 R2. BitLocker should work like any specific physical machine within its hardware limitations as long as the environment (physical or virtual) meets Windows Operating System requirements to run.
- With TPM - Yes it is supported
- Without TPM - Yes it is supported (with password ) protector
BitLocker is also supported on data volume VHDs, such as those used by clusters, if you are running Windows 10, Windows 8.1, Windows 8, Windows Server 2012, or Windows Server 2012 R2.
## Can I use BitLocker with virtual machines (VMs)? ## Can I use BitLocker with virtual machines (VMs)?