Skip to content

Commit f729bb7

Browse files
Merge branch 'main' into WI-185273-upcoming-change-new-rcommendations-azure-stack-hci
2 parents ab28132 + f86f6b4 commit f729bb7

File tree

280 files changed

+37232
-36627
lines changed

Some content is hidden

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

280 files changed

+37232
-36627
lines changed

.openpublishing.publish.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,6 +1248,7 @@
12481248
"articles/digital-twins/.openpublishing.redirection.digital-twins.json",
12491249
"articles/event-grid/.openpublishing.redirection.event-grid.json",
12501250
"articles/event-hubs/.openpublishing.redirection.event-hubs.json",
1251+
"articles/governance/policy/.openpublishing.redirection.policy.json",
12511252
"articles/hdinsight/.openpublishing.redirection.hdinsight.json",
12521253
"articles/hdinsight-aks/.openpublishing.redirection.hdinsight-aks.json",
12531254
"articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",

.openpublishing.redirection.active-directory.json

Lines changed: 33248 additions & 32724 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.azure-resource-manager.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1919,11 +1919,6 @@
19191919
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-powershell-sample-get-managed-group-resize-vm.md",
19201920
"redirect_url": "/azure/azure-resource-manager/managed-applications/overview",
19211921
"redirect_document_id": false
1922-
},
1923-
{
1924-
"source_path_from_root": "/articles/governance/policy/tutorials/policy-as-code-github.md",
1925-
"redirect_url": "/azure/governance/policy/concepts/policy-as-code",
1926-
"redirect_document_id": false
1927-
}
1922+
}
19281923
]
19291924
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -914,6 +914,11 @@
914914
"source_path_from_root": "/articles/defender-for-cloud/tutorial-security-incident.md",
915915
"redirect_url": "/azure/defender-for-cloud/managing-and-responding-alerts",
916916
"redirect_document_id": true
917+
},
918+
{
919+
"source_path_from_root": "/articles/defender-for-cloud/how-to-migrate-to-built-in.md",
920+
"redirect_url": "/azure/defender-for-cloud/how-to-transition-to-built-in",
921+
"redirect_document_id": true
917922
}
918923
]
919924
}

.openpublishing.redirection.json

Lines changed: 164 additions & 1463 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.virtual-desktop.json

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,71 @@
304304
"source_path_from_root": "/articles/virtual-desktop/whats-new-client-web.md",
305305
"redirect_url": "/azure/virtual-desktop/users/remote-desktop-clients-overview",
306306
"redirect_document_id": false
307+
},
308+
{
309+
"source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/index.yml",
310+
"redirect_url": "/azure/virtual-desktop/index",
311+
"redirect_document_id": true
312+
},
313+
{
314+
"source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/overview.md",
315+
"redirect_url": "/azure/virtual-desktop/overview",
316+
"redirect_document_id": true
317+
},
318+
{
319+
"source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/architecture-recs.md",
320+
"redirect_url": "/azure/virtual-desktop/organization-internal-external-commercial-purposes-recommendations",
321+
"redirect_document_id": true
322+
},
323+
{
324+
"source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/custom-apps.md",
325+
"redirect_url": "/azure/virtual-desktop/publish-applications",
326+
"redirect_document_id": false
327+
},
328+
{
329+
"source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/identities.md",
330+
"redirect_url": "/azure/virtual-desktop/authentication",
331+
"redirect_document_id": true
332+
},
333+
{
334+
"source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/licensing.md",
335+
"redirect_url": "/azure/virtual-desktop/licensing",
336+
"redirect_document_id": true
337+
},
338+
{
339+
"source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/msix-app-attach.md",
340+
"redirect_url": "/azure/virtual-desktop/app-attach-overview",
341+
"redirect_document_id": false
342+
},
343+
{
344+
"source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/per-user-access-pricing.md",
345+
"redirect_url": "/azure/virtual-desktop/enroll-per-user-access-pricing",
346+
"redirect_document_id": true
347+
},
348+
{
349+
"source_path_from_root": "/articles/virtual-desktop/security-guide.md",
350+
"redirect_url": "/azure/virtual-desktop/security-recommendations",
351+
"redirect_document_id": true
352+
},
353+
{
354+
"source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/security.md",
355+
"redirect_url": "/azure/virtual-desktop/security-recommendations",
356+
"redirect_document_id": false
357+
},
358+
{
359+
"source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/total-costs.md",
360+
"redirect_url": "/azure/virtual-desktop/understand-estimate-costs",
361+
"redirect_document_id": true
362+
},
363+
{
364+
"source_path_from_root": "/articles/virtual-desktop/remote-app-streaming/streaming-costs.md",
365+
"redirect_url": "/azure/virtual-desktop/understand-estimate-costs",
366+
"redirect_document_id": false
367+
},
368+
{
369+
"source_path_from_root": "/articles/virtual-desktop/publish-applications.md",
370+
"redirect_url": "/azure/virtual-desktop/publish-applications-stream-remoteapp",
371+
"redirect_document_id": false
307372
}
308373
]
309374
}

