Skip to content

Commit 97d5c8c

Browse files
tiburdtiburd
authored
Merge branch 'main' into patch-132
2 parents ff30f33 + b3b03f3 commit 97d5c8c

File tree

61 files changed

+3906
-2145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+3906
-2145
lines changed

‎.openpublishing.publish.config.json‎

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
11
{
2-
"dependent_packages": [{
3-
"id": "Microsoft.DocAsCode.MAML2Yaml",
4-
"nuget_feed": "https://www.myget.org/F/op/api/v2",
5-
"path_to_root": "_dependentPackages/MAML2Yaml",
6-
"target_framework": "net45",
7-
"version": "latest"
8-
}],
9-
"dependent_repositories": [{
10-
"branch_mapping": {},
11-
"branch": "master",
12-
"path_to_root": "_themes",
13-
"url": "https://github.com/Microsoft/templates.docs.msft"
14-
}],
15-
"docsets_to_publish": [{
2+
"docsets_to_publish": [
3+
{
164
"build_entry_point": "docs",
175
"build_output_subfolder": "windows-powershell",
186
"build_source_folder": "docset",
@@ -38,22 +26,39 @@
3826
"PowershellCmdlet": "Content",
3927
"Conceptual": "Content"
4028
},
41-
"xref_query_tags": [ "/dotnet" ],
29+
"xref_query_tags": [
30+
"/dotnet"
31+
],
4232
"version": 0
43-
}],
44-
45-
"git_repository_branch_open_to_public_contributors": "master",
46-
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/windows-powershell-docs",
47-
"need_preview_pull_request": true,
48-
33+
}
34+
],
4935
"notification_subscribers": [],
5036
"sync_notification_subscribers": [],
51-
"contribution_branch_mappings": {},
37+
"branches_to_filter": [],
38+
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/windows-powershell-docs",
39+
"git_repository_branch_open_to_public_contributors": "main",
5240
"skip_source_output_uploading": false,
53-
54-
"need_generate_pdf_url_template": false,
41+
"need_preview_pull_request": true,
42+
"contribution_branch_mappings": {},
43+
"dependent_repositories": [
44+
{
45+
"path_to_root": "_themes",
46+
"url": "https://github.com/Microsoft/templates.docs.msft",
47+
"branch": "main",
48+
"branch_mapping": {}
49+
}
50+
],
5551
"branch_target_mapping": {},
56-
"branches_to_filter": [],
52+
"dependent_packages": [
53+
{
54+
"id": "Microsoft.DocAsCode.MAML2Yaml",
55+
"nuget_feed": "https://www.myget.org/F/op/api/v2",
56+
"path_to_root": "_dependentPackages/MAML2Yaml",
57+
"target_framework": "net45",
58+
"version": "latest"
59+
}
60+
],
61+
"need_generate_pdf_url_template": false,
5762
"targets": {},
5863
"docs_build_engine": {
5964
"name": "docfx_v3"

‎.openpublishing.redirection.json‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5200,6 +5200,21 @@
52005200
"redirect_url": "/powershell/module/windowsdeveloperlicense/WindowsDeveloperLicense?view=windowsserver2019-ps",
52015201
"redirect_document_id": false
52025202
},
5203+
{
5204+
"source_path": "docset/winserver2022-ps/pkiclient/Export-PfxCertificate.md",
5205+
"redirect_url": "/powershell/module/pki/Export-PfxCertificate?view=windowsserver2022-ps",
5206+
"redirect_document_id": false
5207+
},
5208+
{
5209+
"source_path": "docset/winserver2022-ps/pkiclient/PKIClient.md",
5210+
"redirect_url": "/powershell/module/pki/?view=windowsserver2022-ps",
5211+
"redirect_document_id": false
5212+
},
5213+
{
5214+
"source_path": "docset/winserver2022-ps/pkiclient/New-SelfSignedCertificate.md",
5215+
"redirect_url": "/powershell/module/pki/New-SelfSignedCertificate?view=winserver2022-ps",
5216+
"redirect_document_id": false
5217+
},
52035218
{
52045219
"source_path": "docset/winserver2022-ps/remotedesktop/Set-RDDeploymentGatewayConfiguration.md",
52055220
"redirect_url": "/powershell/module/rdmgmt/Set-RDDeploymentGatewayConfiguration.md?view=windowsserver2022-ps",
@@ -5406,4 +5421,4 @@
54065421
"redirect_document_id": false
54075422
}
54085423
]
5409-
}
5424+
}

