Merge remote-tracking branch 'refs/remotes/Microsoft/master'

Author: jasongroce

articles/dns/dns-domain-delegation.md

@@ -5,7 +5,6 @@ services: dns
 documentationcenter: na
 author: sdwheeler
 manager: carmonm
-editor: ''
 
 ms.assetid: 257da6ec-d6e2-4b6f-ad76-ee2dde4efbcc
 ms.service: dns
@@ -158,26 +157,26 @@ The following PowerShell example demonstrates how this works. The same steps can
 First, we create the parent and child zones. These can be in same resource group or different resource groups.
 
 ```powershell
-    $parent = New-AzureRmDnsZone -Name contoso.com -ResourceGroupName RG1
-    $child = New-AzureRmDnsZone -Name partners.contoso.com -ResourceGroupName RG1
+$parent = New-AzureRmDnsZone -Name contoso.com -ResourceGroupName RG1
+$child = New-AzureRmDnsZone -Name partners.contoso.com -ResourceGroupName RG1
 ```
 
 #### Step 2. Retrieve NS records
 
 Next, we retrieve the authoritative NS records from child zone as shown in the next example.  This contains the name servers assigned to the child zone.
 
 ```powershell
-    $child_ns_recordset = Get-AzureRmDnsRecordSet -Zone $child -Name "@" -RecordType NS
+$child_ns_recordset = Get-AzureRmDnsRecordSet -Zone $child -Name "@" -RecordType NS
 ```
 
 #### Step 3. Delegate the child zone
 
 Create corresponding NS record set in the parent zone to complete the delegation. Note that the record set name in the parent zone matches the child zone name, in this case "partners".
 
 ```powershell
-    $parent_ns_recordset = New-AzureRmDnsRecordSet -Zone $parent -Name "partners" -RecordType NS -Ttl 3600
-    $parent_ns_recordset.Records = $child_ns_recordset.Records
-    Set-AzureRmDnsRecordSet -RecordSet $parent_ns_recordset
+$parent_ns_recordset = New-AzureRmDnsRecordSet -Zone $parent -Name "partners" -RecordType NS -Ttl 3600
+$parent_ns_recordset.Records = $child_ns_recordset.Records
+Set-AzureRmDnsRecordSet -RecordSet $parent_ns_recordset
 ```
 
 ### To verify name resolution is working

articles/dns/dns-getstarted-create-dnszone-cli.md

@@ -5,7 +5,6 @@ services: dns
 documentationcenter: na
 author: sdwheeler
 manager: carmonm
-editor: ''
 
 ms.assetid: 1514426a-133c-491a-aa27-ee0962cea9dc
 ms.service: dns
@@ -41,31 +40,31 @@ You can install Azure CLI for Windows, Linux, or MAC. The following steps need t
 All the network provider commands on CLI can be found using the following command:
 
 ```azurecli
-    azure network
+azure network
 ```
 
 ### 2. Switch CLI mode
 
 Azure DNS uses Azure Resource Manager. Make sure you switch CLI mode to use ARM commands.
 
 ```azurecli
-    azure config mode arm
+azure config mode arm
 ```
 
 ### 3. Sign in to your Azure account
 
 You will be prompted to authenticate with your credentials. Keep in mind that you can only use ORGID accounts.
 
 ```azurecli
-    azure login -u "username"
+azure login -u "username"
 ```
 
 ### 4. Select the subscription
 
 Choose which of your Azure subscriptions to use.
 
 ```azurecli
-    azure account set "subscription name"
+azure account set "subscription name"
 ```
 
 ### 5. Create a resource group
