Skip to content

Commit 0736a8d

Browse files
authored
Merge branch 'master' into fix-2733-add-note
2 parents 5a020b4 + 390601d commit 0736a8d

File tree

23 files changed

+86
-53
lines changed

23 files changed

+86
-53
lines changed

docset/winserver2012-ps/activedirectory/Get-ADOrganizationalUnit.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ For more information about the how to determine the properties for computer obje
5555
### Example 1: Get all of the OUs in a domain
5656
```powershell
5757
PS C:\>Get-ADOrganizationalUnit -Filter 'Name -like "*"' | Format-Table Name, DistinguishedName -A
58+
```
59+
```output
5860
Name DistinguishedName
5961
---- -----------------
6062
Domain Controllers OU=Domain Controllers,DC=FABRIKAM,DC=COM
@@ -81,6 +83,8 @@ This command gets all of the OUs in a domain.
8183
### Example 2: Get an OU by its distinguished name
8284
```powershell
8385
PS C:\> Get-ADOrganizationalUnit -Identity 'OU=AsiaPacific,OU=Sales,OU=UserAccounts,DC=FABRIKAM,DC=COM' | Format-Table Name,Country,PostalCode,City,StreetAddress,State -A
86+
```
87+
```output
8488
Name Country PostalCode City StreetAddress State
8589
---- ------- ---------- ---- ------------- -----
8690
AsiaPacific AU 4171 Balmoral 45 Martens Place QLD
@@ -91,6 +95,8 @@ This command gets the OU with the distinguished name OU=AsiaPacific,OU=Sales,OU=
9195
### Example 3: Get child OUs
9296
```powershell
9397
PS C:\> Get-ADOrganizationalUnit -LDAPFilter '(name=*)' -SearchBase 'OU=Sales,OU=UserAccounts,DC=FABRIKAM,DC=COM' -SearchScope OneLevel | Format-Table Name,Country,PostalCode,City,StreetAddress,State
98+
```
99+
```output
94100
Name Country PostalCode City StreetAddress State
95101
---- ------- ---------- ---- ------------- -----
96102
AsiaPacific AU 4171 Balmoral 45 Martens Place QLD

docset/winserver2012-ps/activedirectory/Get-ADUser.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Get-ADUser [-AuthType <ADAuthType>] [-Credential <PSCredential>] -LDAPFilter <St
3636
The **Get-ADUser** cmdlet gets a specified user object or performs a search to get multiple user objects.
3737

3838
The *Identity* parameter specifies the Active Directory user to get.
39-
You can identify a user by its distinguished name (DN), GUID, security identifier (SID), Security Account Manager (SAM) account name, or name.
39+
You can identify a user by its distinguished name (DN), GUID, security identifier (SID), or Security Account Manager (SAM) account name.
4040
You can also set the parameter to a user object variable such as `$<localUserObject>` or pass a user object through the pipeline to the *Identity* parameter.
4141

4242
To search for and retrieve more than one user, use the *Filter* or *LDAPFilter* parameters.

docset/winserver2012-ps/scheduledtasks/New-ScheduledTask.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ PS C:\> Register-ScheduledTask T1 -InputObject $task
3838

3939
In this example, the set of commands uses several cmdlets and variables to define and then register a scheduled task.
4040

41-
The first command uses the **New-ScheduledTaskAction** cmdlet to assign the executable file tskmgr.exe to the variable $A.
41+
The first command uses the **New-ScheduledTaskAction** cmdlet to assign the executable file `tskmgr.exe` to the variable `$action`.
4242

43-
The second command uses the **New-ScheduledTaskTrigger** cmdlet to assign the value AtLogon to the variable $T.
43+
The second command uses the **New-ScheduledTaskTrigger** cmdlet to assign the value `AtLogon` to the variable `$trigger`.
4444

45-
The third command assigns the principal of the scheduled task `Contoso\Administrator` to the variable $P.
45+
The third command assigns the principal of the scheduled task `Contoso\Administrator` to the variable `$principal`.
4646

47-
The fourth command uses the **New-ScheduledTaskSettingsSet** cmdlet to assign a task settings object to the variable $S.
47+
The fourth command uses the **New-ScheduledTaskSettingsSet** cmdlet to assign a task settings object to the variable `$settings`.
4848

49-
The fifth command creates a new task and assigns the task definition to the variable $D.
49+
The fifth command creates a new task and assigns the task definition to the variable `$task`.
5050

5151
The sixth command (hypothetically) runs at a later time.
52-
It registers the new scheduled task and defines it by using the $D variable.
52+
It registers the new scheduled task and defines it by using the `$task` variable.
5353

5454
### Example 2: Define a scheduled task with multiple actions
5555
```powershell

