Merge pull request #2600 from eric-urban/eur/resolve-conflict-ds-1

[DIRTY PR] resolve conflict ds 1

Author: ShannonLeavitt

articles/ai-foundry/model-inference/concepts/endpoints.md

@@ -38,7 +38,7 @@ To learn more about how to create deployments see [Add and configure model deplo
 
 ## Azure AI inference endpoint
 
-The Azure AI inference endpoint allows customers to use a single endpoint with the same authentication and schema to generate inference for the deployed models in the resource. This endpoint follows the [Azure AI model inference API](../../../ai-studio/reference/reference-model-inference-api.md) which all the models in Azure AI model inference support. It support the following modalidities:
+The Azure AI inference endpoint allows customers to use a single endpoint with the same authentication and schema to generate inference for the deployed models in the resource. This endpoint follows the [Azure AI model inference API](.././reference/reference-model-inference-api.md) which all the models in Azure AI model inference support. It support the following modalidities:
 
 * Text embeddings
 * Image embeddings

articles/ai-foundry/model-inference/how-to/inference.md

@@ -26,7 +26,7 @@ Azure AI services expose multiple endpoints depending on the type of work you're
 > * Azure AI model inference endpoint
 > * Azure OpenAI endpoint
 
-The **Azure AI inference endpoint** (usually with the form `https://<resource-name>.services.ai.azure.com/models`) allows customers to use a single endpoint with the same authentication and schema to generate inference for the deployed models in the resource. All the models support this capability. This endpoint follows the [Azure AI model inference API](../../../ai-studio/reference/reference-model-inference-api.md). 
+The **Azure AI inference endpoint** (usually with the form `https://<resource-name>.services.ai.azure.com/models`) allows customers to use a single endpoint with the same authentication and schema to generate inference for the deployed models in the resource. All the models support this capability. This endpoint follows the [Azure AI model inference API](.././reference/reference-model-inference-api.md). 
 
 **Azure OpenAI** models deployed to AI services also support the Azure OpenAI API (usually with the form `https://<resource-name>.openai.azure.com`). This endpoint exposes the full capabilities of OpenAI models and supports more features like assistants, threads, files, and batch inference.
 

articles/ai-foundry/model-inference/how-to/use-chat-completions.md

@@ -49,4 +49,4 @@ zone_pivot_groups: azure-ai-inference-samples
 ## Related content
 
 * [Use embeddings models](use-embeddings.md)
-* [Azure AI Model Inference API](../../../ai-studio/reference/reference-model-inference-api.md)
+* [Azure AI Model Inference API](.././reference/reference-model-inference-api.md)

articles/ai-foundry/model-inference/how-to/use-embeddings.md

@@ -49,4 +49,4 @@ zone_pivot_groups: azure-ai-inference-samples
 ## Related content
 
 * [Use embeddings models](use-embeddings.md)
-* [Azure AI Model Inference API](../../../ai-studio/reference/reference-model-inference-api.md)
+* [Azure AI Model Inference API](.././reference/reference-model-inference-api.md)

articles/ai-foundry/model-inference/how-to/use-image-embeddings.md

@@ -49,4 +49,4 @@ zone_pivot_groups: azure-ai-inference-samples
 ## Related content
 
 * [Use embeddings models](use-embeddings.md)
-* [Azure AI Model Inference API](../../../ai-studio/reference/reference-model-inference-api.md)
+* [Azure AI Model Inference API](.././reference/reference-model-inference-api.md)

articles/ai-foundry/model-inference/includes/code-create-chat-client-entra.md

@@ -117,7 +117,7 @@ Explore our [samples](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/
 
 # [REST](#tab/rest)
 
-Use the reference section to explore the API design and which parameters are available and indicate authentication token in the header `Authorization`. For example, the reference section for [Chat completions](../../../ai-studio/reference/reference-model-inference-chat-completions.md) details how to use the route `/chat/completions` to generate predictions based on chat-formatted instructions. Notice that the path `/models` is included to the root of the URL:
+Use the reference section to explore the API design and which parameters are available and indicate authentication token in the header `Authorization`. For example, the reference section for [Chat completions](.././reference/reference-model-inference-chat-completions.md) details how to use the route `/chat/completions` to generate predictions based on chat-formatted instructions. Notice that the path `/models` is included to the root of the URL:
 
 __Request__
 

articles/ai-foundry/model-inference/includes/code-create-chat-client.md

@@ -109,7 +109,7 @@ Explore our [samples](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/
 
 # [REST](#tab/rest)
 
-Use the reference section to explore the API design and which parameters are available. For example, the reference section for [Chat completions](../../../ai-studio/reference/reference-model-inference-chat-completions.md) details how to use the route `/chat/completions` to generate predictions based on chat-formatted instructions. Notice that the path `/models` is included to the root of the URL:
+Use the reference section to explore the API design and which parameters are available. For example, the reference section for [Chat completions](.././reference/reference-model-inference-chat-completions.md) details how to use the route `/chat/completions` to generate predictions based on chat-formatted instructions. Notice that the path `/models` is included to the root of the URL:
 
 __Request__
 

articles/ai-foundry/model-inference/includes/code-create-embeddings-client.md

@@ -126,7 +126,7 @@ Explore our [samples](https://aka.ms/azsdk/azure-ai-inference/csharp/samples) an
 
 # [REST](#tab/rest)
 
-Use the reference section to explore the API design and which parameters are available. For example, the reference section for [Embeddings](../../../ai-studio/reference/reference-model-inference-embeddings.md) details how to use the route `/embeddings` to generate predictions based on chat-formatted instructions. Notice that the path `/models` is included to the root of the URL:
+Use the reference section to explore the API design and which parameters are available. For example, the reference section for [Embeddings](.././reference/reference-model-inference-embeddings.md) details how to use the route `/embeddings` to generate predictions based on chat-formatted instructions. Notice that the path `/models` is included to the root of the URL:
 
 __Request__
 

articles/ai-foundry/model-inference/includes/feature-preview.md

@@ -0,0 +1,13 @@
+---
+title: include file
+description: include file
+author: msakande
+ms.author: mopeakande
+ms.service: azure-ai-studio
+ms.topic: include
+ms.date: 1/28/2025
+ms.custom: include file
+---
+
+> [!IMPORTANT]
+> Items marked (preview) in this article are currently in public preview. This preview is provided without a service-level agreement, and we don't recommend it for production workloads. Certain features might not be supported or might have constrained capabilities. For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/).

articles/ai-foundry/model-inference/overview.md

@@ -23,7 +23,7 @@ Azure AI model inference provides access to the most powerful models available i
 
 Azure AI model inference provides a way to **consume models as APIs without hosting them on your infrastructure**. Models are hosted in a Microsoft-managed infrastructure, which enables API-based access to the model provider's model. API-based access can dramatically reduce the cost of accessing a model and simplify the provisioning experience.
 
-Azure AI model inference is part of Azure AI Services, and users can access the service through [REST APIs](../../ai-studio/reference/reference-model-inference-api.md), [SDKs in several languages](supported-languages.md) such as Python, C#, JavaScript, and Java. You can also use the Azure AI model inference from [Azure AI Foundry by configuring a connection](how-to/configure-project-connection.md).
+Azure AI model inference is part of Azure AI Services, and users can access the service through [REST APIs](./reference/reference-model-inference-api.md), [SDKs in several languages](supported-languages.md) such as Python, C#, JavaScript, and Java. You can also use the Azure AI model inference from [Azure AI Foundry by configuring a connection](how-to/configure-project-connection.md).
 
 ## Models