articles/ai-services/authentication.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,12 @@ Now that you have a custom subdomain associated with your resource, you're going
216216
New-AzADServicePrincipal -ApplicationId <APPLICATION_ID>
217217
```
218218

219-
>[!NOTE]
219+
> [!NOTE]
220220
> If you register an application in the Azure portal, this step is completed for you.
221221
222222
3. The last step is to [assign the "Cognitive Services User" role](/powershell/module/az.Resources/New-azRoleAssignment) to the service principal (scoped to the resource). By assigning a role, you're granting service principal access to this resource. You can grant the same service principal access to multiple resources in your subscription.
223-
>[!NOTE]
223+
224+
> [!NOTE]
224225
> The ObjectId of the service principal is used, not the ObjectId for the application.
225226
> The ACCOUNT_ID will be the Azure resource Id of the Azure AI services account you created. You can find Azure resource Id from "properties" of the resource in Azure portal.
226227
@@ -239,32 +240,31 @@ In this sample, a password is used to authenticate the service principal. The to
239240
```
240241

241242
2. Get a token:
242-
> [!NOTE]
243-
> If you're using Azure Cloud Shell, the `SecureClientSecret` class isn't available.
244-
245-
#### [PowerShell](#tab/powershell)
246243
```powershell-interactive
247-
$authContext = New-Object "Microsoft.IdentityModel.Clients.ActiveDirectory.AuthenticationContext" -ArgumentList "https://login.windows.net/<TENANT_ID>"
248-
$secureSecretObject = New-Object "Microsoft.IdentityModel.Clients.ActiveDirectory.SecureClientSecret" -ArgumentList $SecureStringPassword
249-
$clientCredential = New-Object "Microsoft.IdentityModel.Clients.ActiveDirectory.ClientCredential" -ArgumentList $app.ApplicationId, $secureSecretObject
250-
$token=$authContext.AcquireTokenAsync("https://cognitiveservices.azure.com/", $clientCredential).Result
251-
$token
252-
```
244+
$tenantId = $context.Tenant.Id
245+
$clientId = $app.ApplicationId
246+
$clientSecret = "<YOUR_PASSWORD>"
247+
$resourceUrl = "https://cognitiveservices.azure.com/"
253248
254-
#### [Azure Cloud Shell](#tab/azure-cloud-shell)
255-
```Azure Cloud Shell
256-
$authContext = New-Object "Microsoft.IdentityModel.Clients.ActiveDirectory.AuthenticationContext" -ArgumentList "https://login.windows.net/<TENANT_ID>"
257-
$clientCredential = New-Object "Microsoft.IdentityModel.Clients.ActiveDirectory.ClientCredential" -ArgumentList $app.ApplicationId, <YOUR_PASSWORD>
258-
$token=$authContext.AcquireTokenAsync("https://cognitiveservices.azure.com/", $clientCredential).Result
259-
$token
260-
```
261-
262-
---
249+
$tokenEndpoint = "https://login.microsoftonline.com/$tenantId/oauth2/token"
250+
$body = @{
251+
grant_type = "client_credentials"
252+
client_id = $clientId
253+
client_secret = $clientSecret
254+
resource = $resourceUrl
255+
}
256+
257+
$responseToken = Invoke-RestMethod -Uri $tokenEndpoint -Method Post -Body $body
258+
$accessToken = $responseToken.access_token
259+
```
263260

261+
> [!NOTE]
262+
> Anytime you use passwords in a script, the most secure option is to use the PowerShell Secrets Management module and integrate with a solution such as Azure KeyVault.
263+
264264
3. Call the Computer Vision API:
265265
```powershell-interactive
266266
$url = $account.Endpoint+"vision/v1.0/models"
267-
$result = Invoke-RestMethod -Uri $url -Method Get -Headers @{"Authorization"=$token.CreateAuthorizationHeader()} -Verbose
267+
$result = Invoke-RestMethod -Uri $url -Method Get -Headers @{"Authorization"="Bearer $accessToken"} -Verbose
268268
$result | ConvertTo-Json
269269
```
270270

articles/ai-services/computer-vision/identity-api-reference.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@ Azure AI Face is a cloud-based service that provides algorithms for face detecti
2424
- [LargeFaceList APIs](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/5a157b68d2de3616c086f2cc): Used to manage a LargeFaceList for [Find Similar](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/563879b61984550f30395237).
2525
- [PersonGroup Person APIs](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/563879b61984550f3039523c): Used to manage PersonGroup Person Faces for [Identification](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/563879b61984550f30395239).
2626
- [PersonGroup APIs](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/563879b61984550f30395244): Used to manage a PersonGroup dataset for [Identification](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/563879b61984550f30395239).
27+
- [PersonDirectory Person APIs](https://westus.dev.cognitive.microsoft.com/docs/services/face-v1-0-preview/operations/5f06637aad1c4fba7238de25)
28+
- [PersonDirectory DynamicPersonGroup APIs](https://westus.dev.cognitive.microsoft.com/docs/services/face-v1-0-preview/operations/5f066b475d2e298611e11115)
2729
- [Snapshot APIs](https://westus.dev.cognitive.microsoft.com/docs/services/563879b61984550e40cbbe8d/operations/snapshot-take): Used to manage a Snapshot for data migration across subscriptions.

articles/ai-services/computer-vision/toc.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -378,12 +378,8 @@ items:
378378
href: intro-to-spatial-analysis-public-preview.md
379379
- name: Responsible use of AI
380380
items:
381-
- name: Transparency notes
382-
items:
383-
- name: Spatial Analysis use cases
384-
href: /legal/cognitive-services/computer-vision/transparency-note-spatial-analysis?context=/azure/ai-services/computer-vision/context/context
385-
- name: Characteristics and limitations
386-
href: /legal/cognitive-services/computer-vision/accuracy-and-limitations?context=/azure/ai-services/computer-vision/context/context
381+
- name: Transparency note
382+
href: /legal/cognitive-services/computer-vision/transparency-note-spatial-analysis?context=/azure/ai-services/computer-vision/context/context
387383
- name: Integration and responsible use
388384
items:
389385
- name: Responsible use in AI deployment

articles/ai-services/document-intelligence/concept-retrieval-augumented-generation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ If you're looking for a specific section in a document, you can use semantic chu
119119

120120
```python
121121

122-
# Using SDK targeting 2023-10-31-preview
122+
# Using SDK targeting 2023-10-31-preview, make sure your resource is in one of these regions: East US, West US2, West Europe
123123
# pip install azure-ai-documentintelligence==1.0.0b1
124124
# pip install langchain langchain-community azure-ai-documentintelligence
125125

@@ -154,4 +154,4 @@ splits
154154

155155
* [Learn how to process your own forms and documents](quickstarts/try-document-intelligence-studio.md) with the [Document Intelligence Studio](https://formrecognizer.appliedai.azure.com/studio).
156156

157-
* Complete a [Document Intelligence quickstart](quickstarts/get-started-sdks-rest-api.md?view=doc-intel-3.1.0&preserve-view=true) and get started creating a document processing app in the development language of your choice.
157+
* Complete a [Document Intelligence quickstart](quickstarts/get-started-sdks-rest-api.md?view=doc-intel-4.0.0&preserve-view=true) and get started creating a document processing app in the development language of your choice.

0 commit comments

Comments
 (0)