Merge branch 'main' into main

JonnyTech · web-flow · commit f403fd37221d · 2025-07-20T18:33:52.000+01:00
diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json
@@ -38,16 +38,16 @@
             "docset_name": "windows-powershell",
             "locale": "en-us",
             "monikerPath": [
-                "mapping/MAML2Yaml/monikerMapping.json"
+                "mapping/monikerMapping.json"
             ],
             "moniker_ranges": [],
             "monikers": [],
             "open_to_public_contributors": true,
             "template_folder": "_themes",
             "type_mapping": {
                 "Conceptual": "Content",
-                "PowershellCmdlet": "Content",
-                "PowershellModule": "Content"
+                "PowerShellCmdlet1": "Content",
+                "PowerShellModule1": "Content"
             },
             "version": 0,
             "xref_query_tags": [
diff --git a/docset/mapping/cabgenConfig.json b/docset/mapping/cabgenConfig.json
@@ -5,28 +5,28 @@
                 "exclude": [
                     "docset/winserver2025-ps/Microsoft.DiagnosticDataViewer",
                     "docset/winserver2025-ps/Microsoft.Windows.ServerManager.Migration",
-                    "docset/winserver2025-ps/windowsdiagnosticdata"
+                    "docset/winserver2025-ps/WindowsDiagnosticData"
                 ]
             },
             "WindowsServer2022-ps": {
                 "exclude": [
                     "docset/winserver2022-ps/Microsoft.DiagnosticDataViewer",
                     "docset/winserver2022-ps/Microsoft.Windows.ServerManager.Migration",
-                    "docset/winserver2022-ps/windowsdiagnosticdata"
+                    "docset/winserver2022-ps/WindowsDiagnosticData"
                 ]
             },
             "WindowsServer2019-ps": {
                 "exclude": [
                     "docset/winserver2019-ps/Microsoft.DiagnosticDataViewer",
                     "docset/winserver2019-ps/Microsoft.Windows.ServerManager.Migration",
-                    "docset/winserver2019-ps/windowsdiagnosticdata"
+                    "docset/winserver2019-ps/WindowsDiagnosticData"
                 ]
             },
             "WindowsServer2016-ps": {
                 "exclude": [
                     "docset/winserver2016-ps/Microsoft.DiagnosticDataViewer",
                     "docset/winserver2016-ps/Microsoft.Windows.ServerManager.Migration",
-                    "docset/winserver2016-ps/windowsdiagnosticdata"
+                    "docset/winserver2016-ps/WindowsDiagnosticData"
                 ]
             }
         }
diff --git a/docset/mapping/monikerMapping.json b/docset/mapping/monikerMapping.json
diff --git a/docset/winserver2016-ps/Microsoft.DiagnosticDataViewer/Microsoft.DiagnosticDataViewer.md b/docset/winserver2016-ps/Microsoft.DiagnosticDataViewer/Microsoft.DiagnosticDataViewer.md
@@ -1,6 +1,6 @@
 ---
-Download Help Link: https://aka.ms/winsvr-2016-pshelp
-Help Version: {{Please enter version of help manually (X.X.X.X) format}}
+Download Help Link:
+Help Version:
 Locale: en-US
 Module Guid: 9bd99f27-788b-4912-8f67-5d9d1640fd9b
 Module Name: Microsoft.DiagnosticDataViewer
@@ -12,7 +12,7 @@ title: Microsoft.DiagnosticsDataViewer
 The Microsoft.DiagnosticDataViewer module provides commands for viewing and analyzing the Diagnostic Data sent by a Windows device.
 
 ## Minimum Requirements
-The module requires Windows 10 version 17134 (1803) or higher.  
+The module requires Windows 10 version 17134 (1803) or higher.
 
 ## Microsoft.DiagnosticDataViewer Cmdlets
 ### [Disable-DiagnosticDataViewing](Disable-DiagnosticDataViewing.md)
diff --git a/docset/winserver2016-ps/Microsoft.Windows.ServerManager.Migration/Microsoft.Windows.ServerManager.Migration.md b/docset/winserver2016-ps/Microsoft.Windows.ServerManager.Migration/Microsoft.Windows.ServerManager.Migration.md
@@ -1,7 +1,7 @@
 ---
 description: Use this topic to help manage Windows and Windows Server technologies with Windows PowerShell.