@@ -75,15 +74,15 @@ Azure Resource Manager requires that all resource groups specify a location. Thi
 You can skip this step if you are using an existing resource group.
 
 ```azurecli
-    azure group create -n myresourcegroup --location "West US"
+azure group create -n myresourcegroup --location "West US"
 ```
 
 ### 6. Register
 
 The Azure DNS service is managed by the Microsoft.Network resource provider. Your Azure subscription needs to be registered to use this resource provider before you can use Azure DNS. This is a one-time operation for each subscription.
 
 ```azurecli
-    azure provider register --namespace Microsoft.Network
+azure provider register --namespace Microsoft.Network
 ```
 
 ## Step 2 - Create a DNS zone
@@ -99,7 +98,7 @@ The example below creates a DNS zone called *contoso.com* in the resource group
 Use the example to create your DNS zone, substituting the values for your own.
 
 ```azurecli
-    azure network dns zone create myresourcegroup contoso.com
+azure network dns zone create myresourcegroup contoso.com
 ```
 
 ### To create a DNS zone and tags.
@@ -109,7 +108,7 @@ Azure DNS CLI supports tags of DNS zones specified by using the optional *-Tag*
 Use the example below to create a DNS zone and tags, substituting the values for your own.
 
 ```azurecli
-    azure network dns zone create myresourcegroup contoso.com -t "project=demo";"env=test"
+azure network dns zone create myresourcegroup contoso.com -t "project=demo";"env=test"
 ```
 
 ## View records

articles/dns/dns-getstarted-create-dnszone.md

@@ -5,7 +5,6 @@ services: dns
 documentationcenter: na
 author: sdwheeler
 manager: carmonm
-editor: ''
 
 ms.assetid: d78583b7-e669-435c-819b-7605cf791b0e
 ms.service: dns
@@ -67,19 +66,19 @@ Open your PowerShell console and connect to your account. For more information,
 Use the following sample to help you connect:
 
 ```powershell
-    Login-AzureRmAccount
+Login-AzureRmAccount
 ```
 
 Check the subscriptions for the account.
 
 ```powershell
-    Get-AzureRmSubscription
+Get-AzureRmSubscription
 ```
 
 Specify the subscription that you want to use.
 
 ```powershell
-    Select-AzureRmSubscription -SubscriptionName "Replace_with_your_subscription_name"
+Select-AzureRmSubscription -SubscriptionName "Replace_with_your_subscription_name"
 ```
 
 ## Step 2 - Create a resource group
@@ -89,15 +88,15 @@ Azure Resource Manager requires that all resource groups specify a location. Thi
 You can skip this step if you are using an existing resource group.
 
 ```powershell
-    New-AzureRmResourceGroup -Name MyAzureResourceGroup -location "West US"
+New-AzureRmResourceGroup -Name MyAzureResourceGroup -location "West US"
 ```
 
 ## Step 3 - Register
 
 The Azure DNS service is managed by the Microsoft.Network resource provider. Your Azure subscription needs to be registered to use this resource provider before you can use Azure DNS. This is a one-time operation for each subscription.
 
 ```powershell
-    Register-AzureRmResourceProvider -ProviderNamespace Microsoft.Network
+Register-AzureRmResourceProvider -ProviderNamespace Microsoft.Network
 ```
 
 ## Step 4 -  Create a DNS zone
@@ -112,15 +111,15 @@ A DNS zone is created by using the `New-AzureRmDnsZone` cmdlet. There are exampl
 The example below creates a DNS zone called *contoso.com* in the resource group called *MyResourceGroup*. Use the example to create a DNS zone, substituting the values for your own.
 
 ```powershell
-    New-AzureRmDnsZone -Name contoso.com -ResourceGroupName MyAzureResourceGroup
+New-AzureRmDnsZone -Name contoso.com -ResourceGroupName MyAzureResourceGroup
 ```
 
 ### To create a DNS zone with tags
 
 The following example shows how to create a DNS zone with two tags, *project = demo* and *env = test*. Use the example to create a DNS zone, substituting the values for your own.
 
 ```powershell
-    New-AzureRmDnsZone -Name contoso.com -ResourceGroupName MyAzureResourceGroup -Tag @( @{ Name="project"; Value="demo" }, @{ Name="env"; Value="test" } )
+New-AzureRmDnsZone -Name contoso.com -ResourceGroupName MyAzureResourceGroup -Tag @( @{ Name="project"; Value="demo" }, @{ Name="env"; Value="test" } )
 ```
 
 ## View records

