Skip to content

Commit 5c82ba4

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 95204b4 + 86720d4 commit 5c82ba4

File tree

169 files changed

+2442
-2055
lines changed

Some content is hidden

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

169 files changed

+2442
-2055
lines changed

.openpublishing.redirection.container-service.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/container-service/container-registry-auth-aci.md",
5+
"redirect_url": "/azure/container-service/container-registry-authentication",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/container-service/dcos-swarm/container-service-application-specific-marathon.md",
510
"redirect_url": "/previous-versions/azure/container-service/dcos-swarm/container-service-application-specific-marathon",

.openpublishing.redirection.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3909,6 +3909,11 @@
39093909
"redirect_url": "/azure/batch/monitor-batch",
39103910
"redirect_document_id": false
39113911
},
3912+
{
3913+
"source_path_from_root": "/articles/container-registry/container-registry-auth-aci.md",
3914+
"redirect_url": "/azure/container-registry/container-registry-authentication",
3915+
"redirect_document_id": false
3916+
},
39123917
{
39133918
"source_path_from_root": "/articles/event-hubs/move-cluster-across-regions.md",
39143919
"redirect_url": "/azure/operational-excellence/relocation-event-hub-cluster",
@@ -3923,6 +3928,27 @@
39233928
"source_path_from_root": "/articles/defender-for-iot/organizations/update-legacy-ot-software.md",
39243929
"redirect_url": "/azure/defender-for-iot/organizations/update-ot-software?tabs=portal",
39253930
"redirect_document_id": false
3931+
},
3932+
{
3933+
"source_path_from_root":"/articles/virtual-network-manager/concept-user-defined-route-management.md",
3934+
"redirect_url":"/azure/virtual-network-manager/overview",
3935+
"redirect_document_id":false
3936+
3937+
},
3938+
{
3939+
"source_path_from_root":"/articles/virtual-network-manager/how-to-create-user-defined-routes.md",
3940+
"redirect_url":"/azure/virtual-network-manager/overview",
3941+
"redirect_document_id":false
3942+
},
3943+
{
3944+
"source_path_from_root":"/articles/virtual-network-manager/how-to-create-security-admin-rule-network-groups.md",
3945+
"redirect_url":"/azure/virtual-network-manager/overview",
3946+
"redirect_document_id":false
3947+
},
3948+
{
3949+
"source_path_from_root":"/articles/virtual-network-manager/concept-security-admin-rules-network-groups.md",
3950+
"redirect_url":"/azure/virtual-network-manager/overview",
3951+
"redirect_document_id":false
39263952
}
39273953
]
39283954
}

articles/ai-services/openai/toc.yml

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ items:
7070
displayName: PTU, provisioned, provisioned throughput units
7171
- name: System message templates
7272
href: ./concepts/system-message.md
73-
- name: Using your data - text
74-
href: ./concepts/use-your-data.md
75-
- name: Using your data - image (preview)
76-
href: ./concepts/use-your-image-data.md
7773
- name: Legacy models
7874
href: ./concepts/legacy-models.md
7975
- name: How-to
@@ -133,6 +129,16 @@ items:
133129
- name: Function calling
134130
href: ./how-to/fine-tuning-functions.md
135131
displayName: fine-tuning, finetuning
132+
- name: Use your data
133+
items:
134+
- name: Text data
135+
href: ./concepts/use-your-data.md
136+
- name: Image data (preview)
137+
href: ./concepts/use-your-image-data.md
138+
- name: Use Azure OpenAI On Your Data securely
139+
href: ./how-to/use-your-data-securely.md
140+
- name: Deploy and use web apps
141+
href: ./how-to/use-web-app.md
136142
- name: Migrate to OpenAI Python v1.x
137143
href: ./how-to/migration.md
138144
- name: Models
@@ -201,14 +207,27 @@ items:
201207
items:
202208
- name: Assistants API Reference
203209
items:
204-
- name: Assistants
205-
href: ./assistants-reference.md
206-
- name: Threads
207-
href: ./assistants-reference-threads.md
208-
- name: Messages
209-
href: ./assistants-reference-messages.md
210-
- name: Runs
211-
href: ./assistants-reference-runs.md
210+
- name: Python/REST
211+
items:
212+
- name: Assistants
213+
href: ./assistants-reference.md
214+
- name: Threads
215+
href: ./assistants-reference-threads.md
216+
- name: Messages
217+
href: ./assistants-reference-messages.md
218+
- name: Runs
219+
href: ./assistants-reference-runs.md
220+
- name: SDK
221+
items:
222+
- name: C#
223+
href: /dotnet/api/overview/azure/ai.openai.assistants-readme?context=/azure/ai-services/openai/context/context
224+
- name: Go
225+
href: https://pkg.go.dev/github.com/Azure/azure-sdk-for-go/sdk/ai/azopenai
226+
- name: Java
227+
href: /java/api/overview/azure/ai-openai-assistants-readme?context=/azure/ai-services/openai/context/context
228+
- name: JavaScript
229+
href: /javascript/api/overview/azure/openai-assistants-readme?context=/azure/ai-services/openai/context/context
230+
212231
- name: Azure OpenAI On Your Data API Reference
213232
items:
214233
- name: Azure OpenAI On Your Data

articles/aks/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@
849849
- name: Resources
850850
items:
851851
- name: Build your skills with Microsoft Learn training
852-
href: /training/browse/?products=azure-container-instances&azure-container-registry
852+
href: /training/browse/?products=azure-kubernetes-service
853853
- name: Region availability
854854
href: https://azure.microsoft.com/global-infrastructure/services/
855855
- name: Pricing

0 commit comments

Comments
 (0)