Skip to content

Commit 92e728f

Browse files
authored
Merge branch 'master' into smbshare
2 parents 8f95d1f + 376f133 commit 92e728f

File tree

266 files changed

+2420
-389
lines changed

Some content is hidden

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

266 files changed

+2420
-389
lines changed

docset/winserver2012-ps/netsecurity/Set-NetFirewallRule.md

Lines changed: 18 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -522,27 +522,17 @@ Accept wildcard characters: False
522522
523523
### -LocalAddress
524524
Specifies that network packets with matching IP addresses match this rule.
525-
526525
This parameter value is the first end point of an IPsec rule and specifies the computers that are subject to the requirements of this rule.
527-
528-
This parameter value is an IPv4 or IPv6 address, hostname, subnet, range, or the following keyword: Any.
529-
526+
This parameter value is an IPv4 or IPv6 address, subnet, range, or the following keyword: Any.
530527
The acceptable formats for this parameter are:
531-
532-
-- Single IPv4 Address: 1.2.3.4
533-
534-
-- Single IPv6 Address: fe80::1
535-
536-
-- IPv4 Subnet (by network bit count): 1.2.3.4/24
537-
538-
-- IPv6 Subnet (by network bit count): fe80::1/48
539-
540-
-- IPv4 Subnet (by network mask): 1.2.3.4/255.255.255.0
541-
542-
-- IPv4 Range: 1.2.3.4 through 1.2.3.7
543-
544-
-- IPv6 Range: fe80::1 through fe80::9
545-
Note: Querying for rules with this parameter can only be performed using filter objects.
528+
- Single IPv4 Address: 1.2.3.4
529+
- Single IPv6 Address: fe80::1
530+
- IPv4 Subnet (by network bit count): 1.2.3.4/24
531+
- IPv6 Subnet (by network bit count): fe80::1/48
532+
- IPv4 Subnet (by network mask): 1.2.3.4/255.255.255.0
533+
- IPv4 Range: 1.2.3.4 through 1.2.3.7
534+
- IPv6 Range: fe80::1 through fe80::9
535+
Querying for rules with this parameter can only be performed using filter objects.
546536
See the Get-NetFirewallAddressFilter cmdlet for more information.
547537
548538
```yaml
@@ -944,27 +934,17 @@ Accept wildcard characters: False
944934

945935
### -RemoteAddress
946936
Specifies that network packets with matching IP addresses match this rule.
947-
948937
This parameter value is the second end point of an IPsec rule and specifies the computers that are subject to the requirements of this rule.
949-
950-
This parameter value is an IPv4 or IPv6 address, hostname, subnet, range, or the following keyword: Any.
951-
938+
This parameter value is an IPv4 or IPv6 address, subnet, range, or the following keyword: Any.
952939
The acceptable formats for this parameter are:
953-
954-
-- Single IPv4 Address: 1.2.3.4
955-
956-
-- Single IPv6 Address: fe80::1
957-
958-
-- IPv4 Subnet (by network bit count): 1.2.3.4/24
959-
960-
-- IPv6 Subnet (by network bit count): fe80::1/48
961-
962-
-- IPv4 Subnet (by network mask): 1.2.3.4/255.255.255.0
963-
964-
-- IPv4 Range: 1.2.3.4 through 1.2.3.7
965-
966-
-- IPv6 Range: fe80::1 through fe80::9
967-
Note: Querying for rules with this parameter can only be performed using filter objects.
940+
- Single IPv4 Address: 1.2.3.4
941+
- Single IPv6 Address: fe80::1
942+
- IPv4 Subnet (by network bit count): 1.2.3.4/24
943+
- IPv6 Subnet (by network bit count): fe80::1/48
944+
- IPv4 Subnet (by network mask): 1.2.3.4/255.255.255.0
945+
- IPv4 Range: 1.2.3.4 through 1.2.3.7
946+
- IPv6 Range: fe80::1 through fe80::9
947+
Querying for rules with this parameter can only be performed using filter objects.
968948
See the Get-NetFirewallAddressFilter cmdlet for more information.
969949

970950
```yaml

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,26 @@ To create a new volume, use this cmdlet in conjunction with the Initialize-Disk
6969
## EXAMPLES
7070

7171
### Example 1: Quick format
72-
```
72+
```powershell
7373
PS C:\>Format-Volume -DriveLetter D
7474
```
7575

7676
This example performs a format of the D volume.
7777

7878
### Example 2: Full format using FAT32
79-
```
79+
```powershell
8080
PS C:\>Format-Volume -DriveLetter D -FileSystem FAT32 -Full -Force
8181
```
8282

8383
This example performs a full format of the D volume using the FAT32 file system.
8484

85+
### Example 3: Full format using NTFS and allocation size 8192
86+
```powershell
87+
PS C:\> Format-Volume -DriveLetter D -FileSystem NTFS -AllocationUnitSize 8192
88+
```
89+
90+
This example performs a full format of the D volume using the NTFS file system and allocation size 8192.
91+
8592
## PARAMETERS
8693

