Fix merge issues

Author: ritwikbasu

ChangeLog.md

@@ -97,6 +97,9 @@
         - Updated New-AzureRmNetworkSecurityRuleConfig: Added optional parameters SourceApplicationSecurityGroup, SourceApplicationSecurityGroupId, DestinationApplicationSecurityGroup, and DestinationApplicationSecurityGroupId
         - Updated Add-AzureRmNetworkSecurityRuleConfig: Added optional parameters SourceApplicationSecurityGroup, SourceApplicationSecurityGroupId, DestinationApplicationSecurityGroup, and DestinationApplicationSecurityGroupId
         - Updated Set-AzureRmNetworkSecurityRuleConfig: Added optional parameters SourceApplicationSecurityGroup, SourceApplicationSecurityGroupId, DestinationApplicationSecurityGroup, and DestinationApplicationSecurityGroupId
+    * Added new commands for VpnDeviceConfiguration Scripts 
+        - Get-AzureRmVirtualNetworkGatewaySupportedVpnDevices 
+        - Get-AzureRmVirtualNetworkGatewayConnectionVpnDeviceConfigScript 
 * Resources
     * Add PolicySetDefinition cmdlets
         - New-AzureRmPolicySetDefinition cmdlet to create a policy set definition

src/ResourceManager/Network/Commands.Network/help/Get-AzureRmVirtualNetworkGatewayConnectionVpnDeviceConfigScript.md

@@ -13,8 +13,8 @@ This commandlet takes the connection resource, VPN device brand, model, firmware
 ## SYNTAX
 
 ```
-Get-AzureRmVirtualNetworkGatewayConnectionVpnDeviceConfigScript [-Name <String>] -ResourceGroupName <String>
- [-DeviceVendor <String>] [-DeviceFamily <String>] [-FirmwareVersion <String>]
+Get-AzureRmVirtualNetworkGatewayConnectionVpnDeviceConfigScript -Name <String> -ResourceGroupName <String>
+ -DeviceVendor <String> -DeviceFamily <String> -FirmwareVersion <String>
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
 ```
 
@@ -25,11 +25,11 @@ This commandlet takes the connection resource, VPN device brand, model, firmware
 
 ### Example 1
 ```
-PS C:\> Get-AzureRmVirtualNetworkGatewaySupportedVpnDevices -ResourceGroupName TestRG -Name TestGateway
+PS C:\> Get-AzureRmVirtualNetworkGatewaySupportedVpnDevice -ResourceGroupName TestRG -Name TestGateway
 PS C:\> Get-AzureRmVirtualNetworkGatewayConnectionVpnDeviceConfigScript -ResourceGroupName TestRG -Name TestConnection -DeviceVendor “Cisco-Test” -DeviceFamily “IOS-Test” -FirmwareVersion “20”
 ```
 
-The above example uses Get-AzureRmVirtualNetworkGatewaySupportedVpnDevices to get the supported VPN Device brands, models, and firmware versions.
+The above example uses Get-AzureRmVirtualNetworkGatewaySupportedVpnDevice to get the supported VPN Device brands, models, and firmware versions.
 Then uses one of the returned models information to generate a VPN Device configuration script for the VirtualNetworkGatewayConnection "TestConnection". The device used in this example has DeviceFamily "IOS-Test", DeviceVendor "Cisco-Test" and FirmwareVersion 20.
 
 ## PARAMETERS
@@ -57,7 +57,7 @@ Type: String
 Parameter Sets: (All)
 Aliases: 
 
-Required: False
+Required: True
 Position: Named
 Default value: None
 Accept pipeline input: True (ByPropertyName)
@@ -72,7 +72,7 @@ Type: String
 Parameter Sets: (All)
 Aliases: 
 
-Required: False
+Required: True
 Position: Named
 Default value: None
 Accept pipeline input: True (ByPropertyName)
@@ -87,7 +87,7 @@ Type: String
 Parameter Sets: (All)
 Aliases: 
 
-Required: False
+Required: True
 Position: Named
 Default value: None
 Accept pipeline input: True (ByPropertyName)
@@ -102,7 +102,7 @@ Type: String
 Parameter Sets: (All)
 Aliases: ResourceName
 
-Required: False
+Required: True
 Position: Named
 Default value: None
 Accept pipeline input: True (ByPropertyName)

src/ResourceManager/Network/Commands.Network/help/Get-AzureRmVirtualNetworkGatewaySupportedVpnDevice.md

@@ -13,7 +13,7 @@ This commandlet returns a list of supported VPN device brands, models, and firmw
 ## SYNTAX
 
 ```
-Get-AzureRmVirtualNetworkGatewaySupportedVpnDevice [-Name <String>] -ResourceGroupName <String>
+Get-AzureRmVirtualNetworkGatewaySupportedVpnDevice -Name <String> -ResourceGroupName <String>
  [-DefaultProfile <IAzureContextContainer>]
 ```
 
@@ -64,14 +64,14 @@ Accept wildcard characters: False
 ```
 
 ### -Name
-The resource name.
+The virtual network gateway name.
 
 ```yaml
 Type: String
 Parameter Sets: (All)
 Aliases: ResourceName
 
-Required: False
+Required: True
 Position: Named
 Default value: None
 Accept pipeline input: True (ByPropertyName)