Merging changes synced from https://github.com/MicrosoftDocs/windows-docs-pr (branch live)

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

@@ -22,7 +22,7 @@ ms.topic: troubleshooting
 There are several reasons why a Windows-based computer may have problems during startup. To troubleshoot boot problems, first determine in which of the following phases the computer gets stuck:
 
 
-| **Phase** |   **Boot Process**   |              **BIOS**              |             **UEFI**              |
+|   Phase   |     Boot Process     |                BIOS                |               UEFI                |
 |-----------|----------------------|------------------------------------|-----------------------------------|
 |     1     |       PreBoot        |      MBR/PBR (Bootstrap Code)      |           UEFI Firmware           |
 |     2     | Windows Boot Manager |       %SystemDrive%\bootmgr        | \EFI\Microsoft\Boot\bootmgfw.efi  |
@@ -73,10 +73,12 @@ Each phase has a different approach to troubleshooting. This article provides tr
 To determine whether the system has passed the BIOS phase, follow these steps:
 
 1. If there are any external peripherals connected to the computer, disconnect them.
+
 2. Check whether the hard disk drive light on the physical computer is working. If it is not working, this indicates that the startup process is stuck at the BIOS phase.
+
 3. Press the NumLock key to see whether the indicator light toggles on and off. If it does not, this indicates that the startup process is stuck at BIOS.
 
-If the system is stuck at the BIOS phase, there may be a hardware problem.
+   If the system is stuck at the BIOS phase, there may be a hardware problem.
 
 ## Boot loader phase
 
@@ -116,20 +118,20 @@ The Startup Repair tool generates a log file to help you understand the startup
 **%windir%\System32\LogFiles\Srt\Srttrail.txt**
 
 
