Skip to content

Commit 7cb553f

Browse files
seesharprunseesharprun
authored
Merge branch 'MicrosoftDocs:main' into cosmos-revamp-faq
2 parents 70912bd + 2b1ff13 commit 7cb553f

File tree

1,125 files changed

+42947
-6350
lines changed

Some content is hidden

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

1,125 files changed

+42947
-6350
lines changed

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1807,7 +1807,7 @@
18071807
},
18081808
{
18091809
"source_path_from_root": "/articles/monitoring-and-diagnostics/resource-group-insights.md",
1810-
"redirect_url": "/azure/azure-monitor/insights/resource-group-insights",
1810+
"redirect_url": "/azure/azure-resource-manager/management/resource-group-insights",
18111811
"redirect_document_id": true
18121812
},
18131813
{
@@ -6608,6 +6608,11 @@
66086608
"source_path_from_root": "/articles/azure-monitor/monitor-reference.md",
66096609
"redirect_url": "/azure/azure-monitor/overview",
66106610
"redirect_document_id": false
6611+
},
6612+
{
6613+
"source_path_from_root": "/articles/azure-monitor/insights/resource-group-insights.md",
6614+
"redirect_url": "/azure/azure-resource-manager/management/resource-group-insights",
6615+
"redirect_document_id": false
66116616
}
66126617
]
66136618
}