-Download Help Link: https://aka.ms/winsvr-2016-pshelp
-Help Version: 1.0.0.0
+Download Help Link:
+Help Version:
 Locale: en-US
 Module Name: Microsoft.Windows.ServerManager.Migration
 Module Guid: 00000000-0000-0000-0000-000000000000
diff --git a/docset/winserver2016-ps/WindowsDiagnosticData/WindowsDiagnosticData.md b/docset/winserver2016-ps/WindowsDiagnosticData/WindowsDiagnosticData.md
@@ -1,6 +1,6 @@
 ---
-Download Help Link: https://aka.ms/winsvr-2016-pshelp
-Help Version: 1.0.0.0
+Download Help Link:
+Help Version:
 Locale: en-US
 Module Guid: 11888dc4-4830-4138-b422-e8bc2209ffb9
 Module Name: WindowsDiagnosticData
diff --git a/docset/winserver2019-ps/Microsoft.DiagnosticDataViewer/Microsoft.DiagnosticDataViewer.md b/docset/winserver2019-ps/Microsoft.DiagnosticDataViewer/Microsoft.DiagnosticDataViewer.md
@@ -1,6 +1,6 @@
 ---
-Download Help Link: https://aka.ms/winsvr-2019-pshelp
-Help Version: {{Please enter version of help manually (X.X.X.X) format}}
+Download Help Link:
+Help Version:
 Locale: en-US
 Module Guid: 9bd99f27-788b-4912-8f67-5d9d1640fd9b
 Module Name: Microsoft.DiagnosticDataViewer
@@ -12,7 +12,7 @@ title: Microsoft.DiagnosticsDataViewer
 The Microsoft.DiagnosticDataViewer module provides commands for viewing and analyzing the Diagnostic Data sent by a Windows device.
 
 ## Minimum Requirements
-The module requires Windows 10 version 17134 (1803) or higher.  
+The module requires Windows 10 version 17134 (1803) or higher.
 
 ## Microsoft.DiagnosticDataViewer Cmdlets
 ### [Disable-DiagnosticDataViewing](Disable-DiagnosticDataViewing.md)
diff --git a/docset/winserver2019-ps/Microsoft.Windows.ServerManager.Migration/Microsoft.Windows.ServerManager.Migration.md b/docset/winserver2019-ps/Microsoft.Windows.ServerManager.Migration/Microsoft.Windows.ServerManager.Migration.md
@@ -1,7 +1,7 @@
 ---
 description: Use this topic to help manage Windows and Windows Server technologies with Windows PowerShell.
-Download Help Link: https://aka.ms/winsvr-2019-pshelp
-Help Version: 1.0.0.0
+Download Help Link:
+Help Version:
 Locale: en-US
 Module Name: Microsoft.Windows.ServerManager.Migration
 Module Guid: 00000000-0000-0000-0000-000000000000
diff --git a/docset/winserver2019-ps/WindowsDiagnosticData/WindowsDiagnosticData.md b/docset/winserver2019-ps/WindowsDiagnosticData/WindowsDiagnosticData.md
@@ -1,6 +1,6 @@
 ---
-Download Help Link: https://aka.ms/winsvr-2019-pshelp
-Help Version: 1.0.0.0
+Download Help Link:
+Help Version:
 Locale: en-US
 Module Guid: 11888dc4-4830-4138-b422-e8bc2209ffb9
 Module Name: WindowsDiagnosticData
diff --git a/docset/winserver2022-ps/Microsoft.DiagnosticDataViewer/Microsoft.DiagnosticDataViewer.md b/docset/winserver2022-ps/Microsoft.DiagnosticDataViewer/Microsoft.DiagnosticDataViewer.md
@@ -1,6 +1,6 @@
 ---
-Download Help Link: https://aka.ms/winsvr-2022-pshelp
-Help Version: {{Please enter version of help manually (X.X.X.X) format}}
+Download Help Link:
+Help Version:
 Locale: en-US
 Module Guid: 9bd99f27-788b-4912-8f67-5d9d1640fd9b
 Module Name: Microsoft.DiagnosticDataViewer
