Merge pull request #184538 from MicrosoftDocs/master

Merge master to live 4 AM

Author: ttorble

.github/workflows/stale.yml

@@ -18,7 +18,7 @@ jobs:
         stale-pr-label: inactive
         close-pr-label: auto-close
         exempt-pr-labels: keep-open
-        operations-per-run: 1200
+        operations-per-run: 1300
         ascending: false
         # start-date: '2021-03-19'
         stale-pr-message: >

articles/active-directory/authentication/howto-registration-mfa-sspr-combined-troubleshoot.md

@@ -147,8 +147,8 @@ In a PowerShell window, run the following command, providing the script and user
 To disable the updated experience for your users, complete these steps:
 
 1. Sign in to the Azure portal as a user administrator.
-2. Go to **Azure Active Directory** > **User settings** > **Manage settings for access panel preview features**.
-3. Under **Users can use preview features for registering and managing security info**, set the selector to **None**, and then select **Save**.
+2. Go to **Azure Active Directory** > **User settings** > **Manage user feature settings**.
+3. Under **Users can use the combined security information registration experience**, set the selector to **None**, and then select **Save**.
 
 Users will no longer be prompted to register by using the updated experience.
 

articles/active-directory/develop/includes/web-app/quickstart-aspnet.md

@@ -61,10 +61,6 @@ If you want to manually configure your application and code sample, use the foll
 [!INCLUDE [active-directory-develop-path-length-tip](../../../../../includes/active-directory-develop-path-length-tip.md)]
 
 
-#### Step 3: Your app is configured and ready to run
-We've configured your project with values of your app's properties.
-
-
 #### Step 3: Run your Visual Studio project
 
 1. Extract the .zip file to a local folder that's close to the root folder. For example, extract to *C:\Azure-Samples*.

articles/active-directory/manage-apps/f5-aad-integration.md

@@ -129,14 +129,15 @@ No previous experience or F5 BIG-IP knowledge is necessary to implement SHA, but
 
 ## Deployment scenarios
 
-
 Configuring a BIG-IP for SHA is achieved using any of the many available methods, including several template based options, or a manual configuration.
 The following tutorials provide detailed guidance on implementing some of the more common patterns for BIG-IP and Azure AD SHA, using these methods.  
 
 **Advanced configuration**
 
 The advanced approach provides a more elaborate, yet flexible way of implementing SHA by manually creating all BIG-IP configuration objects. You would use this approach for scenarios not covered by the guided configuration templates. 
 
+Refer to the following advanced configuration guides for your integration requirements:
+
 - [F5 BIG-IP in Azure deployment walk-through](f5-bigip-deployment-guide.md)
 
 - [Securing F5 BIG-IP SSL-VPN with Azure AD SHA](f5-aad-password-less-vpn.md)
@@ -145,18 +146,22 @@ The advanced approach provides a more elaborate, yet flexible way of implementin
 
 - [F5 BIG-IP APM and Azure AD SSO to Kerberos applications](f5-big-ip-kerberos-advanced.md)
 
-- [F5 BIG-IP APM and Azure AD SSO to Header-based applications](f5-big-ip-header-advanced.md)
+- [F5 BIG-IP APM and Azure AD SSO to header-based applications](f5-big-ip-header-advanced.md)
 
 - [F5 BIG-IP APM and Azure AD SSO to forms-based applications](f5-big-ip-forms-advanced.md)
 
 **Guided Configuration and Easy Button templates**
 
 The Guided Configuration wizard, available from BIG-IP version 13.1 aims to minimize time and effort implementing common BIG-IP publishing scenarios. Its workflow-based framework provides an intuitive deployment experience tailored to specific access topologies.
 
-The latest version of the Guided Configuration 16.1 now offers an Easy Button feature. With **Easy Button**, admins no longer go back and forth between Azure AD and a BIG-IP to enable services for SHA. The end-to-end deployment and policy management is handled directly between the APM’s Guided Configuration wizard and Microsoft Graph. This rich integration between BIG-IP APM and Azure AD ensures applications can quickly, easily support identity federation, SSO, and Azure AD Conditional Access, without management overhead of having to do so on a per app basis.
+The latest version of the Guided Configuration 16.1 now offers an Easy Button feature. With **Easy Button**, admins no longer go back and forth between Azure AD and a BIG-IP to enable services for SHA. The end-to-end deployment and policy management is handled directly between the APM’s Guided Configuration wizard and Microsoft Graph. This rich integration between BIG-IP APM and Azure AD ensures applications can quickly, easily support identity federation, SSO, and Azure AD Conditional Access, without management overhead of having to do so on a per app basis. 
+
+Refer to the following guided configuration guides using Easy Button templates for your integration requirements:
 
 - [F5 BIG-IP Easy Button for SSO to Kerberos applications](f5-big-ip-kerberos-easy-button.md)
 
+- [F5 BIG-IP Easy Button for SSO to header-based applications](f5-big-ip-headers-easy-button.md)
+
 - [F5 BIG-IP Easy Button for SSO to header-based and LDAP applications](f5-big-ip-ldap-header-easybutton.md)
 
 ## Additional resources