diff --git a/articles/media/web-sites-custom-domain-name/godaddy-customdomain.png b/articles/media/web-sites-custom-domain-name/godaddy-customdomain.png
new file mode 100644
index 00000000000..06691efdcd2
Binary files /dev/null and b/articles/media/web-sites-custom-domain-name/godaddy-customdomain.png differ
diff --git a/articles/media/web-sites-custom-domain-name/godaddy-quickaddcname.png b/articles/media/web-sites-custom-domain-name/godaddy-quickaddcname.png
new file mode 100644
index 00000000000..8a6754d353c
Binary files /dev/null and b/articles/media/web-sites-custom-domain-name/godaddy-quickaddcname.png differ
diff --git a/articles/media/web-sites-custom-domain-name/godaddy-zonetab.png b/articles/media/web-sites-custom-domain-name/godaddy-zonetab.png
new file mode 100644
index 00000000000..302fedc0fdc
Binary files /dev/null and b/articles/media/web-sites-custom-domain-name/godaddy-zonetab.png differ
diff --git a/articles/web-sites-enom-custom-domain.md b/articles/web-sites-enom-custom-domain.md
new file mode 100644
index 00000000000..d4cbb0759fe
--- /dev/null
+++ b/articles/web-sites-enom-custom-domain.md
@@ -0,0 +1,59 @@
+
+
+#Configuring a custom domain name for an Azure web site (eNom)
+
+
+
+
+[WACOM.INCLUDE [intro](../includes/custom-dns-web-site-intro.md)]
+
+This article provides instructions on using a custom domain name purchased from [eNom](https://enom.com) with Azure Web Sites.
+
+[WACOM.INCLUDE [introfooter](../includes/custom-dns-web-site-intro-notes.md)]
+
+In this article:
+
+- [Understanding DNS records](#understanding-records)
+- [Configure your web sites for basic, shared or standard mode](#bkmk_configsharedmode)
+- [Add a DNS record for your custom domain](#bkmk_configurecname)
+- [Enable the domain on your web site](#enabledomain)
+
+Understanding DNS records
+
+[WACOM.INCLUDE [understandingdns](../includes/custom-dns-web-site-understanding-dns-raw.md)]
+
+Configure your web sites for basic, shared or standard mode
+
+[WACOM.INCLUDE [modes](../includes/custom-dns-web-site-modes.md)]
+
+Add a DNS record for your custom domain
+
+To associate your custom domain with an Azure Web Site, you must add a new entry in the DNS table for your custom domain by using tools provided by eNom. Use the following steps to locate the DNS tools for enom.com
+
+1. Log on to your account with GoDaddy.com, and select **My Account** and then **Manage your domains**. Finally, select the domain name that you wish to use with your Azure Web Site.
+
+ 
+
+2. From the **Domain details** page, select the **DNS Zone File** tab. This is the section used for adding and modifying DNS records for your domain name. Select the **Edit** button to display the **Zone File Editor**.
+
+ 
+
+4. The **Zone File Editor** is broken out into sections for each record type, starting with A records (listed as **A (Host)** as the very first section, followed by CNAME records (listed as **CNAME (Alias)**.) To add a new entry, use the **Quick Add** button below the corresponding section. To edit an existing entry, select that entry and modify the existing information.
+
+ 
+
+ > [WACOM.NOTE] Before adding entries to the zone file, note that GoDaddy has already created DNS records for popular sub-domains (called **Host** in editor,) such as **email**, **files**, **mail**, and others. If the name you wish to use already exists, modify the existing record instead of creating a new one.
+
+ * When adding a CNAME record, you must set the **host** field to the sub-domain you wish to use. For example, **www**. You must set the **Points to** field to the **.azurewebsites.net** domain name of your Azure Web Site. For example, **contoso.azurwebsites.net**.
+
+ * When adding an A record, you must set the **host** field to either **@** (this represents root domain name, such as **contoso.com**,) or the sub-domain you wish to use (for example, **www**.) You must set the **Points to** field to the IP address of your Azure Web Site.
+
+ > [WACOM.NOTE] When adding an A record, you must also add a CNAME record with a host of **awverify**, and a **Points to** of **awverify.<yourwebsitename>.azurewebsites.net.
+
+5. When you have finished adding or modifying records, click **Save Zone File** to save changes.
+
+ > [WACOM.NOTE] It can take some time for your CNAME to propagate through the DNS system. You cannot set the CNAME for the web site until the CNAME has propagated. You can use a service such as http://www.digwebinterface.com/ to verify that the CNAME is available.
+
+Enable the domain name on your web site
+
+[WACOM.INCLUDE [modes](../includes/custom-dns-web-site-enable-on-web-site.md)]
diff --git a/articles/web-sites-godaddy-custom-domain-name.md b/articles/web-sites-godaddy-custom-domain-name.md
index a38639dfb13..617b162dd93 100644
--- a/articles/web-sites-godaddy-custom-domain-name.md
+++ b/articles/web-sites-godaddy-custom-domain-name.md
@@ -1,13 +1,13 @@
-
+
-#Configuring a custom domain name for a Windows Azure web site
+#Configuring a custom domain name for an Azure web site (GoDaddy)
-
+
[WACOM.INCLUDE [intro](../includes/custom-dns-web-site-intro.md)]
-This article provides instructions on using a custom domain name purchased from GoDaddy.com with Azure Web Sites.
+This article provides instructions on using a custom domain name purchased from [Go Daddy](https://godaddy.com) with Azure Web Sites.
[WACOM.INCLUDE [introfooter](../includes/custom-dns-web-site-intro-notes.md)]
@@ -32,19 +32,15 @@ To associate your custom domain with an Azure Web Site, you must add a new entry
1. Log on to your account with GoDaddy.com, and select **My Account** and then **Manage your domains**. Finally, select the domain name that you wish to use with your Azure Web Site.
- ![custom domain page for GoDaddy][godaddydomain]
+ 
-2. From the **Domain details** page, select the **DNS Zone File** tab. This is the section used for adding and modifying DNS records for your domain name.
+2. From the **Domain details** page, select the **DNS Zone File** tab. This is the section used for adding and modifying DNS records for your domain name. Select the **Edit** button to display the **Zone File Editor**.
- ![DNS Zone File tab][godaddyzonetab]
-
-3. To edit the DNS records, select the **Edit** button. This will display the **Zone File Editor**.
-
- ![edit button[godaddyeditbutton]
+ 
4. The **Zone File Editor** is broken out into sections for each record type, starting with A records (listed as **A (Host)** as the very first section, followed by CNAME records (listed as **CNAME (Alias)**.) To add a new entry, use the **Quick Add** button below the corresponding section. To edit an existing entry, select that entry and modify the existing information.
- ![zone file editor][godaddyzonefileeditor]
+ 
> [WACOM.NOTE] Before adding entries to the zone file, note that GoDaddy has already created DNS records for popular sub-domains (called **Host** in editor,) such as **email**, **files**, **mail**, and others. If the name you wish to use already exists, modify the existing record instead of creating a new one.
@@ -56,8 +52,6 @@ To associate your custom domain with an Azure Web Site, you must add a new entry
5. When you have finished adding or modifying records, click **Save Zone File** to save changes.
- ![save zone file button][godaddysavezonefile]
-
> [WACOM.NOTE] It can take some time for your CNAME to propagate through the DNS system. You cannot set the CNAME for the web site until the CNAME has propagated. You can use a service such as http://www.digwebinterface.com/ to verify that the CNAME is available.
Enable the domain name on your web site
diff --git a/articles/web-sites-godaddy-traffic-manager-custom-domain-name.md b/articles/web-sites-godaddy-traffic-manager-custom-domain-name.md
new file mode 100644
index 00000000000..5dcbaadb012
--- /dev/null
+++ b/articles/web-sites-godaddy-traffic-manager-custom-domain-name.md
@@ -0,0 +1,60 @@
+
+
+#Configuring a custom domain name for an Azure web site (GoDaddy)
+
+
+
+
+
+[WACOM.INCLUDE [intro](../includes/custom-dns-web-site-intro-traffic-manager.md)]
+
+This article provides instructions on using a custom domain name purchased from [Go Daddy](https://godaddy.com) with Azure Web Sites.
+
+[WACOM.INCLUDE [tmwebsitefooter](../includes/custom-dns-web-site-traffic-manager-notes.md)]
+
+[WACOM.INCLUDE [introfooter](../includes/custom-dns-web-site-intro-notes.md)]
+
+In this article:
+
+- [Understanding DNS records](#understanding-records)
+- [Configure your web sites for standard mode](#bkmk_configsharedmode)
+- [Add a DNS record for your custom domain](#bkmk_configurecname)
+- [Enable Traffic Manager for your web site](#enabledomain)
+
+Understanding DNS records
+
+[WACOM.INCLUDE [understandingdns](../includes/custom-dns-web-site-understanding-dns-traffic-manager.md)]
+
+Configure your web sites for standard mode
+
+[WACOM.INCLUDE [modes](../includes/custom-dns-web-site-modes-traffic-manager.md)]
+
+Add a DNS record for your custom domain
+
+To associate your custom domain with an Azure Web Site, you must add a new entry in the DNS table for your custom domain by using tools provided by GoDaddy. Use the following steps to locate the DNS tools for GoDaddy.com
+
+1. Log on to your account with GoDaddy.com, and select **My Account** and then **Manage your domains**. Finally, select the domain name that you wish to use with your Azure Web Site.
+
+ 
+
+2. From the **Domain details** page, select the **DNS Zone File** tab. This is the section used for adding and modifying DNS records for your domain name. Select the **Edit** button to display the **Zone File Editor**.
+
+ 
+
+4. The **Zone File Editor** is broken out into sections for each record type, starting with A records (listed as **A (Host)** as the very first section, followed by CNAME records (listed as **CNAME (Alias)**.) To add a new entry, use the **Quick Add** button below the corresponding section. To edit an existing entry, select that entry and modify the existing information.
+
+ 
+
+ > [WACOM.NOTE] Before adding entries to the zone file, note that GoDaddy has already created DNS records for popular sub-domains (called **Host** in editor,) such as **email**, **files**, **mail**, and others. If the name you wish to use already exists, modify the existing record instead of creating a new one.
+
+ When adding a CNAME record, you must set the **host** field to the sub-domain you wish to use. For example, **www**. You must set the **Points to** field to the **.trafficmgr.com** domain name of your Azure Web Site. For example, **contoso.trafficmgr.com**.
+
+ > [WACOM.NOTE] You must only use CNAME records when associating your custom domain name with a web site that is load balanced using Traffic Manager.
+
+5. When you have finished adding or modifying records, click **Save Zone File** to save changes.
+
+ > [WACOM.NOTE] It can take some time for your CNAME to propagate through the DNS system. You cannot set the CNAME for the web site until the CNAME has propagated. You can use a service such as http://www.digwebinterface.com/ to verify that the CNAME is available.
+
+Enable Traffic Manager web site
+
+[WACOM.INCLUDE [modes](../includes/custom-dns-web-site-enable-on-traffic-manager.md)]
diff --git a/articles/web-sites-network-solutions-custom-domain-name.md b/articles/web-sites-network-solutions-custom-domain-name.md
new file mode 100644
index 00000000000..f37d57d2f55
--- /dev/null
+++ b/articles/web-sites-network-solutions-custom-domain-name.md
@@ -0,0 +1,59 @@
+
+
+#Configuring a custom domain name for an Azure web site (Network Solutions)
+
+
+
+
+[WACOM.INCLUDE [intro](../includes/custom-dns-web-site-intro.md)]
+
+This article provides instructions on using a custom domain name purchased from [Network Solutions](https://networksolutions.com) with Azure Web Sites.
+
+[WACOM.INCLUDE [introfooter](../includes/custom-dns-web-site-intro-notes.md)]
+
+In this article:
+
+- [Understanding DNS records](#understanding-records)
+- [Configure your web sites for basic, shared or standard mode](#bkmk_configsharedmode)
+- [Add a DNS record for your custom domain](#bkmk_configurecname)
+- [Enable the domain on your web site](#enabledomain)
+
+Understanding DNS records
+
+[WACOM.INCLUDE [understandingdns](../includes/custom-dns-web-site-understanding-dns-raw.md)]
+
+Configure your web sites for basic, shared or standard mode
+
+[WACOM.INCLUDE [modes](../includes/custom-dns-web-site-modes.md)]
+
+Add a DNS record for your custom domain
+
+To associate your custom domain with an Azure Web Site, you must add a new entry in the DNS table for your custom domain by using tools provided by Network Solutions. Use the following steps to locate the DNS tools for networksolutions.com
+
+1. Log on to your account with GoDaddy.com, and select **My Account** and then **Manage your domains**. Finally, select the domain name that you wish to use with your Azure Web Site.
+
+ 
+
+2. From the **Domain details** page, select the **DNS Zone File** tab. This is the section used for adding and modifying DNS records for your domain name. Select the **Edit** button to display the **Zone File Editor**.
+
+ 
+
+4. The **Zone File Editor** is broken out into sections for each record type, starting with A records (listed as **A (Host)** as the very first section, followed by CNAME records (listed as **CNAME (Alias)**.) To add a new entry, use the **Quick Add** button below the corresponding section. To edit an existing entry, select that entry and modify the existing information.
+
+ 
+
+ > [WACOM.NOTE] Before adding entries to the zone file, note that GoDaddy has already created DNS records for popular sub-domains (called **Host** in editor,) such as **email**, **files**, **mail**, and others. If the name you wish to use already exists, modify the existing record instead of creating a new one.
+
+ * When adding a CNAME record, you must set the **host** field to the sub-domain you wish to use. For example, **www**. You must set the **Points to** field to the **.azurewebsites.net** domain name of your Azure Web Site. For example, **contoso.azurwebsites.net**.
+
+ * When adding an A record, you must set the **host** field to either **@** (this represents root domain name, such as **contoso.com**,) or the sub-domain you wish to use (for example, **www**.) You must set the **Points to** field to the IP address of your Azure Web Site.
+
+ > [WACOM.NOTE] When adding an A record, you must also add a CNAME record with a host of **awverify**, and a **Points to** of **awverify.<yourwebsitename>.azurewebsites.net.
+
+5. When you have finished adding or modifying records, click **Save Zone File** to save changes.
+
+ > [WACOM.NOTE] It can take some time for your CNAME to propagate through the DNS system. You cannot set the CNAME for the web site until the CNAME has propagated. You can use a service such as http://www.digwebinterface.com/ to verify that the CNAME is available.
+
+Enable the domain name on your web site
+
+[WACOM.INCLUDE [modes](../includes/custom-dns-web-site-enable-on-web-site.md)]
diff --git a/articles/web-sites-registerdotcom-custom-domain-name.md b/articles/web-sites-registerdotcom-custom-domain-name.md
new file mode 100644
index 00000000000..b10daa7a227
--- /dev/null
+++ b/articles/web-sites-registerdotcom-custom-domain-name.md
@@ -0,0 +1,59 @@
+
+
+#Configuring a custom domain name for an Azure web site (Register.com)
+
+
+
+
+[WACOM.INCLUDE [intro](../includes/custom-dns-web-site-intro.md)]
+
+This article provides instructions on using a custom domain name purchased from [Register.com](https://register.com) with Azure Web Sites.
+
+[WACOM.INCLUDE [introfooter](../includes/custom-dns-web-site-intro-notes.md)]
+
+In this article:
+
+- [Understanding DNS records](#understanding-records)
+- [Configure your web sites for basic, shared or standard mode](#bkmk_configsharedmode)
+- [Add a DNS record for your custom domain](#bkmk_configurecname)
+- [Enable the domain on your web site](#enabledomain)
+
+Understanding DNS records
+
+[WACOM.INCLUDE [understandingdns](../includes/custom-dns-web-site-understanding-dns-raw.md)]
+
+Configure your web sites for basic, shared or standard mode
+
+[WACOM.INCLUDE [modes](../includes/custom-dns-web-site-modes.md)]
+
+Add a DNS record for your custom domain
+
+To associate your custom domain with an Azure Web Site, you must add a new entry in the DNS table for your custom domain by using tools provided by Register.com. Use the following steps to locate the DNS tools for Register.com
+
+1. Log on to your account with GoDaddy.com, and select **My Account** and then **Manage your domains**. Finally, select the domain name that you wish to use with your Azure Web Site.
+
+ 
+
+2. From the **Domain details** page, select the **DNS Zone File** tab. This is the section used for adding and modifying DNS records for your domain name. Select the **Edit** button to display the **Zone File Editor**.
+
+ 
+
+4. The **Zone File Editor** is broken out into sections for each record type, starting with A records (listed as **A (Host)** as the very first section, followed by CNAME records (listed as **CNAME (Alias)**.) To add a new entry, use the **Quick Add** button below the corresponding section. To edit an existing entry, select that entry and modify the existing information.
+
+ 
+
+ > [WACOM.NOTE] Before adding entries to the zone file, note that GoDaddy has already created DNS records for popular sub-domains (called **Host** in editor,) such as **email**, **files**, **mail**, and others. If the name you wish to use already exists, modify the existing record instead of creating a new one.
+
+ * When adding a CNAME record, you must set the **host** field to the sub-domain you wish to use. For example, **www**. You must set the **Points to** field to the **.azurewebsites.net** domain name of your Azure Web Site. For example, **contoso.azurwebsites.net**.
+
+ * When adding an A record, you must set the **host** field to either **@** (this represents root domain name, such as **contoso.com**,) or the sub-domain you wish to use (for example, **www**.) You must set the **Points to** field to the IP address of your Azure Web Site.
+
+ > [WACOM.NOTE] When adding an A record, you must also add a CNAME record with a host of **awverify**, and a **Points to** of **awverify.<yourwebsitename>.azurewebsites.net.
+
+5. When you have finished adding or modifying records, click **Save Zone File** to save changes.
+
+ > [WACOM.NOTE] It can take some time for your CNAME to propagate through the DNS system. You cannot set the CNAME for the web site until the CNAME has propagated. You can use a service such as http://www.digwebinterface.com/ to verify that the CNAME is available.
+
+Enable the domain name on your web site
+
+[WACOM.INCLUDE [modes](../includes/custom-dns-web-site-enable-on-web-site.md)]
diff --git a/includes/custom-dns-web-site-add-to-traffic-manager.md b/includes/custom-dns-web-site-add-to-traffic-manager.md
deleted file mode 100644
index 9a0e7c10870..00000000000
--- a/includes/custom-dns-web-site-add-to-traffic-manager.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Microsoft Azure Traffic Manager allows you to load balance your web site traffic using several load balancing methods. For more information on Traffic Manager, see the [Traffic Manager product page](http://www.windowsazure.com/en-us/documentation/services/traffic-manager/). To use your web site with Traffic Manager, perform the following steps.
-
-1. If you do not already have a Traffic Manager profile, use the information in [Create a Traffic Manager profile using Quick Create][createprofile] to create one. Note the **.trafficmgr.com** domain name associated with your Traffic Manager profile. This will be used in a later step.
-
-2. Use the information in [Add or Delete Endpoints][addendpoint] to add your web site as an endpoint in your Traffic Manager profile.
-
- > [WACOM.NOTE] If your web site is not listed when adding an endpoint, verify that it is configured for Standard mode. You must use Standard mode for your web site in order to work with Traffic Manager.
diff --git a/includes/custom-dns-web-site-enable-on-traffic-manager.md b/includes/custom-dns-web-site-enable-on-traffic-manager.md
new file mode 100644
index 00000000000..adb44757e68
--- /dev/null
+++ b/includes/custom-dns-web-site-enable-on-traffic-manager.md
@@ -0,0 +1,5 @@
+After the records for your domain name have propagated, you should be able to use your browser to verify that your custom domain name can be used to access your web site.
+
+If you have not already added your web site as a Traffic Manager endpoint, you must do this before name resolution will work, as the custom domain name routes to Traffic Manager. Traffic Manager then routes to your web site. Use the information in [Add or Delete Endpoints](http://msdn.microsoft.com/en-us/library/windowsazure/hh744839.aspx) to add your web site as an endpoint in your Traffic Manager profile.
+
+> [WACOM.NOTE] If your web site is not listed when adding an endpoint, verify that it is configured for Standard mode. You must use Standard mode for your web site in order to work with Traffic Manager.
\ No newline at end of file
diff --git a/includes/custom-dns-web-site-intro-notes.md b/includes/custom-dns-web-site-intro-notes.md
index e3fe4708b98..336427f5f49 100644
--- a/includes/custom-dns-web-site-intro-notes.md
+++ b/includes/custom-dns-web-site-intro-notes.md
@@ -1,3 +1,5 @@
-> [WACOM.NOTE] The procedures in this task apply to Windows Azure Web Sites; for Cloud Services, see Configuring a Custom Domain Name in Windows Azure.
+> [WACOM.NOTE] The procedures in this task apply to Web Sites; for Cloud Services, see Configuring a Custom Domain Name in Windows Azure.
+
+> [WACOM.NOTE] The steps in this task are specific to Web Sites that do not use Traffic Manager to load balance traffic. If your web site uses Traffic Manager, use the selector at the top of this article to select the Traffic Manager specific steps.
> [WACOM.NOTE] The steps in this task require you to configure your web sites for Shared, Basic, or Standard mode, which may change how much you are billed for your subscription. See Web Sites Pricing Details for more information.
\ No newline at end of file
diff --git a/includes/custom-dns-web-site-intro-traffic-manager.md b/includes/custom-dns-web-site-intro-traffic-manager.md
new file mode 100644
index 00000000000..52d222bae3d
--- /dev/null
+++ b/includes/custom-dns-web-site-intro-traffic-manager.md
@@ -0,0 +1 @@
+When you use a Microsoft Azure Traffic Manager to load balance traffic to your Azure Web Site, that web site can then be accessed using the **\*.trafficmgr.com** domain name assigned by Azure. Microsoft Azure also allows you to associate a custom domain name, such as www.contoso.com, with your web site.
\ No newline at end of file
diff --git a/includes/custom-dns-web-site-modes-traffic-manager.md b/includes/custom-dns-web-site-modes-traffic-manager.md
new file mode 100644
index 00000000000..4101f11553a
--- /dev/null
+++ b/includes/custom-dns-web-site-modes-traffic-manager.md
@@ -0,0 +1,26 @@
+
+Configure your web sites for shared or standard mode
+
+Setting a custom domain name on a web site that is load balanced by Traffic Manager is only available for Standard mode web sites. Before switching a web site from the Free mode to Standard mode, you must first remove spending caps in place for your Web Site subscription. For more information on Shared and Standard mode pricing, see [Pricing Details][PricingDetails].
+
+1. In your browser, open the [Management Portal][portal].
+2. In the **Web Sites** tab, click the name of your site.
+
+ ![][standardmode1]
+
+3. Click the **SCALE** tab.
+
+ ![][standardmode2]
+
+
+4. In the **general** section, set the web site mode by clicking **STANDARD**.
+
+ ![][standardmode3]
+
+5. Click **Save**.
+6. When prompted about the increase in cost for Standard mode, click **Yes** if you agree.
+
+
+
+ **Note**
+ If you receive a "Configuring scale for web site 'web site name' failed" error, you can use the details button to get more information.
\ No newline at end of file
diff --git a/includes/custom-dns-web-site-traffic-manager-notes.md b/includes/custom-dns-web-site-traffic-manager-notes.md
new file mode 100644
index 00000000000..be759bba26b
--- /dev/null
+++ b/includes/custom-dns-web-site-traffic-manager-notes.md
@@ -0,0 +1 @@
+If you do not already have a Traffic Manager profile, use the information in [Create a Traffic Manager profile using Quick Create](http://msdn.microsoft.com/en-us/library/windowsazure/dn339012.aspx) to create one. Note the **.trafficmgr.com** domain name associated with your Traffic Manager profile, as this will be used later by later steps in this document.
\ No newline at end of file
diff --git a/includes/custom-dns-web-site-understanding-dns-traffic-manager.md b/includes/custom-dns-web-site-understanding-dns-traffic-manager.md
index 7281b22ddd4..a7d4e555f94 100644
--- a/includes/custom-dns-web-site-understanding-dns-traffic-manager.md
+++ b/includes/custom-dns-web-site-understanding-dns-traffic-manager.md
@@ -6,6 +6,8 @@ When you create an Azure Web Site, a DNS name is automatically assigned to the s
> [WACOM.NOTE] When your web site is configured as a Traffic Manager endpoint, you will usually use the **.traficmgr.com** address when creating DNS records.
+> [WACOM.NOTE] You can only use CNAME records with Traffic Manager
+
There are also multiple types of records, each with their own functions and limitations, but for web sites configured to as Traffic Manager endpoints, we only care about one; *CNAME* records.
###CNAME or Alias record