@@ -12,7 +12,7 @@ title: Microsoft.DiagnosticsDataViewer
 The Microsoft.DiagnosticDataViewer module provides commands for viewing and analyzing the Diagnostic Data sent by a Windows device.
 
 ## Minimum Requirements
-The module requires Windows 10 version 17134 (1803) or higher.  
+The module requires Windows 10 version 17134 (1803) or higher.
 
 ## Microsoft.DiagnosticDataViewer Cmdlets
 ### [Disable-DiagnosticDataViewing](Disable-DiagnosticDataViewing.md)
diff --git a/docset/winserver2022-ps/Microsoft.Windows.ServerManager.Migration/Microsoft.Windows.ServerManager.Migration.md b/docset/winserver2022-ps/Microsoft.Windows.ServerManager.Migration/Microsoft.Windows.ServerManager.Migration.md
@@ -1,7 +1,7 @@
 ---
 description: Use this topic to help manage Windows and Windows Server technologies with Windows PowerShell.
-Download Help Link: https://aka.ms/winsvr-2022-pshelp
-Help Version: 1.0.0.0
+Download Help Link:
+Help Version:
 Locale: en-US
 Module Name: Microsoft.Windows.ServerManager.Migration
 Module Guid: 00000000-0000-0000-0000-000000000000
diff --git a/docset/winserver2022-ps/WindowsDiagnosticData/WindowsDiagnosticData.md b/docset/winserver2022-ps/WindowsDiagnosticData/WindowsDiagnosticData.md
@@ -1,6 +1,6 @@
 ---
-Download Help Link: https://aka.ms/winsvr-2022-pshelp
-Help Version: 1.0.0.0
+Download Help Link:
+Help Version:
 Locale: en-US
 Module Guid: 11888dc4-4830-4138-b422-e8bc2209ffb9
 Module Name: WindowsDiagnosticData
diff --git a/docset/winserver2025-ps/FailoverClusters/Update-ClusterFunctionalLevel.md b/docset/winserver2025-ps/FailoverClusters/Update-ClusterFunctionalLevel.md
@@ -2,7 +2,7 @@
 description: Use this topic to help manage Windows and Windows Server technologies with Windows PowerShell.
 external help file: Microsoft.FailoverClusters.PowerShell.dll-Help.xml
 Module Name: FailoverClusters
-ms.date: 11/23/2022
+ms.date: 07/18/2025
 online version: https://learn.microsoft.com/powershell/module/failoverclusters/update-clusterfunctionallevel?view=windowsserver2025-ps&wt.mc_id=ps-gethelp
 schema: 2.0.0
 title: Update-ClusterFunctionalLevel
@@ -26,34 +26,18 @@ The `Update-ClusterFunctionalLevel` cmdlet updates the functional level of a mix
 cluster. You can update the cluster after all nodes have been updated.
 
 Starting with Windows Server 2016, you can add a node that runs a more recent version of the Windows
-operating system into a cluster of nodes that run a previous version of the Windows operating
-system. To add a cluster node, use the `Add-ClusterNode` cmdlet.
+operating system (OS) into a cluster of nodes that run a previous version of the Windows OS.
 
-After you add a node that runs a different version of the Windows operating system, the cluster
-becomes a mixed-version cluster. You can implement a mixed-version cluster to continue to run while
-you upgrade the operating system on each node in the cluster.
+After you add a node that runs a different version of the Windows OS, the cluster becomes a
+mixed-version cluster. You can implement a mixed-version cluster to continue to run while you
+upgrade the OS on each node in the cluster.
 
 We recommend that you upgrade all nodes in the cluster within a month. We don't recommend using a
 mixed-version cluster permanently.
 
