Skip to content

Commit b503555

Browse files
committed
prmerger feedback
1 parent 94a31c3 commit b503555

File tree

7 files changed

+43
-23
lines changed

7 files changed

+43
-23
lines changed

articles/app-service/app-service-web-tutorial-custom-domain.md

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,27 @@ Create two records according to the following table:
8989

9090
### [Subdomain (e.g. www.contoso.com)](#tab/subdomain)
9191

92-
[!INCLUDE [dns-record-creation](includes/tutorial-secure-domain-certificate/dns-record-creation.md)]
92+
#### With an A record
93+
94+
Create two records according to the following table:
95+
96+
|Record type|Host|Value|Comments|
97+
|--- |--- |--- |--- |
98+
|A|\<subdomain\> (for example, www)|IP address shown in the **Add custom domain** dialog.| The domain mapping itself. |
99+
|TXT|asuid.\<subdomain\> (for example, asuid.www)|The domain verification ID shown in the **Add custom domain** dialog.| App Service accesses the `asuid.<subdomain>` TXT record to verify your ownership of the custom domain. |
100+
101+
![Screenshot that shows a DNS records subdomain page.](../../media/app-service-web-tutorial-custom-domain/a-record-subdomain.png)
102+
103+
#### With a CNAME record
104+
105+
Create two records according to the following table:
106+
107+
| Record type | Host | Value | Comments |
108+
| - | - | - |
109+
| CNAME | `<subdomain>` (for example, `www`) | `<app-name>.azurewebsites.net` | The domain mapping itself. |
110+
| TXT | `asuid.<subdomain>` (for example, `asuid.www`) | The domain verification ID shown in the **Add custom domain** dialog. | App Service accesses the `asuid.<subdomain>` TXT record to verify your ownership of the custom domain. |
111+
112+
![Screenshot that shows the portal navigation to an Azure app.](../../media/app-service-web-tutorial-custom-domain/cname-record.png)
93113

94114
### [Wildcard (CNAME)](#tab/wildcard)
95115

articles/app-service/environment/integrate-with-application-gateway.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ To integrate your application gateway with your ILB App Service environment, you
3939

4040
### ILB App Service environment
4141

42-
For details on how to create an ILB App Service environment, see [Create an ASE in the Azure portal][creation] and [Create an ASE with ARM][createfromtemplate].
42+
For details on how to create an ILB App Service environment, see [Create an ASE in the Azure portal][creation] and [Create an ASE with ARM template][createfromtemplate].
4343

4444
* After ILB ASE is created, the default domain is `<YourAseName>.appserviceenvironment.net`.
4545

@@ -108,7 +108,7 @@ In the Azure portal, select **New** > **Network** > **Application Gateway** to c
108108

109109
4. Configuration setting
110110

111-
In **Configuration** setting, you need to add a routing rule by clicking **Add a routing rule** icon.
111+
In **Configuration** setting, you need to add a routing rule by selecting **Add a routing rule** icon.
112112

113113
:::image type="content" source="./media/integrate-with-application-gateway/configuration.png" alt-text="Screenshot of adding a routing rule in configuration setting.":::
114114

@@ -143,9 +143,9 @@ In the Azure portal, select **New** > **Network** > **Application Gateway** to c
143143
| Host type | Multiple/Wildcard | Set to multiple or wildcard website name if listener type is set to multi-sites. |
144144
| Host name | For example: `app.asabuludemo.com` | Set to a routable domain name for App Service |
145145
146-
:::image type="content" source="./media/integrate-with-application-gateway/https-routing-rule.png" alt-text="H T T P S listener of the application gateway Routing Rule.":::
146+
:::image type="content" source="./media/integrate-with-application-gateway/https-routing-rule.png" alt-text="HTTPS listener of the application gateway Routing Rule.":::
147147

148-
* You have to configure a **Backend Pool** and **HTTP setting** in **Backend targets**. The Backend pool was configured in previously steps. Click **Add new** link to add an HTTP setting.
148+
* You have to configure a **Backend Pool** and **HTTP setting** in **Backend targets**. The Backend pool was configured in previously steps. Select **Add new** link to add an HTTP setting.
149149

