Fix build merge conflicts

Author: Nilambari

src/ResourceManager/DataLakeStore/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fix example for Export-AzureRmDataLakeStoreChildItemProperties
 * Fix null parameter exception for Recurse case in Set-AzureRmDataLakeStoreItemAclEntry 
 * Fix the help files for Set-AzureRmDataLakeStoreItemAclEntry, Set-AzureRmDataLakeStoreItemAcl, Remove-AzureRmDataLakeStoreItemAclEntry 
 

src/ResourceManager/DataLakeStore/Commands.DataLakeStore/help/Export-AzureRmDataLakeStoreChildItemProperties.md

@@ -50,9 +50,9 @@ Get the disk usage and ACL usage for all subdirectories and files under /a. Incl
 
 ### Example 2: Get the ACL usage for all subdirectories and files with the consistent ACL hidden
 ```
-PS C:\> $fullAcl="user:c9d53a11-cbd5-4a04-8b7c-0d6e39d7fa35:--x|user::rwx|other::---|group::rwx"
+PS C:\> $fullAcl="user:contoso-userid:--x|user::rwx|other::---|group::rwx"
 PS C:\> $newFullAcl = $fullAcl.Split("{|}");
-PS C:\> Set-AzureRmDataLakeStoreItemAcl -Account rdutta1 -Path /a -Acl $newFullAcl -Recurse -Debug
+PS C:\> Set-AzureRmDataLakeStoreItemAcl -Account ContosoADL -Path /a -Acl $newFullAcl -Recurse -Debug
 
 PS C:\> Export-AzureRmDataLakeStoreChildItemProperties -Account ContosoADL -Path /a -OutputPath "C:\Users\contoso\Desktop\DumpFile.txt" -GetAcl -HideConsistentAcl -IncludeFile
 ```

src/ResourceManager/Network/Commands.Network/help/AzureRM.Network.md

@@ -63,7 +63,7 @@ Adds a backend address pool configuration to a load balancer.
 Adds a front-end IP configuration to a load balancer.
 
 ### [Add-AzureRmLoadBalancerInboundNatPoolConfig](Add-AzureRmLoadBalancerInboundNatPoolConfig.md)
-
+Adds an inbound NAT pool configuration to a load balancer.
 
 ### [Add-AzureRmLoadBalancerInboundNatRuleConfig](Add-AzureRmLoadBalancerInboundNatRuleConfig.md)
 Adds an inbound NAT rule configuration to a load balancer.
@@ -213,10 +213,10 @@ Gets a load balancer.
 Gets a backend address pool configuration for a load balancer.
 
 ### [Get-AzureRmLoadBalancerFrontendIpConfig](Get-AzureRmLoadBalancerFrontendIpConfig.md)
-Gets a front-end IP configuration in a load balancer.
+Gets a front-end IP configuration for a load balancer.
 
 ### [Get-AzureRmLoadBalancerInboundNatPoolConfig](Get-AzureRmLoadBalancerInboundNatPoolConfig.md)
-
+Gets an inbound NAT pool configuration for a load balancer.
 
 ### [Get-AzureRmLoadBalancerInboundNatRuleConfig](Get-AzureRmLoadBalancerInboundNatRuleConfig.md)
 Gets an inbound NAT rule configuration for a load balancer.
@@ -438,7 +438,7 @@ Creates a backend address pool configuration for a load balancer.
 Creates a front-end IP configuration for a load balancer.
 
 ### [New-AzureRmLoadBalancerInboundNatPoolConfig](New-AzureRmLoadBalancerInboundNatPoolConfig.md)
-
+Creates an inbound NAT pool configuration for a load balancer.
 
 ### [New-AzureRmLoadBalancerInboundNatRuleConfig](New-AzureRmLoadBalancerInboundNatRuleConfig.md)
 Creates an inbound NAT rule configuration for a load balancer.
@@ -597,7 +597,7 @@ Removes a backend address pool configuration from a load balancer.
 Removes a front-end IP configuration from a load balancer.
 
 ### [Remove-AzureRmLoadBalancerInboundNatPoolConfig](Remove-AzureRmLoadBalancerInboundNatPoolConfig.md)
-
+Removes an inbound NAT pool configuration from a load balancer.
 
 ### [Remove-AzureRmLoadBalancerInboundNatRuleConfig](Remove-AzureRmLoadBalancerInboundNatRuleConfig.md)
 Removes an inbound NAT rule configuration from a load balancer.
