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

merge conflict fixed

Browse Source
This commit is contained in:
martyav
2019-07-31 17:04:11 -04:00
parent 78cbb4ea28 916be1ed45
commit 4e6eb1278a
5 changed files with 5 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
devices/surface-hub/surface-hub-2s-manage-intune.md
View File

@ -48,9 +48,9 @@ To ensure optimal video and audio quality on Surface Hub 2S, add the following Q
|**Name**|**Description**|**OMA-URI**|**Type**|**Value**|
|:------ |:------------- |:--------- |:------ |:------- |
|**Audio Ports**| Audio Port range | ./Device/Vendor/MSFT/NetworkQoSPolicy/HubAudio/SourcePortMatchCondition | String | 50000–50019 |
|**Audio Ports**| Audio Port range | ./Device/Vendor/MSFT/NetworkQoSPolicy/HubAudio/SourcePortMatchCondition | String | 50000-50019 |
|**Audio DSCP**| Audio ports marking | ./Device/Vendor/MSFT/NetworkQoSPolicy/HubAudio/DSCPAction | Integer | 46 |
|**Video Ports**| Video Port range | ./Device/Vendor/MSFT/NetworkQoSPolicy/HubVideo/SourcePortMatchCondition | String | 50020–50039 |
|**Video Ports**| Video Port range | ./Device/Vendor/MSFT/NetworkQoSPolicy/HubVideo/SourcePortMatchCondition | String | 50020-50039 |
|**Video DSCP**| Video ports marking | ./Device/Vendor/MSFT/NetworkQoSPolicy/HubVideo/DSCPAction | Integer | 34 |
> [!NOTE]

BIN
education/images/MSC17_cloud_005.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 122 KiB

BIN
education/images/MSC17_cloud_012_merged.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 96 KiB

63
education/index.md
View File

@ -32,7 +32,7 @@ ms.prod: w10
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="https://docs.microsoft.com/media/hubs/microsoft365/M365-education.svg" alt="" />
<img src="images/MSC17_cloud_012_merged.png" alt="" />
</div>
</div>
<div class="cardText">
@ -51,7 +51,7 @@ ms.prod: w10
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="https://docs.microsoft.com/media/hubs/education/education-pro-get-started.svg" alt="" />
<img src="images/MSC17_cloud_005.png" alt="" />
</div>
</div>
<div class="cardText">
@ -63,65 +63,6 @@ ms.prod: w10
</div>
</a>
</li>
<li>
</li>
<li>
<a href="/microsoft-365/education/index?branch=m365-integration#pivot=itpro&amp;panel=itpro-scd" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="https://docs.microsoft.com/media/hubs/education/education-pro-office365.svg" alt="" />
</div>
</div>
<div class="cardText">
<h3>1. M365 EDU 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>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="/microsoft-365/education/index?branch=m365-integration#pivot=itpro&amp;panel=itpro-sdm" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="https://docs.microsoft.com/media/hubs/education/education-pro-usb.svg" alt="" />
</div>
</div>
<div class="cardText">
<h3>2. Device Management</h3>
<p>Improve student learning outcomes through connected classrooms and engaging new technologies with streamlined device management.</p>
</div>
</div>
</div>
</div>
</a>
</li>
<li>
<a href="/microsoft-365/education/deploy/post-deployment-next-steps" target="_blank">
<div class="cardSize">
<div class="cardPadding">
<div class="card">
<div class="cardImageOuter">
<div class="cardImage bgdAccent1">
<img src="https://docs.microsoft.com/media/hubs/education/education-ms-teams.svg" alt="" />
</div>
</div>
<div class="cardText">
<h3>3. Post Deployment Next Steps</h3>
<p>Migrate to Sharepoint Server Hybrid or Sharepoint Online, and Exchange Server Hybrid or Exchange Online. Configure settings in your Admin portals.</p>
</div>
</div>
</div>
</div>
</a>
</li>
</ul>
</li>
</ul>

2
windows/security/threat-protection/index.md
View File

@ -67,7 +67,7 @@ The attack surface reduction set of capabilities provide the first line of defen
- [Network protection](windows-defender-exploit-guard/network-protection.md)
- [Controlled folder access](windows-defender-exploit-guard/controlled-folders.md)
- [Network firewall](windows-firewall/windows-firewall-with-advanced-security.md)
- [Attack surface reduction controls](windows-defender-exploit-guard/attack-surface-reduction.md)
- [Attack surface reduction rules](windows-defender-exploit-guard/attack-surface-reduction.md)
<a name="ngp"></a>