Merge branch 'main' into new-relic-change-plan

Author: ProfessorKendrick

.openpublishing.redirection.json

@@ -1,5 +1,15 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/defender-for-iot/organizations/appliance-catalog/virtual-management-hyper-v.md",
+      "redirect_url": "/previous-versions/azure/defender-for-iot/organizations/appliance-catalog/virtual-management-hyper-v",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/defender-for-iot/organizations/appliance-catalog/virtual-management-vmware.md",
+      "redirect_url": "/previous-versions/azure/defender-for-iot/organizations/appliance-catalog/virtual-management-vmware",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/defender-for-iot/organizations/api/management-alert-apis.md",
       "redirect_url": "/previous-versions/azure/defender-for-iot/organizations/api/management-alert-apis",

articles/active-directory-b2c/language-customization.md

@@ -466,7 +466,7 @@ Microsoft provides the `ui_locales` OIDC parameter to social logins. But some so
 
 ### Browser behavior
 
-Chrome and Firefox both request for their set language. If it's a supported language, it's displayed before the default. Microsoft Edge currently doesn't request a language and goes straight to the default language.
+Microsoft Edge, Chrome and Firefox request for their set language. If it's a supported language, it's displayed before the default.
 
 ## Supported languages
 

articles/active-directory-b2c/partner-cloudflare.md

@@ -1,7 +1,7 @@
 ---
-title: Tutorial to configure Azure Active Directory B2C with Cloudflare Web Application Firewall
+title: Configure Azure Active Directory B2C with Cloudflare Web Application Firewall
 titleSuffix: Azure AD B2C
-description: Tutorial to configure Azure Active Directory B2C with Cloudflare Web application firewall and protect applications from malicious attacks 
+description: Configure Azure Active Directory B2C with Cloudflare Web application firewall and protect applications from malicious attacks 
 author: gargi-sinha
 manager: martinco
 ms.reviewer: kengaderdus
@@ -13,9 +13,9 @@ ms.subservice: b2c
 
 # Customer intent: I'm a developer configuring Azure AD B2C with Cloudflare WAF. I need to enable and configure the Web Application Firewall, so I can protect my application from malicious attacks such as SQL Injection and cross-site scripting (XSS).
 ---
-# Tutorial: Configure Cloudflare Web Application Firewall with Azure Active Directory B2C
+# Configure Cloudflare Web Application Firewall with Azure Active Directory B2C
 
