Skip to content

Commit e7b403a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into apimllm
2 parents 4009b12 + e6c7ae6 commit e7b403a

File tree

517 files changed

+16280
-3671
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

517 files changed

+16280
-3671
lines changed

.openpublishing.publish.config.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1290,7 +1290,6 @@
12901290
".openpublishing.redirection.availability-zones.json",
12911291
".openpublishing.redirection.azure-app-configuration.json",
12921292
".openpublishing.redirection.azure-arc-data.json",
1293-
".openpublishing.redirection.azure-attestation.json",
12941293
".openpublishing.redirection.azure-australia.json",
12951294
".openpublishing.redirection.azure-databricks.json",
12961295
".openpublishing.redirection.azure-datalake-storage-gen1.json",
@@ -1307,7 +1306,6 @@
13071306
".openpublishing.redirection.cognitive-services.json",
13081307
".openpublishing.redirection.container-service.json",
13091308
".openpublishing.redirection.data-lake-analytics.json",
1310-
".openpublishing.redirection.defender-for-cloud.json",
13111309
".openpublishing.redirection.defender-for-iot.json",
13121310
".openpublishing.redirection.dev-spaces.json",
13131311
".openpublishing.redirection.devops-project.json",
@@ -1321,7 +1319,6 @@
13211319
".openpublishing.redirection.iot-develop.json",
13221320
".openpublishing.redirection.iot-hub-device-update.json",
13231321
".openpublishing.redirection.json",
1324-
".openpublishing.redirection.key-vault.json",
13251322
".openpublishing.redirection.machine-configuration.json",
13261323
".openpublishing.redirection.marketplace.json",
13271324
".openpublishing.redirection.openshift.json",

.openpublishing.redirection.defender-for-cloud.json

Lines changed: 0 additions & 654 deletions
This file was deleted.

.openpublishing.redirection.security-center.json

Lines changed: 1086 additions & 436 deletions
Large diffs are not rendered by default.

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
44
description: Learn about the model deprecations and retirements in Azure OpenAI.
55
ms.service: azure-ai-openai
66
ms.topic: conceptual
7-
ms.date: 08/07/2024
7+
ms.date: 08/08/2024
88
ms.custom:
99
manager: nitinme
1010
author: mrbullwinkle
@@ -90,7 +90,7 @@ These models are currently available for use in Azure OpenAI Service.
9090
| Model | Version | Retirement date |
9191
| ---- | ---- | ---- |
9292
| `gpt-35-turbo` | 0301 | No earlier than October 1, 2024 |
93-
| `gpt-35-turbo`<br>`gpt-35-turbo-16k` | 0613 | October 1, 2024 |
93+
| `gpt-35-turbo`<br>`gpt-35-turbo-16k` | 0613 | November 1, 2024 |
9494
| `gpt-35-turbo` | 1106 | No earlier than Nov 17, 2024 |
9595
| `gpt-35-turbo` | 0125 | No earlier than Feb 22, 2025 |
9696
| `gpt-4`<br>`gpt-4-32k` | 0314 | **Deprecation:** October 1, 2024 <br> **Retirement:** June 6, 2025 |
@@ -145,6 +145,10 @@ If you're an existing customer looking for information about these models, see [
145145

146146
## Retirement and deprecation history
147147

148+
### August 8, 2024
149+
150+
* Updated `gpt-35-turbo` & `gpt-35-turbo-16k` (0613) model's retirement date to November 1, 2024.
151+
148152
### July 30, 2024
149153

150154
* Updated `gpt-4` preview model upgrade date to November 15, 2024 or later for the following versions:

articles/ai-services/speech-service/text-to-speech-avatar/avatar-gestures-with-ssml.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ The full list of prebuilt avatar supported gestures provided here can also be fo
5959
| Meg | casual | a-little-bit<br>click-the-link<br>cross-hand<br>display-number<br>encourage-1<br>encourage-2<br>five-star-praise<br>front-left<br>front-right<br>good-1<br>good-2<br>handclap<br>introduction-to-products-1<br>introduction-to-products-2<br>introduction-to-products-3<br>left<br>length<br>lower-left<br>lower-right<br>number-one<br>press-both-hands-down<br>right<br>say-hi<br>shrug-ones-shoulders<br>slide-from-right-to-left<br>slide-to-the-left<br>spread-hands<br>the-front<br>top-middle-and-bottom-left<br>top-middle-and-bottom-right<br>upper-left<br>upper-right |
6060
| Meg | business | a-little-bit<br>encourage-1<br>encourage-2<br>five-star-praise<br>front-left<br>front-right<br>good-1<br>good-2<br>introduction-to-products-1<br>introduction-to-products-2<br>introduction-to-products-3<br>left<br>length<br>number-one<br>press-both-hands-down-1<br>press-both-hands-down-2<br>raise-ones-hand<br>right<br>say-hi<br>shrug-ones-shoulders<br>slide-from-left-to-right<br>slide-to-the-left<br>spread-hands<br>thanks<br>the-front<br>upper-left |
6161

62-
Only the `casual-sitting` style is supported via the real-time text to speech API. Gestures are only supported with the batch synthesis API and aren't supported via the real-time API.
62+
All styles except `lisa-graceful-sitting`, `lisa-graceful-standing`, `lisa-technical-sitting`, and `lisa-technical-standing` are supported via the real-time text to speech API. Gestures are only supported with the batch synthesis API and aren't supported via the real-time API.
6363

6464
## Next steps
6565

articles/ai-studio/.openpublishing.redirection.ai-studio.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
"redirect_url": "/azure/ai-studio/concepts/deployments-overview",
1616
"redirect_document_id": true
1717
},
18+
{
19+
"source_path_from_root": "/articles/ai-studio/how-to/deploy-jais-models.md",
20+
"redirect_url": "/azure/ai-studio/how-to/deploy-models-jais",
21+
"redirect_document_id": true
22+
},
1823
{
1924
"source_path_from_root": "/articles/ai-studio/quickstarts/playground-completions.md",
2025
"redirect_url": "/azure/ai-studio/quickstarts/assistants",

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

Lines changed: 0 additions & 286 deletions
This file was deleted.

0 commit comments

Comments
 (0)