Merge pull request #6109 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/windows-itpro-docs (branch public)

windows/client-management/advanced-troubleshooting-boot-problems.md

@@ -150,49 +150,19 @@ If you receive BCD-related errors, follow these steps:
 
 2. Restart the computer to check whether the problem is fixed.
 
-3. If the problem is not fixed, run the following command:
+3. If the problem is not fixed, run the following commands:
-
-    ```console
-    Bootrec /rebuildbcd
-    ```
-
-4. You might receive one of the following outputs:
-
-    ```console
-    Scanning all disks for Windows installations. Please wait, since this may take a while ...
-    Successfully scanned Windows installations. Total identified Windows installations: 0
-    The operation completed successfully.
-    ```
-
-    ```console
-    Scanning all disks for Windows installations. Please wait, since this may take a while ...
-    Successfully scanned Windows installations. Total identified Windows installations: 1
-    D:\Windows  
-    Add installation to boot list? Yes/No/All:
-    ```
-
-    If the output shows **windows installation: 0**, run the following commands:
     
     ```console
     bcdedit /export c:\bcdbackup
     
-    attrib c:\\boot\\bcd -r –s -h
+    attrib c:\boot\bcd -r -s -h
     
-    ren c:\\boot\\bcd bcd.old
+    ren c:\boot\bcd bcd.old
     
     bootrec /rebuildbcd
     ```
-    
-    After you run the command, you receive the following output:
-    
-    ```console
-    Scanning all disks for Windows installations. Please wait, since this may take a while ...
-    Successfully scanned Windows installations. Total identified Windows installations: 1
-    {D}:\Windows
-    Add installation to boot list? Yes/No/All: Y
-    ```
 
-5. Try restarting the system.
+4. Restart the system.
 
 ### Method 4: Replace Bootmgr
 
@@ -206,7 +176,7 @@ If methods 1, 2 and 3 do not fix the problem, replace the Bootmgr file from driv
     attrib -r -s -h
     ```
 
-3. Run the same **attrib** command on the Windows (system drive):
+3. Navigate to the system drive and run the same command:
 
     ```console
     attrib -r -s -h
@@ -394,7 +364,7 @@ If the dump file shows an error that is related to a driver (for example, window
     - To do this, open WinRE, open a command prompt, and then run the following command:
 
         ```console
-        SFC /Scannow /OffBootDir=C:\ /OffWinDir=E:\Windows
+        SFC /Scannow /OffBootDir=C:\ /OffWinDir=C:\Windows
         ```
 
         For more information, see [Using System File Checker (SFC) To Fix  Issues](/archive/blogs/askcore/using-system-file-checker-sfc-to-fix-issues)

windows/security/information-protection/tpm/trusted-platform-module-services-group-policy-settings.md

@@ -35,8 +35,8 @@ The following Group Policy settings were introduced in Windows.
 
 ## Configure the level of TPM owner authorization information available to the operating system
 
->[!IMPORTANT]
+> [!IMPORTANT]
->Beginning with Windows 10 version 1607 and Windows Server 2016, this policy setting is no longer used by Windows, but it continues to appear in GPEdit.msc for compatibility with previous versions. Beginning with Windows 10 version 1703, the default value is 5. This value is implemented during provisioning so that another Windows component can either delete it or take ownership of it, depending on the system configuration. For TPM 2.0, a value of 5 means keep the lockout authorization. For TPM 1.2, it means discard the Full TPM owner authorization and retain only the Delegated authorization.
+> Beginning with Windows 10 version 1703, the default value is 5. This value is implemented during provisioning so that another Windows component can either delete it or take ownership of it, depending on the system configuration. For TPM 2.0, a value of 5 means keep the lockout authorization. For TPM 1.2, it means discard the Full TPM owner authorization and retain only the Delegated authorization.
 
 This policy setting configured which TPM authorization values are stored in the registry of the local computer. Certain authorization values are required in order to allow Windows to perform certain actions.
 
@@ -149,4 +149,4 @@ If you don't want users to see the recommendation to update TPM firmware, you ca
 
 - [Trusted Platform Module](trusted-platform-module-top-node.md) 
 - [TPM Cmdlets in Windows PowerShell](/powershell/module/trustedplatformmodule/?view=win10-ps&preserve-view=true)
-- [Prepare your organization for BitLocker: Planning and Policies - TPM configurations](../bitlocker/prepare-your-organization-for-bitlocker-planning-and-policies.md)
+- [Prepare your organization for BitLocker: Planning and Policies - TPM configurations](../bitlocker/prepare-your-organization-for-bitlocker-planning-and-policies.md)