Merge branch 'main' into master

Author: skycommand

.openpublishing.publish.config.json

@@ -1,18 +1,6 @@
 {
-  "dependent_packages": [{
-      "id": "Microsoft.DocAsCode.MAML2Yaml",
-      "nuget_feed": "https://www.myget.org/F/op/api/v2",
-      "path_to_root": "_dependentPackages/MAML2Yaml",
-      "target_framework": "net45",
-      "version": "latest"
-    }],
-  "dependent_repositories": [{
-      "branch_mapping": {},
-      "branch": "master",
-      "path_to_root": "_themes",
-      "url": "https://github.com/Microsoft/templates.docs.msft"
-    }],
-  "docsets_to_publish": [{
+  "docsets_to_publish": [
+    {
       "build_entry_point": "docs",
       "build_output_subfolder": "windows-powershell",
       "build_source_folder": "docset",
@@ -38,22 +26,39 @@
         "PowershellCmdlet": "Content",
         "Conceptual": "Content"
       },
-      "xref_query_tags": [ "/dotnet" ],
+      "xref_query_tags": [
+        "/dotnet"
+      ],
       "version": 0
-    }],
-
-  "git_repository_branch_open_to_public_contributors": "master",
-  "git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/windows-powershell-docs",
-  "need_preview_pull_request": true,
-
+    }
+  ],
   "notification_subscribers": [],
   "sync_notification_subscribers": [],
-  "contribution_branch_mappings": {},
+  "branches_to_filter": [],
+  "git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/windows-powershell-docs",
+  "git_repository_branch_open_to_public_contributors": "main",
   "skip_source_output_uploading": false,
-
-  "need_generate_pdf_url_template": false,
+  "need_preview_pull_request": true,
+  "contribution_branch_mappings": {},
+  "dependent_repositories": [
+    {
+      "path_to_root": "_themes",
+      "url": "https://github.com/Microsoft/templates.docs.msft",
+      "branch": "main",
+      "branch_mapping": {}
+    }
+  ],
   "branch_target_mapping": {},
-  "branches_to_filter": [],
+  "dependent_packages": [
+    {
+      "id": "Microsoft.DocAsCode.MAML2Yaml",
+      "nuget_feed": "https://www.myget.org/F/op/api/v2",
+      "path_to_root": "_dependentPackages/MAML2Yaml",
+      "target_framework": "net45",
+      "version": "latest"
+    }
+  ],
+  "need_generate_pdf_url_template": false,
   "targets": {},
   "docs_build_engine": {
     "name": "docfx_v3"

docset/docs-conceptual/winserver2016-ps/module-compatibility.md

@@ -1,2 +1,5 @@
-- name: Windows PowerShell
-  href: get-started.md
+items:
+  - name: Windows PowerShell
+    href: get-started.md
+  - name: PowerShell 7 compatibility
+    href: module-compatibility.md

docset/docs-conceptual/winserver2016-ps/toc.yml

@@ -1,2 +1,5 @@
-- name: Windows PowerShell
-  href: get-started.md
+items:
+  - name: Windows PowerShell
+    href: get-started.md
+  - name: PowerShell 7 compatibility
+    href: module-compatibility.md

docset/docs-conceptual/winserver2019-ps/module-compatibility.md

@@ -1,2 +1,5 @@
-- name: Windows PowerShell
-  href: get-started.md
+items:
+  - name: Windows PowerShell
+    href: get-started.md
+  - name: PowerShell 7 compatibility
+    href: module-compatibility.md

docset/docs-conceptual/winserver2019-ps/toc.yml

@@ -73,7 +73,7 @@ The acceptable values for this parameter are: Full, Change, or Read.
 Type: ShareAccessRight
 Parameter Sets: (All)
 Aliases: 
-Accepted values: Full, Change, Read, Custom
+Accepted values: Full, Change, Read
 
 Required: False
 Position: Named

docset/docs-conceptual/winserver2022-ps/module-compatibility.md

@@ -74,7 +74,7 @@ The acceptable values for this parameter are: Full, Change, or Read.
 Type: ShareAccessRight
 Parameter Sets: (All)
 Aliases:
-Accepted values: Full, Change, Read, Custom
+Accepted values: Full, Change, Read
 
 Required: False
 Position: Named

docset/docs-conceptual/winserver2022-ps/toc.yml

@@ -28,7 +28,7 @@ Many object properties are defined by setting cmdlet parameters.
 Properties that cannot be set by cmdlet parameters can be set using the **OtherAttributes** parameter.
 
 The **Name** and **GroupScope** parameters specify the name and scope of the group and are required to create a new group.
-You can define the new group as a security or distribution group by setting the **GroupType** parameter.
+You can define the new group as a security or distribution group by setting the **GroupCategory** parameter.
 The **Path** parameter specifies the container or organizational unit (OU) for the group.
 
 The following methods explain different ways to create an object by using this cmdlet.