Merge branch 'master' into patch-20

AndreaBarr · web-flow · commit bb619abb6faf · 2019-07-18T11:22:48.000-07:00
diff --git a/docset/windows/adfs/new-adfsazuremfatenantcertificate.md b/docset/windows/adfs/new-adfsazuremfatenantcertificate.md
@@ -46,12 +46,15 @@ If it does not find one, it generates it.
 ### Example 1: Create a certificate and enable Azure MFA on an AD FS farm
 ```
 PS C:\> $certbase64 = New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID>
-PS C:\> New-MsolServicePrincipalCredential -AppPrincipalId 981f26a1-7f43-403b-a875-f8b09b8cd720 -Type asymmetric -Usage verify -Value $certBase64
+PS C:\> New-AzureADServicePrincipalKeyCredential -ObjectId 981f26a1-7f43-403b-a875-f8b09b8cd720 -Type asymmetric -Usage verify -Value $certBase64
 PS C:\> Set-AdfsAzureMfaTenant -TenantId <your tenant ID> -ClientId 981f26a1-7f43-403b-a875-f8b09b8cd720
 ```
 
 These commands create a certificate for Azure MFA, register the certificate in a tenant, and enable Azure MFA on an AD FS farm.
 
+> [!NOTE]
+> Customers are encouraged to use the newer Azure Active Directory PowerShell 2.0 module. For more information about the v2.0 module please see [AzureAD PowerShell 2.0](https://docs.microsoft.com/powershell/module/Azuread/?view=azureadps-2.0).
+
 ### Example 2: Determine which certificate Azure MFA is using
 ```
 PS C:\> New-AdfsAzureMfaTenantCertificate -TenantID <your tenant ID> -out-file amfacert.cer
diff --git a/docset/windows/defender/add-mppreference.md b/docset/windows/defender/add-mppreference.md
@@ -159,7 +159,7 @@ The acceptable values for this parameter are:
 - 1: Clean 
 - 2: Quarantine 
 - 3: Remove 
-- 4: Allow 
+- 6: Allow 
 - 8: UserDefined 
 - 9: NoAction 
 - 10: Block
diff --git a/docset/windows/defender/set-mppreference.md b/docset/windows/defender/set-mppreference.md
@@ -1098,7 +1098,7 @@ The acceptable values for this parameter are:
 - 1: Clean 
 - 2: Quarantine 
 - 3: Remove 
-- 4: Allow 
+- 6: Allow 
 - 8: UserDefined 
 - 9: NoAction 
 - 10: Block
diff --git a/docset/windows/dism/add-windowscapability.md b/docset/windows/dism/add-windowscapability.md
@@ -106,7 +106,7 @@ Accept wildcard characters: False
 
 ### -LogPath
 Specifies the full path and file name to log to.
-If not set, the default is `$env:WINDIR\Logs\Dism\dism.log`.
+If not set, the default is `"$env:WINDIR\Logs\Dism\dism.log"`.
 In Windows PE, the default directory is the RAMDISK scratch space which can be as low as 32 MB.
 The log file will automatically be archived.
 The archived log file will be saved with .bak appended to the file name and a new log file will be generated.
@@ -174,7 +174,7 @@ Accept wildcard characters: False
 ### -ScratchDirectory
 Specifies a temporary directory that will be used when extracting files for use during servicing.
 The directory must exist locally.
-If not specified, the `\Windows\%Temp%` directory will be used, with a subdirectory name of a randomly generated hexadecimal value for each run of DISM.
+If not specified, the `"$env:Temp"` directory will be used, with a subdirectory name of a randomly generated hexadecimal value for each run of DISM.
 Items in the scratch directory are deleted after each operation. 
 You should not use a network share location as a scratch directory to expand a package (.cab or .msu file) for installation.
 The directory used for extracting files for temporary usage during servicing should be a local directory.
diff --git a/docset/windows/msdtc/test-dtc.md b/docset/windows/msdtc/test-dtc.md
@@ -39,12 +39,15 @@ The cmdlet performs the following tests:
 - Checks whether the two computers can ping each other.
 - Checks whether a transaction can be propagated between the two computers.
 
-To run this cmdlet, you must first enable the firewall rule for WMI on both computers by using the Netsh utility.
-Run the following command: 
+To run this cmdlet, you must first enable the firewall rule for Distributed Transaction Coordinator on both computers by using the Netsh utility run the following command: 
 
-`netsh advfirewall firewall set rule group="Windows Management Instrumentation (WMI)" new enable=yes`
+`netsh advfirewall firewall set rule group="Distributed Transaction Coordinator" new enable=yes`
 
-For more information, see [The Netsh Command-Line Utility](https://technet.microsoft.com/library/cc785383.aspx) (https://technet.microsoft.com/library/cc785383.aspx) in the TechNet library.
+For more information, see [Netsh Command Syntax, Contexts, and Formatting](https://docs.microsoft.com/en-us/windows-server/networking/technologies/netsh/netsh-contexts).
+
+To enable the rule using PowerShell run the following command:
+
+`Enable-NetFirewallRule -DisplayGroup "Distributed Transaction Coordinator"`
 
 ## EXAMPLES
 
diff --git a/docset/windows/netsecurity/new-netfirewallrule.md b/docset/windows/netsecurity/new-netfirewallrule.md
@@ -756,7 +756,7 @@ Accepted values: Any, Domain, Private, Public, NotApplicable
 
 Required: False
 Position: Named
-Default value: None
+Default value: Any
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
diff --git a/docset/windows/storage/get-disk.md b/docset/windows/storage/get-disk.md
@@ -23,6 +23,9 @@ ms.assetid: 3929EB27-1365-42CA-8ACF-68B364C3599F
 ## SYNOPSIS
 Gets one or more disks visible to the operating system.
 
+> [!NOTE]
+> This cmdlet returns physical disk objects like basic disks and partitioned drive partitions.  Dynamic disks can span multiple pieces of physical media, so they will not be returned by Get-Disk. For more information, see [Basic and Dynamic Disks](https://docs.microsoft.com/windows/desktop/FileIO/basic-and-dynamic-disks).
+
 ## SYNTAX
 
 ### ByNumber (Default)
diff --git a/docset/windows/storage/get-storagetier.md b/docset/windows/storage/get-storagetier.md
@@ -72,7 +72,7 @@ The **Get-StorageTier** cmdlet gets the storage tier from the storage pool objec
 
 ### Example 3: Get a storage tier from a virtual disk
 ```
-PS C:\>Get-VirtualDisk-FriendlyName "VDisk01" | Get-StorageTier
+PS C:\>Get-VirtualDisk -FriendlyName "VDisk01" | Get-StorageTier
 ```
 
 This command uses the Get-VirtualDisk cmdlet to get the tiered virtual disk named VDisk01.
diff --git a/docset/winserver2012-ps/msdtc/Test-Dtc.md b/docset/winserver2012-ps/msdtc/Test-Dtc.md
@@ -29,6 +29,16 @@ The cmdlet performs the following tests:
 - Checks whether the Microsoft Distributed Transaction Coordinator (MSDTC) network security settings are correctly configured for network transactions.
 - Checks whether the two computers can ping each other.
 - Checks whether a transaction can be propagated between the two computers.
+ 
+To run this cmdlet, you must first enable the firewall rule for Distributed Transaction Coordinator on both computers by using the Netsh utility run the following command: 
+
+`netsh advfirewall firewall set rule group="Distributed Transaction Coordinator" new enable=yes`
+
+For more information, see [Netsh Command Syntax, Contexts, and Formatting](https://docs.microsoft.com/en-us/windows-server/networking/technologies/netsh/netsh-contexts).
+
+To enable the rule using PowerShell run the following command:
+
+`Enable-NetFirewallRule -DisplayGroup "Distributed Transaction Coordinator"`
 
 ## EXAMPLES
 
diff --git a/docset/winserver2012r2-ps/msdtc/Test-Dtc.md b/docset/winserver2012r2-ps/msdtc/Test-Dtc.md
@@ -38,6 +38,16 @@ The cmdlet performs the following tests:
 - Checks whether the two computers can ping each other.
 - Checks whether a transaction can be propagated between the two computers.
 
+To run this cmdlet, you must first enable the firewall rule for Distributed Transaction Coordinator on both computers by using the Netsh utility run the following command: 
+
+`netsh advfirewall firewall set rule group="Distributed Transaction Coordinator" new enable=yes`
+
+For more information, see [Netsh Command Syntax, Contexts, and Formatting](https://docs.microsoft.com/en-us/windows-server/networking/technologies/netsh/netsh-contexts).
+
+To enable the rule using PowerShell run the following command:
+
+`Enable-NetFirewallRule -DisplayGroup "Distributed Transaction Coordinator"`
+
 ## EXAMPLES
 
 ### Example 1: Test MSDTC on the local computer
