Fix merge conflict

Author: ShawnKupfer

.openpublishing.redirection.json

@@ -33156,6 +33156,286 @@
       "redirect_url": "/training/browse/",
       "redirect_document_id": false
     },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-usage-billing-azure-stack-hub/index.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-usage-billing-azure-stack-hub/1-introduction.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/paths/provide-services-for-azure-stack-hub/index.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-usage-billing-azure-stack-hub/9-azure-stack-hub-usage-bill.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-usage-billing-azure-stack-hub/8-usage-report-infrastructure-cloud-solution-providers.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-usage-billing-azure-stack-hub/7-add-tenant-usage-bill.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-usage-billing-azure-stack-hub/6-usage-bill-multitenant-scenarios.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-usage-billing-azure-stack-hub/5-view-retrieve-usage-data.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-usage-billing-azure-stack-hub/4-set-up-usage-data-report.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-usage-billing-azure-stack-hub/3-select-billing-model.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-usage-billing-azure-stack-hub/2-usage-bill.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-usage-billing-azure-stack-hub/10-knowledge-check.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-usage-billing-azure-stack-hub/11-summary.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-services-for-azure-stack-hub/index.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-services-for-azure-stack-hub/9-change-user-subscription-owner.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-services-for-azure-stack-hub/8-manage-subscriptions-plans-offers-powershell.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-services-for-azure-stack-hub/7-create-user-subscriptions.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-services-for-azure-stack-hub/6-delegate-offers.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-services-for-azure-stack-hub/5-create-manage-offers.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-services-for-azure-stack-hub/4-create-add-plan.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-services-for-azure-stack-hub/3-create-plan.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-services-for-azure-stack-hub/2-azure-stack-hub-quotas-plans-offers-subscriptions.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-services-for-azure-stack-hub/10-knowledge-check.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-services-for-azure-stack-hub/1-introduction.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-services-for-azure-stack-hub/11-summary.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-app-services-resource-provider-for-azure-stack-hub/index.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-app-services-resource-provider-for-azure-stack-hub/9-knowledge-check.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-app-services-resource-provider-for-azure-stack-hub/8-back-up-app-services.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-app-services-resource-provider-for-azure-stack-hub/7-rotate-app-services-secrets-certificates.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-app-services-resource-provider-for-azure-stack-hub/6-scale-roles-based-capacity-requirements.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-app-services-resource-provider-for-azure-stack-hub/5-update-app-services-resource-provider.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-app-services-resource-provider-for-azure-stack-hub/4-deploy-app-services-resource-provider.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-app-services-resource-provider-for-azure-stack-hub/3-plan-app-services-resource-provider-deployment.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-app-services-resource-provider-for-azure-stack-hub/2-azure-app-service-azure-stack-hub-overview.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-app-services-resource-provider-for-azure-stack-hub/1-introduction.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-app-services-resource-provider-for-azure-stack-hub/10-summary.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-event-hubs-resource-provider-for-azure-stack-hub/index.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-event-hubs-resource-provider-for-azure-stack-hub/6-knowledge-check.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-event-hubs-resource-provider-for-azure-stack-hub/5-rotate-event-hubs-secrets-certificates.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-event-hubs-resource-provider-for-azure-stack-hub/4-update-event-hubs-resource-provider.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-event-hubs-resource-provider-for-azure-stack-hub/3-deploy-event-hubs-resource-provider.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-event-hubs-resource-provider-for-azure-stack-hub/2-plan-event-hubs-resource-provider-deployment.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-event-hubs-resource-provider-for-azure-stack-hub/1-introduction.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/offer-event-hubs-resource-provider-for-azure-stack-hub/7-summary.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-azure-stack-hub-marketplace/index.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-azure-stack-hub-marketplace/9-azure-stack-hub-marketplace-frequent-questions.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-azure-stack-hub-marketplace/8-publish-custom-azure-stack-hub-marketplace-item.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-azure-stack-hub-marketplace/7-create-custom-azure-stack-hub-marketplace-item.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-azure-stack-hub-marketplace/6-add-remove-custom-virtual-machine-image-azure-stack-hub.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-azure-stack-hub-marketplace/5-import-publish-azure-stack-hub-marketplace-powershell.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-azure-stack-hub-marketplace/4-populate-azure-stack-hub-marketplace-disconnected-environment.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-azure-stack-hub-marketplace/3-download-marketplace-items-azure-stack-hub.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-azure-stack-hub-marketplace/10-knowledge-check.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-azure-stack-hub-marketplace/2-overview-azure-stack-hub-marketplace.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-azure-stack-hub-marketplace/1-introduction.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/manage-azure-stack-hub-marketplace/11-summary.yml",
