Merge pull request #57969 from MicrosoftDocs/master

fix

Author: Taojunshen

articles/app-service/containers/app-service-linux-intro.md

@@ -29,13 +29,12 @@ App Service on Linux supports a number of Built-in images in order to increase d
 
 | Language | Supported Versions |
 |---|---|
-| Node.js | 4.4, 4.5, 4.8, 6.2, 6.6, 6.9, 6.10, 6.11, 8.0, 8.1, 8.2, 8.8, 8.9, 8.11, 9.4, 10.1 |
-| Java * | 8.0 |
+| Node.js | 4.4, 4.5, 4.8, 6.2, 6.6, 6.9, 6.10, 6.11, 8.0, 8.1, 8.2, 8.8, 8.9, 8.11, 9.4, 10.1,10.10 |
+| Java * | Tomcat 8.5, 9.0, Java SE, WildFly 14 (all running JRE 8) |
 | PHP | 5.6, 7.0, 7.2 |
-| Python (Preview) | 3.7 |
-| .NET Core | 1.0, 1.1, 2.0 |
+| Python (Preview) | 3.6, 3.7 |
+| .NET Core | 1.0, 1.1, 2.0, 2.1 |
 | Ruby | 2.3 |
-| Apache Tomcat | 8.5, 9.0 |
 
 See [Create a Java web app in App Service on Linux](https://docs.microsoft.com/azure/app-service/containers/quickstart-java) for more details.
 

articles/app-service/containers/how-to-configure-python.md

@@ -23,14 +23,28 @@ ms.custom: mvc
 
 This article describes how [Azure App Service on Linux](app-service-linux-intro.md) runs Python apps, and how you can customize the behavior of App Service when needed.
 
+## Set Python version
+
+Two base images are available: Python 3.6 and Python 3.7. You can create an app with the desired Python based image. For example, to create an app with Python 3.7, run the following command in the Cloud Shell:
+
+```azurecli-interactive
+az webapp create --resource-group <group_name> --plan <plan_name> --name <app_name> --runtime "PYTHON|3.7"
+```
+
+To change the Python version (based image) to Python 3.6, for example, run the following command in the Cloud Shell:
+
+```azurecli-interactive
+az webapp config set --resource-group <group_name> --name <app_name> --linux-fx-version "PYTHON|3.6"
+```
+
+If you require a different version of Python, you must build and deploy your own container image instead. For more information, see [Use a custom Docker image for Web App for Containers](tutorial-custom-docker-image.md).
+
 ## Container characteristics
 
-Python apps deployed to App Service on Linux run within a Docker container that's defined in the GitHub repository, [Azure-App-Service/python container](https://github.com/Azure-App-Service/python/tree/master/3.7.0).
+Python apps deployed to App Service on Linux run within a Docker container that's defined in the GitHub repository, [Python 3.6](https://github.com/Azure-App-Service/python/tree/master/3.6.6) or [Python 3.7](https://github.com/Azure-App-Service/python/tree/master/3.7.0).
 
 This container has the following characteristics:
 
-- The base container image is `python-3.7.0-slim-stretch`, which means apps are run with Python 3.7. If you require a different version of Python, you must build and deploy your own container image instead. For more information, see [Use a custom Docker image for Web App for Containers](tutorial-custom-docker-image.md).
-
 - Apps are run using the [Gunicorn WSGI HTTP Server](http://gunicorn.org/), using the additional arguments `--bind=0.0.0.0 --timeout 600`.
 
 - By default, the base image includes the Flask web framework, but the container supports other frameworks that are WSGI-compliant and compatible with Python 3.7, such as Django.

articles/app-service/web-sites-enable-diagnostic-log.md

@@ -191,7 +191,7 @@ The data stored in a blob would look similar to the following example:
     2014-01-30T16:36:52,Error,mywebapp,6ee38a,635266966128818593,0,3096,9,An error occurred
 
 > [!NOTE]
-> The first line of the log contains the column headers as represented in this example.
+> For ASP.NET Core, logging is accomplished using the [Microsoft.Extensions.Logging.AzureAppServices](https://www.nuget.org/packages/Microsoft.Extensions.Logging.AzureAppServices) provider This provider deposits additional log files into the blob container. For more information, see [ASP.NET Core logging in Azure](/aspnet/core/fundamentals/logging/?view=aspnetcore-2.1#logging-in-azure).
 >
 >
 

articles/application-gateway/application-gateway-create-gateway-portal.md

@@ -11,7 +11,7 @@ ms.author: victorh
 
 # Create an application gateway using the Azure portal
 
-You can use the Azure portal to create or manage application gateways. This quickstart shows you how to create network resources, backend servers, and an application gateway.
+You can use the Azure portal to create or manage application gateways. This article shows you how to create network resources, backend servers, and an application gateway.
 
 If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
 
@@ -23,35 +23,42 @@ Sign in to the Azure portal at [http://portal.azure.com](http://portal.azure.com
 
 A virtual network is needed for communication between the resources that you create. Two subnets are created in this example: one for the application gateway, and the other for the backend servers. You can create a virtual network at the same time that you create the application gateway.
 
-1. Click **New** found on the upper left-hand corner of the Azure portal.
-2. Select **Networking** and then select **Application Gateway** in the Featured list.
-3. Enter these values for the application gateway:
+1. Click **Create a resource** found on the upper left-hand corner of the Azure portal.
+2. Click **Networking** and then click **Application Gateway** in the Featured list.
+
+### Basics
+
+1. Enter these values for the application gateway:
 
     - *myAppGateway* - for the name of the application gateway.
     - *myResourceGroupAG* - for the new resource group.
 
     ![Create new application gateway](./media/application-gateway-create-gateway-portal/application-gateway-create.png)
 
-4. Accept the default values for the other settings and then click **OK**.
-5. Click **Choose a virtual network**, click **Create new**, and then enter these values for the virtual network:
+2. Accept the default values for the other settings and then click **OK**.
+
+### Settings
+
+1. Click **Choose a virtual network**, click **Create new**, and then enter these values for the virtual network:
 
     - *myVNet* - for the name of the virtual network.
     - *10.0.0.0/16* - for the virtual network address space.
     - *myAGSubnet* - for the subnet name.
-    - *10.0.0.0/24* - for the subnet address space.
+    - *10.0.0.0/24* - for the subnet address range.
 
     ![Create virtual network](./media/application-gateway-create-gateway-portal/application-gateway-vnet.png)
 
-6. Click **OK** to create the virtual network and subnet.
-6. Click **Choose a public IP address**, click **Create new**, and then enter the name of the public IP address. In this example, the public IP address is named *myAGPublicIPAddress*. Accept the default values for the other settings and then click **OK**.
-8. Accept the default values for the Listener configuration, leave the Web application firewall disabled, and then click **OK**.
-9. Review the settings on the summary page, and then click **OK** to create the virtual network, the public IP address, and the application gateway. It may take several minutes for the application gateway to be created, wait until
-the deployment finishes successfully before moving on to the next section.
+6. Click **OK** to go back to the Settings page.
+7. Under **Frontend IP configuration** ensure **IP address type** is set to **public**, and under **Public IP address**, ensure **Create new** is selected. Type *myAGPublicIPAddress* for the public IP address name. Accept the default values for the other settings and then click **OK**.
 
-### Add a subnet
+### Summary
+
+Review the settings on the summary page, and then click **OK** to create the virtual network, the public IP address, and the application gateway. It may take several minutes for the application gateway to be created. Wait until the deployment finishes successfully before moving on to the next section.
+
+## Add a subnet
 
 1. Click **All resources** in the left-hand menu, and then click **myVNet** from the resources list.
-2. Click **Subnets**, and then click **Subnet**.
+2. Click **Subnets**, and then click **+ Subnet**.
 
     ![Create subnet](./media/application-gateway-create-gateway-portal/application-gateway-subnet.png)
 
@@ -63,20 +70,22 @@ In this example, you create two virtual machines that are used as backend server
 
 ### Create a virtual machine
 
-1. Click **New**.
+1. On the Azure portal, click **Create a resource**.
 2. Click **Compute** and then select **Windows Server 2016 Datacenter** in the Featured list.
 3. Enter these values for the virtual machine:
 
+    - *myResourceGroupAG* for the resource group.
     - *myVM* - for the name of the virtual machine.
     - *azureuser* - for the administrator user name.
     - *Azure123456!* for the password.
-    - Select **Use existing**, and then select *myResourceGroupAG*.
 
-4. Click **OK**.
-5. Select **DS1_V2** for the size of the virtual machine, and click **Select**.
-6. Make sure that **myVNet** is selected for the virtual network and the subnet is **myBackendSubnet**. 
-7. Click **Disabled** to disable boot diagnostics.
-8. Click **OK**, review the settings on the summary page, and then click **Create**.
+   Accept the other defaults and click **Next: Disks**.
+4. Accept the disk defaults and click **Next: Networking**.
+5. Make sure that **myVNet** is selected for the virtual network and the subnet is **myBackendSubnet**.
+6. Accept the other defaults and click **Next: Management**.
+7. Click **Off** to disable boot diagnostics. Accept the other defaults and click **Review + create**.
+8. Review the settings on the summary page, and then click **Create**.
+9. Wait for the virtual machine creation to complete before continuing.
 
 ### Install IIS
 
@@ -102,9 +111,10 @@ In this example, you create two virtual machines that are used as backend server
 
 ### Add backend servers
 
-3. Click **All resources**, and then click **myAppGateway**.
+1. Click **All resources**, and then click **myAppGateway**.
 4. Click **Backend pools**. A default pool was automatically created with the application gateway. Click **appGatewayBackendPool**.
-5. Click **Add target** to add each virtual machine that you created to the backend pool.
+5. Under **Targets**, click **IP address or FQDN** select **Virtual machine**.
+6. Under **Virtual Machine**, add myVM and myVM2 virtual machines and their associated network interfaces.
 
     ![Add backend servers](./media/application-gateway-create-gateway-portal/application-gateway-backend.png)
 
@@ -120,11 +130,10 @@ In this example, you create two virtual machines that are used as backend server
 
     ![Test application gateway](./media/application-gateway-create-gateway-portal/application-gateway-iistest.png)
 
-
 ## Clean up resources
 
 When no longer needed, delete the resource group, application gateway, and all related resources. To do so, select the resource group that contains the application gateway and click **Delete**.
 
 ## Next steps
 
-In this quickstart, you created a resource group, network resources, and backend servers. You then used those resources to create an application gateway. To learn more about application gateways and their associated resources, continue to the how-to articles.
+In this article, you created a resource group, network resources, and backend servers. You then used those resources to create an application gateway. To learn more about application gateways and their associated resources, see [What is Azure Application Gateway?](overview.md)

articles/application-gateway/media/application-gateway-create-gateway-portal/application-gateway-extension.png

@@ -17,14 +17,14 @@ Here's how to resolve errors you might see during configuration, registration, b
 ## Invalid vault credentials provided
 | Error details | Possible causes | Recommended actions |
 | ---     | ---     | ---    |
-| **Error** </br> *Invalid vault credentials provided. The file is either corrupted or does not have the latest credentials associated with recovery service. (ID: 34513)* | <ul><li> The vault credentials are invalid (that is, they were downloaded more than 48 hours before the time of registration).<li>MARS Agent is unable to download files to the Windows Temp directory. <li>The vault credentials are on a network location. <li>TLS 1.0 is disabled<li> A configured proxy server is blocking the connection. <br> |  <ul><li>Download the new vault credentials.(**Note**: If multiple vault credential files are downloaded previously, only the latest downloaded file is valid within 48 hours.) <li>Go to **Internet options** > **Security** > **Internet**. Next, select **Custom Level**, and scroll until you see the file download section. Then select **Enable**.<li>You might also have to add these sites in IE [trusted sites](https://docs.microsoft.com/azure/backup/backup-try-azure-backup-in-10-mins#network-and-connectivity-requirements).<li>Change the settings to use a proxy server. Then provide the proxy server details. <li> Match the date and time with your machine.<li>If you get an error stating that file downloads are not allowed, it is likely that there are a large number of files in the C:/Windows/Temp directory.<li>Go to C:/Windows/Temp and check whether there are more than 60,000 or 65,000 files with the .tmp extension. If there are, delete these files.<li>Ensure that you have .NET framework 4.6.2 installed. <li>If you have disabled TLS 1.0 due to PCI compliance, refer to this [troubleshooting page](https://support.microsoft.com/help/4022913). <li>If you have anti-virus software installed on the server, exclude the following files from the anti-virus scan: <ul><li>CBengine.exe<li>CSC.exe, which is related to .NET Framework. There is a CSC.exe for every .NET version that's installed on the server. Exclude CSC.exe files that are tied to all versions of .NET framework on the affected server. <li>Scratch folder or cache location. <br>*The default location for the scratch folder or the cache location path is C:\Program Files\Microsoft Azure Recovery Services Agent\Scratch*.<br><li>The bin folder C:\Program Files\Microsoft Azure Recovery Services Agent\Bin
+| **Error** </br> *Invalid vault credentials provided. The file is either corrupted or does not have the latest credentials associated with recovery service. (ID: 34513)* | <ul><li> The vault credentials are invalid (that is, they were downloaded more than 48 hours before the time of registration).<li>MARS Agent is unable to download files to the Windows Temp directory. <li>The vault credentials are on a network location. <li>TLS 1.0 is disabled<li> A configured proxy server is blocking the connection. <br> |  <ul><li>Download the new vault credentials.(**Note**: If multiple vault credential files are downloaded previously, only the latest downloaded file is valid within 48 hours.) <li>Go to **Internet options** > **Security** > **Internet**. Next, select **Custom Level**, and scroll until you see the file download section. Then select **Enable**.<li>You might also have to add these sites in IE [trusted sites](https://docs.microsoft.com/azure/backup/backup-try-azure-backup-in-10-mins#network-and-connectivity-requirements).<li>Change the settings to use a proxy server. Then provide the proxy server details. <li> Match the date and time with your machine.<li>If you get an error stating that file downloads are not allowed, it is likely that there are a large number of files in the C:/Windows/Temp directory.<li>Go to C:/Windows/Temp and check whether there are more than 60,000 or 65,000 files with the .tmp extension. If there are, delete these files.<li>Ensure that you have .NET framework 4.6.2 installed. <li>If you have disabled TLS 1.0 due to PCI compliance, refer to this [troubleshooting page](https://support.microsoft.com/help/4022913). <li>If you have anti-virus software installed on the server, exclude the following files from the anti-virus scan: <ul><li>CBengine.exe<li>CSC.exe, which is related to .NET Framework. There is a CSC.exe for every .NET version that's installed on the server. Exclude CSC.exe files that are tied to all versions of .NET Framework on the affected server. *For example, for v2.0.50727 exclude the .NET Framework path C:\Windows\Microsoft.NET\Framework\v2.0.50727; similarly, exclude the remaining .NET Framework version path.* <li>Scratch folder or cache location. <br>*The default location for the scratch folder or the cache location path is C:\Program Files\Microsoft Azure Recovery Services Agent\Scratch*.<br><li>The bin folder C:\Program Files\Microsoft Azure Recovery Services Agent\Bin
 
 
 ## The MARS Agent was unable to connect to Azure Backup
 
 | Error details | Possible causes | Recommended actions |
 | ---     | ---     | ---    |
-| **Error** </br><ol><li>*The Microsoft Azure Recovery Service Agent was unable to connect to Microsoft Azure Backup. (ID: 100050) Check your network settings and ensure that you are able to connect to internet*<li>*(407) Proxy Authentication Required* |Proxy blocking the connection. |  <ul><li>Go into **Internet options** > **Security** > **Internet**. Then select **Custom Level** and scroll until you see the file download section. Select **Enable**.<li>You might also have to add these sites in IE [trusted sites](https://docs.microsoft.com/azure/backup/backup-try-azure-backup-in-10-mins#network-and-connectivity-requirements).<li>Change the settings to use a proxy server. Then provide the proxy server details. <li>If you have anti-virus software installed on the server, exclude the following files from the anti-virus scan. <ul><li>CBEngine.exe (instead of dpmra.exe).<li>CSC.exe (related to .NET Framework). There is a CSC.exe for every .NET version that's installed on the server. Exclude CSC.exe files that are tied to all versions of .NET framework on the affected server. <li>Scratch folder or cache location. <br>*The default location for the scratch folder or the cache location path is C:\Program Files\Microsoft Azure Recovery Services Agent\Scratch*.<li>The bin folder C:\Program Files\Microsoft Azure Recovery Services Agent\Bin
+| **Error** </br><ol><li>*The Microsoft Azure Recovery Service Agent was unable to connect to Microsoft Azure Backup. (ID: 100050) Check your network settings and ensure that you are able to connect to internet*<li>*(407) Proxy Authentication Required* |Proxy blocking the connection. |  <ul><li>Go into **Internet options** > **Security** > **Internet**. Then select **Custom Level** and scroll until you see the file download section. Select **Enable**.<li>You might also have to add these sites in IE [trusted sites](https://docs.microsoft.com/azure/backup/backup-try-azure-backup-in-10-mins#network-and-connectivity-requirements).<li>Change the settings to use a proxy server. Then provide the proxy server details. <li>If you have anti-virus software installed on the server, exclude the following files from the anti-virus scan. <ul><li>CBEngine.exe (instead of dpmra.exe).<li>CSC.exe (related to .NET Framework). There is a CSC.exe for every .NET version that's installed on the server. Exclude CSC.exe files that are tied to all versions of .NET framework on the affected server. *For example, for v2.0.50727 exclude the .NET Framework path C:\Windows\Microsoft.NET\Framework\v2.0.50727; similarly, exclude the remaining .NET Framework version path.* <li>Scratch folder or cache location. <br>*The default location for the scratch folder or the cache location path is C:\Program Files\Microsoft Azure Recovery Services Agent\Scratch*.<li>The bin folder C:\Program Files\Microsoft Azure Recovery Services Agent\Bin
 
 
 ## Failed to set the encryption key for secure backups