Merge branch 'master' into patch-1

Author: denisebmsft

docset/winserver2012-ps/activedirectory/Add-ADGroupMember.md

@@ -416,8 +416,8 @@ By default, this cmdlet does not generate any output.
 
 ## NOTES
 * This cmdlet does not work with a read-only domain controller.
-
-  This cmdlet does not work with an Active Directory Snapshot.
+* This cmdlet does not work with an Active Directory snapshot.
+* This cmdlet will allow you to add a group as a member of itself which could lead to unstable behavior.
 
 ## RELATED LINKS
 

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

@@ -55,6 +55,8 @@ For more information about the how to determine the properties for computer obje
 ### Example 1: Get all of the OUs in a domain
 ```powershell
 PS C:\>Get-ADOrganizationalUnit -Filter 'Name -like "*"' | Format-Table Name, DistinguishedName -A
+```
+```output
 Name                 DistinguishedName
 ----                 -----------------
 Domain Controllers   OU=Domain Controllers,DC=FABRIKAM,DC=COM
@@ -81,6 +83,8 @@ This command gets all of the OUs in a domain.
 ### Example 2: Get an OU by its distinguished name
 ```powershell
 PS C:\> Get-ADOrganizationalUnit -Identity 'OU=AsiaPacific,OU=Sales,OU=UserAccounts,DC=FABRIKAM,DC=COM' | Format-Table Name,Country,PostalCode,City,StreetAddress,State -A
+```
+```output
 Name        Country PostalCode City     StreetAddress    State
 ----        ------- ---------- ----     -------------    -----
 AsiaPacific AU      4171       Balmoral 45 Martens Place QLD
@@ -91,6 +95,8 @@ This command gets the OU with the distinguished name OU=AsiaPacific,OU=Sales,OU=
 ### Example 3: Get child OUs
 ```powershell
 PS C:\> Get-ADOrganizationalUnit -LDAPFilter '(name=*)' -SearchBase 'OU=Sales,OU=UserAccounts,DC=FABRIKAM,DC=COM' -SearchScope OneLevel | Format-Table Name,Country,PostalCode,City,StreetAddress,State
+```
+```output
 Name                    Country                 PostalCode             City                   StreetAddress          State
 ----                    -------                 ----------             ----                   -------------          -----
 AsiaPacific             AU                      4171                   Balmoral               45 Martens Place       QLD

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

@@ -36,7 +36,7 @@ Get-ADUser [-AuthType <ADAuthType>] [-Credential <PSCredential>] -LDAPFilter <St
 The **Get-ADUser** cmdlet gets a specified user object or performs a search to get multiple user objects.
 
 The *Identity* parameter specifies the Active Directory user to get.
-You can identify a user by its distinguished name (DN), GUID, security identifier (SID), Security Account Manager (SAM) account name, or name.
+You can identify a user by its distinguished name (DN), GUID, security identifier (SID), or Security Account Manager (SAM) account name.
 You can also set the parameter to a user object variable such as `$<localUserObject>` or pass a user object through the pipeline to the *Identity* parameter.
 
 To search for and retrieve more than one user, use the *Filter* or *LDAPFilter* parameters.

docset/winserver2012-ps/netadapter/Get-NetAdapterPowerManagement.md

@@ -25,8 +25,7 @@ Get-NetAdapterPowerManagement [-AsJob] [-CimSession <CimSession[]>] [-IncludeHid
 ```
 
 ## DESCRIPTION
-The **Get-NetAdapterPowerManagement** cmdlet gets the state of the power management features of a Power Management capable network adapter.
-You must be an administrator in order to run this cmdlet.
+The **Get-NetAdapterPowerManagement** cmdlet gets the state of the power management features of a Power Management capable network adapter. You need to run this cmdlet in an elevated (Run as Administrator) Windows PowerShell session.
 
 ## EXAMPLES
 

docset/winserver2012-ps/scheduledtasks/New-ScheduledTask.md

@@ -38,18 +38,18 @@ PS C:\> Register-ScheduledTask T1 -InputObject $task
 
 In this example, the set of commands uses several cmdlets and variables to define and then register a scheduled task.
 
-The first command uses the **New-ScheduledTaskAction** cmdlet to assign the executable file tskmgr.exe to the variable $A.
+The first command uses the **New-ScheduledTaskAction** cmdlet to assign the executable file `tskmgr.exe` to the variable `$action`.
 
-The second command uses the **New-ScheduledTaskTrigger** cmdlet to assign the value AtLogon to the variable $T.
+The second command uses the **New-ScheduledTaskTrigger** cmdlet to assign the value `AtLogon` to the variable `$trigger`.
 
-The third command assigns the principal of the scheduled task `Contoso\Administrator` to the variable $P.
+The third command assigns the principal of the scheduled task `Contoso\Administrator` to the variable `$principal`.
 
-The fourth command uses the **New-ScheduledTaskSettingsSet** cmdlet to assign a task settings object to the variable $S.
+The fourth command uses the **New-ScheduledTaskSettingsSet** cmdlet to assign a task settings object to the variable `$settings`.
 
