Merge branch 'marmalade-app-settings' of https://github.com/craigshoemaker/azure-docs-pr into marmalade-app-settings

Author: craigshoemaker

articles/static-apps/environment-variables.md renamed to articles/static-apps/app-settings.md

@@ -1,5 +1,5 @@
 ---
-title: Configure environment variables for Azure Static Web Apps
+title: Configure application settings for Azure Static Web Apps
 description: #Required; article description that is displayed in search results.
 services: static-web-apps
 author: burkeholland
@@ -9,31 +9,36 @@ ms.date: 05/08/2020
 ms.author: buhollan
 ---
 
-# Configure environment variables for Azure Static Web Apps
+# Configure application settings for Azure Static Web Apps
 
-Environment variables hold configuration settings for values that may change, such as database connection strings. Adding environment variables allows you to modify the configuration input to your app, without having to change application code.
+Application settings hold configuration settings for values that may change, such as database connection strings. Adding application settings allows you to modify the configuration input to your app, without having to change application code.
 
-Environment variables are:
+Application settings are:
 
 - Encrypted at rest
 - Copied to [staging](review-publish-pull-requests.md) and production environments
 
-Environment variables are also sometimes referred to as application settings.
+Application settings are also sometimes referred to as environment variables.
+
+> [!IMPORTANT]
+> The application settings described in this article only apply to the backend API of an Azure Static Web App.
+>
+> For information on using environment variables with your frontend web application, see the docs for your [JavaScript framework](#javascript-frameworks-and-libraries) or [Static site generator](#static-site-generators).
 
 ## Prerequisites
 
 - An Azure Static Web Apps application
 - [Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest)
 
-## Types of environment variables
+## Types of application settings
 
 There are typically two aspects to an Azure Static Web Apps application. The first is the web application, or static content, which is represented by HTML, CSS, JavaScript, and images. The second is the back-end API, which is powered by an Azure Functions application.
 
-This article demonstrates how to manage environment variables for the back-end API in Azure Functions.
+This article demonstrates how to manage application settings for the back-end API in Azure Functions.
 
-Many front-end frameworks and static site generators allow the use of environment variables during development. At build time, these variables are replaced by their values in the generated HTML or JavaScript. Since data in HTML and JavaScript is easily discoverable by site visitor, you want to avoid putting sensitive information in the front-end application. Settings that hold sensitive data are best located in API app.
+The application settings described in this article cannot be used or referenced in static web applications. However, many front-end frameworks and static site generators allow the use of environment variables during development. At build time, these variables are replaced by their values in the generated HTML or JavaScript. Since data in HTML and JavaScript is easily discoverable by site visitor, you want to avoid putting sensitive information in the front-end application. Settings that hold sensitive data are best located in the API portion of your application.
 
-For more information about how to use environment variables with your JavaScript framework or library, refer to the following articles for more detail.
+For information about how to use environment variables with your JavaScript framework or library, refer to the following articles for more detail.
 
 ### JavaScript frameworks and libraries
 
@@ -48,9 +53,9 @@ For more information about how to use environment variables with your JavaScript
 - [Hugo](https://gohugo.io/getting-started/configuration/)
 - [Jekyll](https://jekyllrb.com/docs/configuration/environments/)
 
-## About environment variables
+## About API App settings
 
-APIs in Azure Static Web Apps are powered by Azure Functions, which allows you to define environment variables in the _local.settings.json_ file. This file defines environment variables in the `Values` property of the configuration.
+APIs in Azure Static Web Apps are powered by Azure Functions, which allows you to define application settings in the _local.settings.json_ file. This file defines application settings in the `Values` property of the configuration.
 
 The following sample _local.settings.json_ shows how to add a value for the `DATABASE_CONNECTION_STRING`.
 
@@ -75,9 +80,9 @@ The `local.settings.json` file is not tracked by the GitHub repository because s
 
 Generally, uploading your settings is done infrequently, and isn't required with every build.
 
-## Upload settings
+## Uploading App settings
 
-You can upload settings via the Azure Portal or with the Azure CLI.
+You can configure application settings via the Azure Portal or with the Azure CLI.
 
 ### Using the Azure Portal
 
@@ -89,17 +94,19 @@ The Azure Portal provides an interface for creating, updating and deleting App S
 
 1. Click on the **Configuration** option in the sidebar.
 
+1. Select the environment that you want to apply the application settings to. Staging environments are automatically created when a pull request is generated, and are promoted into production once the pull request is merged. You can set application settings per environment.
+
 1. Click on the **Add Button** to add a new app setting.
 
-:::image type="content" source="media/environment-variables/configuration-env-variables.png" alt-text="Azure Static Web Apps configuration view":::
+:::image type="content" source="media/app-settings/configuration-app-settings.png" alt-text="Azure Static Web Apps configuration view":::
 
 1. Enter a **Name** and **Value**
 
 1. Click **OK**
 
 ### Using the Azure CLI
 
-You can use the `az rest` command to do bulk uploads of your settings to Azure. The command accepts environment variables as JSON objects in a parent property called `properties`.
+You can use the `az rest` command to do bulk uploads of your settings to Azure. The command accepts application settings as JSON objects in a parent property called `properties`.
 
 The easiest way to create a JSON file with the appropriate values is to create a modified version of your _local.settings.json_ file.
 
@@ -111,7 +118,7 @@ The easiest way to create a JSON file with the appropriate values is to create a
 
 2. Next, make a copy of your _local.settings.json_ file and name it _local.settings.properties.json_.
 
-3. Inside the new file, remove all other data from the file except for the environment variables and rename `Values` to `properties`.
+3. Inside the new file, remove all other data from the file except for the application settings and rename `Values` to `properties`.
 
    Your file should now look similar to the following example:
 
@@ -140,7 +147,7 @@ The Azure CLI command requires a number of values specific to your account to ru
 > [!IMPORTANT]
 > The "local.settings.properties.json" file must be in the same directory where this command is run. This file can be named anything you like. The name is not significant.
 
-### View environment variables with the Azure CLI
+### View application settings with the Azure CLI
 
 Environment variables are available to view through the Azure CLI.
 
@@ -153,4 +160,4 @@ Environment variables are available to view through the Azure CLI.
 ## Next steps
 
 > [!div class="nextstepaction"]
-> [Setup local development](local-development.md)
+> [setup local development](local-development.md)