articles/dns/dns-getstarted-create-recordset-cli.md

@@ -5,7 +5,6 @@ services: dns
 documentationcenter: na
 author: sdwheeler
 manager: carmonm
-editor: ''
 
 ms.assetid: 02b897d3-e83b-4257-b96d-5c29aa59e843
 ms.service: dns
@@ -41,7 +40,7 @@ To create record set, use `azure network dns record-set create`. Specify the res
 *Usage: network dns record-set create \<resource-group\> \<dns-zone-name\> \<name\> \<type\> \<ttl\>*
 
 ```azurecli
-    azure network dns record-set create myresourcegroup  contoso.com  www A  60
+azure network dns record-set create myresourcegroup  contoso.com  www A  60
 ```
 
 ### 2. Add records
@@ -55,7 +54,7 @@ You can add IPv4 *A* records to the "www" record set by using the following comm
 *Usage: network dns record-set add-record \<resource-group\> \<dns-zone-name\> \<record-set-name\> \<type\>*
 
 ```azurecli
-    azure network dns record-set add-record myresourcegroup contoso.com  www A  -a 134.170.185.46
+azure network dns record-set add-record myresourcegroup contoso.com  www A  -a 134.170.185.46
 ```
 
 ## Additional record type examples

articles/dns/dns-getstarted-create-recordset.md

@@ -5,7 +5,6 @@ services: dns
 documentationcenter: na
 author: sdwheeler
 manager: carmonm
-editor: ''
 
 ms.assetid: a8068c5a-f248-4e97-be97-8bd0d79eeffd
 ms.service: dns
@@ -41,19 +40,19 @@ This section describes how to create a record set and record.
 Open your PowerShell console and connect to your account. Use the following sample to help you connect:
 
 ```powershell
-    Login-AzureRmAccount
+Login-AzureRmAccount
 ```
 
 Check the subscriptions for the account.
 
 ```powershell
-    Get-AzureRmSubscription
+Get-AzureRmSubscription
 ```
 
 Specify the subscription that you want to use.
 
 ```powershell
-    Select-AzureRmSubscription -SubscriptionName "Replace_with_your_subscription_name"
+Select-AzureRmSubscription -SubscriptionName "Replace_with_your_subscription_name"
 ```
 
 For more information about working with PowerShell, see [Using Windows PowerShell with Resource Manager](../powershell-azure-resource-manager.md).
@@ -67,22 +66,22 @@ To create a record set in the apex of the zone (in this case, "contoso.com"), us
 The following example creates a record set with the relative name "www" in the DNS Zone "contoso.com". The fully-qualified name of the record set is "www.contoso.com". The record type is "A", and the TTL is 60 seconds. After completing this step, you will have an empty "www" record set that is assigned to the variable *$rs*.
 
 ```powershell
-    $rs = New-AzureRmDnsRecordSet -Name "www" -RecordType "A" -ZoneName "contoso.com" -ResourceGroupName "MyAzureResourceGroup" -Ttl 60
+$rs = New-AzureRmDnsRecordSet -Name "www" -RecordType "A" -ZoneName "contoso.com" -ResourceGroupName "MyAzureResourceGroup" -Ttl 60
 ```
 
 #### If a record set already exists
 
 If a record set already exists, the command fails unless the *-Overwrite* switch is used. The *-Overwrite* option triggers a confirmation prompt, which can be suppressed by using the *-Force* switch.
 
 ```powershell
-    $rs = New-AzureRmDnsRecordSet -Name www -RecordType A -Ttl 300 -ZoneName contoso.com -ResouceGroupName MyAzureResouceGroup [-Tag $tags] [-Overwrite] [-Force]
+$rs = New-AzureRmDnsRecordSet -Name www -RecordType A -Ttl 300 -ZoneName contoso.com -ResouceGroupName MyAzureResouceGroup [-Tag $tags] [-Overwrite] [-Force]
 ```
 
 In this example, you specify the zone by using the zone name and resource group name. Alternatively, you can specify a zone object, as returned by `Get-AzureRmDnsZone` or `New-AzureRmDnsZone`.
 
 ```powershell
-    $zone = Get-AzureRmDnsZone -Name contoso.com -ResourceGroupName MyAzureResourceGroup
-    $rs = New-AzureRmDnsRecordSet -Name www -RecordType A -Ttl 300 -Zone $zone [-Tag $tags] [-Overwrite] [-Force]
+$zone = Get-AzureRmDnsZone -Name contoso.com -ResourceGroupName MyAzureResourceGroup
+$rs = New-AzureRmDnsRecordSet -Name www -RecordType A -Ttl 300 -Zone $zone [-Tag $tags] [-Overwrite] [-Force]
 ```
 
 `New-AzureRmDnsRecordSet` returns a local object that represents the record set that was created in Azure DNS.
