Skip to content

Commit 4e0db88

Browse files
authored
Merge pull request #281318 from MicrosoftDocs/main
7/19/2024 AM Publish
2 parents ce74d57 + 830bf0f commit 4e0db88

File tree

95 files changed

+388
-469
lines changed

Some content is hidden

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

95 files changed

+388
-469
lines changed

.openpublishing.redirection.baremetal-infrastructure.json

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,36 @@
139139
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/solution-design.md",
140140
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
141141
"redirect_document_id": false
142-
}
142+
},
143+
{
144+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/nc2-baremetal-overview.md",
145+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
146+
"redirect_document_id": false
147+
},
148+
{
149+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/skus.md",
150+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
151+
"redirect_document_id": false
152+
},
153+
{
154+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/nc2-on-azure-responsibility-matrix.md",
155+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
156+
"redirect_document_id": false
157+
},
158+
{
159+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/requirements.md",
160+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
161+
"redirect_document_id": false
162+
},
163+
{
164+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/use-cases-and-supported-scenarios.md",
165+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
166+
"redirect_document_id": false
167+
},
168+
{
169+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/supported-instances-and-regions.md",
170+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
171+
"redirect_document_id": false
172+
}
143173
]
144174
}

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

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ recommendations: false
1414

1515
# Azure OpenAI Service models
1616

