Skip to content

Commit 563a05c

Browse files
committed
edits
1 parent 23bb335 commit 563a05c

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

articles/app-service/app-service-configuration-references.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ Here's a demonstration template for a function app that has App Configuration re
241241

242242
If a reference isn't resolved properly, the reference value is used instead. For an application setting in this scenario, an environment variable that uses the syntax `@Microsoft.AppConfiguration(...)` is created. The reference might cause an error because the application was expecting a configuration value.
243243

244-
This error most commonly is the result of a misconfiguration of the [App Configuration access policy](#granting-your-app-access-to-app-configuration). But it also might occur if there's a syntax error in the reference or if the configuration key-value pair does not exist in the store.
244+
This error most commonly is the result of a misconfiguration of the [App Configuration access policy](#grant-app-access-to-app-configuration). But it also might occur if there's a syntax error in the reference or if the configuration key-value pair does not exist in the store.
245245

246246
## Related content
247247

articles/app-service/deploy-local-git.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ Set-AzResource -PropertyObject $PropertiesObject -ResourceGroupName <group-name>
138138

139139
1. In the Azure portal, go to your app to verify that the content is deployed.
140140

141+
<a name="change-deployment-branch"></a>
142+
141143
## Change the deployment branch
142144

143145
When you push commits to your App Service repository, App Service deploys the files in the `master` branch by default. Because many Git repositories are moving from `master` to `main`, ensure that you push to the correct branch in the App Service repository in one of two ways:

includes/app-service-security-intro.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ ms.topic: include
55
ms.date: 04/15/2020
66
ms.author: cephalin
77
---
8-
The platform components of App Service, including Azure VMs, storage, network connections, web frameworks, management and integration features, are actively secured and hardened. App Service goes through vigorous compliance checks on a continuous basis to make sure that:
8+
The platform components of Azure App Service, including Azure virtual machines (VMs), storage, network connections, web frameworks, and management and integration features are actively secured and hardened. App Service goes through vigorous compliance checks on a continuous basis to make sure that:
99

10-
- Your app resources are [secured](https://github.com/projectkudu/kudu/wiki/Azure-Web-App-sandbox) from the other customers' Azure resources.
11-
- [VM instances and runtime software are regularly updated](/azure/app-service/overview-patch-os-runtime) to address newly discovered vulnerabilities.
12-
- Communication of secrets (such as connection strings) between your app and other Azure resources (such as [SQL Database](https://azure.microsoft.com/services/sql-database/)) stays within Azure and doesn't cross any network boundaries. Secrets are always encrypted when stored.
13-
- All communication over the App Service connectivity features, such as [hybrid connection](/azure/app-service/app-service-hybrid-connections), is encrypted.
14-
- Connections with remote management tools like Azure PowerShell, Azure CLI, Azure SDKs, REST APIs, are all encrypted.
15-
- 24-hour threat management protects the infrastructure and platform against malware, distributed denial-of-service (DDoS), man-in-the-middle (MITM), and other threats.
10+
- Your app resources are [secured](https://github.com/projectkudu/kudu/wiki/Azure-Web-App-sandbox) from other customers' Azure resources.
11+
- [VM instances and runtime software are regularly updated](/azure/app-service/overview-patch-os-runtime) to address newly discovered vulnerabilities.
12+
- Communication of secrets (such as connection strings) between your app and other Azure resources (such as [Azure SQL Database](https://azure.microsoft.com/services/sql-database/)) stays within Azure and doesn't cross any network boundaries. Secrets are always encrypted when stored.
13+
- All communication over the App Service connectivity features, such as [hybrid connection](/azure/app-service/app-service-hybrid-connections), is encrypted.
14+
- Connections with remote management tools like Azure PowerShell, the Azure CLI, Azure SDKs, and REST APIs, are all encrypted.
15+
- 24-hour threat management protects the infrastructure and platform against malware, distributed denial-of-service (DDoS) attacks, man-in-the-middle (MITM) attacks, and other threats.
1616

17-
For more information on infrastructure and platform security in Azure, see [Azure Trust Center](https://azure.microsoft.com/overview/trusted-cloud/).
17+
For more information on infrastructure and platform security in Azure, see the [Azure Trust Center](https://azure.microsoft.com/overview/trusted-cloud/).

includes/app-service-ssl-prepare-app.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@ To create custom TLS/SSL bindings or enable client certificates for your App Ser
2020

2121
![Screenshot of Azure portal, search box, and "App Services" selected.](./media/app-service-ssl-prepare-app/app-services.png)
2222

23-
1. On the **App Services** page, select your web app's name.
23+
1. On the **App Services** pane, select your web app's name.
2424

2525
![Screenshot of the App Services page in Azure portal showing a list of all running web apps, with the first app in the list highlighted.](./media/app-service-ssl-prepare-app/select-app.png)
2626

2727
You're now on your web app's management page.
2828

2929
### Check the pricing tier
3030

31-
1. In the left menu for your web app, under the **Settings** section, select **Scale up (App Service plan)**.
31+
1. On the resource menu for your web app, in the **Settings** section, select **Scale up (App Service plan)**.
3232

3333
![Screenshot of web app menu, "Settings" section, and "Scale up (App Service plan)" selected.](./media/app-service-ssl-prepare-app/scale-up-menu.png)
3434

35-
1. Make sure that your web app isn't in the **F1** or **D1** tier, which doesn't support custom TLS/SSL.
35+
1. Make sure that your web app isn't in the **F1** or **D1** tier, which don't support custom TLS/SSL.
3636

37-
1. If you need to scale up, follow the steps in the next section. Otherwise, close the **Scale up** page, and skip the [Scale up your App Service plan section](#scale-up-your-app-service-plan).
37+
1. If you need to scale up, follow the steps in the next section. Otherwise, close the **Scale up** pane, and skip the [Scale up your App Service plan section](#scale-up-your-app-service-plan).
3838

3939
### Scale up your App Service plan
4040

0 commit comments

Comments
 (0)