Merged PR 6058: Merge vsts16132094 to master

This commit is contained in:
Justin Hall 2018-02-27 22:56:26 +00:00
commit 13a2b62c3c
3 changed files with 12 additions and 24 deletions

View File

@ -5,8 +5,6 @@
## [Configuration](/windows/configuration)
## [Client management](/windows/client-management)
## [Application management](/windows/application-management)
## [Identity and access management](/windows/security/identity-protection)
## [Information protection](/windows/security/information-protection)
## [Threat protection](/windows/security/threat-protection)
## [Security](/windows/security)
## [Troubleshooting](/windows/client-management/windows-10-support-solutions)
## [Other Windows client versions](https://docs.microsoft.com/previous-versions/windows)

View File

@ -37,12 +37,6 @@ Find the latest how to and support content that IT pros need to evaluate, plan,
<a href="/windows/deployment/index">
<img src="images/deployment.png" alt="Windows 10 deployment" title="Windows 10 deployment" />
<br/>Deployment </a><br>
</td>
<td align="center" style="width:25%; border:0;">
<a href="/windows/client-management/index">
<img src="images/clientmanagement.png" alt="Windows 10 client management" title="Client management" />
<br/>Client Management </a><br>
</td>
</tr>
<tr style="text-align:center;">
<td align="center" style="width:25%; border:0;"><br>
@ -51,20 +45,14 @@ Find the latest how to and support content that IT pros need to evaluate, plan,
<br/>Application Management </a>
</td>
<td align="center" style="width:25%; border:0;"><br>
<a href="/windows/access-protection/index">
<img src="images/accessprotection.png" alt="Windows 10 access protection" title="Windows 10 access protection" />
<br/>Access Protection </a>
<a href="/windows/client-management/index">
<img src="images/clientmanagement.png" alt="Windows 10 client management" title="Client management" />
<br/>Client Management </a>
</td>
<td align="center" style="width:25%; border:0;"><br>
<a href="/windows/device-security/index">
<img src="images/devicesecurity.png" alt="Windows 10 device security" title="W10 device security" />
<br/>Device Security </a>
</td>
<td align="center" style="width:25%; border:0;"><br>
<a href="/windows/threat-protection/index">
<img src="images/threatprotection.png" alt="Windows 10 threat protection" title="Windows 10 threat protection" />
<br/>Threat Protection </a>
</td>
<a href="/windows/security/index">
<img src="images/threatprotection.png" alt="Windows 10 security" title="W10 security" />
<br/>Security </a>
</tr>
</table>

View File

@ -14,6 +14,8 @@ metadata:
keywords: protect, company, data, Windows, device, app, management, Microsoft365, e5, e3
ms.localizationpriority: high
author: brianlic-msft
ms.author: brianlic