Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into sasBk

Author: roygara

.openpublishing.redirection.virtual-machines.json

@@ -4,6 +4,6 @@
             "source_path_from_root": "/articles/virtual-machines/security-recommendations.md",
             "redirect_url": "/security/benchmark/azure/baselines/virtual-machines-windows-virtual-machines-security-baseline",
             "redirect_document_id": false
-        }
+        }        
     ]
 }

articles/ai-services/openai/concepts/model-retirements.md

@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
 description: Learn about the model deprecations and retirements in Azure OpenAI.
 ms.service: azure-ai-openai
 ms.topic: conceptual
-ms.date: 08/08/2024
+ms.date: 08/14/2024
 ms.custom: 
 manager: nitinme
 author: mrbullwinkle
@@ -74,9 +74,11 @@ Azure OpenAI notifies those who are members of the following roles for each subs
 
 ## How to get ready for model retirements and version upgrades
 
-To prepare for model retirements and version upgrades, we recommend that customers evaluate their applications with the new models and versions and evaluate their behavior. We also recommend that customers update their applications to use the new models and versions before the retirement date.
+To prepare for model retirements and version upgrades, we recommend that customers test their applications with the new models and versions and evaluate their behavior. We also recommend that customers update their applications to use the new models and versions before the retirement date.
 
