Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into hpcScaffoldAndMigrationGuide

merging main

Author: tomvcassidy

.openpublishing.redirection.app-service.json

@@ -1322,7 +1322,22 @@
         },
         {
             "source_path_from_root": "/articles/app-service/containers/quickstart-multi-container.md",
-            "redirect_url": "/azure/app-service/quickstart-multi-container",
+            "redirect_url": "/azure/app-service/tutorial-custom-container-sidecar",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/app-service/containers/tutorial-multi-container-app.md",
+            "redirect_url": "/azure/app-service/tutorial-custom-container-sidecar",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/app-service/quickstart-multi-container.md",
+            "redirect_url": "/azure/app-service/tutorial-custom-container-sidecar",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/app-service/tutorial-multi-container-app.md",
+            "redirect_url": "/azure/app-service/tutorial-custom-container-sidecar",
             "redirect_document_id": false
         },
         {
@@ -1975,11 +1990,6 @@
             "redirect_url": "/azure/app-service/tutorial-java-spring-cosmosdb",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/app-service/containers/tutorial-multi-container-app.md",
-            "redirect_url": "/azure/app-service/tutorial-multi-container-app",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/app-service/app-service-web-tutorial-nodejs-mongodb-app.md",
             "redirect_url": "/azure/app-service/tutorial-nodejs-mongodb-app",

.openpublishing.redirection.azure-resource-manager.json

@@ -2009,6 +2009,11 @@
       "source_path_from_root": "/articles/azure-resource-manager/bicep/bicep-extensibility-kubernetes-provider.md",
       "redirect_url": "/azure/azure-resource-manager/bicep/bicep-kubernetes-extension",
       "redirect_document_id": false
-    }    
+    },
+    {
+      "source_path_from_root": "/articles/azure-resource-manager/bicep/tutorial-use-deployment-stacks.md",
+      "redirect_url": "/training/modules/manage-resource-lifecycles-deployment-stacks",
+      "redirect_document_id": false
+    }        
   ]
 }

.openpublishing.redirection.education.json

@@ -4,6 +4,11 @@
             "source_path_from_root": "/articles/education-hub/custom-tenant-set-up-classroom.md",
             "redirect_url": "/articles/education-hub/about-education-hub.md",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/education-hub/it-admin-allocate-credit.md",
+            "redirect_url": "/articles/education-hub/about-education-hub.md",
+            "redirect_document_id": false
         }
     ]
     }

.openpublishing.redirection.iot-develop.json

@@ -350,6 +350,11 @@
       "redirect_url": "/azure/iot/concepts-model-parser",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/iot/concepts-model-parser.md",
+      "redirect_url": "/azure/iot/concepts-modeling-guide",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/iot-pnp/concepts-model-repository.md",
       "redirect_url": "/azure/iot/concepts-model-discovery",

.openpublishing.redirection.json

@@ -10,7 +10,7 @@
       "redirect_url": "/previous-versions/azure/azure-app-configuration/rest-api-fiddler",
       "redirect_document_id": false
     },
-    { 
+    {
       "source_path": "articles/kinect-dk/index.yml",
       "redirect_url": "/previous-versions/azure/kinect-dk/index",
       "redirect_document_id": false
@@ -3125,6 +3125,11 @@
       "redirect_url": "/azure/openshift/howto-byok",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/openshift/howto-deploy-java-jboss-enterprise-application-platform-with-auto-redeploy.md",
+      "redirect_url": "/azure/openshift/index",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/openshift/quickstart-portal.md",
       "redirect_url": "/azure/openshift/create-cluster",
@@ -4754,6 +4759,11 @@
       "source_path_from_root": "/articles/virtual-network/virtual-network-service-endpoint-policies-powershell.md",
       "redirect_url": "/azure/virtual-network/virtual-network-service-endpoint-policies",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/modeling-simulation-workbench/how-to-guide-manage-storage.md",
+      "redirect_url": "/azure/modeling-simulation-workbench/concept-storage",
+      "redirect_document_id": false
     }
   ]
 }

