Merge branch 'live' into patch-2

v-raaba · web-flow · commit 6816f59b9618 · 2019-09-25T15:37:04.000-05:00
diff --git a/docset/windows/configci/new-cipolicy.md b/docset/windows/configci/new-cipolicy.md
@@ -331,23 +331,7 @@ Accept wildcard characters: False
 ```
 
 ### -Level
-Specifies the primary level of detail for generated rules.
-The acceptable values for this parameter are:
-
-- None 
-- Hash 
-- FileName 
-- FilePath
-- SignedVersion 
-- PFN
-- Publisher 
-- FilePublisher 
-- LeafCertificate 
-- PcaCertificate 
-- RootCertificate 
-- WHQL 
-- WHQLPublisher 
-- WHQLFilePublisher
+Specifies the primary level of detail for generated rules. Refer to [WDAC File Rule Levels](https://docs.microsoft.com/windows/security/threat-protection/windows-defender-application-control/select-types-of-rules-to-create#windows-defender-application-control-file-rule-levels) for acceptable parameter values and descriptions.
 
 ```yaml
 Type: RuleLevel
diff --git a/docset/windows/configci/new-cipolicyrule.md b/docset/windows/configci/new-cipolicyrule.md
@@ -242,23 +242,7 @@ Accept wildcard characters: False
 ```
 
 ### -Level
-Specifies the primary level of detail for generated rules.
-The acceptable values for this parameter are:
-
-- None 
-- Hash 
-- FileName 
-- FilePath
-- SignedVersion 
-- PFN
-- Publisher 
-- FilePublisher 
-- LeafCertificate 
-- PcaCertificate 
-- RootCertificate 
-- WHQL 
-- WHQLPublisher 
-- WHQLFilePublisher
+Specifies the primary level of detail for generated rules. Refer to [WDAC File Rule Levels](https://docs.microsoft.com/windows/security/threat-protection/windows-defender-application-control/select-types-of-rules-to-create#windows-defender-application-control-file-rule-levels) for acceptable parameter values and descriptions.
 
 ```yaml
 Type: RuleLevel
diff --git a/docset/windows/deduplication/deduplication.md b/docset/windows/deduplication/deduplication.md
@@ -22,7 +22,7 @@ ms.assetid: D93886EE-21C3-470A-B4A5-54F64A74A491
 
 # Deduplication Module
 ## Description
-This reference provides cmdlet descriptions and syntax for all Data Deduplication-specific cmdlets. 
+This reference provides cmdlet descriptions and syntax for all Windows Server Data Deduplication-specific cmdlets. 
 It lists the cmdlets in alphabetical order based on the verb at the beginning of the cmdlet.
 
 ## Deduplication Cmdlets
diff --git a/docset/windows/defender/defender.md b/docset/windows/defender/defender.md
@@ -22,8 +22,11 @@ ms.assetid: 00797342-0AAC-4FFF-84FE-4749DA9242D6
 
 # Defender Module
 ## Description
-This reference provides cmdlet descriptions and syntax for all Defender-specific cmdlets. 
-It lists the cmdlets in alphabetical order based on the verb at the beginning of the cmdlet.
+This reference provides functions descriptions and syntax for all Defender-specific functions. 
+It lists the functions in alphabetical order based on the verb at the beginning of the functions.
+
+> [!NOTE]
+> You might also hear these functions being referred to as cmdlets. They were designed to appear like cmdlets, even though they were developed as PowerShell functions.
 
 ## Defender Cmdlets
 ### [Add-MpPreference](./Add-MpPreference.md)
diff --git a/docset/windows/hnvdiagnostics/disable-muxechoresponder.md b/docset/windows/hnvdiagnostics/disable-muxechoresponder.md
@@ -21,7 +21,7 @@ ms.assetid: 9DB96E25-63EC-4F0F-AF2A-A763F128EED3
 # Disable-MuxEchoResponder
 
 ## SYNOPSIS
-Disables an ICMP echo responder.
+Disables an ICMP echo responder. This cmdlet has been deprecated.
 
 ## SYNTAX
 
