Merge pull request #276721 from adrianhall/swa-dns-docbugs

[SWA] DNS Doc Bugs

Author: v-dirichards

articles/static-web-apps/TOC.yml

@@ -72,7 +72,7 @@
   - name: Use Azure DNS
     items:
     - name: Delegate your domain to Azure DNS
-      href: azure-dns-zone.md
+      href: /azure/dns/dns-delegate-domain-azure-dns
     - name: Set up a custom domain
       href: custom-domain-azure-dns.md
     - name: Set up the apex domain

articles/static-web-apps/azure-dns-zone.md

@@ -27,25 +27,25 @@ The following procedure requires you to copy settings from an Azure DNS zone you
 
 1. Select **DNS zones**.
 
-2. Select **Create**.
+1. Select **Create**.
 
-3. In the *Basics* tab, enter the following values.
+1. In the *Basics* tab, enter the following values.
 
     | Property | Value |
     |---|---|
     | Subscription | Select your Azure subscription.  |
     | Resource group | Select to create a resource group. |
     | Name | Enter the domain name for this zone. |
 
-4. Select **Review + Create**.
+1. Select **Review + Create**.
 
-5. Select **Create** and wait for the zone to provision.
+1. Select **Create** and wait for the zone to provision.
 
-6. Select **Go to resource**.
+1. Select **Go to resource**.
 
     With the DNS zone created, you now have access to Azure's DNS name servers for your application.
 
-7. From the *Overview* window, copy the values for all four name servers listed as **Name server 1** to **Name server 4** and set them aside in a text editor for later use.
+1. From the *Overview* window, copy the values for all four name servers listed as **Name server 1** to **Name server 4** and set them aside in a text editor for later use.
 
 ## Update name server addresses
 

articles/static-web-apps/custom-domain-azure-dns.md

@@ -5,88 +5,53 @@ services: static-web-apps
 author: craigshoemaker
 ms.service: static-web-apps
 ms.topic: how-to
-ms.date: 02/11/2021
+ms.date: 05/30/2024
 ms.author: cshoe
 ---
 
 # Set up a custom domain with Azure DNS in Azure Static Web Apps
 
-By default, Azure Static Web Apps provides an auto-generated domain name for your website, but you can point a custom domain to your site. Free SSL/TLS certificates are automatically created for the auto-generated domain name and any custom domains you may add.
+By default, Azure Static Web Apps provides an autogenerated domain name for your website, but you can point a custom domain to your site. Free SSL/TLS certificates are automatically created for the autogenerated domain name and any custom domains you may add.
 
-This guide demonstrates how to configure your domain name with the `www` subdomain. Once this procedure is complete, you can set up an [apex domain](apex-domain-azure-dns.md).
+Suppose you buy the domain `example.com` from a domain name registrar and then create a zone with the name `example.com` in Azure DNS. You want `www.example.com` to point to your Static Web Apps site.
 
-The following procedure requires you to copy settings from an Azure DNS zone you create and your existing static web app. Consider opening the Azure portal in two different windows to make it easier to switch between the two services.
+- If you're using an apex domain (a domain without a subdomain, also known as a root domain), see [configuring a custom apex domain with Azure DNS](apex-domain-azure-dns.md).
+- If you're using an external DNS provider, see [configuring a custom domain with external DNS](custom-domain-external.md) or [configuring a custom apex domain with external DNS](apex-domain-external.md).
 
 ## Prerequisites
 
-- A custom domain
-- An existing Azure DNS zone
-  - If you don't already have one, refer to [Delegate your domain to Azure DNS](azure-dns-zone.md)
+- A domain purchased from a domain name registrar and hosted on Azure DNS. For details, see [Delegate your domain to Azure DNS](/azure/dns/dns-delegate-domain-azure-dns).
 
 ## Map the domain to your website
 
-Now that your domain is configured for Azure to manage the DNS, you can now link your DNS zone to your static web app.
+Now that your domain is hosted on Azure DNS, you can create a CNAME record for `www.<your domain>` to point to your Static Web App.
 
