Merge branch 'preview' of https://github.com/Azure/azure-powershell into release-4.2.0

# Conflicts:
#	src/ResourceManager/Compute/Commands.Compute/help/New-AzureRmDiskConfig.md
#	src/ResourceManager/Compute/Commands.Compute/help/New-AzureRmDiskUpdateConfig.md
#	src/ResourceManager/Compute/Commands.Compute/help/New-AzureRmSnapshotConfig.md
#	src/ResourceManager/Compute/Commands.Compute/help/New-AzureRmSnapshotUpdateConfig.md

Author: hyonholee

README.md

@@ -5,7 +5,7 @@
 This repository contains a set of PowerShell cmdlets for developers and administrators to develop, deploy and manage Microsoft Azure applications.
 
 * For documentation on how to build and deploy applications to Microsoft Azure please see the [Microsoft Azure Documentation Center](https://docs.microsoft.com/en-us/azure/).
-* For comprehensive documentation on the developer cmdlets see the [overview of Azure PowerShell](aka.ms/azpsdocs).
+* For comprehensive documentation on the developer cmdlets see the [overview of Azure PowerShell](https://aka.ms/azpsdocs).
 * For suggesting improvements, join our improvement discussion ([Issue #3692](https://github.com/Azure/azure-powershell/issues/3692)).
 
 ## Features

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/New-AzureRmAnalysisServicesServer.md

@@ -1,6 +1,6 @@
 ---
 external help file: Microsoft.Azure.Commands.AnalysisServices.dll-Help.xml
-online version: 
+online version:
 schema: 2.0.0
 ---
 
@@ -36,7 +36,7 @@ A string representing a comma separated list of users or groups to be set as adm
 ```yaml
 Type: String
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 
 Required: False
 Position: 4
@@ -51,7 +51,7 @@ The Azure region where the Analysis Services server is hosted
 ```yaml
 Type: String
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 Accepted values: North Central US, South Central US, Central US, West Europe, North Europe, West US, East US, East US 2, Japan East, Japan West, Brazil South, Southeast Asia, East Asia, Australia East, Australia Southeast
 
 Required: True
@@ -67,7 +67,7 @@ Name of the Analysis Services server
 ```yaml
 Type: String
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 
 Required: True
 Position: 1
@@ -82,7 +82,7 @@ Name of the Azure resource group to which the server belongs
 ```yaml
 Type: String
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 
 Required: True
 Position: 0
@@ -98,8 +98,8 @@ The supported values are 'S0', 'S1', 'S2', 'S4' for the Standard tier; 'B1', 'B2
 ```yaml
 Type: String
 Parameter Sets: (All)
-Aliases: 
-Accepted values: S1, S2, S4, D1
+Aliases:
+Accepted values: S1, S2, S4, B1, B2, D1
 
 Required: True
 Position: 3
@@ -109,12 +109,15 @@ Accept wildcard characters: False
 ```
 
 ### -Tag
-Key-value pairs in the form of a hash table set as tags on the server.
+Key-value pairs in the form of a hash table set as tags on the server. For example:
+
+@{key0=$null;key1="value1";key2="value2"}
+
 
 ```yaml
 Type: Hashtable
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 
 Required: False
 Position: 4

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/Set-AzureRmAnalysisServicesServer.md

@@ -1,6 +1,6 @@
 ---
 external help file: Microsoft.Azure.Commands.AnalysisServices.dll-Help.xml
-online version: 
+online version:
 schema: 2.0.0
 ---
 
@@ -23,7 +23,7 @@ The Set-AzureRmAnalysisServicesServer cmdlet modifies an instance of Analysis Se
 
 ### Example 1
 ```
-PS C:\> Set-AzureRmAnalysisServicesServer -Name "testserver" -ResourceGroupName "testgroup" -Tag "key1:value1,key2:value2" -Administrator "[email protected]"
+PS C:\> Set-AzureRmAnalysisServicesServer -Name "testserver" -ResourceGroupName "testgroup" -Tag @{key0="value0";key1=$null;key2="value2"} -Administrator "[email protected]"
 ```
 
 Modifies the server named testserver in resourcegroup testgroup to set the tags as key1:value1 and key2:value2 and administrator to [email protected]
@@ -32,13 +32,12 @@ Modifies the server named testserver in resourcegroup testgroup to set the tags
 
 ### -Administrator
 A string representing a comma separated list of users or groups to be set as administrators on the server.
-The users or groups need to be specified UPN format e.g.
-[email protected] or [email protected]
+The users or groups need to be specified UPN format, for example: [email protected] or [email protected]
 
 ```yaml
 Type: String
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 
 Required: False
 Position: 4
@@ -53,7 +52,7 @@ Name of the Analysis Services server
 ```yaml
 Type: String
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 
 Required: True
 Position: 0
@@ -68,7 +67,7 @@ Will return the deleted server details if the operation completes successfully
 ```yaml
 Type: SwitchParameter
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 
 Required: False
 Position: Named
@@ -83,7 +82,7 @@ Name of the Azure resource group to which the server belongs
 ```yaml
 Type: String
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 
 Required: False
 Position: 1
@@ -99,8 +98,8 @@ The supported values are 'S0', 'S1', 'S2', 'S4' for the Standard tier; 'B1', 'B2
 ```yaml
 Type: String
 Parameter Sets: (All)
-Aliases: 
-Accepted values: S1, S2, S4
+Aliases:
+Accepted values: S1, S2, S4, B1, B2, D1
 
 Required: False
 Position: 2
@@ -110,12 +109,14 @@ Accept wildcard characters: False
 ```
 
 ### -Tag
-Key-value pairs in the form of a hash table set as tags on the server.
+Key-value pairs in the form of a hash table. For example:
+
+@{key0="value0";key1=$null;key2="value2"}
 
 ```yaml
 Type: Hashtable
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 
 Required: False
 Position: 3

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Get-AzureRmApiManagementProperty.md

@@ -1,7 +1,7 @@
 ---
 external help file: Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll-Help.xml
 ms.assetid: 894297BF-2771-4871-9E4C-8684364DAC4B
-online version: 
+online version:
 schema: 2.0.0
 ---
 
@@ -37,7 +37,7 @@ Get-AzureRmApiManagementProperty -Context <PsApiManagementContext> [-Tag <String
 
 ### 1:
 ```
-PS C:\>
+PS C:\> Get-AzureRmApiManagementProperty -Context $Context -Name $PropertyName
 ```
 
 ## PARAMETERS
@@ -46,7 +46,7 @@ PS C:\>
 ```yaml
 Type: PsApiManagementContext
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 
 Required: True
 Position: Named
@@ -59,7 +59,7 @@ Accept wildcard characters: False
 ```yaml
 Type: String
 Parameter Sets: Find properties containing Name
-Aliases: 
+Aliases:
 
 Required: False
 Position: Named
@@ -72,7 +72,7 @@ Accept wildcard characters: False
 ```yaml
 Type: String
 Parameter Sets: Get by property ID
-Aliases: 
+Aliases:
 
 Required: False
 Position: Named
@@ -82,10 +82,14 @@ Accept wildcard characters: False
 ```
 
 ### -Tag
+Key-value pairs in the form of a hash table. For example:
+
+@{key0="value0";key1=$null;key2="value2"}
+
 ```yaml
 Type: String
 Parameter Sets: Find properties by Tag
-Aliases: 
+Aliases:
 
 Required: False
 Position: Named
@@ -103,5 +107,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## NOTES
 
-## RELATED LINKS
-
+## RELATED LINKS

src/ResourceManager/Automation/Commands.Automation/help/Import-AzureRMAutomationRunbook.md

@@ -1,7 +1,7 @@
 ---
 external help file: Microsoft.Azure.Commands.ResourceManager.Automation.dll-Help.xml
 ms.assetid: B6487D26-2B6A-4938-B1CD-48EADD8D0C3C
-online version: 
+online version:
 schema: 2.0.0
 ---
 
@@ -19,16 +19,17 @@ Import-AzureRmAutomationRunbook [-Path] <String> [-Description <String>] [-Name
 ```
 
 ## DESCRIPTION
-The **Import-AzureRmAutomationRunbook** cmdlet imports an Azure Automation runbook.
-Specify the path to a wps_2 script (.ps1 ) file to import for wps_2 and wps_2 Workflow runbooks, or to a graphical runbook (.graphrunbook) file for graphical runbooks.
-The name of the file becomes the name of the runbook.
-For wps_2 Workflow runbooks, the script must contain a single wps_2 Workflow definition that matches the name of the file.
+The **Import-AzureRmAutomationRunbook** cmdlet imports an Azure Automation runbook. Specify the
+path to a wps_2 script (.ps1 ) file to import for wps_2 and wps_2 Workflow runbooks, or to a
+graphical runbook (.graphrunbook) file for graphical runbooks. The name of the file becomes the
+name of the runbook. For wps_2 Workflow runbooks, the script must contain a single wps_2 Workflow
+definition that matches the name of the file.
 
 ## EXAMPLES
 
 ### Example 1: Import a runbook from a file
 ```
-PS C:\>$Tags = @{"tag01"='value01"; "tag02"="value02"}
+PS C:\> $Tags = @{"tag01"="value01"; "tag02"="value02"}
 PS C:\> Import-AzureRmAutomationRunbook -Path .\GraphicalRunbook06.graphrunbook -Tags $Tags -ResourceGroup "ResourceGroup01" -AutomationAccountName "AutomationAccount01" -Type GraphicalPowershell
 ```
 
@@ -45,7 +46,7 @@ Specifies the name of the Automation account into which this cmdlet imports a ru
 ```yaml
 Type: String
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 
 Required: True
 Position: 1
@@ -60,7 +61,7 @@ Specifies a description for the imported runbook.
 ```yaml
 Type: String
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 
 Required: False
 Position: Named
@@ -75,7 +76,7 @@ ps_force
 ```yaml
 Type: SwitchParameter
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 
 Required: False
 Position: Named
@@ -90,7 +91,7 @@ Specifies whether the runbook logs progress information.
 ```yaml
 Type: Boolean
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 
 Required: False
 Position: Named
@@ -105,7 +106,7 @@ Specifies whether the runbook logs detailed information.
 ```yaml
 Type: Boolean
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 
 Required: False
 Position: Named
@@ -150,7 +151,7 @@ Indicates that this cmdlet publishes the runbook that it imports.
 ```yaml
 Type: SwitchParameter
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 
 Required: False
 Position: Named
@@ -165,7 +166,7 @@ Specifies the name of the resource group for which this cmdlet imports a runbook
 ```yaml
 Type: String
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 
 Required: True
 Position: 0
@@ -175,7 +176,9 @@ Accept wildcard characters: False
 ```
 
 ### -Tags
-Specifies a dictionary of tags for the imported runbook.
+Key-value pairs in the form of a hash table. For example:
+
+@{key0="value0";key1=$null;key2="value2"}
 
 ```yaml
 Type: IDictionary
@@ -191,21 +194,21 @@ Accept wildcard characters: False
 
 ### -Type
 Specifies the type of runbook that this cmdlet creates.
-Valid values are: 
+Valid values are:
 
 - PowerShell
 - GraphicalPowerShell
 - PowerShellWorkflow
 - GraphicalPowerShellWorkflow
-- Graph 
+- Graph
 
 The value Graph is obsolete.
 It is equivalent to GraphicalPowerShellWorkflow.
 
 ```yaml
 Type: String
 Parameter Sets: (All)
-Aliases: 
+Aliases:
 Accepted values: PowerShell, GraphicalPowerShell, PowerShellWorkflow, GraphicalPowerShellWorkflow, Graph
 
 Required: True
@@ -272,5 +275,3 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 [Set-AzureRmAutomationRunbook](./Set-AzureRMAutomationRunbook.md)
 
 [Start-AzureRmAutomationRunbook](./Start-AzureRMAutomationRunbook.md)
-
-