From 0693291fe7595367c555e1fd735593965e28cd80 Mon Sep 17 00:00:00 2001 From: gastocco Date: Fri, 26 Aug 2016 12:09:05 -0700 Subject: [PATCH 1/4] Update manage-tpm-lockout.md --- windows/keep-secure/manage-tpm-lockout.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/windows/keep-secure/manage-tpm-lockout.md b/windows/keep-secure/manage-tpm-lockout.md index d7b997538c..450cedba29 100644 --- a/windows/keep-secure/manage-tpm-lockout.md +++ b/windows/keep-secure/manage-tpm-lockout.md @@ -29,11 +29,12 @@ The industry standards from the Trusted Computing Group (TCG) specify that TPM m **TPM 2.0** TPM 2.0 devices have standardized lockout behavior which is configured by Windows. TPM 2.0 devices have a maximum count threshold and a healing time. Windows configures the maximum count to be 32 and the healing time to be 2 hours. This means that every continuous two hours of powered on operation without an event which increases the counter will cause the counter to decrease by 1. -If your TPM has entered lockout mode or is responding slowly to commands, you can reset the lockout value by using the following procedures. Resetting the TPM lockout requires the TPM owner’s authorization. +If your TPM has entered lockout mode or is responding slowly to commands, you can reset the lockout value by using the following procedures. Resetting the TPM lockout requires the TPM owner’s authorization. This value is no longer retained by default starting with Windows 10 1607. ## Reset the TPM lockout by using the TPM MMC +**Note:** This procedure is only available if you have configured Windows to retain the TPM Owner Password. By default, this password is not available in Windows 10 starting with version 1607. -The following procedure explains the steps to reset the TPM lockout by using the TPM MMC. Note that this procedure is only available if you have configured Windows to retain the TPM owner password. By default, this behavior is not available in Windows 10. +The following procedure explains the steps to reset the TPM lockout by using the TPM MMC. **To reset the TPM lockout** From 463e001ed3fb6aada3f5f9c945b868550e1e762a Mon Sep 17 00:00:00 2001 From: gastocco Date: Fri, 26 Aug 2016 12:10:46 -0700 Subject: [PATCH 2/4] Update manage-tpm-lockout.md --- windows/keep-secure/manage-tpm-lockout.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/keep-secure/manage-tpm-lockout.md b/windows/keep-secure/manage-tpm-lockout.md index 450cedba29..f59a117ee3 100644 --- a/windows/keep-secure/manage-tpm-lockout.md +++ b/windows/keep-secure/manage-tpm-lockout.md @@ -29,7 +29,7 @@ The industry standards from the Trusted Computing Group (TCG) specify that TPM m **TPM 2.0** TPM 2.0 devices have standardized lockout behavior which is configured by Windows. TPM 2.0 devices have a maximum count threshold and a healing time. Windows configures the maximum count to be 32 and the healing time to be 2 hours. This means that every continuous two hours of powered on operation without an event which increases the counter will cause the counter to decrease by 1. -If your TPM has entered lockout mode or is responding slowly to commands, you can reset the lockout value by using the following procedures. Resetting the TPM lockout requires the TPM owner’s authorization. This value is no longer retained by default starting with Windows 10 1607. +If your TPM has entered lockout mode or is responding slowly to commands, you can reset the lockout value by using the following procedures. Resetting the TPM lockout requires the TPM owner’s authorization. This value is no longer retained by default starting with Windows 10 version 1607. ## Reset the TPM lockout by using the TPM MMC **Note:** This procedure is only available if you have configured Windows to retain the TPM Owner Password. By default, this password is not available in Windows 10 starting with version 1607. From 094d6db9aecca0f78d87ce3fb14d280bd32f5958 Mon Sep 17 00:00:00 2001 From: xiaoyinl Date: Sat, 27 Aug 2016 02:29:49 -0400 Subject: [PATCH 3/4] [reset-a-windows-10-mobile-device.md] add Recovery Tool I think it is helpful to tell users how to flash Windows 10 Mobile with the original factory image. So I add a link to the Windows Device Recovery Tool. --- windows/manage/reset-a-windows-10-mobile-device.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/manage/reset-a-windows-10-mobile-device.md b/windows/manage/reset-a-windows-10-mobile-device.md index 5455485e1f..b249672893 100644 --- a/windows/manage/reset-a-windows-10-mobile-device.md +++ b/windows/manage/reset-a-windows-10-mobile-device.md @@ -19,7 +19,7 @@ localizationpriority: high There are two methods for resetting a Windows 10 Mobile device: factory reset and "wipe and persist" reset. -- **Factory reset** restores the state of the device back to its first-boot state plus any update packages. The reset will not return device to the original factory state. To return the device to the original factory state, you must flash it with the original factory image.All the provisioning applied to the device by the enterprise will be lost and will need to be re-applied if needed. For details on what is removed or persists, see [Resetting a mobile device](http://go.microsoft.com/fwlink/p/?LinkID=703715). +- **Factory reset** restores the state of the device back to its first-boot state plus any update packages. The reset will not return device to the original factory state. To return the device to the original factory state, you must flash it with the original factory image by using the [Windows Device Recovery Tool](https://support.microsoft.com/help/12379/windows-10-mobile-device-recovery-tool-faq). All the provisioning applied to the device by the enterprise will be lost and will need to be re-applied if needed. For details on what is removed or persists, see [Resetting a mobile device](http://go.microsoft.com/fwlink/p/?LinkID=703715). - **"Wipe and persist" reset** preserves all the provisioning applied to the device before the reset. After the "wipe and persist" reset, all the preserved provisioning packages are automatically applied on the device and the data in the enterprise shared storage folder \\Data\\SharedData\\Enterprise\\Persistent is restored in that folder. For more information on the enterprise shared storage folder, see [EnterpriseExtFileSystem CSP](http://go.microsoft.com/fwlink/p/?LinkId=703716). You can trigger a reset using your mobile device management (MDM) service, or a user can trigger a reset in the user interface (UI) or by using hardware buttons. From ab82672d226bef4dd23ba7d9dfa7dbc8f8f2a6a3 Mon Sep 17 00:00:00 2001 From: xiaoyinl Date: Sat, 27 Aug 2016 02:31:21 -0400 Subject: [PATCH 4/4] [README.md] Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 503b25df69..fa13a55593 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Welcome! This repository houses the docs that are written for IT professionals f ## Contributing We actively merge contributions into this repository via [pull request](https://help.github.com/articles/using-pull-requests/) into the *master* branch. -If not are not a Microsoft employee, before you submit a pull request you must [sign a Contribution License Agreement](https://cla.microsoft.com/) to ensure that the community is free to use your submissions. +If you are not a Microsoft employee, before you submit a pull request you must [sign a Contribution License Agreement](https://cla.microsoft.com/) to ensure that the community is free to use your submissions. For more information on contributing, read our [contributions guide](CONTRIBUTING.md).