diff --git a/docset/windows/hnvdiagnostics/enable-muxechoresponder.md b/docset/windows/hnvdiagnostics/enable-muxechoresponder.md
@@ -21,7 +21,7 @@ ms.assetid: 76E1FFE7-C816-49FD-BCA7-6DCC662CBCD8
 # Enable-MuxEchoResponder
 
 ## SYNOPSIS
-Enables an ICMP echo responder.
+Enables an ICMP echo responder. This cmdlet has been deprecated.
 
 ## SYNTAX
 
diff --git a/docset/windows/netadapter/disable-netadapterencapsulatedpackettaskoffload.md b/docset/windows/netadapter/disable-netadapterencapsulatedpackettaskoffload.md
@@ -116,7 +116,9 @@ Accept wildcard characters: False
 ```
 
 ### -EncapsulationType
-{{Fill EncapsulationType Description}}
+Specifies the encapsulation type. The acceptable values for this parameter are:
+ - NVGRE: Network Virtualization Generic Routing Encapsulation.
+ - VXLAN: Virtual eXtensible Local Area Network.
 
 ```yaml
 Type: EncapsulationType
diff --git a/docset/windows/netadapter/set-netadapterencapsulatedpackettaskoffload.md b/docset/windows/netadapter/set-netadapterencapsulatedpackettaskoffload.md
@@ -58,18 +58,18 @@ The **Enable-NetAdapterEncapsulatedPacketTaskoffload** and **Disable-NetAdapterE
 
 ### Example 1: Enable encapsulated packet task offload on the specified network adapter
 ```
-PS C:\> Set-NetAdapterEncapsulatedPacketTaskOffload -Name "MyAdapter" -EncapsulatedPacketTaskOffloadEnabled $True
+PS C:\> Set-NetAdapterEncapsulatedPacketTaskOffload -Name "MyAdapter" -VxlanEncapsulatedPacketTaskOffloadEnabled $True
 ```
 
-This command enables encapsulated packet task offload on the network adapter named MyAdapter and restarts the network adapter.
+This command enables VXLAN encapsulated packet task offload on the network adapter named MyAdapter and restarts the network adapter.
 The **Enable-NetAdapterEncapsulatedPacketTaskOffload** cmdlet is the preferred cmdlet to perform this operation.
 
 ### Example 2: Disable encapsulated packet task offload on the specified network adapter
 ```
-PS C:\> Set-NetAdapterEncapsulatedPacketTaskOffload -Name "MyAdapter"  -EncapsulatedPacketTaskOffloadEnabled $False
+PS C:\> Set-NetAdapterEncapsulatedPacketTaskOffload -Name "MyAdapter" -VxlanEncapsulatedPacketTaskOffloadEnabled $False
 ```
 
-This command disables encapsulated packet task offload on the network adapter named MyAdapter and restarts the network adapter.
+This command disables VXLAN encapsulated packet task offload on the network adapter named MyAdapter and restarts the network adapter.
 The **Disable-NetAdapterEncapsulatedPacketTaskOffload** cmdlet is the preferred cmdlet to perform this operation.
 
 ## PARAMETERS
@@ -208,7 +208,7 @@ Accept wildcard characters: False
 ```
 
 ### -NvgreEncapsulatedPacketTaskOffloadEnabled
-{{Fill NvgreEncapsulatedPacketTaskOffloadEnabled Description}}
+Specifies the enabled state of the Network Virtualization Generic Routing Encapsulation (NVGRE) encapsulated packet task offload in the network adapter. The acceptable values for this parameter are: $true or $false.
 
 ```yaml
 Type: Boolean
@@ -256,7 +256,7 @@ Accept wildcard characters: False
 ```
 
 ### -VxlanEncapsulatedPacketTaskOffloadEnabled
-{{Fill VxlanEncapsulatedPacketTaskOffloadEnabled Description}}
+Specifies the enabled state of the Virtual eXtensible Local Area Network (VXLAN) encapsulated packet task offload in the network adapter. The acceptable values for this parameter are: $true or $false.
 
 ```yaml
 Type: Boolean