-### Get static web app URL
+1. Sign in to the [Azure portal](https://portal.azure.com).
 
-1. Open the [Azure portal](https://portal.azure.com).
+1. Enter the name of your Static Web App in the top search bar, or find the Static Web App in your resources.
 
-1. Go to your static web app.
+1. Under **Settings**, select **Custom domains**.
 
-1. From the *Overview* window, copy the generated **URL** of your site and set it aside in a text editor for future use.
+1. Select **+ Add**, then select **Custom domain on Azure DNS**.
 
-### Create DNS records in Azure DNS
+1. Enter the following values in the *Add custom domain on Azure DNS* window.
 
-1. Return to the DNS zone you created in the Azure portal.
+    | Field name | Value |
+    | --- | --- |
+    | DNS zone | Select your domain name hosted on Azure DNS |
+    | Subdomain | **www** |
 
-2. Select **+ Record set**.
+   The *Full domain* is updated and should match the desired custom domain name.
 
-3. Enter the following values in the *Add record set* window.
+1. Select **Add**
 
-    | Setting | Property |
-    |---|---|
-    | Name | Enter **www** |
-    | Type | Select **CNAME - Link your subdomain to another account** |
-    | Alias record set | Select **No**. |
-    | TTL | Keep default value. |
-    | TTL unit | Keep default value. |
-    | Alias | Paste in the Static Web Apps generated URL you set aside in a previous step. Make sure to remove the `https://` prefix from your URL. |
-    
-    Additionally, you can select **Yes** for **Alias record set** and select your static web app instead of explicitly providing the URL to take advantage of alias record sets like [prevention from dangling DNS records](/azure/dns/dns-alias#prevent-dangling-dns-records).
+Static Web Apps makes the necessary adjustments to the DNS zone (including adding a CNAME), then validates the changes are available in the global DNS system.
 
-4. Select **OK**.
+> [!WARNING]
+> If you receive the message *CNAME Record is invalid*, then check that your DNS zone lists the Microsoft DNS services with your DNS registrar.  If you have recently moved the domain to Azure DNS, you may need to wait for DNS propagation before adding the custom domain.
 
-### Configure static web app custom domain
+## Validate the custom domain
 
-1. Return to your static web app in the portal.
+It may take some time for the DNS changes to propagate. The default time for Azure DNS is 1 hour.
 
-1. Under *Settings*, select **Custom domains**.
-
-2. Select **+ Add**.
-
-3. In the *Subdomain* box, enter your subdomain name (*i.e.*, **www**). The **Full domain** field should then display the name of your custom domain, including subdomain.
-
-    > [!NOTE]
-    > If you have delegated your domain to Azure DNS, and also elected to *Add custom domain on Azure DNS* when configuring your custom domain, you will have the option to select the *Azure DNS zone*. The following steps will then be performed automatically for you after you select **Add**.
-
-4. Select **Next**.
-
-5. In the *Validate + add* tab, enter the following values.
-
-    | Setting | Value |
-    |---|---|
-    | Domain name | This value should match the domain name you entered in the previous step (with the `www` subdomain). |
-    | Hostname record type | Select **CNAME**. |
-
-6. Select **Add**.
-
-    If you get an error saying that the action is invalid, wait 5 minutes and try again.
-
-7. Open a new browser tab and go to your domain with the `www` subdomain.
-
-    After the DNS records are updated, you should see your static web app in the browser. Also, inspect the location to verify that your site is served securely using `https`.
-
-## Next steps
-
-> [!div class="nextstepaction"]
-> [Set up the apex domain in Azure DNS](apex-domain-azure-dns.md)
+Open a new browser and go to your domain (for example, `https://www.example.com`). Inspect the location to verify that your site is served securely using `https`.

articles/static-web-apps/custom-domain-external.md

@@ -5,24 +5,25 @@ services: static-web-apps
 author: craigshoemaker
 ms.service: static-web-apps
 ms.topic: how-to
-ms.date: 10/13/2022
+ms.date: 05/29/2024
 ms.author: cshoe
 ---
 
 # Set up a custom domain in Azure Static Web Apps
 
-By default, Azure Static Web Apps provides an auto-generated domain name for your website, but you can point a custom domain to your site. Free SSL/TLS certificates automatically get created for the auto-generated domain name and any custom domains that you might add. This article shows how to configure your domain name with the `www` subdomain, using an external provider.
+By default, Azure Static Web Apps provides an autogenerated domain name for your website, but you can point a custom domain to your site. Free SSL/TLS certificates automatically get created for the autogenerated domain name and any custom domains that you might add. This article shows how to configure your domain name with the `www` subdomain, using an external provider.
 
-> [!NOTE]
-> Static Web Apps doesn't support set-up of a custom domain with a private DNS server, hosted on-premises. Consider using an [Azure Private DNS zone](../dns/private-dns-privatednszone.md). 
-## Prerequisites
+There are multiple methods of configuring a custom domain for use with Static Web Apps:
 
-- Consider how you want to support your apex domain. Domain names without a subdomain are known as apex root domains. For example, the domain `www.example.com` is the `www` subdomain joined with the `example.com` apex domain.
-
-- You create an apex domain by configuring an `ALIAS` or `ANAME` record or flattening `CNAME`. Some domain registrars, like GoDaddy and Google, don't support these DNS records. If your domain registrar doesn't support all the DNS records you need, consider using [Azure DNS to configure your domain](custom-domain-azure-dns.md).
+- If you're using an apex domain (a domain without a subdomain, also known as a root domain), see [configuring a custom apex domain on Static Web Apps](apex-domain-external.md).
+- If you're using Azure DNS, see [configuring a custom domain with Azure DNS](custom-domain-azure-dns.md) or [configuring a custom apex domain with Azure DNS](apex-domain-azure-dns.md).
 
 > [!NOTE]
-> If your domain registrar doesn't support specialized DNS records and you don't want to use Azure DNS, you can forward your apex domain to the `www` subdomain. For more information, see [Set up an apex domain in Azure Static Web Apps](apex-domain-external.md).
+> Static Web Apps doesn't support set-up of a custom domain with a private DNS server, hosted on-premises. Consider using an [Azure Private DNS zone](../dns/private-dns-privatednszone.md).
+
+## Prerequisites
+
+- You must be able to create a **CNAME** record on your DNS domain using the tools that your DNS service or domain registrar provides.
 
 ## Watch the video
 
@@ -38,7 +39,7 @@ By default, Azure Static Web Apps provides an auto-generated domain name for you
 
 ## Create a CNAME record on your domain registrar account
 
-Domain registrars are the services you can use to purchase and manage domain names. Common providers include GoDaddy, Namecheap, Google, Tucows, and the like.
+Domain registrars are services you can use to purchase and manage domain names. To find a domain registrar, see the [ICANN list of accredited registrars](https://www.icann.org/en/accredited-registrars).
 
 1. Open a new browser tab and sign in to your domain registrar account.
 
@@ -66,7 +67,7 @@ Domain registrars are the services you can use to purchase and manage domain nam
     For instance, if your domain name is `example.com`, enter `www.example.com`.
     :::image type="content" source="media/custom-domain/add-domain.png" alt-text="Screenshot showing sequence of steps in add custom domain form.":::
 
-1. In the *Validate + Configure* tab, enter the following values.
+1. In the *Validate + add* tab, enter the following values.
 
     | Setting | Value |
     |---|---|
@@ -75,13 +76,8 @@ Domain registrars are the services you can use to purchase and manage domain nam
 
 1. Select **Add**.
 
-   Azure creates your `CNAME` record and updates the DNS settings. Since DNS settings need to propagate, this process can take up to an hour or longer to complete.
+   Azure validates that the CNAME record was created correctly and is available in the global DNS system.  Propagation depends on the time to live (TTL) for your domain and may take several days. If the validation fails, return to add the custom domain later.
 
 1. When the update completes, open a new browser tab and go to your domain with the `www` subdomain.
 
-    You should see your static web app in the browser. Also, inspect the location to verify that your site is served securely using `https`.
-
-## Next steps
-
-> [!div class="nextstepaction"]
-> [Set up the apex domain](apex-domain-external.md)
+    You should see your static web app in the browser. Inspect the location to verify that your site is served securely using `https`.