Skip to content

Commit c7644a8

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/windows-powershell-docs into patricka-dnsserver
2 parents e44031a + 82d919c commit c7644a8

File tree

26 files changed

+94
-104
lines changed

26 files changed

+94
-104
lines changed

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

Lines changed: 1 addition & 1 deletion
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/adcsdeployment/install-adcsnetworkdeviceenrollmentservice.md

Lines changed: 16 additions & 25 deletions
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

Lines changed: 1 addition & 1 deletion
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/windowsserverbackup/New-WBFileSpec.md

Lines changed: 8 additions & 12 deletions
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/Get-ADGroup.md

Lines changed: 1 addition & 1 deletion
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/adcsdeployment/install-adcsnetworkdeviceenrollmentservice.md

Lines changed: 15 additions & 25 deletions
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
-----------

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Accepted values: Errors, Warnings, WarningsInfo
121121

122122
Required: False
123123
Position: Named
124-
Default value: None
124+
Default value: 3
125125
Accept pipeline input: True (ByPropertyName)
126126
Accept wildcard characters: False
127127
```

docset/winserver2012r2-ps/windowsserverbackup/New-WBFileSpec.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,21 @@ PS C:\> $Filespec = New-WBFileSpec -FileSpec C:\Sample\1.jpg
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
45+
PS C:\> $Filespec = New-WBFileSpec -FileSpec "C:\Sample"
4646
```
4747

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.
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.
5050

51-
### Example 3: Add a volume nonrecursively to a backup file specification
51+
### Example 3: Add a folder nonrecursively to a backup file specification
5252
```
53-
PS C:\> $Filespec = New-WBFileSpec -FileSpec C:\Sample -NonRecursive
53+
PS C:\> $Filespec = New-WBFileSpec -FileSpec "C:\Sample" -NonRecursive
5454
```
5555

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.
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.
5858

5959
### Example 4: Exclude files from a backup file specification
6060
```

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

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

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

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

docset/winserver2016-ps/adcsdeployment/Install-AdcsNetworkDeviceEnrollmentService.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ Int is equivalent to Int32 in the [.NET Framework](https://msdn.microsoft.com/en
5252
PS C:\> Install-AdcsNetworkDeviceEnrollmentService -ApplicationPoolIdentity -WhatIf
5353
```
5454

55-
This command displays the default NDES settings when the service is running as the default application identity without making any changes to the configuration.
55+
This command displays the default NDES settings that will be configured if it is installed.
5656

5757
### Example 2: Display the default NDES settings using a service account name and password
5858
```
59-
PS C:\> Install-AdcsNetworkDeviceEnrollmentService -ServiceAccountName "CONTOSO\PattiFul" -ServiceAccountPassword (read-host "Set user password" -assecurestring) -WhatIf
59+
PS C:\> Install-AdcsNetworkDeviceEnrollmentService -ServiceAccountName "CONTOSO\svcNDES" -ServiceAccountPassword (read-host "Set user password" -assecurestring) -WhatIf
6060
```
6161

6262
This command displays the default settings when NDES is using a service account without making any changes to the configuration.
63-
This command uses the service account named CONTOSO\PattiFul that is a member of the local computer's IIS_USRS group.
63+
This command uses the service account named "CONTOSO\svcNDES" that is a member of the local computer's IIS_USRS group.
6464

6565
### Example 3: Install NDES using the application pool identity
6666
```
@@ -72,10 +72,10 @@ Substitute the appropriate CA computer name and common name for `<CAComputerName
7272

7373
### Example 4: Install NDES using a specific service account
7474
```
75-
PS C:\> Install-AdcsNetworkDeviceEnrollmentService -ServiceAccountName MyDomain\AccountName -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
75+
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
7676
```
7777

78-
This command installs the NDES using a service account named CONTOSO\PattiFul that is a member of the local computer's IIS_USRS group.
78+
This command installs the NDES using a service account named "CONTOSO\svcNDES" that is a member of the local computer's IIS_USRS group.
7979
The command also specifies several non-default parameters.
8080

8181
## PARAMETERS

0 commit comments

Comments
 (0)