Skip to content

Commit bd20bc4

Browse files
authored
Merge branch 'main' into fix-Remove-NetSwitchTeamMember
2 parents fec9e76 + 93986fd commit bd20bc4

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

.github/workflows/StaleBranch.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: (Scheduled) Stale branch removal
22

33
permissions:
44
contents: write
5+
pull-requests: read
56

67
# This workflow is designed to be run in the days up to, and including, a "deletion day", specified by 'DeleteOnDayOfMonth' in env: in https://github.com/MicrosoftDocs/microsoft-365-docs/blob/workflows-prod/.github/workflows/Shared-StaleBranch.yml.
78
# On the days leading up to "deletion day", the workflow will report the branches to be deleted. This lets users see which branches will be deleted. On "deletion day", those branches are deleted.

docset/winserver2022-ps/grouppolicy/Set-GPRegistryValue.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ This command configures a registry-based policy setting for the registry value
101101
data type of `DWord`. This policy setting sets the Screen Saver timeout to 900 seconds (15 minutes)
102102
when Group Policy is applied on the client.
103103

104-
### Example 1: Configure a registry-based policy settings for multiple registry values
104+
### Example 2: Configure a registry-based policy settings for multiple registry values
105105

106106
```powershell
107107
$params = @{

docset/winserver2025-ps/defender/Set-MpPreference.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1519,7 +1519,7 @@ Accept wildcard characters: False
15191519
```
15201520

15211521
### -ScanScheduleQuickScanTime
1522-
Specifies the time of day, as the number of minutes after midnight, to perform a scheduled quick scan.
1522+
Specifies the time of day, as the number of minutes after midnight, to perform a daily scheduled quick scan.
15231523
The time refers to the local time on the computer.
15241524
If you do not specify a value for this parameter, a scheduled quick scan runs at the time specified by the **ScanScheduleOffset** parameter.
15251525
That parameter has a default time of two hours after midnight.
@@ -1537,7 +1537,10 @@ Accept wildcard characters: False
15371537
```
15381538

15391539
### -ScanScheduleOffset
1540-
Configures the number of minutes after midnight to perform a scheduled scan. The time on the endpoint is used to determine the local time. If you enable this setting, a scheduled scan will run at the time specified. If you disable or don’t enable this setting, a scheduled scan runs at the default time of two hours (120 minutes) after midnight.
1540+
Configures the number of minutes after midnight to perform a scheduled scan. The time on the endpoint is used to determine the local time. If you enable this setting, a scheduled scan will run at the time specified. If you disable or don’t enable this setting, a scheduled scan runs at the default time of two hours (120 minutes) after midnight.
1541+
1542+
> [!TIP]
1543+
> We recommend using the **ScanScheduleOffset** parameter instead of the **ScanScheduleTime** parameter because it's a more intuitive way to set the time for the Weekly Scheduled Scan. If both **ScanScheduleOffset** and **ScanScheduleTime** are set, whichever configuration was edited more recently is used to determine the time to execute the scan.
15411544

15421545
```yaml
15431546
Type: UInt32

docset/winserver2025-ps/failoverclusters/Start-Cluster.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ cluster name, assuming the cluster name resource is online, can be used instead
5252

5353
### -IgnorePersistentState
5454

55-
Starts the nodes in the cluster without bringing resources online on the nodes.
55+
Starts the nodes in the cluster without bringing resources online on the nodes. Note that this behavior will remain until the cluster is restarted or until the cluster property **IgnorePersistentStateOnStartup** is set to 0.
5656

5757
```yaml
5858
Type: SwitchParameter

docset/winserver2025-ps/smbshare/Set-SmbServerConfiguration.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,12 +1017,12 @@ Accept wildcard characters: False
10171017

10181018
This parameter specifies the minimum version of the SMB protocol to be used. Acceptable values are:
10191019

1020-
- None – There is no maximum protocol version specified, the server can use any supported version.
1021-
- SMB202 – SMB 2.0.2 is the maximum version accepted by the SMB Server
1022-
- SMB210 - SMB 2.1.0 is the maximum version accepted by the SMB Server
1023-
- SMB300 - SMB 3.0.0 is the maximum version accepted by the SMB Server
1024-
- SMB302 - SMB 3.0.2 is the maximum version accepted by the SMB Server
1025-
- SMB311 - SMB 3.1.1 is the maximum version accepted by the SMB Server
1020+
- None – There is no minimum protocol version specified, the server can use any supported version.
1021+
- SMB202 – SMB 2.0.2 is the minimum version accepted by the SMB Server
1022+
- SMB210 - SMB 2.1.0 is the minimum version accepted by the SMB Server
1023+
- SMB300 - SMB 3.0.0 is the minimum version accepted by the SMB Server
1024+
- SMB302 - SMB 3.0.2 is the minimum version accepted by the SMB Server
1025+
- SMB311 - SMB 3.1.1 is the minimum version accepted by the SMB Server
10261026

10271027
```yaml
10281028
Type: Smb2DialectMin

0 commit comments

Comments
 (0)