-For more information, see [How to upgrade to a new model or version](./model-versions.md).
+For more information on the model evaluation process, see the [Getting started with model evaluation guide](https://techcommunity.microsoft.com/t5/ai-azure-ai-services-blog/how-to-evaluate-amp-upgrade-model-versions-in-the-azure-openai/ba-p/4218880).
+
+For information on the model upgrade process, see [How to upgrade to a new model or version](./model-versions.md).
 
 ## Current models
 
@@ -87,22 +89,22 @@ For more information, see [How to upgrade to a new model or version](./model-ver
 
 These models are currently available for use in Azure OpenAI Service.
 
-| Model | Version | Retirement date |
-| ---- | ---- | ---- |
-| `gpt-35-turbo` | 0301 | No earlier than October 1, 2024 |
-| `gpt-35-turbo`<br>`gpt-35-turbo-16k` | 0613 | November 1, 2024 |
-| `gpt-35-turbo` | 1106 | No earlier than Nov 17, 2024 |
-| `gpt-35-turbo` | 0125 | No earlier than Feb 22, 2025 |
-| `gpt-4`<br>`gpt-4-32k` | 0314 | **Deprecation:** October 1, 2024 <br> **Retirement:** June 6, 2025 |
-| `gpt-4`<br>`gpt-4-32k` | 0613 | **Deprecation:** October 1, 2024 <br> **Retirement:** June 6, 2025 |
-| `gpt-4` | 1106-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on November 15, 2024, or later **<sup>1</sup>** |
-| `gpt-4` | 0125-preview |To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on November 15, 2024, or later  **<sup>1</sup>**  |
-| `gpt-4` | vision-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on November 15, 2024, or later  **<sup>1</sup>** |
-| `gpt-3.5-turbo-instruct` | 0914 | No earlier than Sep 14, 2025 |
-| `text-embedding-ada-002` | 2 | No earlier than April 3, 2025 |
-| `text-embedding-ada-002` | 1 | No earlier than April 3, 2025 |
-| `text-embedding-3-small` | | No earlier than Feb 2, 2025 |
-| `text-embedding-3-large` | | No earlier than Feb 2, 2025 |
+| Model | Version | Retirement date | Suggested replacement |
+| ---- | ---- | ---- | --- |
+| `gpt-35-turbo` | 0301 | No earlier than October 1, 2024 | `gpt-4o-mini`  | 
+| `gpt-35-turbo`<br>`gpt-35-turbo-16k` | 0613 | November 1, 2024 | `gpt-4o-mini` |
+| `gpt-35-turbo` | 1106 | No earlier than Nov 17, 2024 | `gpt-4o-mini` |
+| `gpt-35-turbo` | 0125 | No earlier than Feb 22, 2025 | `gpt-4o-mini` |
+| `gpt-4`<br>`gpt-4-32k` | 0314 | **Deprecation:** October 1, 2024 <br> **Retirement:** June 6, 2025 | `gpt-4o` |
+| `gpt-4`<br>`gpt-4-32k` | 0613 | **Deprecation:** October 1, 2024 <br> **Retirement:** June 6, 2025 | `gpt-4o` |
+| `gpt-4` | 1106-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on November 15, 2024, or later **<sup>1</sup>** | `gpt-4o`|
+| `gpt-4` | 0125-preview |To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on November 15, 2024, or later  **<sup>1</sup>**  | `gpt-4o` |
+| `gpt-4` | vision-preview | To be upgraded to `gpt-4` Version: `turbo-2024-04-09`, starting on November 15, 2024, or later  **<sup>1</sup>** | `gpt-4o`|
+| `gpt-3.5-turbo-instruct` | 0914 | No earlier than Sep 14, 2025 |  |
+| `text-embedding-ada-002` | 2 | No earlier than April 3, 2025 | `text-embedding-3-small` or `text-embedding-3-large` |
+| `text-embedding-ada-002` | 1 | No earlier than April 3, 2025 | `text-embedding-3-small` or `text-embedding-3-large` |
+| `text-embedding-3-small` | | No earlier than Feb 2, 2025 | |
+| `text-embedding-3-large` | | No earlier than Feb 2, 2025 | |
 
  **<sup>1</sup>** We will notify all customers with these preview deployments at least 30 days before the start of the upgrades. We will publish an upgrade schedule detailing the order of regions and model versions that we will follow during the upgrades, and link to that schedule from here.
 
@@ -114,7 +116,7 @@ These models were deprecated on July 6, 2023 and were retired on June 14, 2024.
 If you're an existing customer looking for information about these models, see [Legacy models](./legacy-models.md).
 
 | Model | Deprecation date | Retirement date | Suggested replacement |
-| --------- | --------------------- | ------------------- | -------------------- | 
+| --------- | --------------------- | ------------------- | -------------------- |
 | ada | July 6, 2023 | June 14, 2024 | babbage-002 |
 | babbage | July 6, 2023 | June 14, 2024 | babbage-002 |
 | curie | July 6, 2023 | June 14, 2024 | davinci-002 |

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

@@ -335,7 +335,7 @@ These models can only be used with Embedding API requests.
 
 ### Assistants (Preview)
 
-For Assistants you need a combination of a supported model, and a supported region. Certain tools and capabilities require the latest models. The following models are available in the Assistants API, SDK, Azure AI Studio and Azure OpenAI Studio. The following table is for pay-as-you-go. For information on Provisioned Throughput Unit (PTU) availability, see [provisioned throughput](./provisioned-throughput.md). The listed models and regions can be used with both Assistants v1 and v2.
+For Assistants you need a combination of a supported model, and a supported region. Certain tools and capabilities require the latest models. The following models are available in the Assistants API, SDK, Azure AI Studio and Azure OpenAI Studio. The following table is for pay-as-you-go. For information on Provisioned Throughput Unit (PTU) availability, see [provisioned throughput](./provisioned-throughput.md). The listed models and regions can be used with both Assistants v1 and v2. You can use [global standard models](#global-standard-model-availability) if they are supported in the regions listed below. 
 
 | Region | `gpt-35-turbo (0613)` | `gpt-35-turbo (1106)`| `fine tuned gpt-3.5-turbo-0125` | `gpt-4 (0613)` | `gpt-4 (1106)` | `gpt-4 (0125)` | `gpt-4o (2024-05-13)` | `gpt-4o-mini (2024-07-18)` |
 |-----|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|

articles/ai-services/openai/faq.yml

@@ -7,7 +7,7 @@ metadata:
   manager: nitinme
   ms.service: azure-ai-openai
   ms.topic: faq
-  ms.date: 08/06/2024
+  ms.date: 08/13/2024
   ms.author: mbullwin
   author: mrbullwinkle
 title: Azure OpenAI Service frequently asked questions
@@ -270,7 +270,7 @@ sections:
         answer: |
           * Inference cost (input and output) of the base model you're using for each Assistant (for example gpt-4-0125). If you've created multiple Assistants, you will be charged for the base model attached to each Assistant.
           * If you've enabled the Code Interpreter tool. For example if your assistant calls Code Interpreter simultaneously in two different threads, this would create two Code Interpreter sessions, each of which would be charged. Each session is active by default for one hour, which means that you would only pay this fee once if your user keeps giving instructions to Code Interpreter in the same thread for up to one hour.
-          * File search is currently not billed. 
+          * File search is billed based on the vector storage used. 
 
           For more information, see the [pricing page](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/).
       - question: |

articles/ai-services/openai/overview.md

@@ -7,7 +7,7 @@ author: mrbullwinkle
 ms.author: mbullwin
 ms.service: azure-ai-openai
 ms.topic: overview
-ms.date: 08/06/2024
+ms.date: 08/14/2024
 ms.custom: build-2023, build-2023-dataai
 recommendations: false
 ---
@@ -20,8 +20,8 @@ Azure OpenAI Service provides REST API access to OpenAI's powerful language mode
 
 | Feature | Azure OpenAI |
 | --- | --- |
-| Models available | **GPT-4o**<br> **GPT-4 series (including GPT-4 Turbo with Vision)** <br>**GPT-3.5-Turbo series**<br> Embeddings series <br> Learn more in our [Models](./concepts/models.md) page.|
-| Fine-tuning | `GPT-4` (preview) <br>`GPT-3.5-Turbo` (0613) <br> `babbage-002` <br> `davinci-002`.|
+| Models available | **GPT-4o & GPT-4o mini**<br> **GPT-4 series (including GPT-4 Turbo with Vision)** <br>**GPT-3.5-Turbo series**<br> Embeddings series <br> Learn more in our [Models](./concepts/models.md) page.|
+| Fine-tuning | `GPT-4o-mini` (preview) <br> `GPT-4` (preview) <br>`GPT-3.5-Turbo` (0613) <br> `babbage-002` <br> `davinci-002`.|
 | Price | [Available here](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) <br> For details on GPT-4 Turbo with Vision, see the [special pricing information](../openai/concepts/gpt-with-vision.md#special-pricing-information).|
 | Virtual network support & private link support | Yes, unless using [Azure OpenAI on your data](./concepts/use-your-data.md).  |
 | Managed Identity| Yes, via Microsoft Entra ID | 

articles/ai-services/openai/whats-new.md

@@ -10,7 +10,7 @@ ms.custom:
   - ignite-2023
   - references_regions
 ms.topic: whats-new
-ms.date: 08/06/2024
+ms.date: 08/14/2024
 recommendations: false
 ---
 
@@ -20,6 +20,25 @@ This article provides a summary of the latest releases and major documentation u
 
 ## August 2024
 
+### New preview API release
+
+API version `2024-07-01-preview` is the latest dataplane authoring & inference API release. It replaces API version `2024-05-01-preview` and adds support for:
+
+- [Batch API support added](./how-to/batch.md)
+- [Vector store chunking strategy parameters](/azure/ai-services/openai/reference-preview?#request-body-17)
+- `max_num_results` that the file search tool should output.
+
+For more information see our [reference documentation](./reference-preview.md)
+
+### GPT-4o mini regional availability
+
+- GPT-4o mini is available for standard and global standard deployment in the East US and Sweden Central regions.
+- GPT-4o mini is available for global batch deployment in East US, Sweden Central, and West US regions.
+
+### Evaluations guide
+
+- New blog post on [getting started with model evaluations](https://techcommunity.microsoft.com/t5/ai-azure-ai-services-blog/how-to-evaluate-amp-upgrade-model-versions-in-the-azure-openai/ba-p/4218880). We recommend using this guide as part of the [model upgrade and retirement process](./concepts/model-retirements.md).
+
 ### Latest GPT-4o model available in the early access playground (preview)
 
 On August 6, 2024, OpenAI [announced](https://openai.com/index/introducing-structured-outputs-in-the-api/) the latest version of their flagship GPT-4o model version `2024-08-06`. GPT-4o `2024-08-06` has all the capabilities of the previous version as well as:

articles/ai-services/speech-service/includes/how-to/speech-synthesis/cpp.md

@@ -40,6 +40,8 @@ The voice that speaks is determined in order of priority as follows:
 - If both `SpeechSynthesisVoiceName` and `SpeechSynthesisLanguage` are set, the `SpeechSynthesisLanguage` setting is ignored. The voice that you specify by using `SpeechSynthesisVoiceName` speaks.
 - If the voice element is set by using [Speech Synthesis Markup Language (SSML)](../../../speech-synthesis-markup.md), the `SpeechSynthesisVoiceName` and `SpeechSynthesisLanguage` settings are ignored.
 
+[!INCLUDE [Voice Priority Summary](voice-priority.md)]
+
 ## Synthesize speech to a file
 
 Create a [SpeechSynthesizer](/cpp/cognitive-services/speech/speechsynthesizer) object. This object shown in the following snippets runs text to speech conversions and outputs to speakers, files, or other output streams. `SpeechSynthesizer` accepts as parameters:

articles/ai-services/speech-service/includes/how-to/speech-synthesis/csharp.md

@@ -41,6 +41,8 @@ The voice that speaks is determined in order of priority as follows:
 - If both `SpeechSynthesisVoiceName` and `SpeechSynthesisLanguage` are set, the `SpeechSynthesisLanguage` setting is ignored. The voice that you specify by using `SpeechSynthesisVoiceName` speaks.
 - If the voice element is set by using [Speech Synthesis Markup Language (SSML)](../../../speech-synthesis-markup.md), the `SpeechSynthesisVoiceName` and `SpeechSynthesisLanguage` settings are ignored.
 
+[!INCLUDE [Voice Priority Summary](voice-priority.md)]
+
 ## Synthesize speech to a file
 
 Create a [SpeechSynthesizer](/dotnet/api/microsoft.cognitiveservices.speech.speechsynthesizer) object. This object shown in the following snippets runs text to speech conversions and outputs to speakers, files, or other output streams. `SpeechSynthesizer` accepts as parameters:

articles/ai-services/speech-service/includes/how-to/speech-synthesis/go.md

@@ -310,6 +310,8 @@ The voice that speaks is determined in order of priority as follows:
 - If both `SpeechSynthesisVoiceName` and `SpeechSynthesisLanguage` are set, the `SpeechSynthesisLanguage` setting is ignored. The voice that you specify by using `SpeechSynthesisVoiceName` speaks.
 - If the voice element is set by using [Speech Synthesis Markup Language (SSML)](../../../speech-synthesis-markup.md), the `SpeechSynthesisVoiceName` and `SpeechSynthesisLanguage` settings are ignored.
 
+[!INCLUDE [Voice Priority Summary](voice-priority.md)]
+
 ## Use SSML to customize speech characteristics
 
 You can use Speech Synthesis Markup Language (SSML) to fine-tune the pitch, pronunciation, speaking rate, volume, and more in the text to speech output by submitting your requests from an XML schema. This section shows an example of changing the voice. For more information, see [Speech Synthesis Markup Language overview](../../../speech-synthesis-markup.md).

articles/ai-services/speech-service/includes/how-to/speech-synthesis/java.md

@@ -41,6 +41,8 @@ The voice that speaks is determined in order of priority as follows:
 - If both `SpeechSynthesisVoiceName` and `SpeechSynthesisLanguage` are set, the `SpeechSynthesisLanguage` setting is ignored. The voice that you specified by using `SpeechSynthesisVoiceName` speaks.
 - If the voice element is set by using [Speech Synthesis Markup Language (SSML)](../../../speech-synthesis-markup.md), the `SpeechSynthesisVoiceName` and `SpeechSynthesisLanguage` settings are ignored.
 
+[!INCLUDE [Voice Priority Summary](voice-priority.md)]
+
 ## Synthesize speech to a file
 
 Create a [`SpeechSynthesizer`](/java/api/com.microsoft.cognitiveservices.speech.speechsynthesizer) object. This object runs text to speech conversions and outputs to speakers, files, or other output streams. `SpeechSynthesizer` accepts as parameters: