Merge pull request #7827 from MicrosoftDocs/main

Auto Publish – main to live - 2025-12-01 18:30 UTC

Author: learn-build-service-prod[bot]

WindowsServerDocs/administration/OpenSSH/OpenSSH_KeyManagement.md

@@ -20,6 +20,8 @@ By comparison, Linux environments commonly use public/private key pairs to drive
 
 This document provides an overview of how to use these tools on Windows to begin using key-based authentication with Secure Shell (SSH). If you're not familiar with SSH key management, we strongly recommend that you review [NIST document IR 7966](http://nvlpubs.nist.gov/nistpubs/ir/2015/NIST.IR.7966.pdf), titled _Security of Interactive and Automated Access Management Using Secure Shell (SSH)_.
 
+Key-based authentication in OpenSSH for Windows works with local Windows accounts and Active Directory (domain) accounts. Microsoft Entra ID accounts don't support key-based authentication.
+
 > [!NOTE]
 > Windows OpenSSH doesn't support the `AuthorizedKeysCommand` and `AuthorizedKeysCommandUser` directives. Meaning you can't dynamically fetch SSH keys from Active Directory using these directives as you might on Linux system. For more information about the supported configuration options, see [OpenSSH Server configuration for Windows Server and Windows](openssh-server-configuration.md).
 

WindowsServerDocs/administration/windows-commands/shutdown.md

@@ -14,7 +14,7 @@ Enables you to shut down or restart local or remote computers, one at a time.
 ## Syntax
 
 ```
-shutdown [/i | /l | /s | /sg | /r | /g | /a | /p | /h | /e | /o] [/hybrid] [/soft] [/fw] [/f] [/m \\computer][/t xxx][/d [p|u:]xx:yy [/c "comment"]]
+shutdown [/i | /l | /s | /sg | /r | /g | /a | /p | /h | /e | /o] [/hybrid] [/fw] [/f] [/m \\computer][/t xxx][/d [p|u:]xx:yy [/c "comment"]]
 ```
 
 ### Parameters
@@ -27,11 +27,10 @@ shutdown [/i | /l | /s | /sg | /r | /g | /a | /p | /h | /e | /o] [/hybrid] [/sof
 | /sg | Shuts down the computer. On the next boot, if **Automatic Restart Sign-On** is enabled, the device automatically signs in and locks based on the last interactive user. After sign in, it restarts any registered applications. |
 | /r | Restarts the computer after shutdown. |
 | /g | Fully shuts down and restarts the computer. On restart, if **Automatic Restart Sign-On** is enabled, the device automatically signs in and locks based on the last interactive user. After sign in, it restarts any registered applications. |
-| /a | Aborts a system shutdown. Can only be used during the time-out period. Combine with **/fw** to clear any pending boots to firmware. |
+| /a | Aborts a pending system shutdown. This must be run as a separate command in a new command prompt window during the time-out period (for example, `shutdown /a`). Combine with **/fw** to clear any pending boots to firmware. |
 | /p | Turns off the local computer only (not a remote computer) with no time-out period or warning. You can use **/p** only with **/d** or **/f**. If your computer doesn't support power-off functionality, it shuts down when you use **/p**, but the power to the computer remains on. |
 | /h | Puts the local computer into hibernation, if hibernation is enabled. The **/f** switch can be used with the **/h** switch. |
 | /hybrid | Shuts down the device and prepares it for fast startup. This option must be used with the **/s** option. |
-| /soft | Allows running processes and applications to gracefully close instead of forcibly terminating. |
 | /fw | Combining this option with a shutdown option causes the next restart to go to the firmware user interface. |
 | /e | Enables you to document the reason for an unexpected shutdown of a computer in the [Shutdown Event Tracker](/troubleshoot/windows-server/application-management/description-shutdown-event-tracker). |
 | /o | Goes to the **Advanced boot options** menu and restarts the device. This option must be used with the **/r** option. |
@@ -125,6 +124,12 @@ To restart the remote computer *myremoteserver* in 5 minutes due to a security u
 shutdown /r /t 300 /e /c "Security Update" /m \\myremoteserver
 ```
 
+To cancel a pending shutdown (must be run in a new command prompt window during the timeout period), type:
+
+```
+shutdown /a
+```
+
 ## Related links
 
 - [Command-Line Syntax Key](command-line-syntax-key.md)

WindowsServerDocs/administration/windows-server-update-services/manage/wsus-and-the-catalog-site.md

@@ -59,10 +59,10 @@ Use the following instructions to import updates into WSUS:
    C:\temp\ImportUpdateToWSUS.ps1 [-WsusServer] <String> [-PortNumber] <Int32> [-UseSsl] [-UpdateId] <String> [-UpdateIdFilePath] <string> [<CommonParameters>]
    ```
 
-    **Example 1**: While signed into a WSUS server that uses the default port, import a single update by using the following syntax:
+    **Example 1**: Import a single update into a WSUS server by specifying the server name and port number:
 
     ```powershell
-    .\ImportUpdateToWSUS.ps1 -UpdateId 12345678-90ab-cdef-1234-567890abcdef
+    .\ImportUpdateToWSUS.ps1 -WsusServer WSUSServer.contoso.com -PortNumber 8530 -UpdateId 12345678-90ab-cdef-1234-567890abcdef
     ```
 
    **Example 2**: Using a remote computer, import multiple updates into a WSUS server by using SSL with the following syntax:

WindowsServerDocs/docfx.json

@@ -204,6 +204,11 @@
           "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2022</a>",
           "✅ <a href=\"https://learn.microsoft.com/azure/azure-local/release-information-23h2\" target=\"_blank\">Azure Local 2311.2 and later</a>"
         ],
+        "failover-clustering/cluster-set.md": [
+          "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2025</a>",
+          "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2022</a>",
+          "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2019</a>"
+        ],
         "get-started/**/*.md": [
           "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2025</a>",
           "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2022</a>",
@@ -658,6 +663,18 @@
         "storage/storage-replica/storage-replica-enhanced-log.md": [
           "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2025</a>"
         ],
+        "storage/storage-spaces/persistent-memory-health.md": [
+          "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2025</a>",
+          "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2022</a>",
+          "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2019</a>",
+          "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2016</a>"
+        ],
+        "storage/storage-spaces/drive-symmetry-considerations.md": [
+          "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2025</a>",
+          "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2022</a>",
+          "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2019</a>",
+          "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2016</a>"
+        ],
         "storage/storage-spaces-direct/**/*.md": [
           "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2025</a>",
           "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2022</a>",

WindowsServerDocs/failover-clustering/cluster-set.md

@@ -5,13 +5,11 @@ author: robinharwood
 ms.topic: how-to
 ms.date: 09/08/2022
 ms.author: roharwoo
-ms.reviewer: stevenek
+ms.reviewer: robhindman
 ---
 
 # Deploy a cluster set
 
-> Applies to: Windows Server 2019
-
 This article provides information on how to deploy a cluster set for Windows Server Failover Clusters using PowerShell. A cluster set is a group of multiple failover clusters that are clustered together. By using a cluster set, you can increase the number of server nodes in a single Software Defined Data Center (SDDC) cloud by orders of magnitude.
 
 Cluster sets have been tested and supported up to 64 total cluster nodes. However, cluster sets can scale to much larger limits and aren't hardcoded for a limit.
@@ -67,7 +65,7 @@ The following provides a summary of each of the elements shown:
 
 ### Management cluster
 
-The management cluster hosts the highly-available management plane and the namespace referral scale-out file server (SOFS) for the cluster set. A management cluster is logically decoupled from individual member clusters that run VM workloads. This makes the cluster set management plane resilient to any localized cluster-wide failures, such as loss of power of a member cluster.
+The management cluster hosts the highly available management plane and the namespace referral scale-out file server (SOFS) for the cluster set. A management cluster is logically decoupled from individual member clusters that run VM workloads. This makes the cluster set management plane resilient to any localized cluster-wide failures, such as loss of power of a member cluster.
 
 ### Cluster set namespace referral SOFS
 

WindowsServerDocs/identity/ad-ds/deploy/ad-ds-metadata-cleanup.md

@@ -66,15 +66,29 @@ As an alternative, you can clean up metadata by using ntdsutil.exe, a command-li
 
 4. At the `metadata cleanup:` prompt, type the following command, and then press **Enter**:
 
+   `connections`
+
+5. At the `server connections:` prompt, type the following command, and then press **Enter**:
+
+   `connect to server <ServerName>`
+
+   Where `<ServerName>` is the fully qualified domain name (FQDN) or NetBIOS name of the domain controller you want to use to perform the metadata cleanup. This domain controller must be a replication partner of the removed domain controller.
+
+6. At the `server connections:` prompt, type the following command, and then press **Enter**:
+
+   `quit`
+
+7. At the `metadata cleanup:` prompt, type the following command, and then press **Enter**:
+
    `remove selected server <ServerName>`
 
-5. In **Server Remove Configuration Dialog**, review the information and warning, and then click **Yes** to remove the server object and metadata.
+8. In **Server Remove Configuration Dialog**, review the information and warning, and then click **Yes** to remove the server object and metadata.
 
    At this point, Ntdsutil confirms that the domain controller was removed successfully. If you receive an error message that indicates that the object cannot be found, the domain controller might have been removed earlier.
 
-6. At the `metadata cleanup:` and `ntdsutil:` prompts, type `quit`, and then press **Enter**.
+9. At the `metadata cleanup:` and `ntdsutil:` prompts, type `quit`, and then press **Enter**.
 
-7. To confirm removal of the domain controller:
+10. To confirm removal of the domain controller:
 
    Open Active Directory Users and Computers. In the domain of the removed domain controller, click **Domain Controllers**. In the details pane, an object for the domain controller that you removed should not appear.
 

WindowsServerDocs/storage/storage-spaces/drive-symmetry-considerations.md

@@ -1,26 +1,23 @@
 ---
-title: Drive symmetry considerations for Azure Local and Windows Server clusters
+title: Drive symmetry considerations for Storage Spaces Direct in Windows Server
 description: This article explains drive symmetry constraints in Storage Spaces Direct. It also provides examples of supported and unsupported configurations.
 author: robinharwood
 ms.author: roharwoo
+ms.reviewer: robhindman
 ms.topic: concept-article
 ms.date: 02/10/2025
-appliesto: [
-            "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2025</a>",
-            "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2022</a>",
-            "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2019</a>",
-            "✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2016</a>",
-            "✅ <a href=\"https://learn.microsoft.com/azure/azure-local/release-information-23h2\" target=\"_blank\">Azure Local 2311.2 and later</a>"
-           ]
 ---
 
-# Drive symmetry considerations for Azure Local and Windows Server clusters
+# Drive symmetry considerations for Storage Spaces Direct in Windows Server
 
-Azure Local and Windows Server clusters work best when every server has exactly the same drives.
+Storage Spaces Direct works best when every server has exactly the same drives.
 
 In reality, we recognize this isn't always practical. Today, you may buy spacious 3 TB hard drives; next year, it may become impossible to find drives that small. Therefore, some amount of mixing-and-matching is expected and supported. Keep in mind, however, that more symmetry is always better.
 
-Storage Spaces Direct is the underlying storage virtualization technology behind Azure Local and Windows Server. This article explains the constraints and provides examples of supported and unsupported configurations in Storage Spaces Direct.
+Storage Spaces Direct is an underlying storage virtualization technology used in Windows Server to create highly available and scalable software-defined storage. It uses local drives in each server to create a storage pool that can be shared across the cluster. This article explains the constraints and provides examples of supported and unsupported configurations in Storage Spaces Direct.
+
+> [!NOTE]
+> Looking for Azure Local? See the [Azure Local system requirements](/azure/azure-local/concepts/system-requirements-23h2) article for drive requirements specific to Azure Local.
 
 ## Constraints
 

WindowsServerDocs/storage/storage-spaces/persistent-memory-health.md

@@ -1,17 +1,11 @@
 ---
-title: Persistent memory health management in Azure Local and Windows Server
-description: This article provides information about error handling and health management specific to persistent memory (PMem) devices in Azure Local and Windows Server.
+title: Persistent memory health management for Storage Spaces Direct in Windows Server
+description: This article provides information about error handling and health management specific to persistent memory (PMem) devices in Windows Server.
 author: robinharwood
 ms.author: roharwoo
+ms.reviewer: robhindman
 ms.topic: how-to
 ms.date: 02/10/2025
-appliesto: [
-			"✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2025</a>",
-			"✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2022</a>",
-			"✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2019</a>",
-			"✅ <a href=\"https://learn.microsoft.com/windows-server/get-started/windows-server-release-info\" target=\"_blank\">Windows Server 2016</a>",
-			"✅ <a href=\"https://learn.microsoft.com/azure/azure-local/release-information-23h2\" target=\"_blank\">Azure Local 2311.2 and later</a>"
-		   ]
 ---
 
 # Persistent memory health management