8794
### -AllocationUnitSize

docset/winserver2012-ps/webadministration/New-WebBinding.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ This command creates a binding on the default website.
3232
### Example 2: Add a new SSL site binding
3333
```powershell
3434
PS C:\> New-WebBinding -Name "Default Web Site" -IPAddress "*" -Port 443 -HostHeader "TestSite" -Protocol "https"
35+
PS C:\> (Get-WebBinding -Name "Default Web Site" -Port 443 -Protocol "https").AddSslCertificate("a909502dd82ae41433e6f83886b00d4277a32a7b", "my")
3536
```
3637

37-
This command creates an SSL binding on the default website.
38+
This command creates an SSL binding on the default website and adds a certificate with thumbprint `a909502dd82ae41433e6f83886b00d4277a32a7b` from the computer certificate store.
3839

3940
## PARAMETERS
4041

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ For more information about the how to determine the properties for **FineGrained
5353

5454
## EXAMPLES
5555

56-
### Example 1: Get a fine-grained policy for a specified user
56+
### Example 1: Get a fine-grained policy using a name
5757
```
5858
PS C:\>Get-ADFineGrainedPasswordPolicy -Identity AdminsPSO
5959
Name : AdminsPSO

docset/winserver2012r2-ps/adfs/Test-AdfsFarmJoin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ The command specifies the credentials that are stored in the **$FScred** variabl
5858
### Example 2: Test the overwrites of an existing AD FS configuration database
5959
```
6060
PS C:\> $FScred = Get-Credential
61-
PS C:\> Test-AdfsFarmJoin -OverwriteConfiguration -PrimaryComputerName "PrimaryWIDHost" -PrimaryComputerPort 80 -ServiceAccountCredential $FScred -CertificateThumbprint 8169c52b4ec6e77eb2ae17f028fe5da4e35c0bed
61+
PS C:\> Test-AdfsFarmJoin -PrimaryComputerName "PrimaryWIDHost" -PrimaryComputerPort 80 -ServiceAccountCredential $FScred -CertificateThumbprint 8169c52b4ec6e77eb2ae17f028fe5da4e35c0bed
6262
```
6363

6464
The first command uses the **Get-Credential** cmdlet to create a credential object for the Active Directory account under which the AD FS service runs.

docset/winserver2012r2-ps/dhcpserver/Add-DhcpServerv4Reservation.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,13 @@ This example adds all of the reservations in the file named Reservations.csv to
4242
The Import-Csvhttp://go.microsoft.com/fwlink/p/?LinkId=113341 cmdlet returns the objects with reservation fields and pipes the objects to this cmdlet, which adds these reservations to the DHCP server services.
4343
The file named Reservations.csv should contain the reservations in the following comma-separated values (CSV) format:
4444

45-
`ScopeId,IPAddress,Name,ClientId,Description`
46-
`10.10.10.0,10.10.10.10,Computer1,1a-1b-1c-1d-1e-1f,Reserved for Computer1`
47-
`20.20.20.0,20.20.20.11,Computer2,2a-2b-2c-2d-2e-2f,Reserved for Computer2`
48-
`30.30.30.0,30.30.30.12,Computer3,3a-3b-3c-3d-3e-3f,Reserved for Computer3`
45+
ScopeId,IPAddress,Name,ClientId,Description
46+
47+
10.10.10.0,10.10.10.10,Computer1,1a-1b-1c-1d-1e-1f,Reserved for Computer1
48+
49+
20.20.20.0,20.20.20.11,Computer2,2a-2b-2c-2d-2e-2f,Reserved for Computer2
50+
51+
30.30.30.0,30.30.30.12,Computer3,3a-3b-3c-3d-3e-3f,Reserved for Computer3
4952

5053
### EXAMPLE 3
5154
```

docset/winserver2012r2-ps/netsecurity/Set-NetFirewallRule.md

