Merge conflicts

Author: msmbaldwin

.github/ISSUE_TEMPLATE/aks-customer-feedback.yml

@@ -0,0 +1,68 @@
+name: "📄 Azure Kubernetes Services - Feedback control template"
+title: "Feedback"
+description: >-
+  🛈 FYI - This issue template is intended for use by the feedback control on the bottom of Azure Kubernetes Services pages on the
+  https://learn.microsoft.com/azure/aks site.
+labels:
+  - "azure-kubernetes-services/svc"
+body:
+  - type: markdown
+    attributes:
+      value: "## Enter your feedback"
+  - type: markdown
+    attributes:
+      value: Select the issue type, and describe the issue in the text box below. Add as much detail as needed to help us resolve the issue.
+  - type: dropdown
+    id: issue-type
+    attributes:
+      label: Type of issue
+      options:
+        - Typo
+        - Code doesn't work
+        - Missing information
+        - Outdated article
+        - Other (describe below)
+    validations:
+      required: true
+  - type: textarea
+    id: userfeedback
+    validations:
+      required: true
+    attributes:
+      label: Feedback
+      description: >-
+        If possible, please provide extended details that will add context and help the team update
+        the documentation. Additional details may not be useful for typos, grammar, formatting, etc.
+        For technical or factual errors, please include code snippets and output to show how the
+        documentation is incorrect.
+  - type: markdown
+    attributes:
+      value: "## 🚧 Article information 🚧"
+  - type: markdown
+    attributes:
+      value: "*Don't modify the following fields*. They are automatically filled in for you. Doing so will disconnect your issue from the affected article. *Don't edit them*."
+  - type: input
+    id: pageUrl
+    validations:
+      required: true
+    attributes:
+      label: Page URL
+  - type: input
+    id: contentSourceUrl
+    validations:
+      required: true
+    attributes:
+      label: Content source URL
+  - type: input
+    id: author
+    validations:
+      required: true
+    attributes:
+      label: Author
+      description: GitHub Id of the author
+  - type: input
+    id: documentVersionIndependentId
+    validations:
+      required: true
+    attributes:
+      label: Document Id

.openpublishing.redirection.azure-monitor.json

@@ -10,6 +10,11 @@
             "redirect_url": "/azure/azure-monitor/vm/scom-managed-instance-overview",
             "redirect_document_id": false
          },
+        {
+            "source_path_from_root": "/articles/azure-monitor/vm/scom-managed-instance-overview.md",
+            "redirect_url": "/azure/azure-monitor/scom-manage-instance/overview",
+            "redirect_document_id": false
+         },
         {
             "source_path_from_root": "/articles/azure-monitor/best-practices.md",
             "redirect_url": "/azure/azure-monitor/getting-started",
@@ -6733,9 +6738,11 @@
             "source_path_from_root": "/articles/azure-monitor/essentials/pipeline-overview.md",
             "redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-overview",
             "redirect_document_id": false
-        }
-        
-        
-
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/agents/azure-monitor-agent-migration-tools.md",
+            "redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-migration",
+            "redirect_document_id": false
+        }     
     ]
 }

.openpublishing.redirection.json

@@ -4087,10 +4087,32 @@
             "source_path_from_root": "/articles/event-grid/move-domains-across-regions.md",
             "redirect_url": "/azure",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/openshift/tutorial-create-cluster.md",
+            "redirect_url": "/azure/openshift/create-cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/openshift/tutorial-connect-cluster.md",
+            "redirect_url": "/azure/openshift/connect-cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/openshift/tutorial-delete-cluster.md",
+            "redirect_url": "/azure/openshift/delete-cluster",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/openshift/quickstart-portal.md",
+            "redirect_url": "/azure/openshift/create-cluster",
+            "redirect_document_id": false
+        },
+        {
+           "source_path_from_root": "/articles/data-factory/continuous-integration-delivery-automate-github-actions.md",
+            "redirect_url": "/azure",
+            "redirect_document_id": false
         }
-
-
-
-        
+       
     ]
 }

.openpublishing.redirection.virtual-desktop.json

@@ -424,6 +424,11 @@
             "source_path_from_root": "/articles/virtual-desktop/fslogix-containers-azure-files.md",
             "redirect_url": "/azure/virtual-desktop/fslogix-profile-containers",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/host-pool-load-balancing.md",
+            "redirect_url": "/azure/virtual-desktop/configure-host-pool-load-balancing",
+            "redirect_document_id": false
         }
     ]
 }

