Merge pull request #267663 from cephalin/basicauth

add separate SCM/FTP buttons

Author: v-dirichards

articles/app-service/configure-basic-auth-disable.md

@@ -3,7 +3,7 @@ title: Disable basic authentication for deployment
 description: Learn how to secure App Service deployment by disabling basic authentication.
 keywords: azure app service, security, deployment, FTP, MsDeploy
 ms.topic: article
-ms.date: 01/26/2024
+ms.date: 02/29/2024
 author: cephalin
 ms.author: cephalin
 ---
@@ -16,13 +16,18 @@ App Service provides basic authentication for FTP and WebDeploy clients to conne
 
 ## Disable basic authentication
 
+Two different controls for basic authentication are available. Specifically:
+
+- For [FTP deployment](deploy-ftp.md), basic authentication is controlled by the `basicPublishingCredentialsPolicies/ftp` flag (**FTP Basic Auth Publishing Credentials** option in the portal).
+- For other deployment methods that use basic authentication, such as Visual Studio, local Git, and GitHub, basic authentication is controlled by the `basicPublishingCredentialsPolicies/scm` flag (**SCM Basic Auth Publishing Credentials** option in the portal).
+
 ### [Azure portal](#tab/portal)
 
-1. In the [Azure portal], search for and select **App Services**, and then select your app. 
+1. In the [Azure portal](https://portal.azure.com), search for and select **App Services**, and then select your app. 
 
-1. In the app's left menu, select **Configuration**.
+1. In the app's left menu, select **Configuration** > **General settings**.
 
-1. For **Basic Auth Publishing Credentials**, select **Off**, then select **Save**.
+1. For **SCM Basic Auth Publishing Credentials** or **FTP Basic Auth Publishing Credentials**, select **Off**, then select **Save**.
 
     :::image type="content" source="media/configure-basic-auth-disable/basic-auth-disable.png" alt-text="A screenshot showing how to disable basic authentication for Azure App Service in the Azure portal.":::
 
@@ -54,7 +59,9 @@ To confirm that Git access is blocked, try [local Git deployment](deploy-local-g
 
 ## Deployment without basic authentication
 
-When you disable basic authentication, deployment methods that depend on basic authentication stop working. The following table shows how various deployment methods behave when basic authentication is disabled, and if there's any fallback mechanism. For more information, see [Authentication types by deployment methods in Azure App Service](deploy-authentication-types.md).
+When you disable basic authentication, deployment methods that depend on basic authentication stop working. 
+
+The following table shows how various deployment methods behave when basic authentication is disabled, and if there's any fallback mechanism. For more information, see [Authentication types by deployment methods in Azure App Service](deploy-authentication-types.md).
 
 | Deployment method | When basic authentication is disabled |
 |-|-|

articles/app-service/deploy-continuous-deployment.md

@@ -3,7 +3,7 @@ title: Configure continuous deployment
 description: Learn how to enable CI/CD to Azure App Service from GitHub, Bitbucket, Azure Repos, or other repos. Select the build pipeline that fits your needs.
 ms.assetid: 6adb5c84-6cf3-424e-a336-c554f23b4000
 ms.topic: article
-ms.date: 01/26/2024
+ms.date: 02/29/2024
 author: cephalin
 ms.author: cephalin
 ---
@@ -116,7 +116,7 @@ You can customize the GitHub Actions build provider in these ways:
 # [App Service Build Service](#tab/appservice)
 
 > [!NOTE]
-> App Service Build Service requires [basic authentication to be enabled](configure-basic-auth-disable.md) for the webhook to work. For more information, see [Deployment without basic authentication](configure-basic-auth-disable.md#deployment-without-basic-authentication).
+> App Service Build Service requires [SCM basic authentication to be enabled](configure-basic-auth-disable.md) for the webhook to work. For more information, see [Deployment without basic authentication](configure-basic-auth-disable.md#deployment-without-basic-authentication).
 
 App Service Build Service is the deployment and build engine native to App Service, otherwise known as Kudu. When this option is selected, App Service adds a webhook into the repository you authorized. Any code push to the repository triggers the webhook, and App Service pulls the changes into its repository and performs any deployment tasks. For more information, see [Deploying from GitHub (Kudu)](https://github.com/projectkudu/kudu/wiki/Deploying-from-GitHub).
 

articles/app-service/deploy-ftp.md

@@ -4,7 +4,7 @@ description: Learn how to deploy your app to Azure App Service using FTP or FTPS
 
 ms.assetid: ae78b410-1bc0-4d72-8fc4-ac69801247ae
 ms.topic: article
-ms.date: 01/26/2024
+ms.date: 02/29/2024
 author: cephalin
 ms.author: cephalin
 ---
@@ -17,7 +17,7 @@ or API app to [Azure App Service](./overview.md).
 The FTP/S endpoint for your app is already active. No configuration is necessary to enable FTP/S deployment.
 
 > [!NOTE]
-> When [basic authentication is disabled](configure-basic-auth-disable.md), FTP/S deployment doesn't work, and you can't view or configure FTP credentials in the app's Deployment Center.
+> When [FTP basic authentication is disabled](configure-basic-auth-disable.md), FTP/S deployment doesn't work, and you can't view or configure FTP credentials in the app's Deployment Center.
 
 ## Get deployment credentials
 

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

@@ -3,7 +3,7 @@ title: Deploy from local Git repo
 description: Learn how to enable local Git deployment to Azure App Service. One of the simplest ways to deploy code from your local machine.
 ms.assetid: ac50a623-c4b8-4dfd-96b2-a09420770063
 ms.topic: article
-ms.date: 01/26/2024
+ms.date: 02/29/2024
 ms.reviewer: dariac
 ms.custom: devx-track-azurecli, devx-track-azurepowershell
 author: cephalin
@@ -14,7 +14,7 @@ ms.author: cephalin
 This how-to guide shows you how to deploy your app to [Azure App Service](overview.md) from a Git repository on your local computer.
 
 > [!NOTE]
-> When [basic authentication is disabled](configure-basic-auth-disable.md), Local Git deployment doesn't work, and you can't configure Local Git deployment in the app's Deployment Center.
+> When [SCM basic authentication is disabled](configure-basic-auth-disable.md), Local Git deployment doesn't work, and you can't configure Local Git deployment in the app's Deployment Center.
 
 ## Prerequisites