Skip to content

Commit 0c4c051

Browse files
v-aljev-alje
committed
Merge branch 'main' into release-migrate-agent-public-preview
2 parents 663ad9c + 5c8aa56 commit 0c4c051

119 files changed

Lines changed: 1876 additions & 1101 deletions

File tree

Some content is hidden

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

‎.openpublishing.redirection.json‎

Lines changed: 232 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,237 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/migrate/best-practices-assessment.md",
5+
"redirect_url": "/previous-versions/azure/migrate/best-practices-assessment",
6+
"redirect_document_id": false,
7+
"monikers": [
8+
"migrate"
9+
]
10+
},
11+
{
12+
"source_path": "articles/migrate/concepts-assessment-calculation.md",
13+
"redirect_url": "/previous-versions/azure/migrate/concepts-assessment-calculation",
14+
"redirect_document_id": false,
15+
"monikers": [
16+
"migrate"
17+
]
18+
},
19+
{
20+
"source_path": "articles/migrate/concepts-azure-sap-systems-assessment.md",
21+
"redirect_url": "/previous-versions/azure/migrate/concepts-azure-sap-systems-assessment",
22+
"redirect_document_id": false,
23+
"monikers": [
24+
"migrate"
25+
]
26+
},
27+
{
28+
"source_path": "articles/migrate/concepts-azure-sql-assessment-calculation.md",
29+
"redirect_url": "/previous-versions/azure/migrate/concepts-azure-sql-assessment-calculation",
30+
"redirect_document_id": false,
31+
"monikers": [
32+
"migrate"
33+
]
34+
},
35+
{
36+
"source_path": "articles/migrate/concepts-azure-vmware-solution-assessment-calculation.md",
37+
"redirect_url": "/previous-versions/azure/migrate/concepts-azure-vmware-solution-assessment-calculation",
38+
"redirect_document_id": false,
39+
"monikers": [
40+
"migrate"
41+
]
42+
},
43+
{
44+
"source_path": "articles/migrate/concepts-azure-webapps-assessment-calculation.md",
45+
"redirect_url": "/previous-versions/azure/migrate/concepts-azure-webapps-assessment-calculation",
46+
"redirect_document_id": false,
47+
"monikers": [
48+
"migrate"
49+
]
50+
},
51+
{
52+
"source_path": "articles/migrate/concepts-migration-planning.md",
53+
"redirect_url": "/previous-versions/azure/migrate/concepts-migration-planning",
54+
"redirect_document_id": false,
55+
"monikers": [
56+
"migrate"
57+
]
58+
},
59+
{
60+
"source_path": "articles/migrate/concepts-migration-webapps.md",
61+
"redirect_url": "/previous-versions/azure/migrate/concepts-migration-webapps",
62+
"redirect_document_id": false,
63+
"monikers": [
64+
"migrate"
65+
]
66+
},
67+
{
68+
"source_path": "articles/migrate/how-to-create-a-group.md",
69+
"redirect_url": "/previous-versions/azure/migrate/how-to-create-a-group",
70+
"redirect_document_id": false,
71+
"monikers": [
72+
"migrate"
73+
]
74+
},
75+
{
76+
"source_path": "articles/migrate/how-to-create-azure-app-service-assessment.md",
77+
"redirect_url": "/previous-versions/azure/migrate/how-to-create-azure-app-service-assessment",
78+
"redirect_document_id": false,
79+
"monikers": [
80+
"migrate"
81+
]
82+
},
83+
{
84+
"source_path": "articles/migrate/how-to-create-azure-sql-assessment.md",
85+
"redirect_url": "/previous-versions/azure/migrate/how-to-create-azure-sql-assessment",
86+
"redirect_document_id": false,
87+
"monikers": [
88+
"migrate"
89+
]
90+
},
91+
{
92+
"source_path": "articles/migrate/how-to-discover-applications.md",
93+
"redirect_url": "/previous-versions/azure/migrate/how-to-discover-applications",
94+
"redirect_document_id": false,
95+
"monikers": [
96+
"migrate"
97+
]
98+
},
99+
{
100+
"source_path": "articles/migrate/how-to-create-sql-assessment.md",
101+
"redirect_url": "/previous-versions/azure/migrate/how-to-create-sql-assessment",
102+
"redirect_document_id": false,
103+
"monikers": [
104+
"migrate"
105+
]
106+
},
107+
{
108+
"source_path": "articles/migrate/how-to-migrate.md",
109+
"redirect_url": "/previous-versions/azure/migrate/how-to-migrate",
110+
"redirect_document_id": false,
111+
"monikers": [
112+
"migrate"
113+
]
114+
},
115+
{
116+
"source_path": "articles/migrate/how-to-modify-assessment.md",
117+
"redirect_url": "/previous-versions/azure/migrate/how-to-modify-assessment",
118+
"redirect_document_id": false,
119+
"monikers": [
120+
"migrate"
121+
]
122+
},
123+
{
124+
"source_path": "articles/migrate/how-to-review-sql-assessment.md",
125+
"redirect_url": "/previous-versions/azure/migrate/how-to-review-sql-assessment",
126+
"redirect_document_id": false,
127+
"monikers": [
128+
"migrate"
129+
]
130+
},
131+
{
132+
"source_path": "articles/migrate/how-to-set-up-appliance-hyper-v.md",
133+
"redirect_url": "/previous-versions/azure/migrate/how-to-set-up-appliance-hyper-v",
134+
"redirect_document_id": false,
135+
"monikers": [
136+
"migrate"
137+
]
138+
},
139+
{
140+
"source_path": "articles/migrate/how-to-set-up-appliance-vmware.md",
141+
"redirect_url": "/previous-versions/azure/migrate/how-to-set-up-appliance-vmware",
142+
"redirect_document_id": false,
143+
"monikers": [
144+
"migrate"
145+
]
146+
},
147+
{
148+
"source_path": "articles/migrate/migrate-replication-appliance.md",
149+
"redirect_url": "/previous-versions/azure/migrate/migrate-replication-appliance",
150+
"redirect_document_id": false,
151+
"monikers": [
152+
"migrate"
153+
]
154+
},
155+
{
156+
"source_path": "articles/migrate/review-sap-assessment.md",
157+
"redirect_url": "/previous-versions/azure/migrate/review-sap-assessment",
158+
"redirect_document_id": false,
159+
"monikers": [
160+
"migrate"
161+
]
162+
},
163+
{
164+
"source_path": "articles/migrate/tutorial-assess-aspnet-aks.md",
165+
"redirect_url": "/previous-versions/azure/migrate/tutorial-assess-aspnet-aks",
166+
"redirect_document_id": false,
167+
"monikers": [
168+
"migrate"
169+
]
170+
},
171+
{
172+
"source_path": "articles/migrate/tutorial-assess-aws.md",
173+
"redirect_url": "/previous-versions/azure/migrate/tutorial-assess-aws",
174+
"redirect_document_id": false,
175+
"monikers": [
176+
"migrate"
177+
]
178+
},
179+
{
180+
"source_path": "articles/migrate/tutorial-assess-gcp.md",
181+
"redirect_url": "/previous-versions/azure/migrate/tutorial-assess-gcp",
182+
"redirect_document_id": false,
183+
"monikers": [
184+
"migrate"
185+
]
186+
},
187+
{
188+
"source_path": "articles/migrate/tutorial-assess-hyper-v.md",
189+
"redirect_url": "/previous-versions/azure/migrate/tutorial-assess-hyper-v",
190+
"redirect_document_id": false,
191+
"monikers": [
192+
"migrate"
193+
]
194+
},
195+
{
196+
"source_path": "articles/migrate/tutorial-assess-sap-systems.md",
197+
"redirect_url": "/previous-versions/azure/migrate/tutorial-assess-sap-systems",
198+
"redirect_document_id": false,
199+
"monikers": [
200+
"migrate"
201+
]
202+
},
203+
{
204+
"source_path": "articles/migrate/tutorial-assess-webapps.md",
205+
"redirect_url": "/previous-versions/azure/migrate/tutorial-assess-webapps",
206+
"redirect_document_id": false,
207+
"monikers": [
208+
"migrate"
209+
]
210+
},
211+
{
212+
"source_path": "articles/migrate/tutorial-discover-sap-systems.md",
213+
"redirect_url": "/previous-versions/azure/migrate/tutorial-discover-sap-systems",
214+
"redirect_document_id": false,
215+
"monikers": [
216+
"migrate"
217+
]
218+
},
219+
{
220+
"source_path": "articles/migrate/tutorial-migrate-gcp-virtual-machines.md",
221+
"redirect_url": "/previous-versions/azure/migrate/tutorial-migrate-gcp-virtual-machines",
222+
"redirect_document_id": false,
223+
"monikers": [
224+
"migrate"
225+
]
226+
},
227+
{
228+
"source_path": "articles/migrate/migrate-support-matrix-physical-migration.md",
229+
"redirect_url": "/previous-versions/azure/migrate/migrate-support-matrix-physical-migration",
230+
"redirect_document_id": false,
231+
"monikers": [
232+
"migrate"
233+
]
234+
},
3235
{
4236
"source_path": "articles/azure-functions/durable/durable-task-scheduler/durable-task-scheduler-dedicated-sku.md",
5237
"redirect_url": "/azure/azure-functions/durable/durable-task-scheduler/durable-task-scheduler-billing",

‎articles/api-management/azure-ai-foundry-api.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ Learn more about managing AI APIs in API Management:
2424

2525
## Client compatibility options
2626

27-
API Management supports two client compatibility options for AI APIs from Microsoft Foundry. When you import the API using the wizard, choose the option suitable for your model deployment. The option determines how clients call the API and how the API Management instance routes requests to the Foundry Tool.
27+
API Management supports two client compatibility options for AI APIs from Microsoft Foundry. When you import the API using the wizard, choose the option suitable for your model deployment. The option determines how clients call the API and how the API Management instance routes requests to the Foundry tool.
2828

2929
* **Azure OpenAI** - Manage Azure OpenAI in Microsoft Foundry model deployments.
3030

31-
Clients call the deployment at an `/openai` endpoint such as `/openai/deployments/my-deployment/chat/completions`. Deployment name is passed in the request path. Use this option if your Foundry Tool only includes Azure OpenAI model deployments.
31+
Clients call the deployment at an `/openai` endpoint such as `/openai/deployments/my-deployment/chat/completions`. Deployment name is passed in the request path. Use this option if your Foundry tool only includes Azure OpenAI model deployments.
3232

3333
* **Azure AI** - Manage model endpoints in Microsoft Foundry that are exposed through the [Azure AI Model Inference API](/azure/ai-studio/reference/reference-model-inference-api).
3434

@@ -38,7 +38,7 @@ API Management supports two client compatibility options for AI APIs from Micros
3838

3939
- An existing API Management instance. [Create one if you haven't already](get-started-create-service-instance.md).
4040

41-
- A Foundry Tool in your subscription with one or more models deployed. Examples include models deployed in Microsoft Foundry or Azure OpenAI.
41+
- A Foundry tool in your subscription with one or more models deployed. Examples include models deployed in Microsoft Foundry or Azure OpenAI.
4242

4343
## Import Microsoft Foundry API using the portal
4444

@@ -47,7 +47,7 @@ Use the following steps to import an AI API to API Management.
4747
When you import the API, API Management automatically configures:
4848

4949
* Operations for each of the API's REST API endpoints
50-
* A system-assigned identity with the necessary permissions to access the Foundry Tool deployment.
50+
* A system-assigned identity with the necessary permissions to access the Foundry tool deployment.
5151
* A [backend](backends.md) resource and a [set-backend-service](set-backend-service-policy.md) policy that direct API requests to the Azure AI Services endpoint.
5252
* Authentication to the backend using the instance's system-assigned managed identity.
5353
* (optionally) Policies to help you monitor and manage the API.
@@ -62,7 +62,7 @@ To import a Microsoft Foundry API to API Management:
6262
1. On the **Select AI Service** tab:
6363
1. Select the **Subscription** in which to search for Foundry Tools. To get information about the model deployments in a service, select the **deployments** link next to the service name.
6464
:::image type="content" source="media/azure-ai-foundry-api/deployments.png" alt-text="Screenshot of deployments for an AI service in the portal.":::
65-
1. Select a Foundry Tool.
65+
1. Select a Foundry tool.
6666
1. Select **Next**.
6767
1. On the **Configure API** tab:
6868
1. Enter a **Display name** and optional **Description** for the API.

0 commit comments

Comments
 (0)