articles/active-directory-b2c/TOC.yml

@@ -824,8 +824,6 @@
     href: user-flow-versions-legacy.md
 - name: Resources
   items:
-  - name: Azure Roadmap
-    href: https://azure.microsoft.com/updates/?status=nowavailable,inpreview,indevelopment&category=identity,security&query=b2c
   - name: Frequently asked questions
     href: ./faq.yml
     displayName: FAQ

articles/active-directory-b2c/manage-user-data.md

@@ -22,7 +22,7 @@ ms.custom: fasttrack-edit
 
  This article discusses how you can manage the user data in Azure Active Directory B2C (Azure AD B2C) by using the operations that are provided by the [Microsoft Graph API](/graph/use-the-api). Managing user data includes deleting or exporting data from audit logs.
 
-[!INCLUDE [gdpr-intro-sentence.md](~/reusable-content/ce-skilling/azure/includes/gdpr-intro-sentence.md)]
+[!INCLUDE [gdpr-intro-sentence.md](../../includes/gdpr-intro-sentence.md)]
 
 ## Delete user data
 

articles/active-directory-b2c/quickstart-native-app-desktop.md

@@ -21,7 +21,7 @@ ms.subservice: B2C
 
 Azure Active Directory B2C (Azure AD B2C) provides cloud identity management to keep your application, business, and customers protected. Azure AD B2C enables your applications to authenticate to social accounts and enterprise accounts using open standard protocols. In this quickstart, you use a Windows Presentation Foundation (WPF) desktop application to sign in using a social identity provider and call an Azure AD B2C protected web API.
 
-[!INCLUDE [quickstarts-free-trial-note](~/reusable-content/ce-skilling/azure/includes/quickstarts-free-trial-note.md)]
+[!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
 
 ## Prerequisites
 

articles/advisor/advisor-alerts-arm.md

@@ -10,7 +10,7 @@ ms.date: 06/29/2020
 
 This article shows you how to set up an alert for new recommendations from Azure Advisor using an Azure Resource Manager template (ARM template).
 
-[!INCLUDE [About Azure Resource Manager](~/reusable-content/ce-skilling/azure/includes/resource-manager-quickstart-introduction.md)]
+[!INCLUDE [About Azure Resource Manager](../../includes/resource-manager-quickstart-introduction.md)]
 
 Whenever Azure Advisor detects a new recommendation for one of your resources, an event is stored in [Azure Activity log](../azure-monitor/essentials/platform-logs-overview.md). You can set up alerts for these events from Azure Advisor using a recommendation-specific alerts creation experience. You can select a subscription and optionally a resource group to specify the resources that you want to receive alerts on.
 

articles/advisor/advisor-alerts-bicep.md

@@ -10,7 +10,7 @@ ms.date: 04/26/2022
 
 This article shows you how to set up an alert for new recommendations from Azure Advisor using Bicep.
 
-[!INCLUDE [About Bicep](~/reusable-content/ce-skilling/azure/includes/resource-manager-quickstart-bicep-introduction.md)]
+[!INCLUDE [About Bicep](../../includes/resource-manager-quickstart-bicep-introduction.md)]
 
 Whenever Azure Advisor detects a new recommendation for one of your resources, an event is stored in [Azure Activity log](../azure-monitor/essentials/platform-logs-overview.md). You can set up alerts for these events from Azure Advisor using a recommendation-specific alerts creation experience. You can select a subscription and optionally select a resource group to specify the resources that you want to receive alerts on.
 

articles/ai-services/LUIS/luis-traffic-manager.md

@@ -25,7 +25,7 @@ The client-application has to manage the traffic across the keys. LUIS doesn't d
 
 This article explains how to manage the traffic across keys with Azure [Traffic Manager][traffic-manager-marketing]. You must already have a trained and published LUIS app. If you do not have one, follow the Prebuilt domain [quickstart](luis-get-started-create-app.md).
 
-[!INCLUDE [updated-for-az](~/reusable-content/ce-skilling/azure/includes/updated-for-az.md)]
+[!INCLUDE [updated-for-az](../../../includes/updated-for-az.md)]
 
 ## Connect to PowerShell in the Azure portal
 In the [Azure portal](https://portal.azure.com), open the PowerShell window. The icon for the PowerShell window is the **>_** in the top navigation bar. By using PowerShell from the portal, you get the latest PowerShell version and you are authenticated. PowerShell in the portal requires an [Azure Storage](https://azure.microsoft.com/services/storage/) account.