Merge branch 'main' of github.com:MicrosoftDocs/windows-docs-pr into pm-security-book

windows/deployment/usmt/usmt-loadstate-syntax.md

@@ -6,7 +6,7 @@ manager: aaroncz
 ms.author: frankroj
 ms.service: windows-client
 author: frankroj
-ms.date: 01/09/2024
+ms.date: 04/30/2024
 ms.topic: article
 ms.subservice: itpro-deploy
 appliesto:
@@ -127,33 +127,33 @@ The `/uel`, `/ue` and `/ui` options can be used together to migrate only the use
 
 ## Incompatible command-line options
 
-The following table indicates which command-line options aren't compatible with the `LoadState.exe` command. If the table entry for a particular combination has a ✔️, the options are compatible, and they can be used together. The ❌ symbol means that the options aren't compatible. For example, the `/nocompress` option can't be used with the `/encrypt` option.
+The following table indicates which command-line options aren't compatible with the `LoadState.exe` command. If the table entry for a particular combination has a ✅, the options are compatible, and they can be used together. The ❌ symbol means that the options aren't compatible. For example, the `/nocompress` option can't be used with the `/encrypt` option.
 
 | Command-Line Option | /keyfile | /nocompress | /genconfig | /all |
 |--- |--- |--- |--- |--- |
-| **/i** | ✔️ | ✔️ | ✔️ | ✔️ |
-| **/v** | ✔️ | ✔️ | ✔️ | ✔️ |
-| **/nocompress** | ✔️ | N/A | ❌ | ✔️ |
-| **/key** | ❌ | ✔️ | ❌ | ✔️ |
-| **/decrypt** | Required* | ❌ | ❌ | ✔️ |
-| **/keyfile** | N/A | ✔️ | ❌ | ✔️ |
-| **/l** | ✔️ | ✔️ | ✔️ | ✔️ |
-| **/progress** | ✔️ | ✔️ | ❌ | ✔️ |
-| **/r** | ✔️ | ✔️ | ❌ | ✔️ |
-| **/w** | ✔️ | ✔️ | ❌ | ✔️ |
-| **/c** | ✔️ | ✔️ | ❌ | ✔️ |
-| **/p** | ✔️ | ✔️ | ❌ | N/A |
-| **/all** | ✔️ | ✔️ | ❌ | ✔️ |
-| **/ui** | ✔️ | ✔️ | ❌ | ❌ |
-| **/ue** | ✔️ | ✔️ | ❌ | ❌ |
-| **/uel** | ✔️ | ✔️ | ❌ | ❌ |
-| **/genconfig** | ✔️ | ✔️ | N/A | ✔️ |
-| **/config** | ✔️ | ✔️ | ❌ | ✔️ |
-| *StorePath* | ✔️ | ✔️ | ✔️ | ✔️ |
-| **/md** | ✔️ | ✔️ | ✔️ | ✔️ |
-| **/mu** | ✔️ | ✔️ | ✔️ | ✔️ |
-| **/lae** | ✔️ | ✔️ | ✔️ | ✔️ |
-| **/lac** | ✔️ | ✔️ | ✔️ | ✔️ |
+| **/i** | ✅ | ✅ | ✅ | ✅ |
+| **/v** | ✅ | ✅ | ✅ | ✅ |
+| **/nocompress** | ✅ | N/A | ❌ | ✅ |
+| **/key** | ❌ | ✅ | ❌ | ✅ |
+| **/decrypt** | Required* | ❌ | ❌ | ✅ |
+| **/keyfile** | N/A | ✅ | ❌ | ✅ |
+| **/l** | ✅ | ✅ | ✅ | ✅ |
+| **/progress** | ✅ | ✅ | ❌ | ✅ |
+| **/r** | ✅ | ✅ | ❌ | ✅ |
+| **/w** | ✅ | ✅ | ❌ | ✅ |
+| **/c** | ✅ | ✅ | ❌ | ✅ |
+| **/p** | ✅ | ✅ | ❌ | N/A |
+| **/all** | ✅ | ✅ | ❌ | ✅ |
+| **/ui** | ✅ | ✅ | ❌ | ❌ |
+| **/ue** | ✅ | ✅ | ❌ | ❌ |
+| **/uel** | ✅ | ✅ | ❌ | ❌ |
+| **/genconfig** | ✅ | ✅ | N/A | ✅ |
+| **/config** | ✅ | ✅ | ❌ | ✅ |
+| *StorePath* | ✅ | ✅ | ✅ | ✅ |
+| **/md** | ✅ | ✅ | ✅ | ✅ |
+| **/mu** | ✅ | ✅ | ✅ | ✅ |
+| **/lae** | ✅ | ✅ | ✅ | ✅ |
+| **/lac** | ✅ | ✅ | ✅ | ✅ |
 
 > [!NOTE]
 >