Lines changed: 18 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -554,27 +554,17 @@ Accept wildcard characters: False
554554
555555
### -LocalAddress
556556
Specifies that network packets with matching IP addresses match this rule.
557-
558557
This parameter value is the first end point of an IPsec rule and specifies the computers that are subject to the requirements of this rule.
559-
560-
This parameter value is an IPv4 or IPv6 address, hostname, subnet, range, or the following keyword: Any.
561-
558+
This parameter value is an IPv4 or IPv6 address, subnet, range, or the following keyword: Any.
562559
The acceptable formats for this parameter are:
563-
564-
-- Single IPv4 Address: 1.2.3.4
565-
566-
-- Single IPv6 Address: fe80::1
567-
568-
-- IPv4 Subnet (by network bit count): 1.2.3.4/24
569-
570-
-- IPv6 Subnet (by network bit count): fe80::1/48
571-
572-
-- IPv4 Subnet (by network mask): 1.2.3.4/255.255.255.0
573-
574-
-- IPv4 Range: 1.2.3.4 through 1.2.3.7
575-
576-
-- IPv6 Range: fe80::1 through fe80::9
577-
Note: Querying for rules with this parameter can only be performed using filter objects.
560+
- Single IPv4 Address: 1.2.3.4
561+
- Single IPv6 Address: fe80::1
562+
- IPv4 Subnet (by network bit count): 1.2.3.4/24
563+
- IPv6 Subnet (by network bit count): fe80::1/48
564+
- IPv4 Subnet (by network mask): 1.2.3.4/255.255.255.0
565+
- IPv4 Range: 1.2.3.4 through 1.2.3.7
566+
- IPv6 Range: fe80::1 through fe80::9
567+
Querying for rules with this parameter can only be performed using filter objects.
578568
See the Get-NetFirewallAddressFilter cmdlet for more information.
579569
580570
```yaml
@@ -977,27 +967,17 @@ Accept wildcard characters: False
977967

978968
### -RemoteAddress
979969
Specifies that network packets with matching IP addresses match this rule.
980-
981970
This parameter value is the second end point of an IPsec rule and specifies the computers that are subject to the requirements of this rule.
982-
983-
This parameter value is an IPv4 or IPv6 address, hostname, subnet, range, or the following keyword: Any.
984-
971+
This parameter value is an IPv4 or IPv6 address, subnet, range, or the following keyword: Any.
985972
The acceptable formats for this parameter are:
986-
987-
-- Single IPv4 Address: 1.2.3.4
988-
989-
-- Single IPv6 Address: fe80::1
990-
991-
-- IPv4 Subnet (by network bit count): 1.2.3.4/24
992-
993-
-- IPv6 Subnet (by network bit count): fe80::1/48
994-
995-
-- IPv4 Subnet (by network mask): 1.2.3.4/255.255.255.0
996-
997-
-- IPv4 Range: 1.2.3.4 through 1.2.3.7
998-
999-
-- IPv6 Range: fe80::1 through fe80::9
1000-
Note: Querying for rules with this parameter can only be performed using filter objects.
973+
- Single IPv4 Address: 1.2.3.4
974+
- Single IPv6 Address: fe80::1
975+
- IPv4 Subnet (by network bit count): 1.2.3.4/24
976+
- IPv6 Subnet (by network bit count): fe80::1/48
977+
- IPv4 Subnet (by network mask): 1.2.3.4/255.255.255.0
978+
- IPv4 Range: 1.2.3.4 through 1.2.3.7
979+
- IPv6 Range: fe80::1 through fe80::9
980+
Querying for rules with this parameter can only be performed using filter objects.
1001981
See the Get-NetFirewallAddressFilter cmdlet for more information.
1002982

1003983
```yaml

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,26 @@ To create a new volume, use this cmdlet in conjunction with the Initialize-Disk
7171
## EXAMPLES
7272

7373
### Example 1: Quick format
74-
```
74+
```powershell
7575
PS C:\>Format-Volume -DriveLetter D
7676
```
7777

7878
This example performs a format of the D volume.
7979

8080
### Example 2: Full format using FAT32
81-
```
81+
```powershell
8282
PS C:\>Format-Volume -DriveLetter D -FileSystem FAT32 -Full -Force
8383
```
8484

8585
This example performs a full format of the D volume using the FAT32 file system.
8686

87+
### Example 3: Full format using NTFS and allocation size 8192
88+
```powershell
89+
PS C:\> Format-Volume -DriveLetter D -FileSystem NTFS -AllocationUnitSize 8192
90+
```
91+
92+
This example performs a full format of the D volume using the NTFS file system and allocation size 8192.
93+
8794
## PARAMETERS
8895

8996
### -AllocationUnitSize

docset/winserver2012r2-ps/webadministration/New-WebBinding.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ This command creates a binding on the default website.
3434
### Example 2: Add a new SSL site binding
3535
```powershell
3636
PS C:\> New-WebBinding -Name "Default Web Site" -IPAddress "*" -Port 443 -HostHeader "TestSite" -Protocol "https"
37+
PS C:\> (Get-WebBinding -Name "Default Web Site" -Port 443 -Protocol "https").AddSslCertificate("a909502dd82ae41433e6f83886b00d4277a32a7b", "my")
3738
```
3839

39-
This command creates an SSL binding on the default website.
40+
This command creates an SSL binding on the default website and adds a certificate with thumbprint `a909502dd82ae41433e6f83886b00d4277a32a7b` from the computer certificate store.
4041

4142
## PARAMETERS
4243

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ For more information about the how to determine the properties for **FineGrained
5454

5555
## EXAMPLES
5656

57-
### Example 1: Get a fine-grained policy for a specified user
57+
### Example 1: Get a fine-grained policy using a name
5858
```
5959
PS C:\> Get-ADFineGrainedPasswordPolicy -Identity AdminsPSO
6060
Name : AdminsPSO

0 commit comments

Comments
 (0)