README.md

@@ -12,7 +12,7 @@ You've decided to contribute. That's great! To contribute to the documentation,
 
 #### GitHub
 
-Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for [GitHub account setup](https://learn.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
+Contributing to the documentation requires a [GitHub account](https://github.com/). If you don't have an account, follow the instructions for [GitHub account setup](https://learn.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
 
 #### Tools
 

articles/advisor/advisor-how-to-calculate-total-cost-savings.md

@@ -1,14 +1,24 @@
 ---
 title: Calculate cost savings in Azure Advisor
 ms.topic: article
-ms.date: 02/06/2024
+ms.date: 09/05/2024
 description: Export cost savings in Azure Advisor and calculate the aggregated potential yearly savings by using the cost savings amount for each recommendation.
 ---
 
 # Calculate cost savings
 
 This article provides guidance on how to calculate total cost savings in Azure Advisor. 
 
+## Understand cost savings
+
+Azure Advisor provides recommendations for resizing/shutting down underutilized resources, purchasing compute reserved instances, and savings plans for compute.
+
+These recommendations contain one or more calls-to-action and forecasted savings from following the recommendations. Recommendations should be followed in a specific order: rightsizing/shutdown, followed by reservation purchases, and finally, the savings plan purchase. This sequence allows each step to impact the subsequent ones positively.
+
+For example, rightsizing or shutting down resources reduces on-demand costs immediately. This change in your usage pattern essentially invalidates your existing reservation and savings plan recommendations, as they were based on your pre-rightsizing usage and costs. Updated reservation and savings plan recommendations (and their forecasted savings) should appear within three days. 
+
+The forecasted savings from reservations and savings plans are based on actual rates and usage, while the forecasted savings from rightsizing/shutdown are based on retail rates. The actual savings may vary depending on the usage patterns and rates. Assuming there are no material changes to your usage patterns, your actual savings from reservations and savings plan should be in line with the forecasts. Savings from rightsizing/shutdown vary based on your actual rates. This is important if you intend to track cost savings forecasts from Azure Advisor.
+
 ## Export cost savings for recommendations
 
 To calculate aggregated potential yearly savings, follow these steps: 
@@ -26,13 +36,3 @@ The Advisor **Overview** page opens.
 
 > [!NOTE]
 > Different types of cost savings recommendations are generated using overlapping datasets (for example, VM rightsizing/shutdown, VM reservations and savings plan recommendations all consider on-demand VM usage). As a result, resource changes (e.g., VM shutdowns) or reservation/savings plan purchases will impact on-demand usage, and the resulting recommendations and associated savings forecast. 
-
-## Understand cost savings
-
-Azure Advisor provides recommendations for resizing/shutting down underutilized resources, purchasing compute reserved instances, and savings plans for compute.
-
-These recommendations contain one or more calls-to-action and forecasted savings from following the recommendations. Recommendations should be followed in a specific order: rightsizing/shutdown, followed by reservation purchases, and finally, the savings plan purchase. This sequence allows each step to impact the subsequent ones positively.
-
-For example, rightsizing or shutting down resources reduces on-demand costs immediately. This change in your usage pattern essentially invalidates your existing reservation and savings plan recommendations, as they were based on your pre-rightsizing usage and costs. Updated reservation and savings plan recommendations (and their forecasted savings) should appear within three days. 
-
-The forecasted savings from reservations and savings plans are based on actual rates and usage, while the forecasted savings from rightsizing/shutdown are based on retail rates. The actual savings may vary depending on the usage patterns and rates. Assuming there are no material changes to your usage patterns, your actual savings from reservations and savings plan should be in line with the forecasts. Savings from rightsizing/shutdown vary based on your actual rates. This is important if you intend to track cost savings forecasts from Azure Advisor.