‎docset/docs-conceptual/mdop/get-started.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,4 @@ available locally on your computer by using the Update-Help cmdlet. For more inf
2525
| [Advanced Group Policy Management](/powershell/module/agpm) | 4.0 SP3 |
2626
| [Microsoft Application Virtualization](/powershell/module/appv) | 5.1 |
2727
| [Microsoft Bitlocker Administration and Monitoring](/powershell/module/mbam) | 2.5 |
28-
| [Microsoft Enterprise Desktop Virtualization](/powershell/module/medv) | 2.0 |
2928
| [User Experience Virtualization](/powershell/module/uev) | 2.1 SP1 |

‎docset/docs-conceptual/winserver2012-ps/get-started.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ more information.
4343
| Deduplication | [Deduplication Cmdlets](/powershell/module/deduplication) |
4444
| DFSN | [DFSN Cmdlets](/powershell/module/dfsn) |
4545
| DhcpServer | [DHCP Cmdlets](/powershell/module/dfsr) |
46-
| DirectAccessClientComponents | [DirectAccess Client Cmdlets](/powershell/module/directaccessclient) |
46+
| DirectAccessClientComponents | [DirectAccess Client Cmdlets](/powershell/module/directaccessclientcomponents) |
4747
| Dism | [DISM Cmdlets](/powershell/module/dism) |
4848
| DnsClient | [DNS Client Cmdlets](/powershell/module/dnsclient) |
4949
| DnsServer | [DNS Server Cmdlets](/powershell/module/dnsserver) |
5050
| FailoverClusters | [Failover Clusters Cmdlets](/powershell/module/failoverclusters) |
51-
| FileServerResourceManager | [FSRM Cmdlets](/powershell/module/fsrm) |
51+
| FileServerResourceManager | [FSRM Cmdlets](/powershell/module/fileserverresourcemanager) |
5252
| GroupPolicy | [Group Policy Cmdlets](/powershell/module/grouppolicy) |
5353
| Hyper-V | [Hyper-V Cmdlets](/powershell/module/hyper-v) |
54-
| International | [International Settings Cmdlets](/powershell/module/international_cmdlets) |
54+
| International | [International Settings Cmdlets](/powershell/module/international) |
5555
| IpamServer | [IPAM Cmdlets](/powershell/module/ipamserver) |
5656
| iScsi | [iSCSI Cmdlets](/powershell/module/iscsi) |
5757
| iScsiTarget | [iSCSI Target Cmdlets](/powershell/module/iscsitarget) |
@@ -83,12 +83,12 @@ more information.
8383
| ServerCore | [Server Core Cmdlets](/powershell/module/servercore) |
8484
| ServerManager | [Server Manager Cmdlets](/powershell/module/servermanager) |
8585
| ServerManagerTasks | [Server Manager Tasks Cmdlets](/powershell/module/servermanagertasks) |
86-
| ServerMig_Cmdlets | [Server Migration Cmdlets](/powershell/module/servermig_cmdlets) |
86+
| ServerMig_Cmdlets | [Server Migration Cmdlets](/powershell/module/servermigrationcmdlets) |
8787
| SMBShare | [SMB Share Cmdlets](/powershell/module/smbshare) |
8888
| SMBWitness | [SMB Witness Cmdlets](/powershell/module/smbwitness) |
89-
| SMISConfig | [SMI-S Cmdlets](/powershell/module/smisconfiguration) |
89+
| SMISConfig | [SMI-S Cmdlets](/powershell/module/smisconfig) |
9090
| Storage | [Storage Cmdlets](/powershell/module/storage) |
91-
| TroubleshootingPack | [Troubleshooting Pack (TP) Cmdlets](/powershell/module/troubleshootingtack) |
91+
| TroubleshootingPack | [Troubleshooting Pack (TP) Cmdlets](/powershell/module/troubleshootingpack) |
9292
| TrustedPlatformModule | [Trusted Platform Module (TPM) Cmdlets](/powershell/module/trustedplatformmodule) |
9393
| UpdateServices | [Windows Server Update Services (WSUS) Cmdlets](/powershell/module/updateservices) |
9494
| UserAccessLogging | [User Access Logging (UAL) Cmdlets](/powershell/module/useraccesslogging) |

