resolve conflict

Author: b-ahibbard

.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.publish.config.json

@@ -254,6 +254,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "function-flex-consumption",
+      "url": "https://github.com/Azure-Samples/azure-functions-flex-consumption-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "functions-azure-product",
       "url": "https://github.com/Azure/Azure-Functions",
@@ -506,6 +512,12 @@
       "branch": "sdk-codetest",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "rag-data-openai-python-promptflow-main",
+      "url": "https://github.com/Azure-Samples/rag-data-openai-python-promptflow",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azureml-examples-main",
       "url": "https://github.com/azure/azureml-examples",
@@ -986,6 +998,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "msdocs-app-service-sqldb-dotnetcore",
+      "url": "https://github.com/Azure-Samples/msdocs-app-service-sqldb-dotnetcore",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azuresignalr-samples",
       "url": "https://github.com/aspnet/AzureSignalR-samples",
@@ -1219,6 +1237,12 @@
       "url": "https://github.com/MicrosoftDocs/SupportArticles-docs",
       "branch": "main",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "msdocs-python-fastapi-webapp-quickstart",
+      "url": "https://github.com/Azure-Samples/msdocs-python-fastapi-webapp-quickstart",
+      "branch": "main",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {
@@ -1236,6 +1260,10 @@
   },
   "redirection_files": [
   ".openpublishing.redirection.active-directory.json",
+  ".openpublishing.redirection.ai-services-from-applied.json",
+  ".openpublishing.redirection.ai-services-from-cog.json",
+  ".openpublishing.redirection.applied-ai-old.json",
+  ".openpublishing.redirection.applied-ai-services.json",
   ".openpublishing.redirection.ansible.json",
   ".openpublishing.redirection.api-center.json",
   ".openpublishing.redirection.api-management.json",
@@ -1259,12 +1287,14 @@
   ".openpublishing.redirection.azure-web-pubsub.json",
   ".openpublishing.redirection.baremetal-infrastructure.json",
   ".openpublishing.redirection.blockchain.json",
+  ".openpublishing.redirection.cognitive-services.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.dev-spaces.json",
   ".openpublishing.redirection.devops-project.json",
+  ".openpublishing.redirection.document-db.json",
   ".openpublishing.redirection.germany.json",
   ".openpublishing.redirection.government.json",
   ".openpublishing.redirection.guidance.json",
@@ -1277,6 +1307,7 @@
   ".openpublishing.redirection.machine-configuration.json",
   ".openpublishing.redirection.marketplace.json",
   ".openpublishing.redirection.openshift.json",
+  ".openpublishing.redirection.private-multi-access-edge-compute-mec.json",
   ".openpublishing.redirection.purview.json",
   ".openpublishing.redirection.remoteapp.json",
   ".openpublishing.redirection.security-benchmark.json",
@@ -1291,12 +1322,9 @@
   ".openpublishing.redirection.virtual-desktop.json",
   ".openpublishing.redirection.vmware-cloudsimple.json",
   "articles/active-directory-b2c/.openpublishing.redirection.active-directory-b2c.json",
-  "articles/ai-services/.openpublishing.redirection.ai-services-from-applied.json",
-  "articles/ai-services/.openpublishing.redirection.ai-services-from-cog.json",
-  "articles/ai-services/.openpublishing.redirection.applied-ai-old.json",
-  "articles/ai-services/.openpublishing.redirection.applied-ai-services.json",
-  "articles/ai-services/.openpublishing.redirection.cognitive-services.json",
+  "articles/ai-services.openpublishing.redirection.ai-services.json",
   "articles/ai-studio/.openpublishing.redirection.ai-studio.json",
+  "articles/aks/.openpublishing.redirection.aks.json",
   "articles/analysis-services/.openpublishing.redirection.analysis-services.json",
   "articles/application-gateway/.openpublishing.redirection.application-gateway.json",
   "articles/automation/.openpublishing.redirection.automation.json",
@@ -1347,6 +1375,7 @@
   "articles/logic-apps/.openpublishing.redirection.logic-apps.json",
   "articles/machine-learning/.openpublishing.redirection.machine-learning.json",
   "articles/machine-learning/v1/.openpublishing.redirection.machine-learning-v1.json",
+  "articles/managed-instance-apache-cassandra/.openpublishing.redirection.managed-instance-apache-cassandra.json",
   "articles/mariadb/.openpublishing.redirection.mariadb.json",
   "articles/migrate/.openpublishing.redirection.migrate.json",
   "articles/mysql/.openpublishing.redirection.mysql.json",

articles/ai-services/.openpublishing.redirection.ai-services-from-applied.json renamed to .openpublishing.redirection.ai-services-from-applied.json

@@ -539,128 +539,6 @@
       "source_path_from_root": "/articles/applied-ai-services/immersive-reader/context/context.md",
       "redirect_url": "/azure/ai-services/immersive-reader/?context=/azure/ai-services/immersive-reader/context/context",
       "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/v3-migration-guide.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/v3-1-migration-guide",
-      "redirect_document_id": true
-    },
-
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/sdk-overview.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/sdk-overview-v3-0",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/sdk-preview.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/sdk-overview-v3-1",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/get-started/csharp.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/v2-1/csharp",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/get-started/java.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/v2-1/java",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/get-started/javascript.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/v2-1/javascript",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/get-started/python.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/v2-1/python",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/get-started/rest-api.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/v2-1/rest-api",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/concept-insurance-card.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/concept-health-insurance-card",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/concept-w2.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/concept-tax-document",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/resource-customer-stories.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/overview",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/language-support.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/language-support-ocr",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/v3-csharp-sdk.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/csharp-sdk.md",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/v3-javascript-sdk.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/javascript-sdk.md",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/v3-java-sdk.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/java-sdk.md",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/v3-python-sdk.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/python-sdk.md",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/v3-rest-api-sdk.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/rest-api-sdk.md",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/translator/document-translation/quickstarts/document-translation-sdk.md",
-      "redirect_url": "/azure/ai-services/translator/document-translation/quickstarts/asynchronous-sdk",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/translator/document-translation/quickstarts/document-translation-rest-api.md",
-      "redirect_url": "/azure/ai-services/translator/document-translation/quickstarts/asynchronous-rest-api",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/translator/containers/translator-container-configuration.md",
-      "redirect_url": "/azure/ai-services/translator/containers/configuration",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/translator/containers/translator-container-supported-parameters.md",
-      "redirect_url": "/azure/ai-services/translator/containers/translate-text-parameters",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/translator/containers/translator-disconnected-containers.md",
-      "redirect_url": "/azure/ai-services/translator/containers/install-run",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/translator/containers/translator-how-to-install-container.md",
-      "redirect_url": "/azure/ai-services/translator/containers/install-run",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/concept-retrieval-augumented-generation.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/concept-retrieval-augmented-generation",
-      "redirect_document_id": true
     }
-
   ]
 }