-In this tutorial, you can learn how to configure the [Cloudflare Web Application Firewall (WAF)](https://www.cloudflare.com/application-services/products/waf/) solution for Azure Active Directory B2C (Azure AD B2C) tenant with custom domain. Use Cloudflare WAF to help protect organizations from malicious attacks that can exploit vulnerabilities such as SQL Injection, and cross-site scripting (XSS).
+In this article, you can learn how to configure the [Cloudflare Web Application Firewall (WAF)](https://www.cloudflare.com/application-services/products/waf/) solution for Azure Active Directory B2C (Azure AD B2C) tenant with custom domain. Use Cloudflare WAF to help protect organizations from malicious attacks that can exploit vulnerabilities such as SQL Injection, and cross-site scripting (XSS).
 
 ## Prerequisites
 

articles/active-directory-b2c/tutorial-create-user-flows.md

@@ -221,7 +221,7 @@ Now, grant permissions to the API scope you exposed earlier in the *IdentityExpe
 1. Select the **APIs my organization uses** tab, then select the **IdentityExperienceFramework** application.
 1. Under **Permission**, select the **user_impersonation** scope that you defined earlier.
 1. Select **Add permissions**. As directed, wait a few minutes before proceeding to the next step.
-1. Select **Grant admin consent for *<your tenant name)>***.
+1. Select **Grant admin consent for *&lt;your tenant name>***.
 1. Select **Yes**.
 1. Select **Refresh**, and then verify that "Granted for ..." appears under **Status** for the scope.
 

articles/app-service/app-service-web-configure-tls-mutual-auth.md

@@ -109,7 +109,7 @@ In the following screenshot, any path for your app that starts with `/public` do
 ![Certificate Exclusion Paths][exclusion-paths]
 
 ## Client certificate and TLS renegotiation
-App Service requires TLS renegotiation to read a request before knowing whether to prompt for a client certificate. Any of the following settings triggers TLS renegotiation:
+For some client certificate settings, App Service requires TLS renegotiation to read a request before knowing whether to prompt for a client certificate. Any of the following settings triggers TLS renegotiation:
 1. Using "Optional Interactive User" client certificate mode.
 1. Using [client certificate exclusion path](#exclude-paths-from-requiring-authentication).
 

articles/app-service/breadcrumb/toc.yml

@@ -11,11 +11,17 @@ items:
     topicHref: /azure/app-service/index
   - name: App Service
     tocHref: /azure/developer/
-    topicHref: /azure/app-service/index
+    topicHref: /azure/app-service/index 
     items:
     - name: Web Apps
       tocHref: /entra/fundamentals/
       topicHref: /azure/app-service/index
     - name: Web Apps
       tocHref: /azure/developer/
+      topicHref: /azure/app-service/index
+    - name: Web Apps
+      tocHref: /azure/architecture/
+      topicHref: /azure/app-service/index
+    - name: Web Apps
+      tocHref: /azure/api-management/
       topicHref: /azure/app-service/index

articles/app-service/migrate-wordpress.md

@@ -3,6 +3,7 @@ title: Migrate WordPress to App Service on Linux
 description: Migrate WordPress to App Service on Linux.
 author: msangapu-msft
 
+ms.subservice: wordpress
 ms.topic: article
 ms.date: 01/20/2023
 ms.author: msangapu

articles/app-service/overview-wordpress.md

@@ -8,7 +8,7 @@ ms.topic: overview
 ms.date: 12/10/2024
 # ms.devlang: wordpress
 ms.author: msangapu
-ms.service: azure-app-service
+ms.subservice: wordpress
 ms.custom: mvc, linux-related-content
 #customer intent: As a new Azure customer, I want to learn more about WordPress on App Service so that I can build an effective WP site.
 ---

articles/app-service/quickstart-wordpress.md

@@ -3,6 +3,7 @@ title: 'Quickstart: Create a WordPress site'
 description: Create your first WordPress site on Azure App Service in minutes.
 keywords: app service, azure app service, wordpress, preview, app service on linux, plugins, mysql flexible server, wordpress on linux, php
 author: msangapu-msft
+ms.subservice: wordpress
 ms.topic: quickstart
 ms.date: 03/28/2024
 # ms.devlang: wordpress

articles/app-service/toc.yml

@@ -401,7 +401,7 @@
       href: overview-wordpress.md
     - name: WordPress architecture
       displayName: WordPress on App Service architecture
-      href: /azure/architecture/example-scenario/infrastructure/wordpress-app-service
+      href: /azure/architecture/example-scenario/infrastructure/wordpress-app-service?toc=%2Fazure%2Fapp-service%2Ftoc.json&bc=%2Fazure%2Fapp-service%2Fbreadcrumb%2Ftoc.json
     - name: Deploy WordPress
       displayName: Create a WordPress site
       href: quickstart-wordpress.md
@@ -413,7 +413,7 @@
       href: reference-app-settings.md#wordpress
     - name: Customize API Management developer portal
       displayName: API Management and WordPress
-      href: /azure/api-management/developer-portal-wordpress-plugin
+      href: /azure/api-management/developer-portal-wordpress-plugin?toc=%2Fazure%2Fapp-service%2Ftoc.json&bc=%2Fazure%2Fapp-service%2Fbreadcrumb%2Ftoc.json
     - name: WordPress FAQ
       displayName: WordPress frequently asked questions
       href: wordpress-faq.md