resolve conflicts

Author: mumian

.openpublishing.redirection.json

@@ -6,7 +6,7 @@ author: kengaderdus
 manager: CelesteDG
 ms.service: azure-active-directory
 ms.topic: how-to
-ms.date: 01/11/2024
+ms.date: 10/14/2024
 ms.author: kengaderdus
 ms.subservice: b2c
 zone_pivot_groups: b2c-policy-type
@@ -276,7 +276,10 @@ A claim provides temporary storage of data during an Azure AD B2C policy executi
 
 ### Acquiring an access token 
 
-You can obtain an access token in one of several ways, for the [from a federated identity provider](idp-pass-through-user-flow.md), by calling a REST API that returns an access token, by using an [ROPC flow](../active-directory/develop/v2-oauth-ropc.md), or by using the [client credentials flow](../active-directory/develop/v2-oauth2-client-creds-grant-flow.md). The client credentials flow is commonly used for server-to-server interactions that must run in the background, without immediate interaction with a user.
+You can obtain an access token in one of several ways, for the [from a federated identity provider](idp-pass-through-user-flow.md), by calling a REST API that returns an access token, by using an [ROPC flow](/entra/identity-platform/v2-oauth-ropc), or by using the [client credentials flow](../active-directory/develop/v2-oauth2-client-creds-grant-flow.md). The client credentials flow is commonly used for server-to-server interactions that must run in the background, without immediate interaction with a user.
+
+> [!WARNING]
+> Microsoft recommends you do *not* use the ROPC flow. This flow requires a very high degree of trust in the application, and carries risks that are not present in other flows. You should only use this flow when other more secure flows aren't viable.
 
 <a name='acquiring-an-azure-ad-access-token-'></a>
 
@@ -577,12 +580,12 @@ The following XML snippet is an example of a RESTful technical profile configure
 ```
 ::: zone-end
 
-## Next steps
+## Related content
 
 ::: zone pivot="b2c-user-flow"
 - Get started with our [samples](api-connector-samples.md#api-connector-rest-api-samples).
 ::: zone-end
 
 ::: zone pivot="b2c-custom-policy"
 - Learn more about the [Restful technical profile](restful-technical-profile.md) element in the custom policy reference.
-::: zone-end
+::: zone-end

articles/active-directory-b2c/secure-rest-api.md

@@ -80,7 +80,6 @@
             "redirect_url": "/azure/application-gateway/tutorial-protect-application-gateway-ddos",
             "redirect_document_id": false
         },
-        
         {
             "source_path_from_root": "/articles/application-gateway/rewrite-http-headers.md",
             "redirect_url": "/azure/application-gateway/rewrite-http-headers-url",
@@ -305,6 +304,46 @@
             "source_path_from_root": "/articles/application-gateway/application-gateway-web-app-overview.md",
             "redirect_url": "/azure/application-gateway/configure-web-app",
             "redirect_document_id": false
-        }
+        },
+        {
+            "source_path_from_root": "/articles/application-gateway/powershell-samples.md",
+            "redirect_url": "/previous-versions/azure/application-gateway/powershell-samples",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/application-gateway/cli-samples.md",
+            "redirect_url": "/previous-versions/azure/application-gateway/cli-samples",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/application-gateway/resource-manager-template-samples.md",
+            "redirect_url": "/previous-versions/azure/application-gateway/resource-manager-template-samples",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/application-gateway/scripts/create-vmss-cli.md",
+            "redirect_url": "/previous-versions/azure/application-gateway/scripts/create-vmss-cli",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/application-gateway/scripts/create-vmss-powershell.md",
+            "redirect_url": "/previous-versions/azure/application-gateway/scripts/create-vmss-powershell",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/application-gateway/scripts/create-vmss-waf-cli.md",
+            "redirect_url": "/previous-versions/azure/application-gateway/scripts/create-vmss-waf-cli",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/application-gateway/scripts/create-vmss-waf-powershell.md",
+            "redirect_url": "/previous-versions/azure/application-gateway/scripts/create-vmss-waf-powershell",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/application-gateway/scripts/waf-custom-rules-powershell.md",
+            "redirect_url": "/previous-versions/azure/application-gateway/scripts/waf-custom-rules-powershell",
+            "redirect_document_id": false
+        },
     ]
-}
+}

articles/application-gateway/.openpublishing.redirection.application-gateway.json

@@ -3,7 +3,7 @@ title: Overview of Azure Boost
 description: Learn more about how Azure Boost can Learn more about how Azure Boost can improve security and performance of your virtual machines.
 author: mattmcinnes
 ms.service: azure-virtual-machines
-ms.topic: conceptual
+ms.topic: overview
 ms.custom:
   - ignite-2023
 ms.date: 11/07/2023

articles/azure-boost/overview.md

@@ -355,7 +355,9 @@ After a rewrite, two sets of AOF files exist in storage. Rewrites occur in the b
 
 ### Will having firewall exceptions on the storage account affect persistence?
 
-Using managed identity adds the cache instance to the [trusted services list](../storage/common/storage-network-security.md?tabs=azure-portal), making firewall exceptions easier to carry out. If you aren't using managed identity and instead authorizing to a storage account using a key, then having firewall exceptions on the storage account tends to break the persistence process. This only applies to persistence in the Premium tier.
+Yes. Using [firewall settings on the storage account](../storage/common/storage-network-security.md) can prevent the persistence feature from working. You can see if there are errors in persisting data by viewing the [Errors metric](monitor-cache-reference.md#azure-cache-for-redis-metrics). This metric will indicate if the cache is unable to persist data due to firewall restrictions on the storage account or other problems.
+
+In order to use data persistence with a storage account that has a firewall set up, use [managed identity based authentication](cache-managed-identity.md) to connect to storage. Using managed identity adds the cache instance to the [trusted services list](../storage/common/storage-network-security.md?tabs=azure-portal), making firewall exceptions easier to carry out. If you aren't using managed identity and instead authorizing to a storage account using a key, then having firewall exceptions on the storage account tends to break the persistence process. This only applies to persistence in the Premium tier.
 
 ### Can I have AOF persistence enabled if I have more than one replica?
 

articles/azure-cache-for-redis/cache-how-to-premium-persistence.md

@@ -6,8 +6,7 @@ summary: Use Azure Edge Hardware Center service to order from a variety of Azure
 metadata:
   title: Azure Edge Hardware Center documentation
   description: Azure Edge Hardware Center Documentation.
-  ms.service: databox
-  ms.subservice: edge
+  ms.service: azure-stack-edge
   ms.topic: landing-page
   author: alkohli
   ms.author: alkohli