‎docset/docs-conceptual/winserver2012r2-ps/get-started.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ for more information.
4343
| DFSN | [DFSN Cmdlets](/powershell/module/dfsn) |
4444
| Dfsr | [Distributed File System (DFS) Replication Cmdlets](/powershell/module/dfsn) |
4545
| DhcpServer | [DHCP Server Cmdlets](/powershell/module/dhcpserver) |
46-
| DirectAccessClientComponents | [DirectAccess Client Cmdlets](/powershell/module/directaccessclient) |
46+
| DirectAccessClientComponents | [DirectAccess Client Cmdlets](/powershell/module/directaccessclientcomponents/) |
4747
| Dism | [DISM Cmdlets](/powershell/module/dism) |
4848
| DnsClient | [DNS Client Cmdlets](/powershell/module/dnsclient) |
4949
| DnsServer | [DNS Server Cmdlets](/powershell/module/dnsserver) |
5050
| FailoverClusters | [Failover Clusters Cmdlets](/powershell/module/failoverclusters) |
51-
| FileServerResourceManager | [FSRM Cmdlets](/powershell/module/fsrm) |
51+
| FileServerResourceManager | [FSRM Cmdlets](/powershell/module/fileserverresourcemanager) |
5252
| GroupPolicy | [Group Policy Cmdlets](/powershell/module/grouppolicy) |
5353
| HCS | [High Performance Computing Pack](/powershell/module/hpc) |
5454
| HPC | [StorSimple Hybrid Cloud Storage (HCS) Cmdlets](/powershell/module/hcs) |
5555
| Hyper-V | [Hyper-V Cmdlets](/powershell/module/hyper-v) |
56-
| International | [International Settings Cmdlets](/powershell/module/international_cmdlets) |
56+
| International | [International Settings Cmdlets](/powershell/module/international) |
5757
| IpamServer | [IPAM Cmdlets](/powershell/module/ipamserver) |
5858
| iScsi | [iSCSI Cmdlets](/powershell/module/iscsi) |
5959
| iScsiTarget | [iSCSI Target Cmdlets](/powershell/module/iscsitarget) |
@@ -79,7 +79,7 @@ for more information.
7979
| PcsvDevice | [Physical Computer System View (PSCV) Cmdlets](/powershell/module/pcsvdevice) |
8080
| PEF | [Message Analyzer Cmdlets](/powershell/module/pef) |
8181
| PKI | [PKI Client Cmdlets](/powershell/module/pki) |
82-
| PowerShellWebAccess | [Windows PowerShell Web Access Cmdlets](/powershell/module/powershellwebacccess) |
82+
| PowerShellWebAccess | [Windows PowerShell Web Access Cmdlets](/powershell/module/powershellwebaccess) |
8383
| PrintManagement | [Print Management Cmdlets](/powershell/module/printmanagement) |
8484
| RemoteAccess | [Remote Access Cmdlets](/powershell/module/remoteaccess) |
8585
| RemoteDesktop | [Remote Desktop Cmdlets](/powershell/module/remotedesktop) |
@@ -99,7 +99,7 @@ for more information.
9999
| StorageSpaces | [Storage Spaces Cmdlets](/powershell/module/storagespaces) |
100100
| SyncShare | [Sync Share Cmdlets](/powershell/module/syncshare) |
101101
| TLS | [Transport Layer Security (TLS) Authentication Cmdlets](/powershell/module/tls) |
102-
| TroubleshootingPack | [Troubleshooting Pack (TP) Cmdlets](/powershell/module/troubleshootingtack) |
102+
| TroubleshootingPack | [Troubleshooting Pack (TP) Cmdlets](/powershell/module/troubleshootingpack) |
103103
| TrustedPlatformModule | [Trusted Platform Module (TPM) Cmdlets](/powershell/module/trustedplatformmodule) |
104104
| UpdateServices | [Windows Server Update Services (WSUS) Cmdlets](/powershell/module/updateservices) |
105105
| UserAccessLogging | [User Access Logging (UAL) Cmdlets](/powershell/module/useraccesslogging) |

‎docset/docs-conceptual/winserver2016-ps/get-started.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ computer. For more information, see
2121