docset/winserver2012-ps/storage/Format-Volume.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,8 @@ Accept wildcard characters: False
388388
Shows what would happen if the cmdlet runs.
389389
The cmdlet is not run.
390390

391+
**NOTE**: The WhatIf switch does not work with this cmdlet.
392+
391393
```yaml
392394
Type: SwitchParameter
393395
Parameter Sets: (All)

docset/winserver2012r2-ps/activedirectory/Get-ADOrganizationalUnit.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ For more information about the how to determine the properties for computer obje
5757
### Example 1: Get all of the OUs in a domain
5858
```powershell
5959
PS C:\>Get-ADOrganizationalUnit -Filter 'Name -like "*"' | Format-Table Name, DistinguishedName -A
60+
```
61+
```output
6062
Name DistinguishedName
6163
---- -----------------
6264
Domain Controllers OU=Domain Controllers,DC=FABRIKAM,DC=COM
@@ -83,6 +85,8 @@ This command gets all of the OUs in a domain.
8385
### Example 2: Get an OU by its distinguished name
8486
```powershell
8587
PS C:\> Get-ADOrganizationalUnit -Identity 'OU=AsiaPacific,OU=Sales,OU=UserAccounts,DC=FABRIKAM,DC=COM' | Format-Table Name,Country,PostalCode,City,StreetAddress,State -A
88+
```
89+
```output
8690
Name Country PostalCode City StreetAddress State
8791
---- ------- ---------- ---- ------------- -----
8892
AsiaPacific AU 4171 Balmoral 45 Martens Place QLD
@@ -93,6 +97,8 @@ This command gets the OU with the distinguished name OU=AsiaPacific,OU=Sales,OU=
9397
### Example 3: Get child OUs
9498
```powershell
9599
PS C:\> Get-ADOrganizationalUnit -LDAPFilter '(name=*)' -SearchBase 'OU=Sales,OU=UserAccounts,DC=FABRIKAM,DC=COM' -SearchScope OneLevel | Format-Table Name,Country,PostalCode,City,StreetAddress,State
100+
```
101+
```output
96102
Name Country PostalCode City StreetAddress State
97103
---- ------- ---------- ---- ------------- -----
98104
AsiaPacific AU 4171 Balmoral 45 Martens Place QLD

docset/winserver2012r2-ps/activedirectory/Get-ADUser.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Get-ADUser [-AuthType <ADAuthType>] [-Credential <PSCredential>] -LDAPFilter <St
3838
The **Get-ADUser** cmdlet gets a specified user object or performs a search to get multiple user objects.
3939

4040
The *Identity* parameter specifies the Active Directory user to get.
41-
You can identify a user by its distinguished name (DN), GUID, security identifier (SID), Security Account Manager (SAM) account name, or name.
41+
You can identify a user by its distinguished name (DN), GUID, security identifier (SID), or Security Account Manager (SAM) account name.
4242
You can also set the parameter to a user object variable such as `$<localUserObject>` or pass a user object through the pipeline to the *Identity* parameter.
4343

4444
To search for and retrieve more than one user, use the *Filter* or *LDAPFilter* parameters.

docset/winserver2012r2-ps/scheduledtasks/New-ScheduledTask.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@ PS C:\> Register-ScheduledTask T1 -InputObject $task
4040

4141
In this example, the set of commands uses several cmdlets and variables to define and then register a scheduled task.
4242

43-
The first command uses the **New-ScheduledTaskAction** cmdlet to assign the executable file tskmgr.exe to the variable $A.
43+
The first command uses the **New-ScheduledTaskAction** cmdlet to assign the executable file `tskmgr.exe` to the variable `$action`.
4444

