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

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

Browse Source
This commit is contained in:
LizRoss 2016-11-11 10:28:58 -08:00
commit ba916bafdb
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
windows/keep-secure/windows-10-security-guide.md
View File

@ -269,7 +269,6 @@ For more information about how to configure Network Unlock, see [BitLocker: How
### Microsoft BitLocker Administration and Monitoring ### Microsoft BitLocker Administration and Monitoring
>>>>>>> refs/remotes/origin/master
Part of the Microsoft Desktop Optimization Pack, MBAM makes it easier to manage and support BitLocker and BitLocker To Go. MBAM 2.5 with Service Pack 1, the latest version, has the following key features: Part of the Microsoft Desktop Optimization Pack, MBAM makes it easier to manage and support BitLocker and BitLocker To Go. MBAM 2.5 with Service Pack 1, the latest version, has the following key features:
* Enables administrators to automate the process of encrypting volumes on client computers across the enterprise. * Enables administrators to automate the process of encrypting volumes on client computers across the enterprise.