Resolve merge conficts

Author: JKirsch1

.openpublishing.publish.config.json

@@ -110,12 +110,6 @@
       "branch": "main",
       "branch_mapping": {}
     },
-    {
-      "path_to_root": "azureai-samples-temp",
-      "url": "https://github.com/sdgilley/azureai-samples",
-      "branch": "sdg-add-quickstart",
-      "branch_mapping": {}
-    },
     {
       "path_to_root": "azureai-samples-csharp",
       "url": "https://github.com/Azure-Samples/azureai-samples",
@@ -182,6 +176,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azureai-model-inference-bicep",
+      "url": "https://github.com/Azure-Samples/azureai-model-inference-bicep",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure-docs-pr-policy-includes",
       "url": "https://github.com/MicrosoftDocs/azure-docs-pr",

.openpublishing.redirection.json

@@ -15,6 +15,11 @@
       "redirect_url": "/azure/search/search-how-to-dotnet-sdk",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/ai-services/agents/how-to/tools/overview.md",
+      "redirect_url": "/azure/ai-services/agents/overview",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/search/search-howto-index-csv-blobs.md",
       "redirect_url": "/azure/search/search-how-to-index-csv-blobs",
@@ -25,10 +30,140 @@
       "redirect_url": "/azure/search/search-how-to-large-index",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/ai-services/agents/concepts/agents.md",
+      "redirect_url": "/azure/ai-services/agents/overview",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/ai-services/openai/how-to/use-your-data-securely.md",
       "redirect_url": "/azure/ai-services/openai/how-to/on-your-data-configuration",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/concepts/data-formats.md",
+      "redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/concepts/entity-components.md",
+      "redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/concepts/evaluation-metrics.md",
+      "redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/how-to/call-api.md",
+      "redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/how-to/create-project.md",
+      "redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/how-to/deploy-model.md",
+      "redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/how-to/design-schema.md",
+      "redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/how-to/fail-over.md",
+      "redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/how-to/label-data.md",
+      "redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/how-to/train-model.md",
+      "redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/how-to/view-model-evaluation.md",
+      "redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/language-support.md",
+      "redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/overview.md",
+      "redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/quickstart.md",
+      "redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/reference/glossary.md",
+      "redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/custom-text-analytics-for-health/reference/service-limits.md",
+      "redirect_url": "/azure/ai-services/language-service/text-analytics-for-health/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/sentiment-opinion-mining/custom/concepts/data-formats.md",
+      "redirect_url": "/azure/ai-services/language-service/sentiment-opinion-mining/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/sentiment-opinion-mining/custom/how-to/call-api.md",
+      "redirect_url": "/azure/ai-services/language-service/sentiment-opinion-mining/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/sentiment-opinion-mining/custom/how-to/create-project.md",
+      "redirect_url": "/azure/ai-services/language-service/sentiment-opinion-mining/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/sentiment-opinion-mining/custom/how-to/deploy-model.md",
+      "redirect_url": "/azure/ai-services/language-service/sentiment-opinion-mining/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/sentiment-opinion-mining/custom/how-to/design-schema.md",
+      "redirect_url": "/azure/ai-services/language-service/sentiment-opinion-mining/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/sentiment-opinion-mining/custom/how-to/label-data.md",
+      "redirect_url": "/azure/ai-services/language-service/sentiment-opinion-mining/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/sentiment-opinion-mining/custom/how-to/train-model.md",
+      "redirect_url": "/azure/ai-services/language-service/sentiment-opinion-mining/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/language-service/sentiment-opinion-mining/custom/quickstart.md",
+      "redirect_url": "/azure/ai-services/language-service/sentiment-opinion-mining/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ai-services/openai/references/azure-machine-learning.md",
+      "redirect_url": "/azure/ai-services/openai/concepts/use-your-data",
+      "redirect_document_id": false
     }
   ]
 }

.whatsnew.json

@@ -0,0 +1,35 @@
+{ 
+    "$schema": "https://whatsnewapi.azurewebsites.net/schema",
+    "docSetProductName": "Azure AI Services",
+    "rootDirectory": "articles/",
+    "docLinkSettings": {
+        "linkFormat": "relative",
+        "relativeLinkPrefix": "../"
+    },
+    "navigationOptions": {
+        "maximumNumberOfArticles": 5,
+        "tocParentNode": "Latest documentation updates",
+        "repoTocFolder": "articles/ai-services",
+        "indexParentNode": "Latest documentation updates",
+        "repoIndexFolder": "articles/ai-services"
+    },
+    "areas": [
+        {
+            "names": [ "ai-services" ],
+            "heading": "Azure AI Services"
+        },
+        {
+            "names": [ "ai-studio" ],
+            "heading": "Azure AI Foundry"
+        },
+        {
+            "names": [ "machine-learning" ],
+            "heading": "Azure Machine Learning"
+        },
+        {
+            "names": [ "search" ],
+            "heading": "Azure AI Search"
+    
+        }
+    ]
+}

articles/ai-foundry/model-inference/breadcrumb/toc.yml

@@ -0,0 +1,11 @@
+- name: Azure
+  tocHref: /azure/
+  topicHref: /azure/index
+  items:
+  - name: AI Foundry
+    tocHref: /azure/ai-foundry/
+    topicHref: /azure/ai-studio/index
+    items:
+    - name: Model Inference
+      tocHref: /azure/ai-foundry/model-inference/
+      topicHref: /azure/ai-foundry/model-inference/index