Merge pull request #186784 from MicrosoftDocs/master

Merge master to live for 1/29/22 4 p.m.

Author: hmacgregor1

.openpublishing.publish.config.json

@@ -788,7 +788,19 @@
       "url": "https://github.com/Azure/azure-docs-bicep-samples/",
       "branch": "main",
       "branch_mapping": {}
-    }
+    },
+    {
+      "path_to_root": "msdocs-python-flask-webapp-quickstart",
+      "url": "https://github.com/Azure-Samples/msdocs-python-flask-webapp-quickstart",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "msdocs-python-django-webapp-quickstart",
+      "url": "https://github.com/Azure-Samples/msdocs-python-django-webapp-quickstart",
+      "branch": "main",
+      "branch_mapping": {}
+    }    
   ],
   "branch_target_mapping": {
     "live": [

articles/app-service/includes/quickstart-python/create-app-cli.md

@@ -0,0 +1,104 @@
+---
+author: DavidCBerry13
+ms.author: daberry
+ms.topic: include
+ms.date: 01/29/2022
+---
+Azure CLI commands can be run in the [Azure Cloud Shell](https://shell.azure.com) or on a workstation with the [Azure CLI installed](/cli/azure/install-azure-cli).
+
+First, create a resource group to act as a container for all of the Azure resources related to this application.
+
+#### [bash](#tab/terminal-bash)
+
+```azurecli
+# Use 'az account list-locations --output table' to list locations
+LOCATION='eastus'
+RESOURCE_GROUP_NAME='msdocs-python-webapp-quickstart'
+
+az group create \
+    --location $LOCATION \
+    --name $RESOURCE_GROUP_NAME
+```
+
+#### [PowerShell terminal](#tab/terminal-powershell)
+
+```azurecli
+# Use 'az account list-locations --output table' to list locations
+$LOCATION='eastus'
+$RESOURCE_GROUP_NAME='msdocs-python-webapp-quickstart'
+
+# Create a resource group
+az group create `
+    --location $LOCATION `
+    --name $RESOURCE_GROUP_NAME
+```
+
+---
+
+Next, create an App Service plan using the [az appservice plan create](/cli/azure/appservice/plan#az_appservice_plan_create) command.
+
+* The `--sku` parameter defines the size (CPU, memory) and cost of the app service plan.  This example uses the B1 (Basic) service plan, which will incur a small cost in your Azure subscription. For a full list of App Service plans, view the [App Service pricing](https://azure.microsoft.com/pricing/details/app-service/linux/) page.
+* The `--is-linux` flag selects the Linux as the host operating system.
+
+#### [bash](#tab/terminal-bash)
+
+```azurecli
+APP_SERVICE_PLAN_NAME='msdocs-python-webapp-quickstart'    
+
+az appservice plan create \
+    --name $APP_SERVICE_PLAN_NAME \
+    --resource-group $RESOURCE_GROUP_NAME \
+    --sku B1 \
+    --is-linux
+```
+
+#### [PowerShell terminal](#tab/terminal-powershell)
+
+```azurecli
+$APP_SERVICE_PLAN_NAME='msdocs-python-webapp-quickstart'    
+
+az appservice plan create `
+    --name $APP_SERVICE_PLAN_NAME `
+    --resource-group $RESOURCE_GROUP_NAME `
+    --sku B1 `
+    --is-linux
+```
+
+---
+
+Finally, create the App Service web app using the [az webapp create](/cli/azure/webapp#az_webapp_create) command.  
+
+* The *app service name* is used as both the name of the resource in Azure and to form the fully qualified domain name for your app in the form of `https://<app service name>.azurewebsites.com`.
+* The runtime specifies what version of Python your app is running. This example uses Python 3.9. To list all available runtimes, use the command `az webapp list-runtimes --linux --output table`.
+
+#### [bash](#tab/terminal-bash)
+
+```azurecli
+# Change 123 to any three characters to form a unique name across Azure
+APP_SERVICE_NAME='msdocs-python-webapp-quickstart-123'
+
+az webapp create \
+    --name $APP_SERVICE_NAME \
+    --runtime 'PYTHON|3.9' \
+    --plan $APP_SERVICE_PLAN_NAME \
+    --resource-group $RESOURCE_GROUP_NAME \
+    --query 'defaultHostName' \
+    --output table
+```
+
+#### [PowerShell terminal](#tab/terminal-powershell)
+
+```azurecli
+# Change 123 to any three characters to form a unique name across Azure
+$APP_SERVICE_NAME='msdocs-python-webapp-quickstart-123'
+
+az webapp create `
+    --name $APP_SERVICE_NAME `
+    --runtime 'PYTHON:3.9' `
+    --plan $APP_SERVICE_PLAN_NAME `
+    --resource-group $RESOURCE_GROUP_NAME `
+    --query 'defaultHostName' `
+    --output table
+```
+
+---

articles/app-service/includes/quickstart-python/create-app-service-azure-portal-1.md

@@ -0,0 +1,10 @@
+---
+author: DavidCBerry13
+ms.author: daberry
+ms.topic: include
+ms.date: 01/29/2022
+---
+In the Azure portal:
+
+   1. Enter *app services* in the search bar at the top of the Azure portal.
+   1. Select the item labeled **App Services** under the under **Services** heading on the menu that appears below the search bar.

articles/app-service/includes/quickstart-python/create-app-service-azure-portal-2.md

@@ -0,0 +1,7 @@
+---
+author: DavidCBerry13
+ms.author: daberry
+ms.topic: include
+ms.date: 01/29/2022
+---
+On the **App Services** page, select **+ Create**

articles/app-service/includes/quickstart-python/create-app-service-azure-portal-3.md

@@ -0,0 +1,13 @@
+---
+author: DavidCBerry13
+ms.author: daberry
+ms.topic: include
+ms.date: 01/29/2022
+---
+On the **Create Web App** page, fill out the form as follows.
+
+1. **Resource Group** → Select **Create new** and use a name of *msdocs-python-webapp-quickstart*.
+1. **Name** → *msdocs-python-webapp-quickstart-XYZ* where XYZ is any three random characters. This name must be unique across Azure.
+1. **Runtime stack** → **Python 3.9**.
+1. **Region** → Any Azure region near you.
+1. **App Service Plan** → Under **Sku and size**, select **Change size** to select a different App Service plan.

articles/app-service/includes/quickstart-python/create-app-service-azure-portal-4.md

@@ -0,0 +1,11 @@
+---
+author: DavidCBerry13
+ms.author: daberry
+ms.topic: include
+ms.date: 01/29/2022
+---
+The App Service plan controls how many resources (CPU/memory) are available to your app and the cost of those resources.<br>
+<br>
+For this example, select **Dev / Test** at the top of the screen and then select the **B1** (Basic) plan.  The B1 Basic plan will incur a small charge against your Azure account but is recommended for better performance over the F1 (Free) plan.<br>
+<br>
+When finished, select **Apply** to apply your changes.

articles/app-service/includes/quickstart-python/create-app-service-azure-portal-5.md

@@ -0,0 +1,9 @@
+---
+author: DavidCBerry13
+ms.author: daberry
+ms.topic: include
+ms.date: 01/29/2022
+---
+On the main **Create Web App** page, select the **Review + create** at the bottom of the screen.<br>
+<br>
+This will take you to the Review page. Select **Create** to create your App Service.

articles/app-service/includes/quickstart-python/create-app-service-visual-studio-code-1.md

@@ -0,0 +1,9 @@
+---
+author: DavidCBerry13
+ms.author: daberry
+ms.topic: include
+ms.date: 01/29/2022
+---
+Locate the Azure icon in the left-hand toolbar. Select it to bring up the Azure Tools for VS Code extension.<br>
+<br>
+If you do not see the Azure Tools icon, make sure you have the Azure Tools extension for VS Code installed.

articles/app-service/includes/quickstart-python/create-app-service-visual-studio-code-2.md

@@ -0,0 +1,11 @@
+---
+author: DavidCBerry13
+ms.author: daberry
+ms.topic: include
+ms.date: 01/29/2022
+---
+In the Azure Tools extension for VS Code:
+
+1. Locate the **App Service** section in the Azure Tools extension.
+1. Right-click the Azure subscription you want to create your web app in.
+1. Select **Create New Web App...** from the context menu.

articles/app-service/includes/quickstart-python/create-app-service-visual-studio-code-3.md

@@ -0,0 +1,9 @@
+---
+author: DavidCBerry13
+ms.author: daberry
+ms.topic: include
+ms.date: 01/29/2022
+---
+In the dialog box at the top of the screen, enter the name *msdocs-python-webapp-quickstart-XYZ* for this web app, where *XYZ* is any three unique characters.<br>
+<br>
+When deployed, this name is used in the DNS name of the app in the form `https://<app-name>.azurewebsites.net`.