Skip to content

Commit

Permalink
Merge branch 'master' into fix--MD033/no-inline-html
Browse files Browse the repository at this point in the history
  • Loading branch information
kenwith authored Mar 18, 2019
2 parents 217feda + c4b1b1b commit a6ce4ff
Show file tree
Hide file tree
Showing 35 changed files with 187 additions and 243 deletions.
2 changes: 0 additions & 2 deletions .markdownlint.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@
"MD022": false,
"MD024": false,
"MD026": false,
"MD029": false,
"MD031": false,
"MD032": false,
"MD034": false,
"MD036": false,
"MD037": false,
"MD038": false,
"MD040": false,
"MD041": false,
"MD042": false
Expand Down
8 changes: 4 additions & 4 deletions docset/windows/addsadministration/new-aduser.md
Original file line number Diff line number Diff line change
Expand Up @@ -1186,15 +1186,15 @@ This parameter uses the following syntax to add remove, replace or clear service

To add values:

`-ServicePrincipalNames @{Add=value1,value2,...} `
`-ServicePrincipalNames @{Add=value1,value2,...}`

To remove values:

`-ServicePrincipalNames @{Remove=value3,value4,...} `
`-ServicePrincipalNames @{Remove=value3,value4,...}`

To replace values:

`-ServicePrincipalNames @{Replace=value1,value2,...} `
`-ServicePrincipalNames @{Replace=value1,value2,...}`

To clear all values:

Expand All @@ -1203,7 +1203,7 @@ To clear all values:
You can specify more than one change by using a list separated by semicolons.
For example, use the following syntax to add and remove service principal names.

`@{Add=value1,value2,...};@{Remove=value3,value4,...} `
`@{Add=value1,value2,...};@{Remove=value3,value4,...}`

The operators are applied in the following sequence:

Expand Down
4 changes: 2 additions & 2 deletions docset/windows/addsadministration/search-adaccount.md
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ The default is $Null.

The following example shows how to set this parameter so that you receive all of the returned objects:

` -ResultSetSize $Null`
`-ResultSetSize $Null`

```yaml
Type: Int32
Expand All @@ -441,7 +441,7 @@ If no default naming context has been specified for the target AD LDS instance,

The following example shows how to set this parameter to search under an organizational unit.

` -SearchBase "ou=mfg,dc=noam,dc=corp,dc=contoso,dc=com"`
`-SearchBase "ou=mfg,dc=noam,dc=corp,dc=contoso,dc=com"`

When the value of the *SearchBase* parameter is set to an empty string and you are connected to a global catalog port, all partitions are searched.
If the value of the *SearchBase* parameter is set to an empty string and you are not connected to a global catalog port, an error is generated.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ To modify an object property, you must use the Lightweight Directory Access Prot
You can specify multiple values to a property by specifying a comma-separated list of values and more than one property by separating them using a semicolon.
The format for this parameter is:

`-Add @{Attribute1LDAPDisplayName=value1, value2, ...; Attribute2LDAPDisplayName=value1, value2, ...; AttributeNLDAPDisplayName=value1, value2, ...} `
`-Add @{Attribute1LDAPDisplayName=value1, value2, ...; Attribute2LDAPDisplayName=value1, value2, ...; AttributeNLDAPDisplayName=value1, value2, ...}`

When you use the *Add*, *Remove*, *Replace*, and *Clear* parameters together, the operations are performed in the following order:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -343,14 +343,14 @@ To specify the replication schedule:
1. Create a new Active Directory schedule object.
For example:

`$Schedule = New-Object -TypeName System.DirectoryServices.ActiveDirectory.ActiveDirectorySchedule; `
`$Schedule = New-Object -TypeName System.DirectoryServices.ActiveDirectory.ActiveDirectorySchedule;`

2. Edit the schedule on the Active Directory schedule object.
For example:

`$Schedule.ResetSchedule();`

`$Schedule.SetDailySchedule("Twenty","Zero","TwentyTwo","Thirty");`
`$Schedule.SetDailySchedule("Twenty","Zero","TwentyTwo","Thirty");`

3. Using the Active Directory schedule object, set the replication schedule of the connection.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ To modify an object property, you must use the Lightweight Directory Access Prot
You can specify multiple values to a property by specifying a comma-separated list of values and more than one property by separating them using a semicolon.
The format for this parameter is:

`-Add @{Attribute1LDAPDisplayName=value1, value2, ...; Attribute2LDAPDisplayName=value1, value2, ...; AttributeNLDAPDisplayName=value1, value2, ...} `
`-Add @{Attribute1LDAPDisplayName=value1, value2, ...; Attribute2LDAPDisplayName=value1, value2, ...; AttributeNLDAPDisplayName=value1, value2, ...}`

When you use the *Add*, *Remove*, *Replace*, and *Clear* parameters together, the operations will be performed in the following order:

Expand Down Expand Up @@ -339,7 +339,7 @@ Accept wildcard characters: False
```