@@ -271,7 +271,7 @@ Accept wildcard characters: False
 ```
 
 ### -VxlanUDPPortNumber
-{{Fill VxlanUDPPortNumber Description}}
+Specifies the port number to use for the VXLAN UDP destination port.
 
 ```yaml
 Type: UInt16
diff --git a/docset/windows/netadapter/set-netadapterrss.md b/docset/windows/netadapter/set-netadapterrss.md
@@ -55,7 +55,7 @@ Set-NetAdapterRss -InputObject <CimInstance[]> [-NumberOfReceiveQueues <UInt32>]
 ## DESCRIPTION
 The **Set-NetAdapterRss** cmdlet sets the receive side scaling (RSS) properties on a network adapter.
 RSS is a scalability technology that distributes the receive network traffic among multiple processors by hashing the header of the incoming packet.
-Without RSS in firstref_longhorn, firstref_server_7, and Windows Server® 2012; network traffic is received on the first processor which can quickly reach full utilization limiting receive network throughput.
+If RSS is disabled, network traffic is processed on a single processor core. This may impact network performance as the processor utilization increases.
 Many properties can be configured using the parameters to optimize the performance of RSS.
 The selection of the processors to use for RSS is an important aspect of load balancing.
 Most of the parameters for this cmdlet help to determine the processors used by RSS.
@@ -356,7 +356,7 @@ Specifies the RSS profile.
 
 The acceptable values for this parameter are:
 
-- Closest: Behavior is consistent with the behavior of firstref_server_7. 
+- Closest: Behavior is consistent with the behavior of Windows Server® 2008 R2. 
 - ClosestStatic: No dynamic load balancing, such as distributing but not load balancing at runtime. 
 - NUMA: Assigns RSS processors in a round robin basis across every NUMA node to enable applications that are running on NUMA servers to scale well. 
 - NUMAStatic: Default behavior.
diff --git a/docset/windows/netlbfo/set-netlbfoteam.md b/docset/windows/netlbfo/set-netlbfoteam.md
@@ -147,7 +147,7 @@ Accept wildcard characters: False
 ```
 
 ### -LacpTimer
-{{Fill LacpTimer Description}}
+Specifies how often inter-connected devices exchange LACP protocol data units (PDUs) or control messages.
 
 ```yaml
 Type: LacpTimers
diff --git a/docset/windows/remoteaccess/set-vpnserverconfiguration.md b/docset/windows/remoteaccess/set-vpnserverconfiguration.md
@@ -57,41 +57,21 @@ By Specifying CustomPolicy, IPsec parameters can be customized.
 
 ## EXAMPLES
 
-### Example 1: Modify the idle disconnect seconds of a VPN server
+### Example 1: Change the idle disconnect time
 ```
-PS C:\>Set-VpnServerIPsecConfiguration -IdleDisconnectSeconds 1000 -PassThru
-WARNING: Configuration parameters will be modified after the Remote Access service is restarted. 
+PS C:\>Set-VpnServerConfiguration -IdleDisconnectSeconds 1000 -PassThru
 
-EncryptionType                 : OptionalEncryption
-Ikev2Ports                     : 5
-IdleDisconnect(s)              : 1000
-L2tpPorts                      : 5
-SADataSizeForRenegotiation(KB) : 102400
-SALifeTime(s)                  : 28800
 ```
 
-This command modifies the idle disconnect seconds of the VPN server.
+This command changes the idle disconnect time of the VPN server to 1000 seconds. The command includes the PassThru parameter, so it sends a VpnServerIPsecConfiguration object to the console.
 
