Skip to content

Commit f38610d

Browse files
authored
Merge pull request #280048 from MicrosoftDocs/main
7/3/2024 PM Publish
2 parents 2ccb84b + 9791a7f commit f38610d

File tree

56 files changed

+1078
-539
lines changed

Some content is hidden

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

56 files changed

+1078
-539
lines changed

articles/active-directory-b2c/self-asserted-technical-profile.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ You can also call a REST API technical profile with your business logic, overwri
220220
| IncludeClaimResolvingInClaimsHandling  | No | For input and output claims, specifies whether [claims resolution](claim-resolver-overview.md) is included in the technical profile. Possible values: `true`, or `false` (default). If you want to use a claims resolver in the technical profile, set this to `true`. |
221221
|setting.forgotPasswordLinkOverride <sup>4</sup>| No | A password reset claims exchange to be executed. For more information, see [Self-service password reset](add-password-reset-policy.md). |
222222
| setting.enableCaptchaChallenge | No | Specifies whether CAPTCHA challenge code should be displayed. Possible values: `true` , or `false` (default). For this setting to work, the [CAPTCHA display control]() must be referenced in the [display claims](#display-claims) of the self-asserted technical profile. CAPTCHA feature is in **public preview**.|
223+
| setting.showHeading | No | Specifies whether **User Details** heading element should be visible. Possible values: `true` (default), or `false`.|
223224

224225
Notes:
225226

articles/ai-services/openai/concepts/use-your-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ If the policy above doesn't meet your need, please consider other options, for e
474474

475475
## Token usage estimation for Azure OpenAI On Your Data
476476

477-
Azure OpenAI On Your Data Retrieval Augmented Generation (RAG) service that leverages both a search service (such as Azure AI Search) and generation (Azure OpenAI models) to let users get answers for their questions based on provided data.
477+
Azure OpenAI On Your Data Retrieval Augmented Generation (RAG) is a service that leverages both a search service (such as Azure AI Search) and generation (Azure OpenAI models) to let users get answers for their questions based on provided data.
478478

479479
As part of this RAG pipeline, there are three steps at a high-level:
480480

articles/ai-services/openai/how-to/use-your-data-securely.md

Lines changed: 47 additions & 42 deletions
Large diffs are not rendered by default.
7.46 KB
Loading
17.3 KB
Loading
8.9 KB
Loading
100 KB
Loading
32.8 KB
Loading

articles/aks/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,8 @@
483483
href: workload-identity-overview.md
484484
- name: Deploy and configure workload identity for a cluster
485485
href: workload-identity-deploy-cluster.md
486+
- name: Configure cross-tenant workload identity
487+
href: workload-identity-cross-tenant.md
486488
- name: Migrate your app from pod identity to workload identity
487489
href: workload-identity-migrate-from-pod-identity.md
488490
- name: Microsoft Entra pod identity

0 commit comments

Comments
 (0)