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

conflict fixed

Browse Source
This commit is contained in:
Patti Short
2018-08-07 09:50:19 -07:00
parent b674c3fde0 5fa3b7b039
commit 45d1f0fa32
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
windows/security/information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md
View File

@ -351,6 +351,7 @@ The following steps can be used to configure Network Unlock on these older syste
6. [Step Six: Configure registry settings for Network Unlock](#bkmk-stepsix)
Apply the registry settings by running the following certutil script on each computer running any of the client operating systems designated in the **Applies To** list at the beginning of this topic.
certutil -f -grouppolicy -addstore FVE_NKP BitLocker-NetworkUnlock.cer
reg add "HKLM\SOFTWARE\Policies\Microsoft\FVE" /v OSManageNKP /t REG_DWORD /d 1 /f
reg add "HKLM\SOFTWARE\Policies\Microsoft\FVE" /v UseAdvancedStartup /t REG_DWORD /d 1 /f

2
windows/security/threat-protection/security-policy-settings/account-lockout-policy.md
View File

@ -25,8 +25,8 @@ The following topics provide a discussion of each policy setting's implementatio
| Topic | Description |
| - | - |
| [Account lockout duration](account-lockout-duration.md) | Describes the best practices, location, values, and security considerations for the **Account lockout duration** security policy setting. |
| [Account lockout threshold](account-lockout-threshold.md) | Describes the best practices, location, values, and security considerations for the **Account lockout threshold** security policy setting. |
| [Account lockout duration](account-lockout-duration.md) | Describes the best practices, location, values, and security considerations for the **Account lockout duration** security policy setting. |
| [Reset account lockout counter after](reset-account-lockout-counter-after.md) | Describes the best practices, location, values, and security considerations for the **Reset account lockout counter after** security policy setting. |
 
## Related topics