‎.openpublishing.redirection.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2290,6 +2290,31 @@
22902290
"redirect_url": "/azure/automation/automation-solution-vm-management",
22912291
"redirect_document_id": false
22922292
},
2293+
{
2294+
"source_path_from_root": "/articles/automation/automation-solution-vm-management.md",
2295+
"redirect_url":"/azure/azure-functions/start-stop-vms/overview",
2296+
"redirect_document_id": false
2297+
},
2298+
{
2299+
"source_path_from_root": "/articles/automation/automation-solution-vm-management-config.md",
2300+
"redirect_url": "/azure/azure-functions/start-stop-vms/deploy",
2301+
"redirect_document_id": false
2302+
},
2303+
{
2304+
"source_path_from_root": "/articles/automation/automation-solution-vm-management-logs.md",
2305+
"redirect_url": "/azure/azure-functions/start-stop-vms/deploy",
2306+
"redirect_document_id": false
2307+
},
2308+
{
2309+
"source_path_from_root": "/articles/automation/automation-solution-vm-management-remove.md",
2310+
"redirect_url": "/azure/azure-functions/start-stop-vms/remove",
2311+
"redirect_document_id": false
2312+
},
2313+
{
2314+
"source_path_from_root": "/articles/automation/troubleshoot/start-stop-vm.md",
2315+
"redirect_url": "/azure/azure-functions/start-stop-vms/troubleshoot",
2316+
"redirect_document_id": false
2317+
},
22932318
{
22942319
"source_path_from_root": "/articles/update-center/enable-machines.md",
22952320
"redirect_url": "/azure/update-center/updates-maintenance-schedules",

‎articles/ai-services/cognitive-services-support-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: PatrickFarley
66
manager: nitinme
77
ms.service: azure-ai-services
88
ms.topic: conceptual
9-
ms.date: 06/28/2022
9+
ms.date: 02/22/2024
1010
ms.author: pafarley
1111
---
1212

‎articles/ai-services/containers/azure-container-instance-recipe.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.custom: devx-track-azurecli
99
ms.service: azure-ai-services
1010
ms.topic: how-to
11-
ms.date: 12/18/2020
11+
ms.date: 02/22/2024
1212
ms.author: aahi
1313
# https://github.com/Azure/cognitiveservices-aci
1414
#Customer intent: As a potential customer, I want to know more about how Azure AI services provides and supports Docker containers for each service.

‎articles/ai-services/containers/container-reuse-recipe.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: aahill
77
manager: nitinme
88
ms.service: azure-ai-services
99
ms.topic: how-to
10-
ms.date: 10/28/2021
10+
ms.date: 02/22/2024
1111
ms.author: aahi
1212
#Customer intent: As a potential customer, I want to know how to configure containers so I can reuse them.
1313
---

‎articles/ai-services/containers/docker-compose-recipe.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: aahill
77
manager: nitinme
88
ms.service: azure-ai-services
99
ms.topic: how-to
10-
ms.date: 10/29/2020
10+
ms.date: 02/22/2024
1111
ms.author: aahi
1212

1313
# SME: Brendan Walsh

‎articles/ai-services/create-account-terraform.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ author: TomArcherMsft
1212
ms.author: tarcher
1313
content_well_notification:
1414
- AI-contribution
15+
ai-usage: ai-assisted
1516
---
1617

1718
# Quickstart: Create an Azure AI services resource using Terraform

‎articles/ai-services/language-service/native-document-support/use-native-documents.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: laujan
66
manager: nitinme
77
ms.service: azure-ai-language
88
ms.topic: how-to
9-
ms.date: 01/31/2024
9+
ms.date: 02/21/2024
1010
ms.author: lajanuar
1111
---
1212

@@ -197,6 +197,10 @@ For this quickstart, you need a **source document** uploaded to your **source co
197197
}
198198
```
199199

200+
* The source `location` value is the SAS URL for the **source document (blob)**, not the source container SAS URL.
201+
202+
* The `redactionPolicy` possible values are `UseRedactionCharacterWithRefId` (default) or `UseEntityTypeName`. For more information, *see* [**PiiTask Parameters**](/rest/api/language/text-analysis-runtime/analyze-text?view=rest-language-2023-11-15-preview&tabs=HTTP#piitaskparameters&preserve-view=true).
203+
200204
### Run the POST request
201205

202206
1. Here's the preliminary structure of the POST request:
@@ -332,7 +336,7 @@ For this project, you need a **source document** uploaded to your **source conta
332336

333337
1. Copy and paste the Document Summarization **request sample** into your `document-summarization.json` file. Replace **`{your-source-container-SAS-URL}`** and **`{your-target-container-SAS-URL}`** with values from your Azure portal Storage account containers instance:
334338

335-
`**Request sample**`
339+
***Request sample***
336340

337341
```json
338342
{

‎articles/ai-services/openai/assistants-reference-messages.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ A [message](#message-object) object.
5151
from openai import AzureOpenAI
5252

5353
client = AzureOpenAI(
54-
api_key=os.getenv("AZURE_OPENAI_KEY"),
54+
api_key=os.getenv("AZURE_OPENAI_API_KEY"),
5555
api_version="2024-02-15-preview",
5656
azure_endpoint = os.getenv("AZURE_OPENAI_ENDPOINT")
5757
)
@@ -68,7 +68,7 @@ print(thread_message)
6868

6969
```console
7070
curl https://YOUR_RESOURCE_NAME.openai.azure.com/openai/threads/{thread_id}/messages?api-version=2024-02-15-preview \
71-
-H "api-key: $AZURE_OPENAI_KEY" \
71+
-H "api-key: $AZURE_OPENAI_API_KEY" \
7272
-H 'Content-Type: application/json' \
7373
-d '{
7474
"role": "user",
@@ -114,7 +114,7 @@ A list of [message](#message-object) objects.
114114
from openai import AzureOpenAI
115115

116116
client = AzureOpenAI(
117-
api_key=os.getenv("AZURE_OPENAI_KEY"),
117+
api_key=os.getenv("AZURE_OPENAI_API_KEY"),
118118
api_version="2024-02-15-preview",
119119
azure_endpoint = os.getenv("AZURE_OPENAI_ENDPOINT")
120120
)
@@ -128,7 +128,7 @@ print(thread_messages.data)
128128

129129
```console
130130
curl https://YOUR_RESOURCE_NAME.openai.azure.com/openai/threads/{thread_id}/messages?api-version=2024-02-15-preview \
131-
-H "api-key: $AZURE_OPENAI_KEY" \
131+
-H "api-key: $AZURE_OPENAI_API_KEY" \
132132
-H 'Content-Type: application/json'
133133
```
134134

@@ -168,7 +168,7 @@ A list of [message file](#message-file-object) objects
168168
from openai import AzureOpenAI
169169

170170
client = AzureOpenAI(
171-
api_key=os.getenv("AZURE_OPENAI_KEY"),
171+
api_key=os.getenv("AZURE_OPENAI_API_KEY"),
172172
api_version="2024-02-15-preview",
173173
azure_endpoint = os.getenv("AZURE_OPENAI_ENDPOINT")
174174
)
@@ -185,7 +185,7 @@ print(message_files)
185185

186186
```console
187187
curl https://YOUR_RESOURCE_NAME.openai.azure.com/openai/threads/{thread_id}/messages/files?api-version=2024-02-15-preview \
188-
-H "api-key: $AZURE_OPENAI_KEY" \
188+
-H "api-key: $AZURE_OPENAI_API_KEY" \
189189
-H 'Content-Type: application/json'
190190
```
191191

@@ -219,7 +219,7 @@ The [message](#message-object) object matching the specified ID.
219219
from openai import AzureOpenAI
220220

221221
client = AzureOpenAI(
222-
api_key=os.getenv("AZURE_OPENAI_KEY"),
222+
api_key=os.getenv("AZURE_OPENAI_API_KEY"),
223223
api_version="2024-02-15-preview",
224224
azure_endpoint = os.getenv("AZURE_OPENAI_ENDPOINT")
225225
)
@@ -236,7 +236,7 @@ print(message)
236236

237237
```console
238238
curl https://YOUR_RESOURCE_NAME.openai.azure.com/openai/threads/{thread_id}/messages/{message_id}?api-version=2024-02-15-preview \
239-
-H "api-key: $AZURE_OPENAI_KEY" \
239+
-H "api-key: $AZURE_OPENAI_API_KEY" \
240240
-H 'Content-Type: application/json'
241241
```
242242

@@ -270,7 +270,7 @@ The [message file](#message-file-object) object.
270270
from openai import AzureOpenAI
271271

272272
client = AzureOpenAI(
273-
api_key=os.getenv("AZURE_OPENAI_KEY"),
273+
api_key=os.getenv("AZURE_OPENAI_API_KEY"),
274274
api_version="2024-02-15-preview",
275275
azure_endpoint = os.getenv("AZURE_OPENAI_ENDPOINT")
276276
)
@@ -288,7 +288,7 @@ print(message_files)
288288
```console
289289
curl https://YOUR_RESOURCE_NAME.openai.azure.com/openai/threads/{thread_id}/messages/{message_id}/files/{file_id}?api-version=2024-02-15-preview
290290
``` \
291-
-H "api-key: $AZURE_OPENAI_KEY" \
291+
-H "api-key: $AZURE_OPENAI_API_KEY" \
292292
-H 'Content-Type: application/json'
293293
```
294294

@@ -325,7 +325,7 @@ The modified [message](#message-object) object.
325325
from openai import AzureOpenAI
326326

327327
client = AzureOpenAI(
328-
api_key=os.getenv("AZURE_OPENAI_KEY"),
328+
api_key=os.getenv("AZURE_OPENAI_API_KEY"),
329329
api_version="2024-02-15-preview",
330330
azure_endpoint = os.getenv("AZURE_OPENAI_ENDPOINT")
331331
)
@@ -346,7 +346,7 @@ print(message)
346346
```console
347347
curl https://YOUR_RESOURCE_NAME.openai.azure.com/openai/threads/{thread_id}/messages/{message_id}?api-version=2024-02-15-preview
348348
``` \
349-
-H "api-key: $AZURE_OPENAI_KEY" \
349+
-H "api-key: $AZURE_OPENAI_API_KEY" \
350350
-H 'Content-Type: application/json' \
351351
-d '{
352352
"metadata": {

0 commit comments

Comments
 (0)