Skip to content

Commit fa92e19

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/windowsserverdocs-pr into robinharwood-campus-cluster-how-to
2 parents 339d4f7 + 2642ab6 commit fa92e19

1,148 files changed

Lines changed: 8699 additions & 5483 deletions

File tree

Some content is hidden

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

.openpublishing.redirection.get-started.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,21 @@
464464
"source_path": "WindowsServerDocs/get-started/get-started-with-windows-server.md",
465465
"redirect_url": "/windows-server/get-started/overview",
466466
"redirect_document_id": false
467+
},
468+
{
469+
"source_path": "WindowsServerDocs/get-started/perform-in-place-upgrade.md",
470+
"redirect_url": "/windows-server/get-started/upgrade-in-place",
471+
"redirect_document_id": true
472+
},
473+
{
474+
"source_path": "WindowsServerDocs/get-started/manage-feature-updates-group-policy.md",
475+
"redirect_url": "/windows-server/get-started/upgrade-in-place",
476+
"redirect_document_id": false
477+
},
478+
{
479+
"source_path": "WindowsServerDocs/get-started/upgrade-overview.md",
480+
"redirect_url": "/windows-server/get-started/install-upgrade-migrate",
481+
"redirect_document_id": true
467482
}
468483
]
469484
}

.openpublishing.redirection.manage.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "WindowsServerDocs/manage/windows-admin-center/use/migrate-vmware-to-hyper-v.md",
5+
"redirect_url": "/windows-server/manage/windows-admin-center/use/vm-conversion-extension-overview",
6+
"redirect_document_id": true
7+
},
38
{
49
"source_path": "WindowsServerDocs/management/get-started-with-smt.md",
510
"redirect_url": "https://techcommunity.microsoft.com/t5/windows-admin-center-blog/bg-p/Windows-Admin-Center-Blog",

Contributor-guide/metadata-requirements-for-articles.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Add the required metadata tags to your Windows Server-related article
33
description: A list of the information you must add as metadata tags to the top of your Windows Server-related articles. The required tags are subject to change, based on both your reporting and team requirements.
44
author: eross-msft
55
ms.author: roharwoo
6-
ms.date: 05/06/2019
6+
ms.date: 05/07/2019
77
---
88

99
# Add the required metadata tags to your Windows Server-related article

WindowsServerDocs/administration/OpenSSH/OpenSSH_Install_FirstUse.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ To enable SSHD using Server Manager:
5757

5858
1. In the **Properties** window, locate **Remote SSH Access**.
5959

60-
1. Select **Disabled** to enable the OpenSSH service.
60+
1. Select **Enabled** to enable the OpenSSH service.
6161

6262
> [!NOTE]
6363
> If you need to allow or restrict specific users or groups from using OpenSSH for remote access, add them to the **OpenSSH Users** user group.

WindowsServerDocs/administration/OpenSSH/OpenSSH_KeyManagement.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ $authorizedKey = Get-Content -Path $env:USERPROFILE\.ssh\id_ecdsa.pub
161161
$remotePowershell = "powershell New-Item -Force -ItemType Directory -Path $env:USERPROFILE\.ssh; Add-Content -Force -Path $env:USERPROFILE\.ssh\authorized_keys -Value '$authorizedKey'"
162162
163163
# Connect to your server and run the PowerShell command by using the $remotePowerShell variable.
164-
ssh username@domain1@contoso.com $remotePowershell
164+
ssh username@domain@hostname $remotePowershell
165165
```
166166

167167
### Administrative user
@@ -178,16 +178,16 @@ You can use the following code to copy the public key to the server and configur
178178
$authorizedKey = Get-Content -Path $env:USERPROFILE\.ssh\id_ecdsa.pub
179179
180180
# Generate the PowerShell command to run remotely that copies the public key file generated previously on your client to the authorized_keys file on your server.
181-
$remotePowershell = "powershell Add-Content -Force -Path $env:ProgramData\ssh\administrators_authorized_keys -Value '''$authorizedKey''';icacls.exe ""$env:ProgramData\ssh\administrators_authorized_keys"" /inheritance:r /grant ""Administrators:F"" /grant ""SYSTEM:F"""
181+
$remotePowershell = "powershell Add-Content -Force -Path $env:ProgramData\ssh\administrators_authorized_keys -Value '$authorizedKey';icacls.exe ""$env:ProgramData\ssh\administrators_authorized_keys"" /inheritance:r /grant ""Administrators:F"" /grant ""SYSTEM:F"""
182182
183183
# Connect to your server and run the PowerShell command by using the $remotePowerShell variable.
184-
ssh username@domain1@contoso.com $remotePowershell
184+
ssh username@domain@hostname $remotePowershell
185185
```
186186

187187
For non-English localized versions of the operating system, the script needs to be modified to reflect group names accordingly. To prevent errors that can occur when you grant permissions to group names, you can use the security identifier (SID) in place of the group name. You can retrieve the SID by running `Get-LocalGroup | Select-Object Name, SID`. When you use the SID in place of the group name, it must be preceded by an asterisk (__\*__). In the following example, the __Administrators__ group uses the SID `S-1-5-32-544`:
188188

189189
```powershell
190-
$remotePowershell = "powershell Add-Content -Force -Path $env:ProgramData\ssh\administrators_authorized_keys -Value '''$authorizedKey''';icacls.exe ""$env:ProgramData\ssh\administrators_authorized_keys"" /inheritance:r /grant ""*S-1-5-32-544:F"" /grant ""SYSTEM:F"""
190+
$remotePowershell = "powershell Add-Content -Force -Path $env:ProgramData\ssh\administrators_authorized_keys -Value '$authorizedKey';icacls.exe ""$env:ProgramData\ssh\administrators_authorized_keys"" /inheritance:r /grant ""*S-1-5-32-544:F"" /grant ""SYSTEM:F"""
191191
```
192192

193193
These steps complete the configuration required to use key-based authentication with OpenSSH on Windows.

WindowsServerDocs/administration/azure.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
title: Windows Server and Azure Management
33
description: Learn how Microsoft Azure can extend Windows Server Management
4-
author: dknappettmsft
5-
ms.author: daknappe
4+
author: robinharwood
5+
ms.author: roharwoo
66
ms.reviewer: rclaus
77
ms.topic: overview
88
ms.date: 02/27/2022

WindowsServerDocs/administration/manage-windows-server.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ metadata:
77
title: Windows Server Management documentation
88
description: Learn about tools, recommendations and guidance on managing Windows Server.
99
ms.topic: landing-page # Required
10-
author: dknappettmsft
11-
ms.author: daknappe
10+
author: robinharwood
11+
ms.author: roharwoo
1212
ms.date: 02/25/2022
1313
ms.service: windows-server
1414

WindowsServerDocs/administration/performance-tuning/role/file-server/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Performance tuning for file servers
33
description: Performance tuning for file servers running Windows Server
44
ms.topic: best-practice
5-
author: dknappettmsft
6-
ms.author: daknappe
5+
author: robinharwood
6+
ms.author: roharwoo
77
ms.date: 02/24/2025
88
audience: Admin
99
---

WindowsServerDocs/administration/performance-tuning/role/file-server/smb-file-server.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Performance Tuning for SMB File Servers
33
description: Performance Tuning for SMB File Servers in Windows.
44
ms.topic: best-practice
5-
author: dknappettmsft
6-
ms.author: daknappe
5+
author: robinharwood
6+
ms.author: roharwoo
77
ms.date: 01/16/2025
88
---
99

WindowsServerDocs/administration/performance-tuning/role/hyper-v-server/storage-io-performance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ We recommend you use the fixed file type when you need optimal resiliency and pe
190190

191191
When you create a dynamic VHD file, the system allocates space for it on-demand. Blocks in the file start as allocated blocks, and no space in the file backs the unallocated blocks. When a block receives its first write, the virtualization stack then must allocate space for the block in the VHD file, then update the metadata. This allocation increases the number of disk I/Os required for the write, increasing CPU usage. Reads and writes to existing blocks incur disk access and CPU overhead when looking up the blocks' mapping in the metadata.
192192

193-
If you're using a VHDX file, we recommend you use the dynamic file type when you aren't actively monitoring storage on the hosting volume. Make sure you have enough disk space when expanding the VHD file at runtime.
193+
If you're using a VHDX file, use the dynamic file type when you actively monitor storage on the hosting volume. Make sure you have enough disk space when expanding the VHD file at runtime.
194194

195195
### Differencing file type
196196

0 commit comments

Comments
 (0)