-You can use this cmdlet to support a rolling operating system upgrade for a cluster. If you use
-cluster that runs Hyper-V in which all the nodes run Windows Server 2012 R2, you can upgrade the
-nodes of that cluster without downtime for your virtual machines.
-
-First, drain one cluster node by specifying the **Drain** parameter of the `Suspend-ClusterNode`
-cmdlet. This cmdlet causes all virtual machines to live-migrate to one of the other hosts.
-
-Next, remove the host from the cluster by using the `Remove-ClusterNode` cmdlet.
-
-Next, install a new version of the operating system. Don't perform an upgrade or in-place
-installation.
-
-Next, add the Hyper-V role and the **Failover Clustering** feature by using the
-`Install-WindowsFeature` cmdlet. For more information, type `Get-Help Install-WindowsFeature`.
-
-Finally, add the node into the cluster by using the `Add-ClusterNode` cmdlet.
-
-Repeat these steps for each node of the cluster.
+You can use this cmdlet to support a rolling OS upgrade for a cluster. If you use a cluster that
+runs Hyper-V in which all the nodes run Windows Server 2012 R2, you can upgrade the nodes of that
+cluster without downtime for your virtual machines.
 
 ## EXAMPLES
 
@@ -64,7 +48,7 @@ Update-ClusterFunctionalLevel -WhatIf
 ```
 
 This command tests whether an update would finish successfully. Because the command includes the
-**WhatIf** common parameter, the command doesn't perform the update.
+**WhatIf** parameter, the command doesn't perform the update.
 
 ### Example 2: Update a cluster functional level
 
@@ -75,12 +59,39 @@ Update-ClusterFunctionalLevel -Cluster "cluster_17"
 This command updates the cluster functional level of the cluster named `cluster_17`. All of the
 nodes of this cluster must already be updated before you run this command.
 
+### Example 3: Rolling OS upgrade of a cluster
+
+First, drain one cluster node by specifying the **Drain** parameter of the `Suspend-ClusterNode`
+cmdlet. This cmdlet causes all virtual machines to live-migrate to one of the other hosts.
+
+Next, remove the host from the cluster by using the `Remove-ClusterNode` cmdlet.
+
+Next, perform an in-place upgrade to install the new version of the OS. Note that a cluster can only
+be upgraded one OS version at a time, for example:
+
+- Windows Server 2012 R2 to Windows Server 2016
+- Windows Server 2016 to Windows Server 2019
+- Windows Server 2019 to Windows Server 2022
+- Windows Server 2022 to Windows Server 2025
+
+Next, add the **Hyper-V** role and the **Failover Clustering** feature, if not already installed, by
+running the following command:
+
+```powershell
+Install-WindowsFeature -Name Hyper-V -IncludeManagementTools
+Install-WindowsFeature -Name Failover-Clustering -IncludeManagementTools
+```
+
+Finally, add the node into the cluster by using the `Add-ClusterNode` cmdlet.
+
+Repeat these steps for each node in the cluster.
+
 ## PARAMETERS
 
 ### -Cluster
 
 Specifies the name of the cluster on which to run this cmdlet. If the input for this parameter is
-`.` or it is omitted, then the cmdlet runs on the local cluster.
+`.` or it's omitted, then the cmdlet runs on the local cluster.
 
 ```yaml
 Type: String
@@ -164,13 +175,13 @@ This cmdlet returns a **Cluster**. This cmdlet updates the functional level of t
 
 ## NOTES
 
-* This cmdlet performs a one-time, one-way transformation of the cluster functional level. You
-  cannot lower this level.
+Once you update the cluster functional level using this cmdlet, the change is permanent and can't be
+reverted to a previous level.
 
 ## RELATED LINKS
 
-[Add-ClusterNode](./Add-ClusterNode.md)
+[Add-ClusterNode](add-clusternode.md)
 
-[Suspend-ClusterNode](./Suspend-ClusterNode.md)
+[Suspend-ClusterNode](suspend-clusternode.md)
 
-[Remove-ClusterNode](./Remove-ClusterNode.md)
+[Remove-ClusterNode](remove-clusternode.md)
diff --git a/docset/winserver2025-ps/Microsoft.DiagnosticDataViewer/Microsoft.DiagnosticDataViewer.md b/docset/winserver2025-ps/Microsoft.DiagnosticDataViewer/Microsoft.DiagnosticDataViewer.md
@@ -1,6 +1,6 @@
 ---
-Download Help Link: https://aka.ms/winsvr-2025-pshelp
-Help Version: {{Please enter version of help manually (X.X.X.X) format}}
+Download Help Link:
+Help Version:
 Locale: en-US
 Module Guid: 9bd99f27-788b-4912-8f67-5d9d1640fd9b
 Module Name: Microsoft.DiagnosticDataViewer