2222
| Module name | Title and link to Web version |
2323
| - | - |
24-
| ActiveDirectory | [Active Directory Domain Services Administration](/powershell/module/addsadministration) |
24+
| ActiveDirectory | [Active Directory Domain Services Administration](/powershell/module/activedirectory) |
2525
| ADCSAdministration | [Active Directory Certificate Services Administration](/powershell/module/adcsadministration) |
2626
| ADCSDeployment | [Active Directory Certificate Services Deployment](/powershell/module/adcsdeployment) |
2727
| ADDSDeployment | [Active Directory Domain Services Deployment](/powershell/module/addsdeployment) |
@@ -48,7 +48,7 @@ computer. For more information, see
4848
| Dfsn | [Distributed File System (DFS) Namespaces](/powershell/module/dfsn/) |
4949
| Dfsr | [DFS Replication](/powershell/module/dfsr) |
5050
| DHCPServer | [DHCP Server](/powershell/module/dhcpserver) |
51-
| DirectAccessClientComponent | [Direct Access client](/powershell/module/directaccessclientcomponent) |
51+
| DirectAccessClientComponent | [Direct Access client](/powershell/module/directaccessclientcomponents) |
5252
| DISM | [DISM](/powershell/module/dism) |
5353
| DNSClient | [DNS client](/powershell/module/dnsclient) |
5454
| DNSServer | [DNS Server](/powershell/module/dnsserver) |
@@ -79,7 +79,7 @@ computer. For more information, see
7979
| Multipoint | [MultiPoint Services](/powershell/module/multipoint) |
8080
| MultiPointVdi | [Multipoint VDI](/powershell/module/multipointvdi) |
8181
| NanoServerImageGenerator | [Nano Server Image Generator](/powershell/module/nanoserverimagegenerator) |
82-
| NetLdpAgent | [NetLdpAgent](/powershell/module/netldpagent) |
82+
| NetLldpAgent | [NetLldpAgent](/powershell/module/netlldpagent) |
8383
| NetAdapter | [Network Adapter](/powershell/module/netadapter) |
8484
| NetConnection | [Network connection](/powershell/module/netconnection) |
8585
| NetEventPacketCapture | [Network Event Packet Capture](/powershell/module/neteventpacketcapture) |
@@ -99,7 +99,7 @@ computer. For more information, see
9999
| NFS | [Network File System](/powershell/module/nfs) |
100100
| NPS | [Network Policy Server](/powershell/module/nps) |
101101
| PCSVDevice | [Physical Computer System View device](/powershell/module/pcsvdevice) |
102-
| PKIClient | [Public Key Infrastructure](/powershell/module/pkiclient) |
102+
| PKIClient | [Public Key Infrastructure](/powershell/module/pki) |
103103
| PlatformIdentifier | [Platform Identifier](/powershell/module/platformidentifier) |
104104
| PnpDevice | [Plug and Play](/powershell/module/pnpdevice) |
105105
| PrintManagement | [Print management](/powershell/module/printmanagement) |
@@ -113,7 +113,7 @@ computer. For more information, see
113113
| ServerManager | [Server Manager](/powershell/module/servermanager) |
114114
| ServerManagerTasks | [Server Manager tasks](/powershell/module/servermanagertasks) |
115115
| ShieldedVMDataFile | [Shielded Virtual Machine data file](/powershell/module/shieldedvmdatafile) |
116-
| ShieldedVMProvisioning | [Shielded Virtual Machine provisioning](/powershell/module/shieldedvmprovisioning) |
116+
| ShieldedVMProvisioning | [Shielded Virtual Machine provisioning](/powershell/module/shieldedvmcmdlets/) |
117117
| ShieldedVMTemplate | [Shielded Virtual Machine template](/powershell/module/shieldedvmtemplate) |
118118
| SmbShare | [SmbShare share](/powershell/module/smbshare) |
119119
| SmbWitness | [SMB Witness](/powershell/module/smbwitness) |
@@ -128,7 +128,7 @@ computer. For more information, see
128128
| TLS | [TLS](/powershell/module/tls) |
129129
| TroubleshootingPack | [Troubleshooting Pack](/powershell/module/troubleshootingpack) |
130130
| TrustedPlatformModule | [Trusted Platform Module](/powershell/module/trustedplatformmodule) |
131-
| UpdateServices | [Windows Server Update Services](/powershell/module/wsus) |
131+
| UpdateServices | [Windows Server Update Services](/powershell/module/updateservices/) |
132132
| UserAccessLogging | [User Access Logging](/powershell/module/useraccesslogging/) |
133133
| UEV | [User Experience Virtualization](/powershell/module/uev) |
134134
| VAMT | [Volume Activation Management Tool](/powershell/module/vamt) |
@@ -138,7 +138,7 @@ computer. For more information, see
138138
| WebApplicationProxy | [Web Application Proxy](/powershell/module/webapplicationproxy) |
139139
| WDS | [Windows Deployment Services](/powershell/module/wds) |
140140
| WHEA | [Windows Hardware Error Architecture](/powershell/module/whea) |
141-
| WindowsDevLic | [Windows Developer License](/powershell/module/windowsdevlic) |
141+
| WindowsDevLic | [Windows Developer License](/powershell/module/windowsdeveloperlicense) |
142142
| WindowsErrorReporting | [Windows Error Reporting](/powershell/module/windowserrorreporting) |
143143
| WindowsSearch | [Windows Search](/powershell/module/windowssearch) |
144144
| WindowsServerBackup | [Windows Server Backup](/powershell/module/windowsserverbackup) |

0 commit comments

Comments
 (0)