@@ -94,16 +93,16 @@ To use the newly created "www" record set, you need to add records to it. You ca
 Adding records to a record set by using `Add-AzureRmDnsRecordConfig` is an offline operation. Only the local variable *$rs* is updated.
 
 ```powershell
-    Add-AzureRmDnsRecordConfig -RecordSet $rs -Ipv4Address 134.170.185.46
-    Add-AzureRmDnsRecordConfig -RecordSet $rs -Ipv4Address 134.170.188.221
+Add-AzureRmDnsRecordConfig -RecordSet $rs -Ipv4Address 134.170.185.46
+Add-AzureRmDnsRecordConfig -RecordSet $rs -Ipv4Address 134.170.188.221
 ```
 
 ### 4. Commit the changes
 
 Commit the changes to the record set. Use `Set-AzureRmDnsRecordSet` to upload the changes to the record set to Azure DNS.
 
 ```powershell
-    Set-AzureRmDnsRecordSet -RecordSet $rs
+Set-AzureRmDnsRecordSet -RecordSet $rs
 ```
 
 ### 5. Retrieve the record set

articles/dns/dns-import-export.md

@@ -5,7 +5,6 @@ services: dns
 documentationcenter: na
 author: sdwheeler
 manager: carmonm
-editor: ''
 
 ms.assetid: f5797782-3005-4663-a488-ac0089809010
 ms.service: dns
@@ -68,9 +67,9 @@ The following notes provide additional technical details about the zone import p
 
 The format of the Azure CLI command to import a DNS zone is:
 
-    ```azurecli
-    azure network dns zone import [options] <resource group> <zone name> <zone file name>
-    ```
+```azurecli
+azure network dns zone import [options] <resource group> <zone name> <zone file name>
+```
 
 Values:
 
@@ -169,7 +168,7 @@ After you have verified that the zone has been imported correctly, you will need
 The format of the Azure CLI command to import a DNS zone is:
 
     ```azurecli
-        azure network dns zone export [options] <resource group> <zone name> <zone file name>
+    azure network dns zone export [options] <resource group> <zone name> <zone file name>
     ```
 
 Values:

articles/dns/dns-operations-dnszones-cli.md

@@ -5,7 +5,6 @@ services: dns
 documentationcenter: na
 author: sdwheeler
 manager: carmonm
-editor: ''
 
 ms.assetid: 8ab63bc4-5135-4ed8-8c0b-5f0712b9afed
 ms.service: dns
