Skip to content

Commit dd9fc82

Browse files
authored
Merge branch 'master' into patch-125
2 parents 5bb20c6 + 552da2c commit dd9fc82

File tree

86 files changed

+2691
-340
lines changed

Some content is hidden

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

86 files changed

+2691
-340
lines changed

docset/winserver2012-ps/activedirectory/Add-ADGroupMember.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -416,8 +416,8 @@ By default, this cmdlet does not generate any output.
416416
417417
## NOTES
418418
* This cmdlet does not work with a read-only domain controller.
419-
420-
This cmdlet does not work with an Active Directory Snapshot.
419+
* This cmdlet does not work with an Active Directory snapshot.
420+
* This cmdlet will allow you to add a group as a member of itself which could lead to unstable behavior.
421421
422422
## RELATED LINKS
423423

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Get-ADGroup [-AuthType <ADAuthType>] [-Credential <PSCredential>] -LDAPFilter <S
3636
The Get-ADGroup cmdlet gets a group or performs a search to retrieve multiple groups from an Active Directory.
3737

3838
The Identity parameter specifies the Active Directory group to get.
39-
You can identify a group by its distinguished name (DN), GUID, security identifier (SID), Security Accounts Manager (SAM) account name, or canonical name.
39+
You can identify a group by its distinguished name (DN), GUID, security identifier (SID), or Security Accounts Manager (SAM) account name.
4040
You can also specify group object variable, such as $\<localGroupObject\>.
4141

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

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

+6
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

+1-1
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/adcsdeployment/install-adcsnetworkdeviceenrollmentservice.md

+16-25
Original file line numberDiff line numberDiff line change
@@ -43,47 +43,38 @@ Int is equivalent to Int32 in the .NET Frameworkhttp://msdn.microsoft.com/en-us/
4343

4444
## EXAMPLES
4545

46-
### -------------------------- EXAMPLE 1 --------------------------
46+
### Example 1: Display the default NDES settings
4747
```
48-
C:\PS>Install-AdcsNetworkDeviceEnrollmentService -ApplicationPoolIdentity -WhatIf
48+
PS C:\> Install-AdcsNetworkDeviceEnrollmentService -ApplicationPoolIdentity -WhatIf
4949
```
5050

51-
Description
52-
53-
-----------
54-
55-
This command displays the default Network Device Enrollment Service settings when the service is running as the default application identity without making any changes to the configuration.
51+
This command displays the default NDES settings that will be configured if it is installed.
5652

57-
### -------------------------- EXAMPLE 2 --------------------------
53+
### Example 2: Display the default NDES settings using a service account name and password
5854
```
59-
C:\PS>Install-AdcsNetworkDeviceEnrollmentService -ServiceAccountName <Domain>\<AccountName> -ServiceAccountPassword (read-host "Set user password" -assecurestring) -WhatIf
55+
PS C:\> Install-AdcsNetworkDeviceEnrollmentService -ServiceAccountName "CONTOSO\svcNDES" -ServiceAccountPassword (read-host "Set user password" -assecurestring) -WhatIf
6056
```
6157

62-
Description
63-
64-
-----------
65-
6658
This command displays the default settings when NDES is using a service account without making any changes to the configuration.
67-
This command assumes that the \<Domain\>\\\<AccountName\> service account is a member of the local machine's IIS_USRS group.
68-
Substitute the domain name for \<Domain\> and the user account name for \<AccountName\>.
59+
This command uses the service account named CONTOSO\svcNDES that is a member of the local computer's IIS_USRS group.
6960

70-
### -------------------------- EXAMPLE 3 --------------------------
61+
### Example 3: Install NDES using the application pool identity
7162
```
72-
C:\PS>Install-AdcsNetworkDeviceEnrollmentService -ApplicationPoolIdentity -CAConfig <CAComputerName>\<CACommonName>
63+
PS C:\> Install-AdcsNetworkDeviceEnrollmentService -ApplicationPoolIdentity -CAConfig "<CAComputerName>\<CACommonName>"
7364
```
7465