windows/deployment/usmt/usmt-requirements.md

@@ -6,7 +6,7 @@ manager: aaroncz
 ms.author: frankroj
 ms.service: windows-client
 author: frankroj
-ms.date: 01/18/2024
+ms.date: 04/30/2024
 ms.topic: article
 ms.subservice: itpro-deploy
 appliesto:
@@ -24,10 +24,10 @@ The following table lists the operating systems supported in USMT.
 
 | Operating<br>Systems | ScanState<br>(Source<br>Device)| LoadState<br>(Destination<br>Device)|
 |--- |--- |--- |
-|Windows 7|✔️|❌|
-|Windows 8|✔️|❌|
-|Windows 10|✔️|✔️|
-|Windows 11|✔️|✔️|
+|Windows 7|✅|❌|
+|Windows 8|✅|❌|
+|Windows 10|✅|✅|
+|Windows 11|✅|✅|
 
 > [!NOTE]
 >
@@ -79,7 +79,7 @@ To open an elevated command prompt:
 
 ### Specify the `/c` option and \<ErrorControl\> settings in the `Config.xml` file
 
-USMT fails if it can't migrate a file or setting, unless the `/c` option is specified. When the `/c` option is specified, USMT logs an error each time it encounters a file that is in use that didn't migrate, but the migration isn't be interrupted. In USMT, which types of errors should allow the migration to continue and which should cause the migration to fail can be specified in the `Config.xml` file. For more information about error reporting, and the **\<ErrorControl\>** element, see [Config.xml file](usmt-configxml-file.md#errorcontrol), [Log files](usmt-log-files.md), and [XML elements library](usmt-xml-elements-library.md).
+USMT fails if it can't migrate a file or setting, unless the `/c` option is specified. When the `/c` option is specified, USMT logs an error each time it encounters a file that is in use that didn't migrate, but the migration isn't to be interrupted. In USMT, which types of errors should allow the migration to continue and which should cause the migration to fail can be specified in the `Config.xml` file. For more information about error reporting, and the **\<ErrorControl\>** element, see [Config.xml file](usmt-configxml-file.md#errorcontrol), [Log files](usmt-log-files.md), and [XML elements library](usmt-xml-elements-library.md).
 
 ## LoadState
 

windows/deployment/usmt/usmt-scanstate-syntax.md

@@ -6,7 +6,7 @@ manager: aaroncz
 ms.author: frankroj
 ms.service: windows-client
 author: frankroj
-ms.date: 01/09/2024
+ms.date: 04/30/2024
 ms.topic: article
 ms.subservice: itpro-deploy
 appliesto:
@@ -85,7 +85,7 @@ There are several benefits to running the `ScanState.exe` command on an offline
 - **Improved success of migration.**
 
   The migration success rate is increased because:
-  
+
   - Files aren't locked for editing while offline.
   - WinPE provides administrator access to files in the offline Windows file system, eliminating the need for administrator-level access to the online system.
 
