Skip to content

Commit 4c96f9a

Browse files
authored
Merge pull request #280818 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 6308226 + 04b0bf2 commit 4c96f9a

File tree

9 files changed

+13
-15
lines changed

9 files changed

+13
-15
lines changed

articles/active-directory-b2c/relyingparty.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ The **OutputClaim** element contains the following attributes:
283283

284284
### SubjectNamingInfo
285285

286-
With the **SubjectNameingInfo** element, you control the value of the token subject:
286+
With the **SubjectNamingInfo** element, you control the value of the token subject:
287287

288288
- **JWT token** - the `sub` claim. This is a principal about which the token asserts information, such as the user of an application. This value is immutable and cannot be reassigned or reused. It can be used to perform safe authorization checks, such as when the token is used to access a resource. By default, the subject claim is populated with the object ID of the user in the directory. For more information, see [Token, session and single sign-on configuration](session-behavior.md).
289289
- **SAML token** - the `<Subject><NameID>` element, which identifies the subject element. The NameId format can be modified.

articles/app-service/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ If you need to create another web app with an outdated runtime version that is n
6262

6363
## App Service Environments
6464

65-
An App Service Environment is an Azure App Service feature that provides a fully isolated and dedicated environment for running App Service apps securely at high scale. Unlike the App Service offering where supporting ingfrastructure is shared, compute is dedicated to a single customer with App Service Environment. For more information on the differences between App Service Environment and App Service, see the [comparison](./environment/ase-multi-tenant-comparison.md).
65+
An App Service Environment is an Azure App Service feature that provides a fully isolated and dedicated environment for running App Service apps securely at high scale. Unlike the App Service offering where supporting infrastructure is shared, compute is dedicated to a single customer with App Service Environment. For more information on the differences between App Service Environment and App Service, see the [comparison](./environment/ase-multi-tenant-comparison.md).
6666

6767
## Next steps
6868

articles/azure-arc/servers/includes/esu-network-requirements.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ You can enable the following subset of endpoints:
1818
|`aka.ms`|Used to resolve the download script during installation|At installation time, only| Public |
1919
|`download.microsoft.com`|Used to download the Windows installation package|At installation time, only| Public |
2020
|`login.windows.net`|Microsoft Entra ID|Always| Public |
21-
|`*blob.core.windows.net`|Download Arc SQL Extension|SQL Server ESUs| Public |
2221
|`login.microsoftonline.com`|Microsoft Entra ID|Always| Public |
2322
|`management.azure.com`|Azure Resource Manager - to create or delete the Arc server resource|When connecting or disconnecting a server, only| Public, unless a [resource management private link](../../../azure-resource-manager/management/create-private-link-access-portal.md) is also configured |
2423
|`*.his.arc.azure.com`|Metadata and hybrid identity services|Always| Private |
@@ -34,7 +33,6 @@ You can enable the following subset of endpoints:
3433
|`aka.ms`|Used to resolve the download script during installation|At installation time, only| Public |
3534
|`download.microsoft.com`|Used to download the Windows installation package|At installation time, only| Public |
3635
|`login.microsoftonline.us`|Microsoft Entra ID|Always| Public |
37-
|`*blob.core.windows.net`|Download Arc SQL Extension|SQL Server ESUs| Public |
3836
|`management.usgovcloudapi.net`|Azure Resource Manager - to create or delete the Arc server resource|When connecting or disconnecting a server, only| Public, unless a [resource management private link](../../../azure-resource-manager/management/create-private-link-access-portal.md) is also configured |
3937
|`*.his.arc.azure.us`|Metadata and hybrid identity services|Always| Private |
4038
|`*.guestconfiguration.azure.us`| Extension management and guest configuration services |Always| Private |

articles/azure-cache-for-redis/cache-aspnet-output-cache-provider.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ To use the Redis Output Cache Provider, first configure your cache, and then con
2222

2323
For a full feature specification, see [ASP.NET core output caching](/aspnet/core/performance/caching/output?view=aspnetcore-8.0&preserve-view=true).
2424

