Skip to content

Commit 24640a2

Browse files
authored
Merge branch 'master' into patch-14
2 parents 1201060 + 8d9f0ce commit 24640a2

File tree

14 files changed

+92
-36
lines changed

14 files changed

+92
-36
lines changed

docset/windows/dfsn/remove-dfsnroottarget.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ Accept wildcard characters: False
106106
```
107107
108108
### -Confirm
109-
Prompts you for confirmation before running the cmdlet.
109+
Prompts you for confirmation before running the cmdlet. The default value is **True** and asks for confirmation. If you do not want to confirm the operation, you must use the switch with the **False** value, as shown in this example:
110+
111+
**-Confirm:$False**
110112
111113
```yaml
112114
Type: SwitchParameter
@@ -115,7 +117,7 @@ Aliases: cf
115117

116118
Required: False
117119
Position: Named
118-
Default value: False
120+
Default value: True
119121
Accept pipeline input: False
120122
Accept wildcard characters: False
121123
```

docset/windows/dnsserver/test-dnsserver.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ Tests that a specified computer is a functioning DNS server.
2626
## SYNTAX
2727

2828
### Context (Default)
29-
```
29+
```yaml
3030
Test-DnsServer [-IPAddress] <IPAddress[]> [-ComputerName <String>] [[-Context] <String>]
3131
[-CimSession <CimSession[]>] [-ThrottleLimit <Int32>] [-AsJob] [<CommonParameters>]
3232
```
3333

3434
### ZoneMaster
35-
```
35+
```yaml
3636
Test-DnsServer [-IPAddress] <IPAddress[]> [-ComputerName <String>] -ZoneName <String>
3737
[-CimSession <CimSession[]>] [-ThrottleLimit <Int32>] [-AsJob] [<CommonParameters>]
3838
```
@@ -47,29 +47,29 @@ If you also specify a zone name, the cmdlet validates that the DNS server can re
4747
## EXAMPLES
4848

4949
### Example 1: Test whether a DNS server is functional
50-
```
50+
```Powershell
5151
PS C:\> Test-DnsServer -IPAddress 10.123.183.155
5252
5353
IPAddress Result RoundTripTime TcpTried UdpTried
5454
--------- -------- ------------ -------- --------
55-
10.123.183.155 Success 00:00:11 True True
55+
10.123.183.155 Success 00:00:11 False True
5656
```
5757

5858
This command tests whether the computer that has an IP address of 10.123.183.155 is a functional DNS server.
5959

6060
### Example 2: Test whether a DNS server is functional and has valid configured forwarders
61-
```
61+
```Powershell
6262
PS C:\> Test-DnsServer -IPAddress 10.123.183.155 -Context Forwarder
6363
6464
IPAddress Result RoundTripTime TcpTried UdpTried
6565
--------- -------- ------------ -------- --------
66-
10.123.183.155 Success 00:00:11 True True
66+
10.123.183.155 Success 00:00:11 False True
6767
```
6868

6969
This command tests whether the computer that has an IP address of 10.123.183.155 is a functional DNS server that has valid configured forwarders.
7070

7171
### Example 3: Test whether a DNS server is functional and has valid configured root hints
72-
```
72+
```Powershell
7373
PS C:\> Test-DnsServer -IPAddress 10.123.183.155 -Context RootHints
7474
7575
IPAddress Result RoundTripTime TcpTried UdpTried

docset/windows/failoverclusters/suspend-clusternode.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@ Accept wildcard characters: False
126126
```
127127
128128
### -ForceDrain
129+
The -ForceDrain switch, used in conjunction with the -Drain switch, allows all the workloads to be safely moved to other nodes, while maintaining the highest levels of availability and using the best placement logic.
130+
131+
If some or all of the workloads can't be moved safely, any workload that failed will be stopped and moved to another node as a failed role. Thereafter, the node will be forced to pause.
132+
129133
130134
131135
```yaml

docset/windows/hyper-v/measure-vmreplication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Accept wildcard characters: False
170170
171171
### -ReplicationMode
172172
Specifies the replication mode of the virtual machines whose replication statistics you want to get.
173-
Valid values are "None", "Primary", "Replica" and "TestReplica".
173+
Valid values are "None", "Primary", "Replica", "TestReplica" and "ExtendedReplica"
174174
175175
```yaml
176176
Type: VMReplicationMode