-The fifth command creates a new task and assigns the task definition to the variable $D.
+The fifth command creates a new task and assigns the task definition to the variable `$task`.
 
 The sixth command (hypothetically) runs at a later time.
-It registers the new scheduled task and defines it by using the $D variable.
+It registers the new scheduled task and defines it by using the `$task` variable.
 
 ### Example 2: Define a scheduled task with multiple actions
 ```powershell

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

@@ -388,6 +388,8 @@ Accept wildcard characters: False
 Shows what would happen if the cmdlet runs.
 The cmdlet is not run.
 
+**NOTE**: The WhatIf switch does not work with this cmdlet.
+
 ```yaml
 Type: SwitchParameter
 Parameter Sets: (All)

docset/winserver2012r2-ps/activedirectory/Add-ADGroupMember.md

@@ -336,6 +336,7 @@ By default, this cmdlet does not generate any output.
 ## NOTES
 * This cmdlet does not work with a read-only domain controller.
 * This cmdlet does not work with an Active Directory snapshot.
+* This cmdlet will allow you to add a group as a member of itself which could lead to unstable behavior.
 
 ## RELATED LINKS
 

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

@@ -57,6 +57,8 @@ For more information about the how to determine the properties for computer obje
 ### Example 1: Get all of the OUs in a domain
 ```powershell
 PS C:\>Get-ADOrganizationalUnit -Filter 'Name -like "*"' | Format-Table Name, DistinguishedName -A
+```
+```output
 Name                 DistinguishedName
 ----                 -----------------
 Domain Controllers   OU=Domain Controllers,DC=FABRIKAM,DC=COM
@@ -83,6 +85,8 @@ This command gets all of the OUs in a domain.
 ### Example 2: Get an OU by its distinguished name
 ```powershell
 PS C:\> Get-ADOrganizationalUnit -Identity 'OU=AsiaPacific,OU=Sales,OU=UserAccounts,DC=FABRIKAM,DC=COM' | Format-Table Name,Country,PostalCode,City,StreetAddress,State -A
+```
+```output
 Name        Country PostalCode City     StreetAddress    State
 ----        ------- ---------- ----     -------------    -----
 AsiaPacific AU      4171       Balmoral 45 Martens Place QLD
@@ -93,6 +97,8 @@ This command gets the OU with the distinguished name OU=AsiaPacific,OU=Sales,OU=
 ### Example 3: Get child OUs
 ```powershell
 PS C:\> Get-ADOrganizationalUnit -LDAPFilter '(name=*)' -SearchBase 'OU=Sales,OU=UserAccounts,DC=FABRIKAM,DC=COM' -SearchScope OneLevel | Format-Table Name,Country,PostalCode,City,StreetAddress,State
+```
+```output
 Name                    Country                 PostalCode             City                   StreetAddress          State
 ----                    -------                 ----------             ----                   -------------          -----
 AsiaPacific             AU                      4171                   Balmoral               45 Martens Place       QLD

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

@@ -38,7 +38,7 @@ Get-ADUser [-AuthType <ADAuthType>] [-Credential <PSCredential>] -LDAPFilter <St
 The **Get-ADUser** cmdlet gets a specified user object or performs a search to get multiple user objects.
 
 The *Identity* parameter specifies the Active Directory user to get.
-You can identify a user by its distinguished name (DN), GUID, security identifier (SID), Security Account Manager (SAM) account name, or name.
+You can identify a user by its distinguished name (DN), GUID, security identifier (SID), or Security Account Manager (SAM) account name.
 You can also set the parameter to a user object variable such as `$<localUserObject>` or pass a user object through the pipeline to the *Identity* parameter.
 
 To search for and retrieve more than one user, use the *Filter* or *LDAPFilter* parameters.

docset/winserver2012r2-ps/adfs/Remove-AdfsFarmNode.md

@@ -11,7 +11,7 @@ title: Remove-AdfsFarmNode
 
 ## SYNOPSIS
 The Remove-AdfsFarmNode cmdlet is deprecated.
-Instead, use the Uninstall-WindowsFeature cmdlet.
+Instead, use the **Uninstall-WindowsFeature** cmdlet. 
 
 ## SYNTAX
 
@@ -27,8 +27,8 @@ Remove-AdfsFarmNode -GroupServiceAccountIdentifier <String> [-Credential <PSCred
 
 ## DESCRIPTION
 The **Remove-AdfsFarmNode** cmdlet is deprecated in this release.
-Instead, use the Uninstall-WindowsFeaturehttp://go.microsoft.com/fwlink/?LinkID=287572 cmdlet.
-For more information on the **Uninstall-WindowsFeature** cmdlet, type `Get-Help Uninstall-WindowsFeature`.
+Instead, use the [Uninstall-WindowsFeature](https://go.microsoft.com/fwlink/?LinkID=287572) cmdlet.
+For more information on the **Uninstall-WindowsFeature** cmdlet, type `Get-Help Uninstall-WindowsFeature`. Note that the **Uninstall-WindowsFeature** cmdlet removes only the server role but doesn't remove the node from the ADFS farm. For proper cleanup, use the **Set-AdfsFarmInformation** cmdlet with the `-RemoveNode` parameter.
 
 ## EXAMPLES