@@ -40,7 +39,7 @@ To create a new DNS zone to host your domain, see [Create an Azure DNS zone usin
 To retrieve a DNS zone, use `azure network dns zone show`:
 
 ```azurecli
-    azure network dns zone show myresourcegroup contoso.com
+azure network dns zone show myresourcegroup contoso.com
 ```
 
 The operation returns a DNS zone with its id, number of record sets and tags.
@@ -50,15 +49,15 @@ The operation returns a DNS zone with its id, number of record sets and tags.
 To retrieve DNS zones within a resource group, use `azure network dns zone list`.
 
 ```azurecli
-    azure network dns zone list myresourcegroup
+azure network dns zone list myresourcegroup
 ```
 
 ## Update a DNS zone
 
-Changes to a DNS zone resource can be made using `azure network dns zone set`. This does not update any of the DNS record sets within the zone (see [How to Manage DNS records](dns-operations-recordsets.md)). It's only used to update properties of the zone resource itself. This is currently limited to the Azure Resource Manager ‘tags’ for the zone resource. See [Etags and Tags](dns-getstarted-create-dnszone.md#tagetag) for more information.
+Changes to a DNS zone resource can be made using `azure network dns zone set`. This does not update any of the DNS record sets within the zone (see [How to Manage DNS records](dns-operations-recordsets.md)). It's only used to update properties of the zone resource itself. This is currently limited to the Azure Resource Manager 'tags' for the zone resource. See [Etags and Tags](dns-getstarted-create-dnszone.md#tagetag) for more information.
 
 ```azurecli
-    azure network dns zone set myresourcegroup contoso.com -t prod=value2
+azure network dns zone set myresourcegroup contoso.com -t prod=value2
 ```
 
 ## Delete a DNS Zone
@@ -68,7 +67,7 @@ DNS zones can be deleted using `azure network dns zone delete`. This operation h
 Before deleting a DNS zone in Azure DNS, you will need to delete all records sets, except for the NS and SOA records at the root of the zone that were created automatically when the zone was created.
 
 ```azurecli
-    azure network dns zone delete myresourcegroup contoso.com
+azure network dns zone delete myresourcegroup contoso.com
 ```
 
 ## Next steps

articles/dns/dns-operations-dnszones.md

@@ -5,7 +5,6 @@ services: dns
 documentationcenter: na
 author: sdwheeler
 manager: carmonm
-editor: ''
 
 ms.assetid: a67992ab-8166-4052-9b28-554c5a39e60c
 ms.service: dns
@@ -76,16 +75,17 @@ Use one of the following two ways to remove a DNS zone:
 
 ### Specify the zone using the zone name and resource group name
 
-This operation has an optional *-Force* switch which suppresses the prompt to confirm you want to remove the DNS zone.
+This operation has an optional `-Force` switch which suppresses the prompt to confirm you want to remove the DNS zone.
 
 ```powershell
 Remove-AzureRmDnsZone -Name contoso.com -ResourceGroupName MyAzureResourceGroup [-Force]
 ```
 
 ### Specify the zone using a $zone object
 
-Specify the zone using a $zone object from `Get-AzureRmDnsZone`. This operation has an optional *-Force* switch which suppresses the prompt to confirm you want to remove the DNS zone. As with `Set-AzureRmDnsZone`, specifying the zone using a $zone object enables Etag checks to ensure concurrent changes are not deleted. <BR>
-The optional *-Overwrite* flag suppresses these checks. See [Etags and Tags](dns-getstarted-create-dnszone.md#tagetag) for more information.
+Specify the zone using a $zone object from `Get-AzureRmDnsZone`. This operation has an optional `-Force` switch which suppresses the prompt to confirm you want to remove the DNS zone. As with `Set-AzureRmDnsZone`, specifying the zone using a $zone object enables Etag checks to ensure concurrent changes are not deleted.
+
+The optional `-Overwrite` flag suppresses these checks. See [Etags and Tags](dns-getstarted-create-dnszone.md#tagetag) for more information.
 
 ```powershell
 $zone = Get-AzureRmDnsZone -Name contoso.com -ResourceGroupName MyAzureResourceGroup