docset/windows/pkiclient/get-certificate.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,3 +298,5 @@ The EnrollmentResult object contains the results of enrollment.
298298
299299
[Set-Location](http://go.microsoft.com/fwlink/p/?LinkId=293912)
300300
301+
[System Store Locations](https://docs.microsoft.com/windows/desktop/seccrypto/system-store-locations)
302+

docset/windows/pkiclient/import-certificate.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ The **Import-Certificate** cmdlet imports one or more certificates into a certif
3838
```
3939
PS C:\>$file = ( Get-ChildItem -Path C:\files\root.cer )
4040
41-
42-
4341
PS C:\>$file | Import-Certificate -CertStoreLocation cert:\CurrentUser\Root
4442
```
4543

@@ -49,8 +47,6 @@ This example imports the certificate from the file into the root store of the cu
4947
```
5048
PS C:\>Set-Location -Path cert:\CurrentUser\My
5149
52-
53-
5450
PS C:\>Import-Certificate -Filepath "C:\files\intermediate.cert"
5551
```
5652

@@ -146,3 +142,4 @@ The output is an array of **X509Certificate2\[\]** objects.
146142
147143
[Export-Certificate](./Export-Certificate.md)
148144
145+
[System Store Locations](https://docs.microsoft.com/windows/desktop/seccrypto/system-store-locations)

docset/windows/pkiclient/import-pfxcertificate.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,3 +190,4 @@ The imported **X509Certificate2** object contained in the PFX file that is assoc
190190
191191
[Export-PfxCertificate](./Export-PfxCertificate.md)
192192
193+
[System Store Locations](https://docs.microsoft.com/windows/desktop/seccrypto/system-store-locations)

docset/windows/pkiclient/new-selfsignedcertificate.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,3 +1012,4 @@ An **X509Certificate2** object for the certificate that has been created.
10121012

10131013
## RELATED LINKS
10141014

1015+
[System Store Locations](https://docs.microsoft.com/windows/desktop/seccrypto/system-store-locations)

docset/windows/scheduledtasks/get-scheduledtask.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ This command gets the definition object of the SystemScan scheduled task in the
4747

4848
### Example 2: Get an array of scheduled task definition objects
4949
```
50-
PS C:\> Get-ScheduledTask -TaskPath "\UpdateTasks\"
50+
PS C:\> Get-ScheduledTask -TaskPath "\UpdateTasks\*"
5151
TaskPath TaskName State
5252
-------- -------- --------
5353
\UpdateTasks UpdateApps Ready
@@ -94,7 +94,7 @@ Accept wildcard characters: False
9494
```
9595
9696
### -TaskName
97-
Specifies an array of one or more names of a scheduled task.
97+
Specifies an array of one or more names of a scheduled task. You can use **"*"** for a wildcard character query.
9898
9999
```yaml
100100
Type: String[]
@@ -105,12 +105,12 @@ Required: False
105105
Position: 0
106106
Default value: None
107107
Accept pipeline input: True (ByPropertyName)
108-
Accept wildcard characters: False
108+
Accept wildcard characters: True
109109
```
110110
111111
### -TaskPath
112-
Specifies an array of one or more paths for scheduled tasks in Task Scheduler namespace.
113-
You can use **\** for the root folder.
112+
Specifies an array of one or more paths for scheduled tasks in Task Scheduler namespace. You can use **"*"** for a wildcard character query.
113+
You can use ***\\\*** for the root folder.
114114
If you do not specify a path, the cmdlet uses the root folder.
115115
116116
```yaml
@@ -122,12 +122,12 @@ Required: False
122122
Position: 1
123123
Default value: None
124124
Accept pipeline input: True (ByPropertyName)
125-
Accept wildcard characters: False
125+
Accept wildcard characters: True
126126
```
127127
128128
### -ThrottleLimit
129129
Specifies the maximum number of concurrent operations that can be established to run the cmdlet.
130-
If this parameter is omitted or a value of `0` is entered, then Windows PowerShell® calculates an optimum throttle limit for the cmdlet based on the number of CIM cmdlets that are running on the computer.
130+
If this parameter is omitted or a value of `0` is entered, then Windows PowerShell® calculates an optimum throttle limit for the cmdlet based on the number of CIM cmdlets that are running on the computer.
131131
The throttle limit applies only to the current cmdlet, not to the session or to the computer.
132132

133133
```yaml

docset/windows/scheduledtasks/new-scheduledtasksettingsset.md

Lines changed: 47 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,16 @@ You can use the scheduled task settings to register a new scheduled task or upda
5050
```
5151
PS C:\>$Sta = New-ScheduledTaskAction -Execute "Cmd"
5252
53-
The second command creates scheduled task settings that use the default settings and assigns the **ScheduledTaskSettings** object to the $Stset variable.
5453
PS C:\>$STSet = New-ScheduledTaskSettingsSet
5554
56-
The third command registers the scheduled task Task01 to run the task action named Cmd and to use the default task settings.
5755
PS C:\>Register-ScheduledTask Task01 -Action $Sta -Settings $STSet
56+
5857
```
58+
The first command creates a scheduled task action named Cmd and assigns the ScheduledTaskAction object to the $Sta variable.
59+
60+
The second command creates scheduled task settings that use the default settings and assigns the **ScheduledTaskSettings** object to the $Stset variable.
61+
62+
The third command registers the scheduled task Task01 to run the task action named Cmd and to use the default task settings.
5963

6064
This example registers a scheduled task that uses default task settings.
6165

@@ -65,12 +69,16 @@ The first command creates a scheduled task action named Cmd and assigns the **Sc
6569
```
6670
PS C:\>$Sta = New-ScheduledTaskAction -Execute "Cmd"
6771
68-
The second command creates scheduled task settings that sets a higher priority for the scheduled task, and assigns the **ScheduledTaskSettings** object to the $Stset variable.
6972
PS C:\>$STSet = New-ScheduledTaskSettingsSet -Priority 5
7073
71-
The third command registers the scheduled task Task01 to run the task action named Cmd and to use the task settings that have a priority setting of 9.
7274
PS C:\>Register-ScheduledTask Task01 -Action $Sta -Settings $Stset
75+
7376
```
77+
The first command creates a scheduled task action named Cmd and assigns the ScheduledTaskAction object to the $Sta variable.
78+
79+
The second command creates scheduled task settings that sets a higher priority for the scheduled task, and assigns the **ScheduledTaskSettings** object to the $Stset variable.
80+
81+
The third command registers the scheduled task Task01 to run the task action named Cmd and to use the task settings that have a priority setting of 9.
7482

7583
This example sets the priority of a scheduled task.
7684

@@ -80,12 +88,16 @@ The first command creates a scheduled task action named Cmd and assigns the **Sc
8088
```
8189
PS C:\>$Sta = New-ScheduledTaskAction -Execute "Cmd"
8290
83-
The second command creates scheduled task settings that specify that Task Scheduler attempts three restarts of the task at sixty minute intervals. This command assigns the **ScheduledTaskSettings** object to the $Stset variable.
8491
PS C:\>$Stset = New-ScheduledTaskSettingsSet -RestartCount 3 -RestartInterval 60
8592
86-
The third command registers the scheduled task Task01 to run the task action named Cmd and to use the task settings that the **ScheduledTaskSettings** object defines.
8793
PS C:\>Register-ScheduledTask Task01 -Action $Sta -Settings $Stset
94+
8895
```
96+
The first command creates a scheduled task action named Cmd and assigns the ScheduledTaskAction object to the $Sta variable.
97+
98+
The second command creates scheduled task settings that specify that Task Scheduler attempts three restarts of the task at sixty minute intervals. This command assigns the **ScheduledTaskSettings** object to the $Stset variable.
99+
100+
The third command registers the scheduled task Task01 to run the task action named Cmd and to use the task settings that the **ScheduledTaskSettings** object defines.
89101

90102
This example sets restart settings for a scheduled task.
91103

@@ -95,12 +107,16 @@ The first command creates a scheduled task action named Cmd and assigns the **Sc
95107
```
96108
PS C:\>$Sta = New-ScheduledTaskAction -Execute "Cmd"
97109
98-
The second command creates scheduled task settings that specify that Task Scheduler runs the task only when the computer is idle for 2 minutes and waits for 2 hours and 30 minutes for an idle condition. This command assigns the **ScheduledTaskSettings** object to the $Stset variable.
99110
PS C:\>$Stset = New-ScheduledTaskSettingsSet -RunOnlyIfIdle -IdleDuration 00:02:00 -IdleWaitTimeout 02:30:00
100111
101-
The third command registers the scheduled task Task01 to run the task action named Cmd and to use the task settings that the **ScheduledTaskSettings** object defines.
102112
PS C:\>Register-ScheduledTask Task01 -Action $Sta -Settings $Stset
113+
103114
```
115+
The first command creates a scheduled task action named Cmd and assigns the ScheduledTaskAction object to the $Sta variable.
116+
117+
The second command creates scheduled task settings that specify that Task Scheduler runs the task only when the computer is idle for 2 minutes and waits for 2 hours and 30 minutes for an idle condition. This command assigns the **ScheduledTaskSettings** object to the $Stset variable.
118+
119+
The third command registers the scheduled task Task01 to run the task action named Cmd and to use the task settings that the **ScheduledTaskSettings** object defines.
104120

105121
This example sets idle settings for a scheduled task.
106122

@@ -110,16 +126,36 @@ The first command creates a scheduled task action named Cmd and assigns the **Sc
110126
```
111127
PS C:\>$Sta = New-ScheduledTaskAction -Execute "Cmd"
112128
113-
The second command creates scheduled task settings that specify that Task Scheduler runs the task only when a network is available. This command assigns the **ScheduledTaskSettings** object to the $Stset variable.
114129
PS C:\>$Stset = New-ScheduledTaskSettingsSet -RunOnlyIfNetworkAvailable
115130
116-
The third command registers the scheduled task Task01 to run the task action named Cmd only when a network is available.
117131
PS C:\>Register-ScheduledTask Task01 -Action $Sta -Settings $Stset
132+
118133
```
134+
The first command creates a scheduled task action named Cmd and assigns the ScheduledTaskAction object to the $Sta variable.
135+
136+
The second command creates scheduled task settings that specify that Task Scheduler runs the task only when a network is available. This command assigns the **ScheduledTaskSettings** object to the $Stset variable.
137+
138+
The third command registers the scheduled task Task01 to run the task action named Cmd only when a network is available.
119139

120140
This example registers a scheduled task that runs only when a network is available.
121141

122-
The first command creates a scheduled task action named Cmd and assigns the **ScheduledTaskAction** object to the $Sta variable.
142+
### Example 6: Register a scheduled task that has a time limit to complete the task
143+
```
144+
PS C:\>$Sta = New-ScheduledTaskAction -Execute "Cmd"
145+
146+
$Stset = New-ScheduledTaskSettingsSet -ExecutionTimeLimit (New-TimeSpan -Hours 1)
147+
148+
PS C:\>Register-ScheduledTask Task01 -Action $Sta -Settings $Stset
149+
150+
```
151+
The first command creates a scheduled task action named Cmd and assigns the ScheduledTaskAction object to the $Sta variable.
152+
153+
The second command creates scheduled task settings that specify if the task is not finished after one hour, it is considered as failed. This command assigns the **ScheduledTaskSettings** object to the $Stset variable.
154+
155+
The third command registers the scheduled task Task01 to run the task action named Cmd, only then finish the task after one hour.
156+
157+
Without the ExecutionTimeLimit setting defined, the time limit set to it's default of three days for the Task Scheduler is allowed to complete the task. To configure the time limit, see [New-TimeSpan](https://docs.microsoft.com/powershell/module/microsoft.powershell.utility/new-timespan).
158+
123159

124160
## PARAMETERS
125161

0 commit comments

Comments
 (0)