Merge branch 'main' into release-fabric-mirroring-pupr

Author: v-alje

.openpublishing.publish.config.json

@@ -962,6 +962,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "msdocs-tomcat-mysql-sample-app",
+      "url": "https://github.com/Azure-Samples/msdocs-tomcat-mysql-sample-app",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azuresignalr-samples",
       "url": "https://github.com/aspnet/AzureSignalR-samples",
@@ -1214,6 +1220,7 @@
   ".openpublishing.redirection.azure-web-pubsub.json",
   ".openpublishing.redirection.baremetal-infrastructure.json",
   ".openpublishing.redirection.container-service.json",
+  ".openpublishing.redirection.data-lake-analytics.json",
   ".openpublishing.redirection.defender-for-cloud.json",
   ".openpublishing.redirection.defender-for-iot.json",
   ".openpublishing.redirection.devops-project.json",
@@ -1251,7 +1258,6 @@
   "articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json",
   "articles/data-catalog/.openpublishing.redirection.data-catalog.json",
   "articles/data-factory/.openpublishing.redirection.data-factory.json",
-  "articles/data-lake-analytics/.openpublishing.redirection.data-lake-analytics.json",
   "articles/deployment-environments/.openpublishing.redirection.deployment-environments.json",
   "articles/dev-box/.openpublishing.redirection.dev-box.json",
   "articles/digital-twins/.openpublishing.redirection.digital-twins.json",

.openpublishing.redirection.azure-vmware.json

@@ -179,6 +179,66 @@
             "source_path_from_root": "/articles/azure-vmware/vrealize-operations-for-avs.md",
             "redirect_url": "/azure/azure-vmware/vrealize-operations-for-azure-vmware-solution",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-api-management.md",
+            "redirect_url": "/azure/azure-vmware/architecture-api-management",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-design-public-internet-access.md",
+            "redirect_url": "/azure/azure-vmware/architecture-design-public-internet-access",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-hub-and-spoke.md",
+            "redirect_url": "/azure/azure-vmware/architecture-hub-and-spoke",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-identity.md",
+            "redirect_url": "/azure/azure-vmware/architecture-identity",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-migrate.md",
+            "redirect_url": "/azure/azure-vmware/architecture-migrate",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-network-design-considerations.md",
+            "redirect_url": "/azure/azure-vmware/architecture-network-design-considerations",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-networking.md",
+            "redirect_url": "/azure/azure-vmware/architecture-networking",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-private-clouds-clusters.md",
+            "redirect_url": "/azure/azure-vmware/architecture-private-clouds",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-run-command.md",
+            "redirect_url": "/azure/azure-vmware/using-run-command",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-security-recommendations.md",
+            "redirect_url": "/azure/azure-vmware/security-recommendations",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-storage.md",
+            "redirect_url": "/azure/azure-vmware/architecture-storage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-vmware/concepts-vulnerability-management.md",
+            "redirect_url": "/azure/azure-vmware/vulnerability-management",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.data-lake-analytics.json

@@ -4,7 +4,7 @@ description: Full list of available performance recommendations in Advisor.
 ms.topic: article
 author: mabrahms
 ms.author: v-mabrahms
-ms.date: 10/15/2023
+ms.date: 3/22/2024
 ---
 
 # Performance recommendations
@@ -167,9 +167,9 @@ Learn more about [Synapse workspace - UpgradeSynapseManagementClientSDK (Update
 
 ### vSAN capacity utilization has crossed critical threshold
 
-Your vSAN capacity utilization has reached 75%. The cluster utilization is required to remain below the 75% critical threshold for SLA compliance. Add new nodes to VSphere cluster to increase capacity or delete VMs to reduce consumption or adjust VM workloads
+Your vSAN capacity utilization has reached 75%. The cluster utilization is required to remain below the 75% critical threshold for SLA compliance. Add new nodes to the vSphere cluster to increase capacity or delete VMs to reduce consumption or adjust VM workloads
 
-Learn more about [AVS Private cloud - vSANCapacity (vSAN capacity utilization has crossed critical threshold)](../azure-vmware/concepts-private-clouds-clusters.md).
+Learn more about [Azure VMware Solution private cloud - vSANCapacity (vSAN capacity utilization has crossed critical threshold)](../azure-vmware/architecture-private-clouds.md).
 
 ### Update Automanage to the latest API Version
 

articles/advisor/advisor-reference-performance-recommendations.md

@@ -37,5 +37,5 @@ Use the following steps to set the required roles for your Language resource and
 5. Select **Select members**
 6. Select your subscription, and **Language** as the managed identity. You can search for user names in the **Select** field. 
 
-> ![IMPORTANT]
+> [!IMPORTANT]
 > If you have a virtual network or private endpoint, be sure to select **Allow Azure services on the trusted services list to access this storage account** in the Azure portal.

articles/ai-services/language-service/custom-named-entity-recognition/includes/roles-for-resource-and-storage.md

@@ -37,5 +37,5 @@ Use the following steps to set the required roles for your Language resource and
 5. Select **Select members**
 6. Select your subscription, and **Language** as the managed identity. You can search for user names in the **Select** field. 
 
-> ![IMPORTANT]
+> [!IMPORTANT]
 > If you have a virtual network or private endpoint, be sure to select **Allow Azure services on the trusted services list to access this storage account** in the Azure portal.

articles/ai-services/language-service/includes/custom/roles-for-resource-and-storage.md

@@ -21,7 +21,7 @@ By default, your subscription uses Microsoft-managed encryption keys. There is a
 
 Custom question answering uses CMK support from Azure search, and associates the provided CMK to encrypt the data stored in Azure search index. Please follow the steps listed in [this article](../../../../search/search-security-manage-encryption-keys.md) to configure Key Vault access for the Azure search service.
 
-> [NOTE]
+> [!NOTE]
 > Whenever the CMK is being rotated, make sure there is a period of overlap between the old and new versions of the key where both are enabled and not expired.
 
 > [!IMPORTANT]

articles/ai-services/language-service/question-answering/how-to/encrypt-data-at-rest.md

@@ -487,7 +487,7 @@ When the application routing add-on is disabled, some Kubernetes resources might
 
 * [Configure custom ingress configurations][custom-ingress-configurations] shows how to create an advanced Ingress configuration and [configure a custom domain using Azure DNS to manage DNS zones and setup a secure ingress][dns-ssl-configuration].
 
-* To integrate with an Azure internal load balancer and configure a private Azure DNS zone to enable DNS resolution for the private endpoints to resolve specific domains, see [Configure internal NGIX ingress controller for Azure private DNS zone][create-nginx-private-controller].
+* To integrate with an Azure internal load balancer and configure a private Azure DNS zone to enable DNS resolution for the private endpoints to resolve specific domains, see [Configure internal NGINX ingress controller for Azure private DNS zone][create-nginx-private-controller].
 
 * Learn about monitoring the ingress-nginx controller metrics included with the application routing add-on with [with Prometheus in Grafana][prometheus-in-grafana] (preview) as part of analyzing the performance and usage of your application.