You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: articles/app-service/app-service-configuration-references.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -241,7 +241,7 @@ Here's a demonstration template for a function app that has App Configuration re
241
241
242
242
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.
243
243
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.
1. In the Azure portal, go to your app to verify that the content is deployed.
140
140
141
+
<aname="change-deployment-branch"></a>
142
+
141
143
## Change the deployment branch
142
144
143
145
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:
Copy file name to clipboardExpand all lines: includes/app-service-security-intro.md
+8-8Lines changed: 8 additions & 8 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -5,13 +5,13 @@ ms.topic: include
5
5
ms.date: 04/15/2020
6
6
ms.author: cephalin
7
7
---
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:
9
9
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.
16
16
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/).
Copy file name to clipboardExpand all lines: includes/app-service-ssl-prepare-app.md
+4-4Lines changed: 4 additions & 4 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -20,21 +20,21 @@ To create custom TLS/SSL bindings or enable client certificates for your App Ser
20
20
21
21

22
22
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.
24
24
25
25

26
26
27
27
You're now on your web app's management page.
28
28
29
29
### Check the pricing tier
30
30
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)**.
32
32
33
33

34
34
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.
36
36
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).
0 commit comments