-### Example 2: Plumb custom IPsec policy for incoming VPN connections
+### Example 2: Configure a custom IPsec policy
 ```
-PS C:\>Set-VpnServerIPsecConfiguration -CustomPolicy -EncryptionMethod "AES128" -DhGroup "Group2" -PfsGroup "PFS2" -CipherTransformConstants "AES128"  -IntegrityCheckMethod "SHA256" -AuthenticationTransformConstants "SHA256128" -PassThru
-WARNING: Configuration parameters will be modified after the Remote Access service is restarted. 
+PS C:\>Set-VpnServerConfiguration -CustomPolicy -EncryptionMethod "AES128" -DhGroup "Group2" -PfsGroup "PFS2" -CipherTransformConstants "AES128"  -IntegrityCheckMethod "SHA256" -AuthenticationTransformConstants "SHA256128" -PassThru
 
-AuthenticationTransformConstants : SHA256128
-CipherTransformConstants         : AES128
-CustomPolicy                     : True
-DHGroup                          : Group2
-EncryptionMethod                 : AES128
-Ikev2Ports                       : 5
-IdleDisconnect(s)                : 1000
-IntegrityCheckMethod             : SHA256
-L2tpPorts                        : 5
-PFSgroup                         : PFS2
-SADataSizeForRenegotiation(KB)   : 102400
-SALifeTime(s)                    : 28800
 ```
 
-This command plumbs custom IPsec policy for incoming VPN connections and site to site VPN connections whose authentication method is not pre shared key.
+This command configures a custom IPsec policy for incoming VPN connections and S2S protocol VPN connections that do not use a pre-shared key as an authentication method.
 
 ## PARAMETERS
 
diff --git a/docset/winserver2012-ps/deduplication/Deduplication.md b/docset/winserver2012-ps/deduplication/Deduplication.md
@@ -13,7 +13,7 @@ author: andreabarr
 
 # Deduplication Module
 ## Description
-This reference provides cmdlet descriptions and syntax for all Data Deduplication-specific cmdlets. 
+This reference provides cmdlet descriptions and syntax for all Windows Server Data Deduplication-specific cmdlets. 
 It lists the cmdlets in alphabetical order based on the verb at the beginning of the cmdlet.
 
 ## Deduplication Cmdlets
diff --git a/docset/winserver2012r2-ps/deduplication/Deduplication.md b/docset/winserver2012r2-ps/deduplication/Deduplication.md
@@ -20,7 +20,7 @@ ms.assetid: 72144cf9-f9f5-43b3-be84-5c959089c28f
 
 # Deduplication Module
 ## Description
-This reference provides cmdlet descriptions and syntax for all Data Deduplication-specific cmdlets. 
+This reference provides cmdlet descriptions and syntax for all Windows Server Data Deduplication-specific cmdlets. 
 It lists the cmdlets in alphabetical order based on the verb at the beginning of the cmdlet.
 
 ## Deduplication Cmdlets
diff --git a/docset/winserver2012r2-ps/netadapter/Enable-NetAdapterRss.md b/docset/winserver2012r2-ps/netadapter/Enable-NetAdapterRss.md
@@ -45,7 +45,7 @@ Enable-NetAdapterRss -InputObject <CimInstance[]> [-NoRestart] [-PassThru] [-Cim
 ## DESCRIPTION
 The **Enable-NetAdapterRss** cmdlet enables receive side scaling (RSS) on the network adapter.
 RSS is a scalability technology that distributes the receive network traffic among multiple processors by hashing the header of the incoming packet.
-Without RSS in firstref_longhorn and later, network traffic is received on the first processor which can quickly reach full utilization limiting receive network throughput.
+If RSS is disabled, network traffic is processed on a single processor core. This may impact network performance as the processor utilization increases.
 
 ## EXAMPLES
 
diff --git a/docset/winserver2012r2-ps/vpnclient/Add-VpnConnectionTriggerApplication.md b/docset/winserver2012r2-ps/vpnclient/Add-VpnConnectionTriggerApplication.md
@@ -129,7 +129,7 @@ Accept wildcard characters: False
 ```
 
 ### -Force
-{{Fill Force Description}}
+Forces the command to run without asking for user confirmation.
 
 ```yaml
 Type: SwitchParameter
diff --git a/docset/winserver2012r2-ps/vpnclient/Add-VpnConnectionTriggerTrustedNetwork.md b/docset/winserver2012r2-ps/vpnclient/Add-VpnConnectionTriggerTrustedNetwork.md
@@ -127,7 +127,7 @@ Accept wildcard characters: False
 ```
 
 ### -Force
-{{Fill Force Description}}
+Forces the command to run without asking for user confirmation.
 
 ```yaml
 Type: SwitchParameter