75-
Description
76-
77-
-----------
78-
79-
This command installs the Network Device Enrollment Service using the application pool identity to use a remote CA as specified by the CA computer \<CACompterName\>\\\<CACommonName\>.
80-
Substitute the appropriate CA computer name and common name for \<CAComputerName\> and \<CACommonName\>.
66+
This command installs NDES using the application pool identity to use a remote CA as specified by the CA computer `<CAComputerName>\<CACommonName>`.
67+
Substitute the appropriate CA computer name and common name for `<CAComputerName>` and `<CACommonName>`.
8168

82-
### -------------------------- EXAMPLE 4 --------------------------
69+
### Example 4: Install NDES using a specific service account
8370
```
84-
C:\PS>Install-AdcsNetworkDeviceEnrollmentService -ServiceAccountName MyDomain\AccountName -ServiceAccountPassword (read-host "Set user password" -assecurestring) -CAConfig "CAMachineName\CAName" -RAName "Contoso-NDES-RA" -RACountry "US" -RACompany "Contoso" -SigningProviderName "Microsoft Strong Cryptographic Provider" -SigningKeyLength 4096 -EncryptionProviderName "Microsoft Strong Cryptographic Provider" -EncryptionKeyLength 4096
71+
PS C:\> Install-AdcsNetworkDeviceEnrollmentService -ServiceAccountName "CONTOSO\svcNDES" -ServiceAccountPassword (read-host "Set user password" -assecurestring) -CAConfig "CAComputerName\CAName" -RAName "Contoso-NDES-RA" -RACountry "US" -RACompany "Contoso" -SigningProviderName "Microsoft Strong Cryptographic Provider" -SigningKeyLength 4096 -EncryptionProviderName "Microsoft Strong Cryptographic Provider" -EncryptionKeyLength 4096
8572
```
8673

74+
This command installs the NDES using a service account named CONTOSO\svcNDES that is a member of the local computer's IIS_USRS group.
75+
The command also specifies several non-default parameters.
76+
77+
8778
Description
8879

8980
-----------

docset/winserver2012-ps/dism/Get-WindowsImage.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Accepted values: Errors, Warnings, WarningsInfo
119119

120120
Required: False
121121
Position: Named
122-
Default value: None
122+
Default value: 3
123123
Accept pipeline input: True (ByPropertyName)
124124
Accept wildcard characters: False
125125
```

docset/winserver2012-ps/netadapter/Get-NetAdapterPowerManagement.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ Get-NetAdapterPowerManagement [-AsJob] [-CimSession <CimSession[]>] [-IncludeHid
2525
```
2626

2727
## DESCRIPTION
28-
The **Get-NetAdapterPowerManagement** cmdlet gets the state of the power management features of a Power Management capable network adapter.
29-
You must be an administrator in order to run this cmdlet.
28+
The **Get-NetAdapterPowerManagement** cmdlet gets the state of the power management features of a Power Management capable network adapter. You need to run this cmdlet in an elevated (Run as Administrator) Windows PowerShell session.
3029

3130
## EXAMPLES
3231

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

+6-6
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

+2
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/winserver2012-ps/windowsserverbackup/New-WBFileSpec.md

+8-12
Original file line numberDiff line numberDiff line change
@@ -40,25 +40,21 @@ The WBFileSpec object that specifies the file C:\Sample\1.jpg for backup.
4040

4141
This command creates a file specification and adds the file named "C:\Sample\1.jpg" to it.
4242

43-
### Example 2: Add a volume recursively to a backup file specification
43+
### Example 2: Add a folder recursively to a backup file specification
4444
```
45-
PS C:\> $Filespec = New-WBFileSpec -FileSpec C:\Sample
46-
47-
The WBFileSpec object that specifies the folder C:\Sample for backup.
45+
PS C:\> $Filespec = New-WBFileSpec -FileSpec "C:\Sample"
4846
```
4947

