Merge pull request #95055 from DCtheGeek/dmc-industry-mc2

(Dirty PR) Resolving new merge conflict for release branch

Author: rmca14

.openpublishing.redirection.json

@@ -5286,6 +5286,16 @@
       "redirect_url": "/azure/app-service-mobile",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/application-gateway/tutorial-restrict-web-traffic-powershell.md",
+      "redirect_url": "/azure/web-application-firewall/ag/tutorial-restrict-web-traffic-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/application-gateway/tutorial-restrict-web-traffic-cli.md",
+      "redirect_url": "/azure/web-application-firewall/ag/tutorial-restrict-web-traffic-cli",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/application-gateway/configure-waf-custom-rules.md",
       "redirect_url": "/azure/web-application-firewall/ag/configure-waf-custom-rules",
@@ -43367,6 +43377,9 @@
     {
       "source_path": "articles/machine-learning/algorithm-module-reference/import-from-web-url-via-http.md",
       "redirect_url": "/azure/machine-learning/algorithm-module-reference/module-reference",
+      "redirect_document_id": false
+    },
+    {
       "source_path": "articles/industry/financial/actuarial-risk-analysis-and-financial-modeling-overview.md",
       "redirect_url": "/azure/industry-marketing/financial/actuarial-risk-analysis-and-financial-modeling-overview",
       "redirect_document_id": false
@@ -43486,11 +43499,6 @@
       "redirect_url": "/azure/industry-marketing/retail/visual-search-use-case-overview",
       "redirect_document_id": false
     },
-    {
-      "source_path": "articles/industry/agriculture/index.md",
-      "redirect_url": "/azure/industry/agriculture/overview",
-      "redirect_document_id": false
-    },
     {
       "source_path": "articles/machine-learning/service/how-to-ui-sample-classification-predict-churn.md",
       "redirect_url": "how-to-designer-sample-classification-churn",

articles/active-directory/develop/msal-net-adfs-support.md

@@ -23,7 +23,7 @@ ms.collection: M365-identity-device-management
 ---
 
 # Active Directory Federation Services support in MSAL.NET
-Active Directory Federation Services (AD FS) in Windows Server enables you to add OpenID Connect and OAuth 2.0 based authentication and authorization to applications you are developing. Those applications can, then, authenticate users directly against AD FS. For more information, read [AD FS Scenarios for Developers](/windows-server/identity/ad-fs/overview/ad-fs-openid-connect-oauth-flows-scenarios).
+Active Directory Federation Services (AD FS) in Windows Server enables you to add OpenID Connect and OAuth 2.0 based authentication and authorization to applications you are developing. Those applications can, then, authenticate users directly against AD FS. For more information, read [AD FS Scenarios for Developers](https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/overview/ad-fs-openid-connect-oauth-flows-scenarios).
 
 Microsoft Authentication Library for .NET (MSAL.NET) supports two scenarios for authenticating against AD FS:
 

articles/active-directory/hybrid/how-to-connect-password-hash-synchronization.md

@@ -27,7 +27,7 @@ To synchronize your password, Azure AD Connect sync extracts your password hash
 
 The actual data flow of the password hash synchronization process is similar to the synchronization of user data. However, passwords are synchronized more frequently than the standard directory synchronization window for other attributes. The password hash synchronization process runs every 2 minutes. You cannot modify the frequency of this process. When you synchronize a password, it overwrites the existing cloud password.
 
-The first time you enable the password hash synchronization feature, it performs an initial synchronization of the passwords of all in-scope users. You cannot explicitly define a subset of user passwords that you want to synchronize.
+The first time you enable the password hash synchronization feature, it performs an initial synchronization of the passwords of all in-scope users. You cannot explicitly define a subset of user passwords that you want to synchronize. However, if there are multiple connectors, it is possible to disable password hash sync for some connectors but not others using the [Set-ADSyncAADPasswordSyncConfiguration](https://docs.microsoft.com/en-us/azure/active-directory-domain-services/active-directory-ds-getting-started-password-sync-synced-tenant) cmdlet.
 
 When you change an on-premises password, the updated password is synchronized, most often in a matter of minutes.
 The password hash synchronization feature automatically retries failed synchronization attempts. If an error occurs during an attempt to synchronize a password, an error is logged in your event viewer.

articles/active-directory/users-groups-roles/users-bulk-download.md

@@ -27,8 +27,9 @@ To download the list of users from the Azure AD admin center, you must be signed
 ## To download a list of users
 
 1. [Sign in to your Azure AD organization](https://aad.portal.azure.com) with a User administrator account in the organization.
-1. In Azure AD, select **Users** > **Download users**.
-1. On the **Download users** page, select **Start** to receive a CSV file listing user profile properties. If there are errors, you can download and view the results file on the Bulk operation results page. The file contains the reason for each error.
+2. Navigate to Azure Active Directory > Users. Then select the users you wish to include in the download by ticking the box in the left column next to each user. Note: At this time, there is no way to select all users for export. Each one must be individually selected.
+3. In Azure AD, select **Users** > **Download users**.
+4. On the **Download users** page, select **Start** to receive a CSV file listing user profile properties. If there are errors, you can download and view the results file on the Bulk operation results page. The file contains the reason for each error.
 
    ![Select where you want the list the users you want to download](./media/users-bulk-download/bulk-download.png)
 

articles/application-gateway/toc.yml

@@ -127,12 +127,6 @@
       items:
       - name: Configure SSL policy
         href: application-gateway-configure-ssl-policy-powershell.md
-  - name: Configure Web Application Firewall
-    items:
-    - name: Azure PowerShell
-      href: tutorial-restrict-web-traffic-powershell.md
-    - name: Azure CLI
-      href: tutorial-restrict-web-traffic-cli.md
   - name: Ingress for AKS 
     items:
     - name: Set up with existing Application Gateway