@@ -197,33 +197,33 @@ For more information, see [Migrate EFS Files and Certificates](usmt-migrate-efs-
 
 ## Incompatible command-line options
 
-The following table indicates which command-line options aren't compatible with the `ScanState.exe` command. If the table entry for a particular combination has a ✔️, the options are compatible and they can be used together. The ❌ symbol means that the options aren't compatible. For example, the `/nocompress` option can't be used with the `/encrypt` option.
+The following table indicates which command-line options aren't compatible with the `ScanState.exe` command. If the table entry for a particular combination has a ✅, the options are compatible and they can be used together. The ❌ symbol means that the options aren't compatible. For example, the `/nocompress` option can't be used with the `/encrypt` option.
 
 |Command-Line Option|/keyfile|/nocompress|/genconfig|/all|
 |--- |--- |--- |--- |--- |
-|**/i**| ✔️ | ✔️ | ✔️ | ✔️ |
-|**/o**| ✔️ | ✔️ | ✔️ | ✔️ |
-|**/v**| ✔️ | ✔️ | ✔️ | ✔️ |
-|**/nocompress**| ✔️ | ✔️ | ✔️ |N/A|
-|**/localonly**| ✔️ | ✔️ | ❌ | ✔️ |
-|**/key**| ❌ | ✔️ | ❌ | ✔️ |
-|**/encrypt**|Required*| ❌ | ❌ | ✔️ |
-|**/keyfile**|N/A| ✔️ | ❌ | ✔️ |
-|**/l**| ✔️ | ✔️ | ✔️ | ✔️ |
-|**/listfiles**| ✔️ | ✔️ | ❌ | ✔️ |
-|**/progress**| ✔️ | ✔️ | ❌ | ✔️ |
-|**/r**| ✔️ | ✔️ | ❌ | ✔️ |
-|**/w**| ✔️ | ✔️ | ❌ | ✔️ |
-|**/c**| ✔️ | ✔️ | ❌ | ✔️ |
-|**/p**| ✔️ | ✔️ | ❌ |N/A|
-|**/all**| ✔️ | ✔️ | ❌ | ✔️ |
-|**/ui**| ✔️ | ✔️ | ❌ | ❌ |
-|**/ue**| ✔️ | ✔️ | ❌ | ❌ |
-|**/uel**| ✔️ | ✔️ | ❌ | ❌ |
-|**/efs**:*\<option\>*| ✔️ | ✔️ | ❌ | ✔️ |
-|**/genconfig**| ✔️ | ✔️ |N/A| ✔️ |
-|**/config**| ✔️ | ✔️ | ❌ | ✔️ |
-|*\<StorePath\>*| ✔️ | ✔️ | ❌ | ✔️ |
+|**/i**| ✅ | ✅ | ✅ | ✅ |
+|**/o**| ✅ | ✅ | ✅ | ✅ |
+|**/v**| ✅ | ✅ | ✅ | ✅ |
+|**/nocompress**| ✅ | ✅ | ✅ |N/A|
+|**/localonly**| ✅ | ✅ | ❌ | ✅ |
+|**/key**| ❌ | ✅ | ❌ | ✅ |
+|**/encrypt**|Required*| ❌ | ❌ | ✅ |
+|**/keyfile**|N/A| ✅ | ❌ | ✅ |
+|**/l**| ✅ | ✅ | ✅ | ✅ |
+|**/listfiles**| ✅ | ✅ | ❌ | ✅ |
+|**/progress**| ✅ | ✅ | ❌ | ✅ |
+|**/r**| ✅ | ✅ | ❌ | ✅ |
+|**/w**| ✅ | ✅ | ❌ | ✅ |
+|**/c**| ✅ | ✅ | ❌ | ✅ |
+|**/p**| ✅ | ✅ | ❌ |N/A|
+|**/all**| ✅ | ✅ | ❌ | ✅ |
+|**/ui**| ✅ | ✅ | ❌ | ❌ |
+|**/ue**| ✅ | ✅ | ❌ | ❌ |
+|**/uel**| ✅ | ✅ | ❌ | ❌ |
+|**/efs**:*\<option\>*| ✅ | ✅ | ❌ | ✅ |
+|**/genconfig**| ✅ | ✅ |N/A| ✅ |
+|**/config**| ✅ | ✅ | ❌ | ✅ |
+|*\<StorePath\>*| ✅ | ✅ | ❌ | ✅ |
 
 > [!NOTE]
 >