50-
This command creates a file specification and adds the contents of the "C:\Sample" folder to it.
51-
Because the cmdlet does not include the **NonRecursive** parameter, the backup includes the contents of this folder and its subfolders.
48+
This command creates a file specification and adds the contents of the C:\Sample folder to it.
49+
Because the cmdlet does not include the *NonRecursive* parameter, the backup includes the contents of this folder and its subfolders.
5250

53-
### Example 3: Add a volume nonrecursively to a backup file specification
51+
### Example 3: Add a folder nonrecursively to a backup file specification
5452
```
55-
PS C:\> $Filespec = New-WBFileSpec -FileSpec C:\Sample -NonRecursive
56-
57-
The WBFileSpec object that specifies the folder C:\sample for backup non-recursively.
53+
PS C:\> $Filespec = New-WBFileSpec -FileSpec "C:\Sample" -NonRecursive
5854
```
5955

60-
This command creates a file specification and adds the contents of the "C:\Sample" folder to it.
61-
Because the cmdlet includes the **NonRecursive** parameter, the backup includes the contents of this folder but not the contents of its subfolders.
56+
This command creates a file specification and adds the contents of the C:\Sample folder to it.
57+
Because the cmdlet includes the *NonRecursive* parameter, the backup includes the contents of this folder but not the contents of its subfolders.
6258