### -Server
`-Add @{Attribute1LDAPDisplayName=value1, value2, ...; Attribute2LDAPDisplayName=value1, value2, ...; AttributeNLDAPDisplayName=value1, value2, ...} `
`-Add @{Attribute1LDAPDisplayName=value1, value2, ...; Attribute2LDAPDisplayName=value1, value2, ...; AttributeNLDAPDisplayName=value1, value2, ...}`

When you use the *Add*, *Remove*, *Replace*, and *Clear* parameters together, the operations will be performed in the following order:

Expand Down
8 changes: 4 additions & 4 deletions docset/windows/addsadministration/set-adserviceaccount.md
Original file line number Diff line number Diff line change
Expand Up @@ -263,15 +263,15 @@ The Lightweight Directory Access Protocol (LDAP) display name (**ldapDisplayName

To add values:

`-Certificates @{Add=value1,value2,...} `
`-Certificates @{Add=value1,value2,...}`

To remove values:

`-Certificates @{Remove=value3,value4,...} `
`-Certificates @{Remove=value3,value4,...}`

To replace values:

`-Certificates @{Replace=value1,value2,...} `
`-Certificates @{Replace=value1,value2,...}`

To clear all values:

Expand All @@ -280,7 +280,7 @@ To clear all values:
You can specify more than one operation by using a list separated by semicolons.
For example, use the following syntax to add and remove **Certificates** values:

`-Certificates @{Add=value1,value2,...};@{Remove=value3,value4,...} `
`-Certificates @{Add=value1,value2,...};@{Remove=value3,value4,...}`

The operators are applied in the following sequence:

Expand Down
10 changes: 5 additions & 5 deletions docset/windows/addsadministration/set-aduser.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ To modify an object property, you must use the LDAP display name.
You can specify multiple values to a property by specifying a comma-separated list of values and more than one property by separating them using a semicolon.
The format for this parameter is:
`-Add @{Attribute1LDAPDisplayName=value1, value2, ...; Attribute2LDAPDisplayName=value1, value2, ...; AttributeNLDAPDisplayName=value1, value2, ...} `
`-Add @{Attribute1LDAPDisplayName=value1, value2, ...; Attribute2LDAPDisplayName=value1, value2, ...; AttributeNLDAPDisplayName=value1, value2, ...}`

When you use the *Add*, *Remove*, *Replace*, and *Clear* parameters together, the operations will be performed in the following order:

Expand Down Expand Up @@ -347,15 +347,15 @@ The Lightweight Directory Access Protocol (LDAP) display name (**ldapDisplayName

To add values:

`-Certificates @{Add=value1,value2,...} `
`-Certificates @{Add=value1,value2,...}`

To remove values:

`-Certificates @{Remove=value3,value4,...} `
`-Certificates @{Remove=value3,value4,...}`

To replace values:

`-Certificates @{Replace=value1,value2,...} `
`-Certificates @{Replace=value1,value2,...}`

To clear all values:

Expand All @@ -364,7 +364,7 @@ To clear all values:
You can specify more than one operation by using a list separated by semicolons.
For example, use the following syntax to add and remove **Certificates** values:

`-Certificates @{Add=value1,value2,...};@{Remove=value3,value4,...} `
`-Certificates @{Add=value1,value2,...};@{Remove=value3,value4,...}`

The operators are applied in the following sequence:

Expand Down
6 changes: 3 additions & 3 deletions docset/windows/adfs/new-adfsaccesscontrolpolicy.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,14 @@ This command changes the relying party to use a new template.

### Example 9: Complicated conditions with specific claims
```
PS C:\> Set-AdfsRelyingPartyTrust -TargetName "DemoRP1" -AccessControlPolicyName DemoRP -AccessControlPolicyParameters `
PS C:\> Set-AdfsRelyingPartyTrust -TargetName "DemoRP1" -AccessControlPolicyName DemoRP -AccessControlPolicyParameters`
@{"SPParameter"= @{ClaimType="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/OfficeLocation"; Operator="Equals"; Value="Redmond"}}
```

### Example 10: Two specific claims for single parameter
```
PS C:\> Set-AdfsRelyingPartyTrust -TargetName "DemoRP1" -AccessControlPolicyName "DemoRP" -AccessControlPolicyParameters `
@{"SPParameter"= (@{ClaimType="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/OfficeLocation"; Operator="Equals"; Value=("Redmond","DC")}, `
PS C:\> Set-AdfsRelyingPartyTrust -TargetName "DemoRP1" -AccessControlPolicyName "DemoRP" -AccessControlPolicyParameters`
@{"SPParameter"= (@{ClaimType="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/OfficeLocation"; Operator="Equals"; Value=("Redmond","DC")},`
@{ClaimType="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/Department"; Operator="Equals"; Value="Azure"})}
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,27 +133,27 @@ Following settings of a network interface can be retrieved:
4. Whether the NIC is primary
5. Internal DNS name label of the NIC
6. Port settings of the NIC
- Whether MAC spoofing is enabled
- Whether ARP guard is enabled. ARP guard will allow only addresses specified in ArpFilter to pass through the port
- ArpFilter: IP list for allowed addresses when arpGuard is enabled
- Whether DHCP guard is enabled. Specifies whether to drop DHCP messages from a virtual machine claiming to be a DHCP server.
- Storm limit: the number of broadcast, multicast, and unknown unicast packets per second a virtual machine is allowed to send through the specified virtual network adapter. A value of zero (0) means there is no limit.
- Port Flow Limit: Specifies the maximum number of flows that can be executed for the port. A value of blank or zero (0) means there is no limit
- IovWeight: Specifies whether single-root I/O virtualization (SR-IOV) is to be enabled on this virtual network adapter. The range of the value is typically from 0 through 100. Value of 0 disables SR-IOV on the virtual network adapter.
- IovInterruptModeration: Specifies the interrupt moderation value for a single-root I/O virtualization (SR-IOV) virtual function assigned to a virtual network adapter. Allowed values are “default”, “adaptive”, “off”, low”, “medium”, and “high”.
- IovQueuePairsRequested: Specifies the number of hardware queue pairs to be allocated to an SR-IOV virtual function. If receive-side scaling (RSS) is required, and if the physical network adapter that binds to the virtual switch supports RSS on SR-IOV virtual functions, then more than one queue pair is required. Allowed values range from 1 to 4294967295
- VmqWeight: Specifies whether virtual machine queue (VMQ) is to be enabled on the virtual network adapter. The relative weight describes the affinity of the virtual network adapter to use VMQ. The range of value is typically from 0 through 100. Value of 0 disables VMQ on the virtual network adapter.
- QosSettings: Reference to QoS Settings applied on the interface
- Whether MAC spoofing is enabled
- Whether ARP guard is enabled. ARP guard will allow only addresses specified in ArpFilter to pass through the port
- ArpFilter: IP list for allowed addresses when arpGuard is enabled
- Whether DHCP guard is enabled. Specifies whether to drop DHCP messages from a virtual machine claiming to be a DHCP server.
- Storm limit: the number of broadcast, multicast, and unknown unicast packets per second a virtual machine is allowed to send through the specified virtual network adapter. A value of zero (0) means there is no limit.
- Port Flow Limit: Specifies the maximum number of flows that can be executed for the port. A value of blank or zero (0) means there is no limit
- IovWeight: Specifies whether single-root I/O virtualization (SR-IOV) is to be enabled on this virtual network adapter. The range of the value is typically from 0 through 100. Value of 0 disables SR-IOV on the virtual network adapter.
- IovInterruptModeration: Specifies the interrupt moderation value for a single-root I/O virtualization (SR-IOV) virtual function assigned to a virtual network adapter. Allowed values are “default”, “adaptive”, “off”, low”, “medium”, and “high”.
- IovQueuePairsRequested: Specifies the number of hardware queue pairs to be allocated to an SR-IOV virtual function. If receive-side scaling (RSS) is required, and if the physical network adapter that binds to the virtual switch supports RSS on SR-IOV virtual functions, then more than one queue pair is required. Allowed values range from 1 to 4294967295
- VmqWeight: Specifies whether virtual machine queue (VMQ) is to be enabled on the virtual network adapter. The relative weight describes the affinity of the virtual network adapter to use VMQ. The range of value is typically from 0 through 100. Value of 0 disables VMQ on the virtual network adapter.
- QosSettings: Reference to QoS Settings applied on the interface
7. DNS servers assigned to the interface
8. IP configuration of the interface
- Private IP address
- Private IP address allocation method
- Load balancer backend address pools associated with the IP configuration
- Load balancer inbound NAT Rules associated with the IP configuration
- Subnet associated with the IP configuration
- Public IP address associated with the IP configuration
- Access control list associated with the IP Configuration
- Service insertion rules associated with the IP configuration
- Private IP address
- Private IP address allocation method
- Load balancer backend address pools associated with the IP configuration
- Load balancer inbound NAT Rules associated with the IP configuration
- Subnet associated with the IP configuration
- Public IP address associated with the IP configuration
- Access control list associated with the IP Configuration
- Service insertion rules associated with the IP configuration
9. Server where the network interface is hosted
10. Virtual port association of the interface
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -374,14 +374,10 @@ Accept wildcard characters: False
Specifies the level of data encryption used for a Remote Desktop session.
The acceptable values for this parameter are:
- 0.
Low.
- 1.
ClientCompatible.
- 2.
High.
- 3.
FipsCompliant.
- 0 - Low.
- 1 - ClientCompatible.
- 2 - High.
- 3 - FipsCompliant.
The default value is ClientCompatible.
Expand Down Expand Up @@ -546,12 +542,9 @@ Accept wildcard characters: False
Specifies which security protocol to use.
The acceptable values for this parameter are:
- 0.
RDP.
- 1.
Negotiate.
- 2.
SSL.
- 0 - RDP.
- 1 - Negotiate.
- 2 - SSL.
The default value is Negotiate.
Expand Down
33 changes: 12 additions & 21 deletions docset/windows/storage/new-virtualdisk.md
Original file line number Diff line number Diff line change
Expand Up @@ -660,30 +660,21 @@ The cmdlet creates the write-back cache of the size that you specify when the cm

The following describes the behavior of this parameter based on the value that you specify:

- 1.
If you do not specify this parameter, the cmdlet sets the value of the **WriteCacheSizeDefault** property from the storage pool.
1. If you do not specify this parameter, the cmdlet sets the value of the **WriteCacheSizeDefault** property from the storage pool.

- 2.
The default setting of **WriteCacheSizeDefault** for a storage pool is Auto, which specifies that Windows Server automatically selects the optimal write-back cache size for your configuration.
1. The default setting of **WriteCacheSizeDefault** for a storage pool is Auto, which specifies that Windows Server automatically selects the optimal write-back cache size for your configuration.
You can change the value of **WriteCacheSizeDefault** to a concrete value at any time.

- 3.
The Auto setting for **WriteCacheSize** functions as follows:
a.
If any of the following is true, Auto is set to 1 GB:
i.
The storage pool contains at least N drives with enough capacity and you set the *Usage* parameter to Journal.
(N = 1 for simple spaces, N = 2 for two-way mirror and single parity, N = 3 for three-way mirror and dual parity)
ii.
The storage pool contains at least N drives with enough capacity and the media type of the virtual disk is set to SSD (N = 1 for simple spaces, N = 2 for two-way mirror and single parity, N = 3 for three-way mirror and dual parity)
b.
Otherwise, Auto is set to 0 (no log) for simple and mirror spaces, and 32 MB for parity spaces.

- 4.
If you specify Auto or 0 (zero) for this parameter and the storage space is not a parity space, the cmdlet verifies that either 3.a.i or 3.a.ii is true.
If either 3.a.i or 3.a.ii is not true, you cannot set **WriteCacheSize** to Auto or 0.
a.
The objective of these conditions is to help you avoid scenarios in which you force the creation of a write-back cache in situations that result in slower performance.
1. The Auto setting for **WriteCacheSize** functions as follows:
1. If any of the following is true, Auto is set to 1 GB:
1. The storage pool contains at least N drives with enough capacity and you set the *Usage* parameter to Journal.
(N = 1 for simple spaces, N = 2 for two-way mirror and single parity, N = 3 for three-way mirror and dual parity)
1. The storage pool contains at least N drives with enough capacity and the media type of the virtual disk is set to SSD (N = 1 for simple spaces, N = 2 for two-way mirror and single parity, N = 3 for three-way mirror and dual parity)
1. Otherwise, Auto is set to 0 (no log) for simple and mirror spaces, and 32 MB for parity spaces.

1. If you specify Auto or 0 (zero) for this parameter and the storage space is not a parity space, the cmdlet verifies that either 3.a.i or 3.a.ii is true.
If either 3.a.i or 3.a.ii is not true, you cannot set **WriteCacheSize** to Auto or 0.
1. The objective of these conditions is to help you avoid scenarios in which you force the creation of a write-back cache in situations that result in slower performance.

```yaml
Type: UInt64
Expand Down
Loading

0 comments on commit a6ce4ff

Please sign in to comment.