25-
For sample application demonstrating the usage, see [.NET 8 Web Application with Redis Output Caching and Azure Open AI](https://github.com/Azure-Samples/azure-cache-redis-samples/tree/main/tutorial/output-cache-open-ai).
25+
For sample application demonstrating the usage, see [.NET 8 Web Application with Redis Output Caching and Azure OpenAI](https://github.com/Azure-Samples/azure-cache-redis-samples/tree/main/tutorial/output-cache-open-ai).
2626

2727
## Store ASP.NET page output in Redis
2828

articles/azure-cache-for-redis/cache-remove-tls-10-11.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ TLS versions 1.0 and 1.1 also don't support the modern encryption methods and ci
2828
2929
As a part of this effort, you can expect the following changes to Azure Cache for Redis:
3030

31-
- _Phase 1_: Azure Cache for Redis stops offering TLS 1.0/1.1 as an option for _MinimumTLSVersion_ setting for new cache creates. Existing cache instances won't be updated at this point. You can't set the _MinimiumTLSVersion_ to 1.0 or 1.1 for your existing cache.
31+
- _Phase 1_: Azure Cache for Redis stops offering TLS 1.0/1.1 as an option for _MinimumTLSVersion_ setting for new cache creates. Existing cache instances won't be updated at this point. You can't set the _MinimumTLSVersion_ to 1.0 or 1.1 for your existing cache.
3232
- _Phase 2_: Azure Cache for Redis stops supporting TLS 1.1 and TLS 1.0 starting November 1, 2024. After this change, your application must use TLS 1.2 or later to communicate with your cache. The Azure Cache for Redis service remains available while we update the _MinimumTLSVerion_ for all caches to 1.2.
3333

3434
| Date | Description |

articles/azure-functions/functions-add-openai-text-completion.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ zone_pivot_groups: programming-languages-set-functions
1111

1212
# Tutorial: Add Azure OpenAI text completion hints to your functions in Visual Studio Code
1313

14-
This article shows you how to use Visual Studio Code to add an HTTP endpoint to the function app you created in the previous quickstart article. When triggered, this new HTTP endpoint uses an [Azure Open AI text completion input binding](functions-bindings-openai-textcompletion-input.md) to get text completion hints from your data model.
14+
This article shows you how to use Visual Studio Code to add an HTTP endpoint to the function app you created in the previous quickstart article. When triggered, this new HTTP endpoint uses an [Azure OpenAI text completion input binding](functions-bindings-openai-textcompletion-input.md) to get text completion hints from your data model.
1515

1616
During this tutorial, you learn how to accomplish these tasks:
1717

articles/azure-monitor/essentials/activity-log.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ insights-activity-logs/resourceId=/SUBSCRIPTIONS/{subscription ID}/y={four-digit
138138
For example, a particular blob might have a name similar to:
139139

140140
```
141-
insights-logs-networksecuritygrouprulecounter/resourceId=/SUBSCRIPTIONS/00000000-0000-0000-0000-000000000000/y=2020/m=06/d=08/h=18/m=00/PT1H.json
141+
insights-activity-logs/resourceId=/SUBSCRIPTIONS/00000000-0000-0000-0000-000000000000/y=2020/m=06/d=08/h=18/m=00/PT1H.json
142142
```
143143

144144
Each PT1H.json blob contains a JSON object with events from log files that were received during the hour specified in the blob URL. During the present hour, events are appended to the PT1H.json file as they're received, regardless of when they were generated. The minute value in the URL, `m=00` is always `00` as blobs are created on a per hour basis.
@@ -284,4 +284,4 @@ Learn more about:
284284

285285
* [Platform logs](./platform-logs-overview.md)
286286
* [Activity log event schema](activity-log-schema.md)
287-
* [Activity log insights](activity-log-insights.md)
287+
* [Activity log insights](activity-log-insights.md)

articles/defender-for-cloud/alerts-reference.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4382,7 +4382,7 @@ Applies to: Azure Blob (Standard general-purpose v2, Azure Data Lake Storage Gen
43824382

43834383
## Alerts for AI workloads
43844384

4385-
### Detected credential theft attempts on an Azure Open AI model deployment
4385+
### Detected credential theft attempts on an Azure OpenAI model deployment
43864386

43874387
(AI.Azure_CredentialTheftAttempt)
43884388

@@ -4392,7 +4392,7 @@ Applies to: Azure Blob (Standard general-purpose v2, Azure Data Lake Storage Gen
43924392

43934393
**Severity**: Medium
43944394

4395-
### A Jailbreak attempt on an Azure Open AI model deployment was blocked by Azure AI Content Safety Prompt Shields
4395+
### A Jailbreak attempt on an Azure OpenAI model deployment was blocked by Azure AI Content Safety Prompt Shields
43964396

43974397
(AI.Azure_Jailbreak.ContentFiltering.BlockedAttempt)
43984398

@@ -4402,7 +4402,7 @@ Applies to: Azure Blob (Standard general-purpose v2, Azure Data Lake Storage Gen
44024402

44034403
**Severity**: Medium
44044404

4405-
### A Jailbreak attempt on an Azure Open AI model deployment was detected by Azure AI Content Safety Prompt Shields
4405+
### A Jailbreak attempt on an Azure OpenAI model deployment was detected by Azure AI Content Safety Prompt Shields
44064406

44074407
(AI.Azure_Jailbreak.ContentFiltering.DetectedAttempt)
44084408

@@ -4412,7 +4412,7 @@ Applies to: Azure Blob (Standard general-purpose v2, Azure Data Lake Storage Gen
44124412

44134413
**Severity**: Medium
44144414

4415-
### Sensitive Data Exposure Detected in Azure Open AI Model Deployment
4415+
### Sensitive Data Exposure Detected in Azure OpenAI Model Deployment
44164416

44174417
(AI.Azure_DataLeakInModelResponse.Sensitive)
44184418

articles/event-grid/authenticate-with-access-keys-shared-access-signatures.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Shared Access Signatures (SAS) provides you with access control over resources w
5050

5151
## Shared Access Signature token
5252

53-
You can generate a SAS token to be included when your client application communicates with Event Grid. SAS tokens for Event Grid resources are `Base64` encoded strings with the following format: `r={resource}&e={expiration_utc}&s={signature}`.
53+
You can generate a SAS token to be included when your client application communicates with Event Grid. SAS tokens for Event Grid resources are `URL` encoded strings with the following format: `r={resource}&e={expiration_utc}&s={signature}`.
5454

5555
- `{resource}` is the URL that represents the Event Grid resource the client accesses.
5656
- The valid URL format for custom topics, domains, and partner namespaces is `https://<yourtopic>.<region>.eventgrid.azure.net/api/events`.
@@ -141,4 +141,4 @@ Authorization: SharedAccessSignature r=https%3a%2f%2fmytopic.eventgrid.azure.net
141141

142142
- [Send events to your custom topic](custom-event-quickstart.md).
143143
- [Publish events to namespace topics using Java](publish-events-to-namespace-topics-java.md)
144-
- [Receive events using pull delivery with Java](receive-events-from-namespace-topics-java.md)
144+
- [Receive events using pull delivery with Java](receive-events-from-namespace-topics-java.md)

0 commit comments

Comments
 (0)