45-
The second command uses the **New-ScheduledTaskTrigger** cmdlet to assign the value AtLogon to the variable $T.
45+
The second command uses the **New-ScheduledTaskTrigger** cmdlet to assign the value `AtLogon` to the variable `$trigger`.
4646

47-
The third command assigns the principal of the scheduled task `Contoso\Administrator` to the variable $P.
47+
The third command assigns the principal of the scheduled task `Contoso\Administrator` to the variable `$principal`.
4848

49-
The fourth command uses the **New-ScheduledTaskSettingsSet** cmdlet to assign a task settings object to the variable $S.
49+
The fourth command uses the **New-ScheduledTaskSettingsSet** cmdlet to assign a task settings object to the variable `$settings`.
5050

51-
The fifth command creates a new task and assigns the task definition to the variable $D.
51+
The fifth command creates a new task and assigns the task definition to the variable `$task`.
5252

5353
The sixth command (hypothetically) runs at a later time.
54-
It registers the new scheduled task and defines it by using the $D variable.
54+
It registers the new scheduled task and defines it by using the `$task` variable.
5555

5656
### Example 2: Define a scheduled task with multiple actions
5757
```powershell

docset/winserver2012r2-ps/storage/Format-Volume.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,8 @@ Accept wildcard characters: False
408408
Shows what would happen if the cmdlet runs.
409409
The cmdlet is not run.
410410

411+
**NOTE**: The WhatIf switch does not work with this cmdlet.
412+
411413
```yaml
412414
Type: SwitchParameter
413415
Parameter Sets: (All)

docset/winserver2016-ps/activedirectory/Get-ADOrganizationalUnit.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ For more information about the how to determine the properties for computer obje
5858
### Example 1: Get all of the OUs in a domain
5959
```powershell
6060
PS C:\> Get-ADOrganizationalUnit -Filter 'Name -like "*"' | Format-Table Name, DistinguishedName -A
61+
```
62+
```output
6163
Name DistinguishedName
6264
---- -----------------
6365
Domain Controllers OU=Domain Controllers,DC=FABRIKAM,DC=COM
@@ -84,6 +86,8 @@ This command gets all of the OUs in a domain.
8486
### Example 2: Get an OU by its distinguished name
8587
```powershell
8688
PS C:\> Get-ADOrganizationalUnit -Identity 'OU=AsiaPacific,OU=Sales,OU=UserAccounts,DC=FABRIKAM,DC=COM' | Format-Table Name,Country,PostalCode,City,StreetAddress,State -A
89+
```
90+
```output
8791
Name Country PostalCode City StreetAddress State
8892
---- ------- ---------- ---- ------------- -----
8993
AsiaPacific AU 4171 Balmoral 45 Martens Place QLD
@@ -94,6 +98,8 @@ This command gets the OU with the distinguished name OU=AsiaPacific,OU=Sales,OU=
9498
### Example 3: Get child OUs
9599
```powershell
96100
PS C:\> Get-ADOrganizationalUnit -LDAPFilter '(name=*)' -SearchBase 'OU=Sales,OU=UserAccounts,DC=FABRIKAM,DC=COM' -SearchScope OneLevel | Format-Table Name,Country,PostalCode,City,StreetAddress,State
101+
```
102+
```output
97103
Name Country PostalCode City StreetAddress State
98104
---- ------- ---------- ---- ------------- -----
99105
AsiaPacific AU 4171 Balmoral 45 Martens Place QLD

docset/winserver2016-ps/activedirectory/Get-ADUser.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Get-ADUser [-AuthType <ADAuthType>] [-Credential <PSCredential>] -LDAPFilter <St
3939
The **Get-ADUser** cmdlet gets a specified user object or performs a search to get multiple user objects.
4040

4141
The *Identity* parameter specifies the Active Directory user to get.
42-
You can identify a user by its distinguished name (DN), GUID, security identifier (SID), Security Account Manager (SAM) account name, or name.
42+
You can identify a user by its distinguished name (DN), GUID, security identifier (SID), or Security Account Manager (SAM) account name.
4343
You can also set the parameter to a user object variable such as `$<localUserObject>` or pass a user object through the pipeline to the *Identity* parameter.
4444

4545
To search for and retrieve more than one user, use the *Filter* or *LDAPFilter* parameters.

0 commit comments

Comments
 (0)