@@ -660,17 +660,14 @@ Deletes a Virtual Network Gateway Connection
 Removes the default site from a virtual network gateway.
 
 ### [Remove-AzureRmVirtualNetworkGatewayIpConfig](Remove-AzureRmVirtualNetworkGatewayIpConfig.md)
-
+Removes a virtual network gateway ip configuration.
 
 ### [Remove-AzureRmVirtualNetworkPeering](Remove-AzureRmVirtualNetworkPeering.md)
-
+Removes a virtual network peering.
 
 ### [Remove-AzureRmVirtualNetworkSubnetConfig](Remove-AzureRmVirtualNetworkSubnetConfig.md)
 Removes a subnet configuration from a virtual network.
 
-### [Remove-AzureRmVpnClientIpsecParameter](Remove-AzureRmVpnClientIpsecParameter.md)
-{{Fill in the Synopsis}}
-
 ### [Remove-AzureRmVpnClientIpsecParameter](Remove-AzureRmVpnClientIpsecParameter.md)
 Deletes the set vpn ipsec parameters set on the Virtual Network Gateway
 
@@ -681,10 +678,10 @@ Removes a VPN client-revocation certificate.
 Removes an existing VPN client root certificate.
 
 ### [Reset-AzureRmVirtualNetworkGateway](Reset-AzureRmVirtualNetworkGateway.md)
-
+Resets Virtual network gateway instance.
 
 ### [Reset-AzureRmVirtualNetworkGatewayConnectionSharedKey](Reset-AzureRmVirtualNetworkGatewayConnectionSharedKey.md)
-
+Resets Virtual network gateway connection shared key.
 
 ### [Resize-AzureRmVirtualNetworkGateway](Resize-AzureRmVirtualNetworkGateway.md)
 Resizes an existing virtual network gateway.
@@ -753,7 +750,7 @@ Sets the goal state for a load balancer.
 Sets the goal state for a front-end IP configuration in a load balancer.
 
 ### [Set-AzureRmLoadBalancerInboundNatPoolConfig](Set-AzureRmLoadBalancerInboundNatPoolConfig.md)
-
+Sets an inbound NAT pool configuration for a load balancer.
 
 ### [Set-AzureRmLoadBalancerInboundNatRuleConfig](Set-AzureRmLoadBalancerInboundNatRuleConfig.md)
 Sets an inbound NAT rule configuration for a load balancer.
@@ -824,9 +821,6 @@ Configures a virtual network peering.
 ### [Set-AzureRmVirtualNetworkSubnetConfig](Set-AzureRmVirtualNetworkSubnetConfig.md)
 Configures the goal state for a subnet configuration in a virtual network.
 
-### [Set-AzureRmVpnClientIpsecParameter](Set-AzureRmVpnClientIpsecParameter.md)
-{{Fill in the Synopsis}}
-
 ### [Set-AzureRmVpnClientIpsecParameter](Set-AzureRmVpnClientIpsecParameter.md)
 Sets the vpn ipsec parameters for existing virtual network gateway.
 

src/ResourceManager/Network/Commands.Network/help/Remove-AzureRmVirtualNetworkPeering.md

@@ -9,6 +9,7 @@ schema: 2.0.0
 # Remove-AzureRmVirtualNetworkPeering
 
 ## SYNOPSIS
+Removes a virtual network peering.
 
 ## SYNTAX
 
@@ -19,6 +20,7 @@ Remove-AzureRmVirtualNetworkPeering -VirtualNetworkName <String> -Name <String>
 ```
 
 ## DESCRIPTION
+Removes a virtual network peering.
 
 ## EXAMPLES
 

src/ResourceManager/Network/Commands.Network/help/Test-AzureRmDnsAvailability.md

@@ -9,6 +9,7 @@ schema: 2.0.0
 # Test-AzureRmDnsAvailability
 
 ## SYNOPSIS
+Checks whether a domain name in the cloudapp.azure.com zone is available for use.
 
 ## SYNTAX
 
@@ -18,12 +19,13 @@ Test-AzureRmDnsAvailability -DomainNameLabel <String> -Location <String>
 ```
 
 ## DESCRIPTION
+Checks whether a domain name in the cloudapp.azure.com zone is available for use.
 
 ## EXAMPLES
 
-### 1:
+### --- Example 1: Check if contoso.cloudapp.azure.com is available for use. ---
 ```
-
+Test-AzureRmDnsAvailability -DomainNameLabel contoso -Location westus
 ```
 
 ## PARAMETERS