+      "redirect_url": "/training/",
+      "redirect_document_id": false
+    },
     {
       "source_path": "learn-pr/azure/protect-identities-with-aad-idp/1-introduction.yml",
       "redirect_url": "https://learn.microsoft.com/entra/id-protection/overview-identity-protection",
@@ -42028,6 +42308,26 @@
       "source_path": "learn-pr/sqlserver/deploy-sql-server-linux/index.yml",
       "redirect_url": "https://learn.microsoft.com//training/modules/introduction-sql-server-linux/",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/observability-continuous-improvement/7-knowledge-check.yml",
+      "redirect_url": "/training/modules/observability-continuous-improvement/8-knowledge-check",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/observability-continuous-improvement/8-summary.yml",
+      "redirect_url": "/training/modules/observability-continuous-improvement/9-summary",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/strategic-platform-road-mapping/9-knowledge-check.yml",
+      "redirect_url": "/training/modules/strategic-platform-road-mapping/10-knowledge-check",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/strategic-platform-road-mapping/10-summary.yml",
+      "redirect_url": "/training/modules/strategic-platform-road-mapping/11-summary",
+      "redirect_document_id": false
     }
   ]
 }

learn-pr/achievements.yml

@@ -1532,6 +1532,36 @@ achievements:
   title: Build a .NET Core app for Azure Cosmos DB in Visual Studio Code
   summary: Learn how to create a .NET Core application to store and query data in Azure Cosmos DB by using Visual Studio Code.
   iconUrl: /training/achievements/build-cosmos-db-app-with-vscode.svg
+- uid: learn.wwl.manage-azure-stack-hub-marketplace.badge
+  type: badge
+  title: Manage Azure Stack Hub Marketplace
+  summary: Manage Azure Stack Hub Marketplace
+  iconUrl: /training/achievements/1-manage-azure-stack-hub-marketplace.svg
+- uid: learn.wwl.offer-app-services-resource-provider-for-azure-stack-hub.badge
+  type: badge
+  title: Offer an App Services resource provider  for Azure Stack Hub
+  summary: Offer an App Services resource provider  for Azure Stack Hub
+  iconUrl: /training/achievements/2-offer-an-app-services-resource-provider-for-azure-stack-hub.svg
+- uid: learn.wwl.offer-services-for-azure-stack-hub.badge
+  type: badge
+  title: Offer services for Azure Stack Hub
+  summary: Offer services for Azure Stack Hub
+  iconUrl: /training/achievements/4-offer-services-for-azure-stack-hub.svg
+- uid: learn.wwl.manage-usage-billing-for-azure-stack-hub.badge
+  type: badge
+  title: Manage usage and billing for Azure Stack Hub
+  summary: Manage usage and billing for Azure Stack Hub
+  iconUrl: /training/achievements/5-manage-usage-and-billing-for-azure-stack-hub.svg
+- uid: learn.wwl.provide-services-for-azure-stack-hub.trophy
+  type: trophy
+  title: Provide services for Azure Stack Hub
+  summary: Provide services for Azure Stack Hub
+  iconUrl: /training/achievements/provide-services-for-azure-stack-hub.svg
+- uid: learn.wwl.offer-event-hubs-resource-provider-for-azure-stack-hub.badge
+  type: badge
+  title: Offer an Event Hubs resource provider for Azure Stack Hub
+  summary: Offer an Event Hubs resource provider for Azure Stack Hub
+  iconUrl: /training/achievements/offer-an-event-hubs-resource-provider-for-azure-stack-hub.svg
 - uid: learn.monitor-azure-cosmos-db.badge
   type: badge
   title: Optimize the performance of Azure Cosmos DB by using partitioning and indexing strategies