-For more information see, [A Stop error occurs, or the computer stops responding when you try to start Windows Vista or Windows 7](https://support.microsoft.com/help/925810/a-stop-error-occurs-or-the-computer-stops-responding-when-you-try-to-s)
+For more information, see [A Stop error occurs, or the computer stops responding when you try to start Windows Vista or Windows 7](https://support.microsoft.com/help/925810/a-stop-error-occurs-or-the-computer-stops-responding-when-you-try-to-s)
 
 
 ### Method 2: Repair Boot Codes
 
 To repair boot codes, run the following command:
 
-```dos
+```console
 BOOTREC /FIXMBR
 ```
 
 To repair the boot sector, run the following command:
 
-```dos
+```console
 BOOTREC /FIXBOOT
 ```
 
@@ -141,51 +143,54 @@ BOOTREC /FIXBOOT
 If you receive BCD-related errors, follow these steps:
 
 1. Scan for all the systems that are installed. To do this, run the following command:
-   ```dos
+
+   ```console
    Bootrec /ScanOS
    ```
 
 2. Restart the computer to check whether the problem is fixed.
 
 3. If the problem is not fixed, run the following command:
-    ```dos
+
+    ```console
     Bootrec /rebuildbcd
     ```
 
 4. You might receive one of the following outputs:
-    ```dos
+
+    ```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.
     ```
 
-    ```dos
+    ```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:
+    If the output shows **windows installation: 0**, run the following commands:
     
-```dos
+    ```console
-bcdedit /export c:\bcdbackup
+    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
+    bootrec /rebuildbcd
-```
+    ```
     
-After you run the command, you receive the following output:
+    After you run the command, you receive the following output:
     
-```dos
+    ```console
-Scanning all disks for Windows installations. Please wait, since this may take a while ...
+    Scanning all disks for Windows installations. Please wait, since this may take a while ...
-Successfully scanned Windows installations. Total identified Windows installations: 1
+    Successfully scanned Windows installations. Total identified Windows installations: 1
-{D}:\Windows
+    {D}:\Windows
-Add installation to boot list? Yes/No/All: Y
+    Add installation to boot list? Yes/No/All: Y
-```
+    ```
 
 5. Try restarting the system.
 
@@ -196,17 +201,20 @@ If methods 1, 2 and 3 do not fix the problem, replace the Bootmgr file from driv
 1. At a command prompt, change the directory to the System Reserved partition.
 
 2. Run the **attrib** command to unhide the file:
-    ```dos
+
+    ```console
     attrib -r -s -h
     ```
 
 3. Run the same **attrib** command on the Windows (system drive):
-    ```dos
+
+    ```console
     attrib -r -s -h
     ```
 
 4. Rename the Bootmgr file as Bootmgr.old:
-    ```dos
+
+    ```console
     ren c:\bootmgr bootmgr.old
     ```
 
@@ -232,6 +240,7 @@ If the system gets stuck during the kernel phase, you experience multiple sympto
 -   A Stop error appears after the splash screen (Windows Logo screen).
 
 -   Specific error code is displayed.
+
     For example, "0x00000C2" , "0x0000007B" , "inaccessible boot device" and so on.  
     - [Advanced troubleshooting for Stop error 7B or Inaccessible_Boot_Device](./troubleshoot-inaccessible-boot-device.md)
     - [Advanced troubleshooting for Event ID 41 "The system has rebooted without cleanly shutting down first"](troubleshoot-event-id-41-restart.md)
@@ -319,19 +328,21 @@ To fix problems that occur after you install Windows updates, check for pending
 1. Open a Command Prompt window in WinRE.
 
 2. Run the command:
-    ```dos
+
+    ```console
     DISM /image:C:\ /get-packages
     ```
 
 3. If there are any pending updates, uninstall them by running the following commands:
-    ```dos
+
+    ```console
     DISM /image:C:\ /remove-package /packagename: name of the package
     ```
-    ```dos
+    ```console
     DISM /Image:C:\ /Cleanup-Image /RevertPendingActions
     ```
 
-Try to start the computer.
+    Try to start the computer.
 
 If the computer does not start, follow these steps:
 
@@ -379,14 +390,18 @@ If the dump file shows an error that is related to a driver (for example, window
 - If the driver is not important and has no dependencies, load the system hive, and then disable the driver.
 
 - If the stop error indicates system file corruption, run the system file checker in offline mode.
+
     - To do this, open WinRE, open a command prompt, and then run the following command:
-        ```dos
+
+        ```console
         SFC /Scannow /OffBootDir=C:\ /OffWinDir=E:\Windows
         ```
+
         For more information, see [Using System File Checker (SFC) To Fix  Issues](/archive/blogs/askcore/using-system-file-checker-sfc-to-fix-issues)
 
     - If there is disk corruption, run the check disk command:
-        ```dos
+
+        ```console
         chkdsk /f /r
         ```
 

windows/client-management/mdm/policy-csp-localusersandgroups.md

@@ -125,7 +125,7 @@ See [Use custom settings for Windows 10 devices in Intune](/mem/intune/configura
 
 Example 1: AAD focused.
 
-The following example updates the built-in administrators group with AAD account "bob@contoso.com" and an Azure AD group with the SID **S-1-12-1-111111111-22222222222-3333333333-4444444444. On an AAD joined machines**. 
+The following example updates the built-in administrators group with AAD account "bob@contoso.com" and an Azure AD group with the SID **S-1-12-1-111111111-22222222222-3333333333-4444444444** on an AAD-joined machine. 
 
 ```xml
 <GroupConfiguration>
@@ -239,7 +239,7 @@ To troubleshoot Name/SID lookup APIs:
 
 1. Enable **lsp.log** on the client device by running the following commands:
 
-    ```cmd
+    ```powershell
     Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\Lsa" -Name LspDbgInfoLevel -Value 0x800 -Type dword -Force
 
     Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\Lsa" -Name LspDbgTraceOptions -Value 0x1 -Type dword -Force
@@ -249,11 +249,12 @@ To troubleshoot Name/SID lookup APIs:
 
 2. Turn the logging off by running the following command:
 
-    ```cmd
+    ```powershell
     Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\Lsa" -Name LspDbgInfoLevel -Value 0x0 -Type dword -Force
     
     Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\Lsa" -Name LspDbgTraceOptions -Value 0x0 -Type dword -Force
     ```
+
 ```xml
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0">
                           <xs:simpleType name="name">