17-
Azure OpenAI Service is powered by a diverse set of models with different capabilities and price points. Model availability varies by region.
17+
Azure OpenAI Service is powered by a diverse set of models with different capabilities and price points. Model availability varies by region and cloud. For Azure Government model availability, please refer to [Azure Government OpenAI Service](../../../azure-government/compare-azure-government-global-azure.md#azure-ai-services-openai-service).
1818

1919
| Models | Description |
2020
|--|--|
@@ -225,14 +225,6 @@ In addition to the regions above which are available to all Azure OpenAI custome
225225
| `gpt-4` (0314) <br> `gpt-4-32k` (0314) | East US <br> France Central <br> South Central US <br> UK South |
226226
| `gpt-4` (0613) <br> `gpt-4-32k` (0613) | East US <br> East US 2 <br> Japan East <br> UK South |
227227

228-
#### Azure Government regions
229-
230-
The following GPT-4 models are available with [Azure Government](/azure/azure-government/documentation-government-welcome):
231-
232-
|Model ID | Model Availability |
233-
|--|--|
234-
| `gpt-4` (1106-Preview) | US Gov Virginia<br>US Gov Arizona |
235-
236228
### GPT-3.5 models
237229

238230
> [!IMPORTANT]
@@ -250,14 +242,6 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
250242

251243
[!INCLUDE [GPT-35-Turbo](../includes/model-matrix/standard-gpt-35-turbo.md)]
252244

253-
#### Azure Government regions
254-
255-
The following GPT-3.5 turbo models are available with [Azure Government](/azure/azure-government/documentation-government-welcome):
256-
257-
|Model ID | Model Availability |
258-
|--|--|
259-
| `gpt-35-turbo` (1106-Preview) | US Gov Virginia |
260-
261245
### Embeddings models
262246

263247
These models can only be used with Embedding API requests.
@@ -279,14 +263,6 @@ These models can only be used with Embedding API requests.
279263

280264
[!INCLUDE [Embeddings](../includes/model-matrix/standard-embeddings.md)]
281265

282-
#### Azure Government regions
283-
284-
The following Embeddings models are available with [Azure Government](/azure/azure-government/documentation-government-welcome):
285-
286-
|Model ID | Model Availability |
287-
|--|--|
288-
|`text-embedding-ada-002` (version 2) |US Gov Virginia<br>US Gov Arizona |
289-
290266
### DALL-E models
291267

292268
| Model ID | Feature Availability | Max Request (characters) |

articles/ai-services/openai/how-to/reproducible-output.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: cognitive-services
66
manager: nitinme
77
ms.service: azure-ai-openai
88
ms.topic: how-to
9-
ms.date: 04/09/2024
9+
ms.date: 07/19/2024
1010
author: mrbullwinkle
1111
ms.author: mbullwin
1212
recommendations: false
@@ -23,10 +23,14 @@ Reproducible output is only currently supported with the following:
2323

2424
### Supported models
2525

26-
* `gpt-35-turbo` (1106) - [region availability](../concepts/models.md#gpt-35-turbo-model-availability)
27-
* `gpt-35-turbo` (0125) - [region availability](../concepts/models.md#gpt-35-turbo-model-availability)
28-
* `gpt-4` (1106-Preview) - [region availability](../concepts/models.md#gpt-4-and-gpt-4-turbo-model-availability)
29-
* `gpt-4` (0125-Preview) - [region availability](../concepts/models.md#gpt-4-and-gpt-4-turbo-model-availability)
26+
* `gpt-35-turbo` (1106)
27+
* `gpt-35-turbo` (0125)
28+
* `gpt-4` (1106-Preview)
29+
* `gpt-4` (0125-Preview)
30+
* `gpt-4` (turbo-2024-04-09)
31+
* `gpt-4o` (2024-05-13)
32+
33+
Consult the [models page](../concepts/models.md) for the latest information on model regional availability.
3034

3135
### API Version
3236

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Refer to our [Default safety policy documentation](./concepts/default-safety-pol
4646
API version `2024-06-01` is the latest GA data plane inference API release. It replaces API version `2024-02-01` and adds support for:
4747

4848
- embeddings `encoding_format` & `dimensions` parameters.
49-
- chat completions `logprops` & `top_logprobs` parameters.
49+
- chat completions `logprobs` & `top_logprobs` parameters.
5050

5151
Refer to our [data plane inference reference documentation](./reference.md) for more information.
5252

articles/azure-arc/servers/agent-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Overview of the Azure Connected Machine agent
33
description: This article provides a detailed overview of the Azure Connected Machine agent, which supports monitoring virtual machines hosted in hybrid environments.
44
ms.date: 06/03/2024
5-
ms.topic: conceptual
5+
ms.topic: overview
66
---
77

88
# Overview of Azure Connected Machine agent

articles/azure-arc/servers/deploy-ama-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: How to deploy and configure Azure Monitor Agent using Azure Policy
33
description: Learn how to deploy and configure Azure Monitor Agent using Azure Policy.
44
ms.date: 05/17/2023
5-
ms.topic: conceptual
5+
ms.topic: how-to
66
---
77

88
# Deploy and configure Azure Monitor Agent using Azure Policy

articles/azure-arc/servers/manage-howto-migrate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: How to migrate Azure Arc-enabled servers across regions
33
description: Learn how to migrate an Azure Arc-enabled server from one region to another.
44
ms.date: 3/29/2022
5-
ms.topic: conceptual
5+
ms.topic: how-to
66
---
77

88
# How to migrate Azure Arc-enabled servers across regions

articles/azure-arc/servers/manage-vm-extensions-ansible.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Enable VM extension using Red Hat Ansible
33
description: This article describes how to deploy virtual machine extensions to Azure Arc-enabled servers running in hybrid cloud environments using Red Hat Ansible Automation.
44
ms.date: 05/15/2023
5-
ms.topic: conceptual
5+
ms.topic: how-to
66
ms.custom: devx-track-ansible
77
---
88

articles/azure-arc/servers/manage-vm-extensions-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Enable VM extension using Azure CLI
33
description: This article describes how to deploy virtual machine extensions to Azure Arc-enabled servers running in hybrid cloud environments using the Azure CLI.
44
ms.date: 03/30/2022
5-
ms.topic: conceptual
5+
ms.topic: how-to
66
ms.custom: devx-track-azurecli
77
---
88

articles/azure-arc/servers/manage-vm-extensions-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Enable VM extension from the Azure portal
33
description: This article describes how to deploy virtual machine extensions to Azure Arc-enabled servers running in hybrid cloud environments from the Azure portal.
44
ms.date: 10/15/2021
5-
ms.topic: conceptual
5+
ms.topic: how-to
66
---
77

88
# Enable Azure VM extensions from the Azure portal

0 commit comments

Comments
 (0)