Skip to content

Commit 31c0d92

Browse files
authored
Merge pull request MicrosoftDocs#2986 from MicrosoftDocs/main
merge main to live Tues morning 10:30
2 parents 08086cd + 95facb0 commit 31c0d92

File tree

18 files changed

+51
-28
lines changed

18 files changed

+51
-28
lines changed

docset/winserver2012-ps/nfs/New-NfsClientgroup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Required: False
7070
Position: 2
7171
Default value: None
7272
Accept pipeline input: True (ByPropertyName)
73-
Accept wildcard characters: False
73+
Accept wildcard characters: True
7474
```
7575
7676
### -AsJob

docset/winserver2012r2-ps/activedirectory/Search-ADAccount.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,10 +297,10 @@ Accept wildcard characters: False
297297
```
298298
299299
### -DateTime
300-
Specifies a distinct time value for Search-ADAccount parameters such as **AccountExpiring**, **AccountInactive**, and **PasswordExpiring**.
300+
Specifies a distinct time value for Search-ADAccount parameters such as **AccountExpiring**, **AccountInactive**, and **PasswordExpired**.
301301
302302
Time is assumed to be local time unless otherwise specified.
303-
When a time value is not specified, the time is assumed to midnight local time.
303+
When a time value is not specified, the time is assumed to be midnight local time.
304304
If you do not specify a date, the date is assumed to be the current date.
305305
The following examples show commonly-used syntax to specify a **DateTime** object.
306306

docset/winserver2012r2-ps/nfs/New-NfsClientgroup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Required: False
7171
Position: 1
7272
Default value: None
7373
Accept pipeline input: True (ByPropertyName)
74-
Accept wildcard characters: False
74+
Accept wildcard characters: True
7575
```
7676
7777
### -AsJob

docset/winserver2016-ps/activedirectory/Search-ADAccount.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,10 @@ Accept wildcard characters: False
291291
```
292292
293293
### -DateTime
294-
Specifies a distinct time value for **Search-ADAccount** parameters such as *AccountExpiring*, *AccountInactive*, and *PasswordExpiring*.
294+
Specifies a distinct time value for **Search-ADAccount** parameters such as *AccountExpiring*, *AccountInactive*, and *PasswordExpired*.
295295
296296
Time is assumed to be local time unless otherwise specified.
297-
When a time value is not specified, the time is assumed to midnight local time.
297+
When a time value is not specified, the time is assumed to be midnight local time.
298298
If you do not specify a date, the date is assumed to be the current date.
299299
The following examples show commonly-used syntax to specify a *DateTime* object.
300300

docset/winserver2016-ps/adfs/New-AdfsAzureMfaTenantCertificate.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,12 @@ These commands create a certificate for Azure MFA, register the certificate in a
4646
4747
### Example 2: Determine which certificate Azure MFA is using
4848
```
49-
PS C:\> New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID> | Out-File amfacert.cer
49+
$CertInBase64 = New-AdfsAzureMfaTenantCertificate -TenantID
50+
$cert = Security.Cryptography.X509Certificates.X509Certificate2
51+
$cert | Format-List *
5052
```
5153

52-
After AD FS has been configured for Azure MFA, this command determines which certificate Azure MFA is using.
54+
After AD FS has been configured for Azure MFA, this command determines which certificate Azure MFA is using and when it expires.
5355

5456
## PARAMETERS
5557

docset/winserver2016-ps/adfs/Set-AdfsAzureMfaTenant.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,13 @@ PS C:\> Set-AdfsAzureMfaTenant -TenantId <your tenant ID> -ClientId 981f26a1-7f4
3333

3434
This command creates a certificate for Azure MFA, registers it in the tenant, and enables Azure MFA on the AD FS farm.
3535

36-
### Example 2: Determine the Azure MFA certificate
36+
### Example 2: Determine which certificate Azure MFA is using
3737
```
38-
PS C:\> New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID> -out-file amfacert.cer
38+
$CertInBase64 = New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID>
39+
[Security.Cryptography.X509Certificates.X509Certificate2]([System.Convert]::FromBase64String($CertInBase64))
3940
```
4041

41-
This command determines which certificate Azure MFA is using, after AD FS has been configured for Azure MFA using the previous example.
42+
After AD FS has been configured for Azure MFA, this command determines which certificate Azure MFA is using and when it expires.
4243

4344
## PARAMETERS
4445

docset/winserver2016-ps/hyper-v/Restart-VM.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,9 @@ Accept wildcard characters: False
217217
```
218218
219219
### -Timeout
220+
Specifies the duration of the wait, in seconds. When the timeout elapses, **Restart-VM** returns to the command prompt, even if the virtual machine isn't restarted.
220221
222+
This parameter is only valid with the `-Wait` parameter. The `-Timeout` parameter overrides the `-Wait` parameter's indefinite waiting period.
221223

222224
```yaml
223225
Type: Int32
@@ -247,7 +249,9 @@ Accept wildcard characters: False
247249
```
248250

249251
### -Wait
252+
**Restart-VM** suppresses the PowerShell prompt and blocks the pipeline until the virtual machine has restarted. You can use this parameter in a script to restart the virtual machine and then continue to process when the restart is finished.
250253

254+
The `-Wait` parameter waits indefinitely for the virtual machine to restart. You can use the `-Timeout` parameter to adjust the timing and the `-For` and `-Delay` parameters to wait for particular services to become available on the restarted virtual machine.
251255

252256
```yaml
253257
Type: SwitchParameter

docset/winserver2016-ps/nfs/New-NfsClientgroup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Required: False
7272
Position: 1
7373
Default value: None
7474
Accept pipeline input: True (ByPropertyName)
75-
Accept wildcard characters: False
75+
Accept wildcard characters: True
7676
```
7777
7878
### -AsJob

docset/winserver2019-ps/activedirectory/Search-ADAccount.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,10 @@ Accept wildcard characters: False
291291
```
292292
293293
### -DateTime
294-
Specifies a distinct time value for **Search-ADAccount** parameters such as *AccountExpiring*, *AccountInactive*, and *PasswordExpiring*.
294+
Specifies a distinct time value for **Search-ADAccount** parameters such as *AccountExpiring*, *AccountInactive*, and *PasswordExpired*.
295295
296296
Time is assumed to be local time unless otherwise specified.
297-
When a time value is not specified, the time is assumed to midnight local time.
297+
When a time value is not specified, the time is assumed to be midnight local time.
298298
If you do not specify a date, the date is assumed to be the current date.
299299
The following examples show commonly-used syntax to specify a *DateTime* object.
300300

docset/winserver2019-ps/adfs/New-AdfsAzureMfaTenantCertificate.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,12 @@ These commands create a certificate for Azure MFA, register the certificate in a
4646
4747
### Example 2: Determine which certificate Azure MFA is using
4848
```
49-
PS C:\> New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID> | Out-File amfacert.cer
49+
$CertInBase64 = New-AdfsAzureMfaTenantCertificate -TenantID
50+
$cert = Security.Cryptography.X509Certificates.X509Certificate2
51+
$cert | Format-List *
5052
```
5153

52-
After AD FS has been configured for Azure MFA, this command determines which certificate Azure MFA is using.
54+
After AD FS has been configured for Azure MFA, this command determines which certificate Azure MFA is using and when it expires.
5355

5456
## PARAMETERS
5557

0 commit comments

Comments
 (0)