Skip to content

Commit 0a3edf4

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into afdorigin
2 parents d3160f0 + 4769ee9 commit 0a3edf4

File tree

3 files changed

+19
-25
lines changed

3 files changed

+19
-25
lines changed

articles/cosmos-db/postgresql/howto-scale-grow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ queries.
3333
1. Select **Save** to apply the changed values.
3434

3535
> [!NOTE]
36-
> Once you increase nodes and save, you can't decrease the number of worker nodes by using this form.
36+
> Once you increase nodes and save, you can't decrease the number of worker nodes by using this **Scale** page.
3737
3838
> [!NOTE]
3939
> To take advantage of newly added nodes you must [rebalance distributed table

articles/cost-management-billing/savings-plan/savings-plan-compute-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: cost-management-billing
88
ms.subservice: savings-plan
99
ms.custom: ignite-2022
1010
ms.topic: overview
11-
ms.date: 02/16/2023
11+
ms.date: 04/04/2023
1212
ms.author: banders
1313
---
1414

@@ -87,7 +87,7 @@ Savings plan purchases can't be canceled or refunded.
8787

8888
## Charges covered by savings plan
8989

90-
- Virtual Machines - A savings plan only covers the virtual machine compute costs. It doesn't cover other software, Windows, networking, or storage charges. Virtual machines don't include BareMetal Infrastructure, A, G, and GS series. Spot VMs aren't covered by savings plans.
90+
- Virtual Machines - A savings plan only covers the virtual machine compute costs. It doesn't cover other software, Windows, networking, or storage charges. Virtual machines don't include BareMetal Infrastructure or the Av1 series. Spot VMs aren't covered by savings plans.
9191
- Azure Dedicated Hosts - Only the compute costs are included with the dedicated hosts.
9292
- Container Instances
9393
- Azure Premium Functions

articles/frontdoor/front-door-custom-domain.md

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,21 @@
11
---
2-
title: 'Tutorial: Add custom domain to your Azure Front Door configuration'
3-
description: In this tutorial, you learn how to onboard a custom domain to Azure Front Door.
2+
title: 'Add a custom domain to Azure Front Door'
3+
description: In this article, you learn how to onboard a custom domain to Azure Front Door.
44
services: frontdoor
5-
author: jessie-jyy
5+
author: duongau
66
ms.service: frontdoor
77
ms.workload: infrastructure-services
8-
ms.topic: tutorial
9-
ms.date: 04/12/2021
10-
ms.author: yuajia
8+
ms.topic: how-to
9+
ms.date: 04/04/2023
10+
ms.author: duau
1111
#Customer intent: As a website owner, I want to add a custom domain to my Front Door configuration so that my users can use my custom domain to access my content.
1212
---
1313

14-
# Tutorial: Add a custom domain to your Front Door
14+
# Add a custom domain to Azure Front Door
1515

16-
This tutorial shows how to add a custom domain to your Front Door. When you use Azure Front Door for application delivery, a custom domain is necessary if you would like your own domain name to be visible in your end-user request. Having a visible domain name can be convenient for your customers and useful for branding purposes.
16+
This article shows how to add a custom domain to your Front Door. When you use Azure Front Door for application delivery, a custom domain is necessary if you want your own domain name to be visible in your end-user request. Having a visible domain name can be convenient for your customers and useful for branding purposes.
1717

18-
After you create a Front Door, the default frontend host, which is a subdomain of `azurefd.net`, is included in the URL for delivering Front Door content from your backend by default (for example, https:\//contoso-frontend.azurefd.net/activeusers.htm). For your convenience, Azure Front Door provides the option of associating a custom domain with the default host. With this option, you deliver your content with a custom domain in your URL instead of a Front Door owned domain name (for example, https:\//www.contoso.com/photo.png).
19-
20-
In this tutorial, you learn how to:
21-
> [!div class="checklist"]
22-
> - Create a CNAME DNS record.
23-
> - Associate the custom domain with your Front Door.
24-
> - Verify the custom domain.
18+
After you create a Front Door profile, the default frontend host is a subdomain of `azurefd.net`. This name is included in the URL for delivering Front Door content to your backend by default. For example, `https://contoso-frontend.azurefd.net`. For your convenience, Azure Front Door provides the option to associate a custom domain to the endpoint. With this capability, you can deliver your content with your URL instead of the Front Door default domain name such as, `https://www.contoso.com/photo.png`.
2519

2620
[!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
2721

@@ -39,16 +33,16 @@ In this tutorial, you learn how to:
3933

4034
## Create a CNAME DNS record
4135

42-
Before you can use a custom domain with your Front Door, you must first create a canonical name (CNAME) record with your domain provider to point to your Front Door's default frontend host (say contoso.azurefd.net). A CNAME record is a type of DNS record that maps a source domain name to a destination domain name. For Azure Front Door, the source domain name is your custom domain name and the destination domain name is your Front Door default hostname. After Front Door verifies the CNAME record that you create, traffic addressed to the source custom domain (such as www\.contoso.com) is routed to the specified destination Front Door default frontend host (such as contoso-frontend.azurefd.net).
36+
Before you can use a custom domain with your Front Door, you must first create a canonical name (CNAME) record with your domain provider to point to the Front Door default frontend host. A CNAME record is a type of DNS record that maps a source domain name to a destination domain name. In Azure Front Door, the source domain name is your custom domain name and the destination domain name is your Front Door default hostname. Once Front Door verifies the CNAME record gets created, traffic to the source custom domain gets routed to the specified destination Front Door default frontend host.
4337

4438
A custom domain and its subdomain can be associated with only a single Front Door at a time. However, you can use different subdomains from the same custom domain for different Front Doors by using multiple CNAME records. You can also map a custom domain with different subdomains to the same Front Door.
4539

4640

4741
## Map the temporary afdverify subdomain
4842

49-
When you map an existing domain that is in production, there are special considerations. While you're registering your custom domain in the Azure portal, a brief period of downtime for the domain can occur. To avoid interruption of web traffic, first map your custom domain to your Front Door default frontend host with the Azure afdverify subdomain to create a temporary CNAME mapping. With this method, users can access your domain without interruption while the DNS mapping occurs.
43+
When you map an existing domain that is in production, there are things consider. While you're registering your custom domain in the Azure portal, a brief period of downtime for the domain may occur. To avoid interruption of web traffic, map your custom domain to your Front Door default frontend host with the Azure afdverify subdomain first to create a temporary CNAME mapping. Your users can access your domain without interruption when the DNS mapping occurs.
5044

51-
Otherwise, if you're using your custom domain for the first time and no production traffic is running on it, you can directly map your custom domain to your Front Door. continue to [Map the permanent custom domain](#map-the-permanent-custom-domain).
45+
If you're using your custom domain for the first time with no production traffic, you can directly map your custom domain to your Front Door. You can skip ahead to [Map the permanent custom domain](#map-the-permanent-custom-domain).
5246

5347
To create a CNAME record with the afdverify subdomain:
5448

@@ -105,13 +99,13 @@ After you've registered your custom domain, you can then add it to your Front Do
10599

106100
3. Specify **Custom domain**.
107101

108-
4. For **Frontend host**, the frontend host to use as the destination domain of your CNAME record is pre-filled and is derived from your Front Door: *<default hostname>*.azurefd.net. It cannot be changed.
102+
4. For **Frontend host**, the frontend host to use as the destination domain of your CNAME record is predetermined and is derived from your Front Door: *<default hostname>*.azurefd.net. It can't be changed.
109103

110104
5. For **Custom hostname**, enter your custom domain, including the subdomain, to use as the source domain of your CNAME record. For example, www\.contoso.com or cdn.contoso.com. Don't use the afdverify subdomain name.
111105

112106
6. Select **Add**.
113107

114-
Azure verifies that the CNAME record exists for the custom domain name you entered. If the CNAME is correct, your custom domain will be validated.
108+
Azure verifies that the CNAME record exists for the custom domain name you entered. If the CNAME is correct, your custom domain gets validated.
115109

116110
>[!WARNING]
117111
> You **must** ensure that each of the frontend hosts (including custom domains) in your Front Door has a routing rule with a default path ('/\*') associated with it. That is, across all of your routing rules there must be at least one routing rule for each of your frontend hosts defined at the default path ('/\*'). Failing to do so, may result in your end-user traffic not getting routed correctly.
@@ -125,7 +119,7 @@ In your browser, navigate to the address of the file by using the custom domain.
125119

126120
## Map the permanent custom domain
127121

128-
If you've verified that the afdverify subdomain has been successfully mapped to your Front Door (or if you're using a new custom domain that isn't in production), you can then map the custom domain directly to your default Front Door frontend host.
122+
If you've verified that the afdverify subdomain has been successfully mapped to your Front Door, you can then map the custom domain directly to your default Front Door frontend host.
129123

130124
To create a CNAME record for your custom domain:
131125

@@ -190,7 +184,7 @@ In the preceding steps, you added a custom domain to a Front Door. If you no lon
190184
191185
2. In your Front Door designer, select the custom domain that you want to remove.
192186

193-
3. Select **Delete** from the context menu for the custom domain. The custom domain will now disassociate from your endpoint.
187+
3. Select **Delete** from the context menu for the custom domain. The custom domain is removed from your endpoint.
194188

195189
## Next steps
196190

0 commit comments

Comments
 (0)