150150
:::image type="content" source="./media/integrate-with-application-gateway/add-new-http-setting.png" alt-text="Screenshot of adding new link to add an H T T P setting.":::
151151

@@ -166,7 +166,7 @@ In the Azure portal, select **New** > **Network** > **Application Gateway** to c
166166

167167
## Configure an application gateway integration with ILB ASE
168168

169-
To access ILB ASE from the application gateway, you need to check if a virtual network link to private DNS zone. If there is no virtual network linked to your application gateway's VNet, add a virtual network link with following steps.
169+
To access ILB ASE from the application gateway, you need to check if a virtual network link to private DNS zone. If there's no virtual network linked to your application gateway's VNet, add a virtual network link with following steps.
170170

171171
### Configure virtual network links with a private DNS zone
172172

articles/app-service/manage-custom-dns-migrate-domain.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.custom: seodec18
1313

1414
This article shows you how to migrate an active DNS name to [Azure App Service](../app-service/overview.md) without any downtime.
1515

16-
When you migrate a live site and its DNS domain name to App Service, that DNS name is already serving live traffic. You can avoid downtime in DNS resolution during the migration by binding the active DNS name to your App Service app pre-emptively.
16+
When you migrate a live site and its DNS domain name to App Service, that DNS name is already serving live traffic. You can avoid downtime in DNS resolution during the migration by binding the active DNS name to your App Service app preemptively.
1717

1818
If you're not worried about downtime in DNS resolution, see [Map an existing custom DNS name to Azure App Service](app-service-web-tutorial-custom-domain.md).
1919

