Merge branch 'main' into release-maxsurge-ga

Author: v-alje

.openpublishing.redirection.json

@@ -4878,6 +4878,13 @@
             "redirect_document_id": false
         },
         {
+
+            "source_path_from_root": "/articles/backup/azure-backup-move-vaults-across-regions.md",
+            "redirect_url": "/azure/operational-excellence/relocation-backup",
+            "redirect_document_id": false
+        },
+        {
+
            "source_path_from_root": "/articles/cosmos-db/how-to-move-regions.md",
            "redirect_url": "/azure/operational-excellence/relocation-cosmos-db",
            "redirect_document_id": false
@@ -4926,6 +4933,16 @@
             "source_path_from_root": "/articles/virtual-network/ip-services/create-vm-dual-stack-ipv6-powershell.md",
             "redirect_url": "/azure/virtual-network/ip-services/create-vm-dual-stack-ipv6-portal",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-network/ip-services/routing-preference-powershell.md",
+            "redirect_url": "/azure/virtual-network/ip-services/routing-preference-portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-network/ip-services/routing-preference-cli.md",
+            "redirect_url": "/azure/virtual-network/ip-services/routing-preference-portal",
+            "redirect_document_id": false
         }
 
     ]

articles/ai-services/openai/concepts/use-your-data.md

@@ -579,14 +579,18 @@ These estimates will vary based on the values set for the above parameters. For
 
 The estimates also depend on the nature of the documents and questions being asked. For example, if the questions are open-ended, the responses are likely to be longer. Similarly, a longer system message would contribute to a longer prompt that consumes more tokens, and if the conversation history is long, the prompt will be longer.
 
-| Model | Max tokens for system message | Max tokens for model response |
-|--|--|--|
-| GPT-35-0301 | 400 | 1500 |
-| GPT-35-0613-16K | 1000 | 3200 |
-| GPT-4-0613-8K | 400 | 1500 |
-| GPT-4-0613-32K | 2000 | 6400 |
-
-The table above shows the maximum number of tokens that can be used for the [system message](#system-message) and the model response. Additionally, the following also consume tokens:
+| Model | Max tokens for system message | 
+|--|--|
+| GPT-35-0301 | 400 |
+| GPT-35-0613-16K | 1000 |
+| GPT-4-0613-8K | 400 |
+| GPT-4-0613-32K | 2000 |
+| GPT-35-turbo-0125 | 2000 |
+| GPT-4-turbo-0409 | 4000 |
+| GPT-4o | 4000 |
+| GPT-4o-mini | 4000 |
+
+The table above shows the maximum number of tokens that can be used for the [system message](#system-message). To see the maximum tokens for the model response, see the [models article](./models.md#gpt-4-and-gpt-4-turbo-models). Additionally, the following also consume tokens:
 
 
 

articles/ai-services/openai/quotas-limits.md

@@ -61,7 +61,7 @@ The following sections provide you with a quick guide to the default quotas and
 
 |Tier| Quota Limit in tokens per minute (TPM) | Requests per minute |
 |---|:---:|:---:|
-|Enterprise agreement | 30 M | 60 K |
+|Enterprise agreement | 30 M | 180 K |
 |Default | 450 K | 2.7 K |
 
 M = million | K = thousand

articles/ai-studio/concepts/fine-tuning-overview.md

@@ -99,6 +99,7 @@ There isn't a single right answer to this question, but you should have clearly
 
 Now that you know when to leverage fine-tuning for your use-case, you can go to Azure AI Studio to find several models available to fine-tune including:
 - Azure OpenAI models
+- Phi-3 family of models
 - Meta Llama 2 family models
 - Meta Llama 3.1 family of models
 
@@ -119,22 +120,33 @@ The following Azure OpenAI models are supported in Azure AI Studio for fine-tuni
 
 Please note for fine-tuning Azure OpenAI models, you must add a connection to an Azure OpenAI resource with a supported region to your project.
 
+### Phi-3 family models
+The following Phi-3 family models are supported in Azure AI Studio for fine-tuning:
+- `Phi-3-mini-4k-instruct`
+- `Phi-3-mini-128k-instruct`
+- `Phi-3-medium-4k-instruct`
+- `Phi-3-medium-128k-instruct`
+
+Fine-tuning of Phi-3 models is currently supported in projects located in East US2.
+
 ### Llama 2 family models
 The following Llama 2 family models are supported in Azure AI Studio for fine-tuning:
 - `Meta-Llama-2-70b`
 - `Meta-Llama-2-7b`
 - `Meta-Llama-2-13b`
 
-Fine-tuning of Llama 2 models is currently supported in projects located in West US 3.
+Fine-tuning of Llama 2 models is currently supported in projects located in West US3.
 
 ### Llama 3.1 family models
 The following Llama 3.1 family models are supported in Azure AI Studio for fine-tuning:
 - `Meta-Llama-3.1-70b-Instruct`
-- `Meta-Llama-3.1-7b-Instruct`
+- `Meta-Llama-3.1-8b-Instruct`
 
-Fine-tuning of Llama 3.1 models is currently supported in projects located in West US 3.
+Fine-tuning of Llama 3.1 models is currently supported in projects located in West US3.
 
 ## Related content
 
 - [Learn how to fine-tune an Azure OpenAI model in Azure AI Studio](../../ai-services/openai/how-to/fine-tuning.md?context=/azure/ai-studio/context/context)
 - [Learn how to fine-tune a Llama 2 model in Azure AI Studio](../how-to/fine-tune-model-llama.md)
+- [Learn how to fine-tune a Phi-3 model in Azure AI Studio](../how-to/fine-tune-phi-3.md)
+- [How to deploy Phi-3 family of small language models with Azure AI Studio](../how-to/deploy-models-phi-3.md)

articles/ai-studio/how-to/deploy-models-llama.md

@@ -41,9 +41,9 @@ Meta Llama 3.1 models - like `Meta Llama 3.1 405B Instruct` - can be deployed as
 
 The following models are available in Azure Marketplace for Llama 3.1 and Llama 3 when deployed as a service with pay-as-you-go:
 
-* [Meta-Llama-3.1-405B-Instruct (preview)](https://aka.ms/aistudio/landing/meta-llama-3-405B-base)
-* [Meta-Llama-3.1-70B-Instruct (preview)](https://aka.ms/aistudio/landing/meta-llama-3-8B-refresh)
-* [Meta Llama-3.1-8B-Instruct (preview)](https://aka.ms/aistudio/landing/meta-llama-3-70B-refresh)
+* [Meta-Llama-3.1-405B-Instruct (preview)](https://aka.ms/aistudio/landing/meta-llama-3.1-405B-instruct)
+* [Meta-Llama-3.1-70B-Instruct (preview)](https://aka.ms/aistudio/landing/meta-llama-3.1-70B-instruct)
+* [Meta Llama-3.1-8B-Instruct (preview)](https://aka.ms/aistudio/landing/meta-llama-3.1-8B-instruct)
 * [Meta-Llama-3-70B-Instruct (preview)](https://aka.ms/aistudio/landing/meta-llama-3-70b-chat)
 * [Meta-Llama-3-8B-Instruct (preview)](https://aka.ms/aistudio/landing/meta-llama-3-8b-chat)