@@ -12,7 +12,7 @@ title: Microsoft.DiagnosticsDataViewer
 The Microsoft.DiagnosticDataViewer module provides commands for viewing and analyzing the Diagnostic Data sent by a Windows device.
 
 ## Minimum Requirements
-The module requires Windows 10 version 17134 (1803) or higher.  
+The module requires Windows 10 version 17134 (1803) or higher.
 
 ## Microsoft.DiagnosticDataViewer Cmdlets
 ### [Disable-DiagnosticDataViewing](Disable-DiagnosticDataViewing.md)
diff --git a/docset/winserver2025-ps/Microsoft.Windows.ServerManager.Migration/Microsoft.Windows.ServerManager.Migration.md b/docset/winserver2025-ps/Microsoft.Windows.ServerManager.Migration/Microsoft.Windows.ServerManager.Migration.md
@@ -1,7 +1,7 @@
 ---
 description: Use this topic to help manage Windows and Windows Server technologies with Windows PowerShell.
-Download Help Link: https://aka.ms/winsvr-2025-pshelp
-Help Version: 1.0.0.0
+Download Help Link:
+Help Version:
 Locale: en-US
 Module Name: Microsoft.Windows.ServerManager.Migration
 Module Guid: 00000000-0000-0000-0000-000000000000
diff --git a/docset/winserver2025-ps/WindowsDiagnosticData/WindowsDiagnosticData.md b/docset/winserver2025-ps/WindowsDiagnosticData/WindowsDiagnosticData.md
@@ -1,6 +1,6 @@
 ---
-Download Help Link: https://aka.ms/winsvr-2025-pshelp
-Help Version: 1.0.0.0
+Download Help Link:
+Help Version:
 Locale: en-US
 Module Guid: 11888dc4-4830-4138-b422-e8bc2209ffb9
 Module Name: WindowsDiagnosticData

Original file line number	Diff line number	Diff line change
`@@ -5,28 +5,28 @@`
`5`	`5`	`"exclude": [`
`6`	`6`	`"docset/winserver2025-ps/Microsoft.DiagnosticDataViewer",`
`7`	`7`	`"docset/winserver2025-ps/Microsoft.Windows.ServerManager.Migration",`
`8`		`- "docset/winserver2025-ps/windowsdiagnosticdata"`
	`8`	`+ "docset/winserver2025-ps/WindowsDiagnosticData"`
`9`	`9`	`]`
`10`	`10`	`},`
`11`	`11`	`"WindowsServer2022-ps": {`
`12`	`12`	`"exclude": [`
`13`	`13`	`"docset/winserver2022-ps/Microsoft.DiagnosticDataViewer",`
`14`	`14`	`"docset/winserver2022-ps/Microsoft.Windows.ServerManager.Migration",`
`15`		`- "docset/winserver2022-ps/windowsdiagnosticdata"`
	`15`	`+ "docset/winserver2022-ps/WindowsDiagnosticData"`
`16`	`16`	`]`
`17`	`17`	`},`
`18`	`18`	`"WindowsServer2019-ps": {`
`19`	`19`	`"exclude": [`
`20`	`20`	`"docset/winserver2019-ps/Microsoft.DiagnosticDataViewer",`
`21`	`21`	`"docset/winserver2019-ps/Microsoft.Windows.ServerManager.Migration",`
`22`		`- "docset/winserver2019-ps/windowsdiagnosticdata"`
	`22`	`+ "docset/winserver2019-ps/WindowsDiagnosticData"`
`23`	`23`	`]`
`24`	`24`	`},`
`25`	`25`	`"WindowsServer2016-ps": {`
`26`	`26`	`"exclude": [`
`27`	`27`	`"docset/winserver2016-ps/Microsoft.DiagnosticDataViewer",`
`28`	`28`	`"docset/winserver2016-ps/Microsoft.Windows.ServerManager.Migration",`
`29`		`- "docset/winserver2016-ps/windowsdiagnosticdata"`
	`29`	`+ "docset/winserver2016-ps/WindowsDiagnosticData"`
`30`	`30`	`]`
`31`	`31`	`}`
`32`	`32`	`}`