6359
### Example 4: Exclude files from a backup file specification
6460
```

docset/winserver2012r2-ps/activedirectory/Add-ADGroupMember.md

+1
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ By default, this cmdlet does not generate any output.
336336
## NOTES
337337
* This cmdlet does not work with a read-only domain controller.
338338
* This cmdlet does not work with an Active Directory snapshot.
339+
* This cmdlet will allow you to add a group as a member of itself which could lead to unstable behavior.
339340

340341
## RELATED LINKS
341342

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Get-ADGroup [-AuthType <ADAuthType>] [-Credential <PSCredential>] -LDAPFilter <S
3838
The **Get-ADGroup** cmdlet gets a group or performs a search to retrieve multiple groups from an Active Directory.
3939

4040
The **Identity** parameter specifies the Active Directory group to get.
41-
You can identify a group by its distinguished name (DN), GUID, security identifier (SID), Security Accounts Manager (SAM) account name, or canonical name.
41+
You can identify a group by its distinguished name (DN), GUID, security identifier (SID), or Security Accounts Manager (SAM) account name.
4242
You can also specify group object variable, such as **$\<localGroupObject\>**.
4343

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

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

+6
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

+1-1
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/activedirectory/New-ADUser.md

+7
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,13 @@ PS C:\>New-ADUser -Name "ChewDavid" -Type iNetOrgPerson -Path "DC=AppNC" -Server
8888

8989
This command creates an **inetOrgPerson**-class user named ChewDavid on an AD LDS instance.
9090

91+
### Example 4: Create a user and set password
92+
```
93+
PS C:\> New-ADUser -Name "ChewDavid" -Accountpassword (Read-Host -AsSecureString "AccountPassword") -Enabled $true
94+
```
95+
96+
This command creates a new user named ChewDavid and sets the account password.
97+
9198
## PARAMETERS
9299

93100
### -AccountExpirationDate

docset/winserver2012r2-ps/adcsdeployment/install-adcsnetworkdeviceenrollmentservice.md

+15-25
Original file line numberDiff line numberDiff line change
@@ -45,47 +45,37 @@ Int is equivalent to Int32 in the .NET Frameworkhttp://msdn.microsoft.com/en-us/
4545

4646
## EXAMPLES
4747

48-
### -------------------------- EXAMPLE 1 --------------------------
48+
### Example 1: Display the default NDES settings
4949
```
50-
C:\PS>Install-AdcsNetworkDeviceEnrollmentService -ApplicationPoolIdentity -WhatIf
50+
PS C:\> Install-AdcsNetworkDeviceEnrollmentService -ApplicationPoolIdentity -WhatIf
5151
```
5252

53-
Description
54-
55-
-----------
56-
57-
This command displays the default Network Device Enrollment Service settings when the service is running as the default application identity without making any changes to the configuration.
53+
This command displays the default NDES settings that will be configured if it is installed.
5854

59-
### -------------------------- EXAMPLE 2 --------------------------
55+
### Example 2: Display the default NDES settings using a service account name and password
6056
```
61-
C:\PS>Install-AdcsNetworkDeviceEnrollmentService -ServiceAccountName <Domain>\<AccountName> -ServiceAccountPassword (read-host "Set user password" -assecurestring) -WhatIf
57+
PS C:\> Install-AdcsNetworkDeviceEnrollmentService -ServiceAccountName "CONTOSO\svcNDES" -ServiceAccountPassword (read-host "Set user password" -assecurestring) -WhatIf
6258
```
6359

64-
Description
65-
66-
-----------
67-
6860
This command displays the default settings when NDES is using a service account without making any changes to the configuration.
69-
This command assumes that the \<Domain\>\\\<AccountName\> service account is a member of the local machine's IIS_USRS group.
70-
Substitute the domain name for \<Domain\> and the user account name for \<AccountName\>.
61+
This command uses the service account named CONTOSO\svcNDES that is a member of the local computer's IIS_USRS group.
7162

72-
### -------------------------- EXAMPLE 3 --------------------------
63+
### Example 3: Install NDES using the application pool identity
7364
```
74-
C:\PS>Install-AdcsNetworkDeviceEnrollmentService -ApplicationPoolIdentity -CAConfig <CAComputerName>\<CACommonName>
65+
PS C:\> Install-AdcsNetworkDeviceEnrollmentService -ApplicationPoolIdentity -CAConfig "<CAComputerName>\<CACommonName>"
7566
```
7667

77-
Description
78-
79-
-----------
68+
This command installs NDES using the application pool identity to use a remote CA as specified by the CA computer `<CAComputerName>\<CACommonName>`.
69+
Substitute the appropriate CA computer name and common name for `<CAComputerName>` and `<CACommonName>`.
8070

81-
This command installs the Network Device Enrollment Service using the application pool identity to use a remote CA as specified by the CA computer \<CACompterName\>\\\<CACommonName\>.
82-
Substitute the appropriate CA computer name and common name for \<CAComputerName\> and \<CACommonName\>.
83-
84-
### -------------------------- EXAMPLE 4 --------------------------
71+
### Example 4: Install NDES using a specific service account
8572
```
86-
C:\PS>Install-AdcsNetworkDeviceEnrollmentService -ServiceAccountName MyDomain\AccountName -ServiceAccountPassword (read-host "Set user password" -assecurestring) -CAConfig "CAMachineName\CAName" -RAName "Contoso-NDES-RA" -RACountry "US" -RACompany "Contoso" -SigningProviderName "Microsoft Strong Cryptographic Provider" -SigningKeyLength 4096 -EncryptionProviderName "Microsoft Strong Cryptographic Provider" -EncryptionKeyLength 4096
73+
PS C:\> Install-AdcsNetworkDeviceEnrollmentService -ServiceAccountName "CONTOSO\svcNDES" -ServiceAccountPassword (read-host "Set user password" -assecurestring) -CAConfig "CAComputerName\CAName" -RAName "Contoso-NDES-RA" -RACountry "US" -RACompany "Contoso" -SigningProviderName "Microsoft Strong Cryptographic Provider" -SigningKeyLength 4096 -EncryptionProviderName "Microsoft Strong Cryptographic Provider" -EncryptionKeyLength 4096
8774
```
8875

76+
This command installs the NDES using a service account named CONTOSO\svcNDES that is a member of the local computer's IIS_USRS group.
77+
The command also specifies several non-default parameters.
78+
8979
Description
9080

9181
-----------

0 commit comments

Comments
 (0)