Merge pull request #228508 from mrbullwinkle/merge_conflict_fix_02_24

[Cognitive Services] [Azure OpenAI] Resolve merge conflict

Author: prmerger-automator[bot]

articles/cognitive-services/openai/concepts/models.md

@@ -157,28 +157,30 @@ When using our embeddings models, keep in mind their limitations and risks.
 ### GPT-3 Models
 |  Model ID  | Supports Completions | Supports Embeddings |  Base model Regions   | Fine-Tuning Regions |	
 |  --- | --- | --- | --- | --- |
-| ada | 	Yes	| No	|	N/A	| East US, South Central US, West Europe |
-| text-ada-001 | Yes | No | East US, South Central US, West Europe | N/A |
-| babbage | Yes | No | N/A | East US, South Central US, West Europe |
-| text-babbage-001 | Yes | No | East US, South Central US, West Europe | N/A |
-| curie | Yes | No | N/A | East US, South Central US, West Europe |
-| text-curie-001 | Yes | No | East US, South Central US, West Europe | N/A |
-| davinci<sup>1</sup> | Yes | No | N/A | East US, South Central US, West Europe |
+| ada | 	Yes	| No	|	N/A	| East US<sup>2</sup>, South Central US, West Europe |
+| text-ada-001 | Yes | No | East US<sup>2</sup>, South Central US, West Europe | N/A |
+| babbage | Yes | No | N/A | East US<sup>2</sup>, South Central US, West Europe |
+| text-babbage-001 | Yes | No | East US<sup>2</sup>, South Central US, West Europe | N/A |
+| curie | Yes | No | N/A | East US<sup>2</sup>, South Central US, West Europe |
+| text-curie-001 | Yes | No | East US<sup>2</sup>, South Central US, West Europe | N/A |
+| davinci<sup>1</sup> | Yes | No | N/A | East US<sup>2</sup>, South Central US, West Europe |
 | text-davinci-001 | Yes | No | South Central US, West Europe | N/A |
 | text-davinci-002 | Yes | No | East US, South Central US, West Europe | N/A |
 | text-davinci-003 | Yes | No | East US | N/A |
 | text-davinci-fine-tune-002<sup>1</sup> | Yes | No | N/A | East US, West Europe |
 
 <sup>1</sup> The model is available by request only. Currently we aren't accepting new requests to use the model.
+<br><sup>2</sup> East US is currently unavailable for new customers to fine-tune due to high demand. Please use US South Central region for US based training.
 
 ### Codex Models
 |  Model ID  | Supports Completions | Supports Embeddings |  Base model Regions   | Fine-Tuning Regions |	
 |  --- | --- | --- | --- | --- |
-| code-cushman-001<sup>2</sup> | Yes | No | South Central US, West Europe | East US, South Central US, West Europe |
+| code-cushman-001<sup>1</sup> | Yes | No | South Central US, West Europe | East US<sup>2</sup> , South Central US, West Europe |
 | code-davinci-002 | Yes | No | East US,  West Europe |  N/A |
-| code-davinci-fine-tune-002<sup>2</sup> | Yes | No | N/A | East US, West Europe |
+| code-davinci-fine-tune-002<sup>1</sup> | Yes | No | N/A | East US<sup>2</sup> , West Europe |
 
-<sup>2</sup> The model is available for fine-tuning by request only. Currently we aren't accepting new requests to fine-tune the model.
+<sup>1</sup> The model is available for fine-tuning by request only. Currently we aren't accepting new requests to fine-tune the model.
+<br><sup>2</sup> East US is currently unavailable for new customers to fine-tune due to high demand. Please use US South Central region for US based training.
 
 ### Embeddings Models
 |  Model ID  | Supports Completions | Supports Embeddings |  Base model Regions   | Fine-Tuning Regions |	

articles/cognitive-services/openai/overview.md

@@ -23,9 +23,9 @@ Azure OpenAI Service provides REST API access to OpenAI's powerful language mode
 | Feature | Azure OpenAI |
 | --- | --- |
 | Models available | GPT-3 base series <br> Codex series <br> Embeddings series <br> Learn more in our [Models](./concepts/models.md) page.|
-| Fine-tuning | Ada <br> Babbage <br> Curie <br> Cushman* <br> Davinci* <br> \* Currently unavailable.|
+| Fine-tuning | Ada <br> Babbage <br> Curie <br> Cushman* <br> Davinci* <br> \* Currently unavailable. \*\*East US Fine-tuning is currently unavailable to new customers. Please use US South Central for US based training|
 | Price | [Available here](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) |
-| Virtual network support | Yes | 
+| Virtual network support & private link support | Yes | 
 | Managed Identity| Yes, via Azure Active Directory | 
 | UI experience | **Azure Portal** for account & resource management, <br> **Azure OpenAI Service Studio** for model exploration and fine tuning |
 | Regional availability | East US <br> South Central US <br> West Europe |