@@ -23,7 +23,7 @@ To complete the steps, [make sure that your App Service app isn't in FREE tier](
2323

2424
## 1. Get a domain verification ID
2525

26-
When you bind a custom domain pre-emptively, you accomplish both of the following before making any changes to
26+
When you bind a custom domain preemptively, you accomplish both of the following before making any changes to
2727
your existing DNS records:
2828

2929
- Verify domain ownership by adding a domain verification ID with your domain provider.
@@ -81,7 +81,7 @@ Add a TXT record for domain verification. The hostname for the TXT record depend
8181

8282
1. You should see the custom domain added to the list. You may also see a red X with **No binding**.
8383

84-
Sinc you selected **Add certificate later**, you see a red X with **No binding**. It will remain until you [add a private certificate for the domain](configure-ssl-certificate.md) and [configure the binding](configure-ssl-bindings.md).
84+
Since you selected **Add certificate later**, you see a red X with **No binding**. It will remain until you [add a private certificate for the domain](configure-ssl-certificate.md) and [configure the binding](configure-ssl-bindings.md).
8585

8686
:::image type="content" source="./media/app-service-web-tutorial-custom-domain/add-custom-domain-preempt-complete.png" alt-text="A screenshot showing the custom domains page with the new secured custom domain." border="true":::
8787

@@ -114,10 +114,10 @@ DNS queries should start resolving to your App Service app immediately after DNS
114114

115115
## Frequently asked questions
116116

117-
- [Can I add a App Service managed certificate when migrating a live domain?](#can-i-add-a-app-service-managed-certificate-when-migrating-a-live-domain)
117+
- [Can I add an App Service managed certificate when migrating a live domain?](#can-i-add-an-app-service-managed-certificate-when-migrating-a-live-domain)
118118
- [How do I migrate a domain from another app?](#how-do-i-migrate-a-domain-from-another-app)
119119

120-
#### Can I add a App Service managed certificate when migrating a live domain?
120+
#### Can I add an App Service managed certificate when migrating a live domain?
121121

122122
You can add an App Service managed certificate to a migrated live domain, but only after you [remap the active DNS name](#4-remap-the-active-dns-name). To add the App Service managed certificate, see [Create a free managed certificate](configure-ssl-certificate.md#create-a-free-managed-certificate).
123123

articles/app-service/quickstart-dotnetcore-uiex.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ If you've installed Visual Studio 2019 already:
6363

6464
1. In **Solution Explorer**, right-click the **myFirstAzureWebApp** project and select **Publish**.
6565

66-
1. In **Publish**, select **Azure** and click **Next**.
66+
1. In **Publish**, select **Azure** and select **Next**.
6767

6868
1. Your options depend on whether you're signed in to Azure already and whether you have a Visual Studio account linked to an Azure account. Select either **Add an account** or **Sign in** to sign in to your Azure subscription. If you're already signed in, select the account you want.
6969

7070
![Sign in to Azure](./media/quickstart-dotnetcore/sign-in-azure-vs2019.png)
7171

72-
1. To the right of **App Service instances**, click **+**.
72+
1. To the right of **App Service instances**, select **+**.
7373

7474
![New App Service app](./media/quickstart-dotnetcore/publish-new-app-service.png)
7575

@@ -102,7 +102,7 @@ If you've installed Visual Studio 2019 already:
102102

103103
1. Wait for the wizard to finish creating Azure resources. Select **Finish** to close the wizard.
104104

105-
1. In the **Publish** page, click **Publish** to deploy your project.
105+
1. In the **Publish** page, select **Publish** to deploy your project.
106106

107107
<details>
108108
<summary>What's Visual Studio doing?</summary>
@@ -318,7 +318,7 @@ http://<app_name>.azurewebsites.net
318318
319319
<details>
320320
<summary>What's <code>az webapp up</code> doing this time?</summary>
321-
The first time you ran the command, it saved the app name, resource group, and App Service plan in the <i>.azure/config</i> file from the project root. When you run it again from the project root, it uses the values saved in <i>.azure/config</i>, detects that the App Service resources already exists, and performs Zip deploy again.
321+
The first time you ran the command, it saved the app name, resource group, and App Service plan in the <i>.azure/config</i> file from the project root. When you run it again from the project root, it uses the values saved in <i>.azure/config</i>, detects that the App Service resources already exist, and performs Zip deploy again.
322322
</details>
323323

324324
1. Once deployment has completed, **hit refresh** in the browser window that previously opened.
@@ -333,7 +333,7 @@ http://<app_name>.azurewebsites.net
333333

334334
1. Go to the <a href="https://portal.azure.com" target="_blank">Azure portal</a>.
335335

336-
1. From the left menu, click **App Services**, and then click the name of your Azure app.
336+
1. From the left menu, select **App Services**, and then select the name of your Azure app.
337337

338338
:::image type="content" source="./media/quickstart-dotnetcore/portal-app-service-list-up.png" alt-text="Screenshot of the App Services page showing an example Azure app selected.":::
339339

articles/app-service/quickstart-nodejs.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ This quickstart configures an App Service app in the **Free** tier and incurs no
3333

3434
- Have an Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?utm_source=campaign&utm_campaign=vscode-tutorial-app-service-extension&mktingSource=vscode-tutorial-app-service-extension).
3535
- Install [Node.js LTS and npm](https://nodejs.org). Run the command `node --version` to verify that Node.js is installed.
36-
- Install <a href="/cli/azure/install-azure-cli" target="_blank">Azure CLI</a>, with which you run commands in any shell to provision and configure Azure resources.
36+
- Install <a href="/cli/azure/install-azure-cli" target="_blank">Azure CLI</a>, with which you run commands in any shell to create and configure Azure resources.
3737

3838
::: zone-end
3939

@@ -42,7 +42,7 @@ This quickstart configures an App Service app in the **Free** tier and incurs no
4242

4343
- Have an Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?utm_source=campaign&utm_campaign=vscode-tutorial-app-service-extension&mktingSource=vscode-tutorial-app-service-extension).
4444
- Install [Node.js LTS and npm](https://nodejs.org). Run the command `node --version` to verify that Node.js is installed.
45-
- Have a FTP client (for example, [FileZilla](https://filezilla-project.org)), to connect to your app.
45+
- Have an FTP client (for example, [FileZilla](https://filezilla-project.org)), to connect to your app.
4646

4747
::: zone-end
4848
## Create your Node.js application
@@ -117,10 +117,10 @@ Before you continue, ensure that you have all the prerequisites installed and co
117117
2. Right-click on App Services and select **Create new Web App**. A Linux container is used by default.
118118
1. Type a globally unique name for your web app and press **Enter**. The name must be unique across all of Azure and use only alphanumeric characters ('A-Z', 'a-z', and '0-9') and hyphens ('-').
119119
1. In Select a runtime stack, select the Node.js version you want. An **LTS** version is recommended.
120-
1. In Select a pricing tier, select **Free (F1)** and wait for the resources to be provisioned in Azure.
120+
1. In Select a pricing tier, select **Free (F1)** and wait for the resources to be created in Azure.
121121
1. In the popup **Always deploy the workspace "myExpressApp" to \<app-name>"**, select **Yes**. This way, as long as you're in the same workspace, Visual Studio Code deploys to the same App Service app each time.
122122
123-
While Visual Studio Code provisions the Azure resources and deploys the code, it shows [progress notifications](https://code.visualstudio.com/api/references/extension-guidelines#notifications).
123+
While Visual Studio Code creates the Azure resources and deploys the code, it shows [progress notifications](https://code.visualstudio.com/api/references/extension-guidelines#notifications).
124124
125125
1. Once deployment completes, select **Browse Website** in the notification popup. The browser should display the Express default page.
126126
@@ -133,10 +133,10 @@ Before you continue, ensure that you have all the prerequisites installed and co
133133
1. Select **Windows** for the operating system.
134134
1. Select the location you want to serve your app from. For example, *West Europe*.
135135
1. Select **Create new App Service plan**, then enter a name for the plan (such as *AppServiceQS-plan*), then select **F1 Free** for the pricing tier.
136-
1. For **Select an Application Insights resource for your app**, select **Skip for now** and wait the resources to be provisioned in Azure.
136+
1. For **Select an Application Insights resource for your app**, select **Skip for now** and wait the resources to be created in Azure.
137137
1. In the popup **Always deploy the workspace "myExpressApp" to \<app-name>"**, select **Yes**. This way, as long as you're in the same workspace, Visual Studio Code deploys to the same App Service app each time.
138138
139-
While Visual Studio Code provisions the Azure resources and deploys the code, it shows [progress notifications](https://code.visualstudio.com/api/references/extension-guidelines#notifications).
139+
While Visual Studio Code creates the Azure resources and deploys the code, it shows [progress notifications](https://code.visualstudio.com/api/references/extension-guidelines#notifications).
140140
141141
> [!NOTE]
142142
> When deployment completes, your Azure app doesn't run yet because your project root doesn't have a *web.config*. Follow the remaining steps to generate it automatically. For more information, see [You do not have permission to view this directory or page](configure-language-nodejs.md#you-do-not-have-permission-to-view-this-directory-or-page).

includes/app-service-ssl-binding-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ ms.custom: "include file"
1414
|-|-|
1515
| Custom domain | The domain name to add the TLS/SSL binding for. |
1616
| Private Certificate Thumbprint | The certificate to bind. |
17-
| TLS/SSL Type | <ul><li>**[SNI SSL](https://en.wikipedia.org/wiki/Server_Name_Indication)** - Multiple SNI SSL bindings may be added. This option allows multiple TLS/SSL certificates to secure multiple domains on the same IP address. Most modern browsers (including Internet Explorer, Chrome, Firefox, and Opera) support SNI (for more information, see [Server Name Indication](https://wikipedia.org/wiki/Server_Name_Indication)).</li><li>**IP SSL** - Only one IP SSL binding may be added. This option allows only one TLS/SSL certificate to secure a dedicated public IP address. After you configure the binding, follow the steps in [Remap records for IP SSL](../articles/app-service/configure-ssl-bindings.md#remap-records-for-ip-ssl).<br/>IP SSL is supported only in **Standard** tier or above. </li></ul> |
17+
| TLS/SSL Type | - **[SNI SSL](https://en.wikipedia.org/wiki/Server_Name_Indication)**: Multiple SNI SSL bindings may be added. This option allows multiple TLS/SSL certificates to secure multiple domains on the same IP address. Most modern browsers (including Internet Explorer, Chrome, Firefox, and Opera) support SNI (for more information, see [Server Name Indication](https://wikipedia.org/wiki/Server_Name_Indication)).<br />- **IP SSL**: Only one IP SSL binding may be added. This option allows only one TLS/SSL certificate to secure a dedicated public IP address. After you configure the binding, follow the steps in [Remap records for IP SSL](../articles/app-service/configure-ssl-bindings.md#remap-records-for-ip-ssl).<br/>IP SSL is supported only in **Standard** tier or above. |
1818

0 commit comments

Comments
 (0)