Skip to content

Commit 693684c

Browse files
committed
Merge branch 'main' into release-maxsurge-ga
2 parents eb45ba9 + 3ecac73 commit 693684c

File tree

125 files changed

+12300
-717
lines changed

Some content is hidden

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

125 files changed

+12300
-717
lines changed

.openpublishing.redirection.container-registry.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
},
110110
{
111111
"source_path": "articles/container-registry/container-registry-diagnostics-audit-logs.md",
112-
"redirect_url": "/azure/container-registry/monitor-service"
112+
"redirect_url": "/azure/container-registry/monitor-container-registry"
113113
},
114114
{
115115
"source_path_from_root": "/articles/container-registry/container-registry-managed-get-started-azure-cli.md",
@@ -155,6 +155,16 @@
155155
"source_path_from_root": "/articles/container-registry/github-action-scan.md",
156156
"redirect_url": "/azure/developer/github/",
157157
"redirect_document_id": false
158+
},
159+
{
160+
"source_path": "articles/container-registry/monitor-service.md",
161+
"redirect_url": "/azure/container-registry/monitor-container-registry",
162+
"redirect_document_id": true
163+
},
164+
{
165+
"source_path": "articles/container-registry/monitor-service-reference.md",
166+
"redirect_url": "/azure/container-registry/monitor-container-registry-reference",
167+
"redirect_document_id": true
158168
}
159169
]
160170
}

articles/active-directory-b2c/custom-email-sendgrid.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,9 @@ The Localization element allows you to support multiple locales or languages in
542542
<LocalizedString ElementType="DisplayControl" ElementId="emailVerificationControl" StringId="but_send_new_code">Send new code</LocalizedString>
543543
<LocalizedString ElementType="DisplayControl" ElementId="emailVerificationControl" StringId="but_change_claims">Change e-mail</LocalizedString>
544544
<!-- Claims-->
545-
<LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="DisplayName">Verification Code</LocalizedString>
546-
<LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="UserHelpText">Verification code received in the email.</LocalizedString>
547-
<LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="AdminHelpText">Verification code received in the email.</LocalizedString>
545+
<LocalizedString ElementType="ClaimType" ElementId="VerificationCode" StringId="DisplayName">Verification Code</LocalizedString>
546+
<LocalizedString ElementType="ClaimType" ElementId="VerificationCode" StringId="UserHelpText">Verification code received in the email.</LocalizedString>
547+
<LocalizedString ElementType="ClaimType" ElementId="VerificationCode" StringId="AdminHelpText">Verification code received in the email.</LocalizedString>
548548
<LocalizedString ElementType="ClaimType" ElementId="email" StringId="DisplayName">Email</LocalizedString>
549549
<!-- Email validation error messages-->
550550
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfSessionDoesNotExist">You have exceeded the maximum time allowed.</LocalizedString>

articles/ai-services/openai/how-to/deployment-types.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,9 @@ Standard deployments are optimized for low to medium volume workloads with high
5555
> [!IMPORTANT]
5656
> Data might be processed outside of the resource's Azure geography, but data storage remains in its Azure geography. [Learn more about data residency](https://azure.microsoft.com/explore/global-infrastructure/data-residency/).
5757
58-
Global deployments are available in the same Azure OpenAI resources as non-global offers but allow you to leverage Azure's global infrastructure to dynamically route traffic to the data center with best availability for each request. Global standard will provide the highest default quota for new models and eliminates the need to load balance across multiple resources.
58+
Global deployments are available in the same Azure OpenAI resources as non-global deployment types but allow you to leverage Azure's global infrastructure to dynamically route traffic to the data center with best availability for each request. Global standard provides the highest default quota and eliminates the need to load balance across multiple resources.
5959

60-
The deployment type is optimized for low to medium volume workloads with high burstiness. Customers with high consistent volume may experience greater latency variability. The threshold is set per model. See the [quotas page to learn more](./quota.md).
61-
62-
For customers that require the lower latency variance at large workload usage, we recommend purchasing provisioned throughput.
60+
Customers with high consistent volume may experience greater latency variability. The threshold is set per model. See the [quotas page to learn more](./quota.md). For applications that require the lower latency variance at large workload usage, we recommend purchasing provisioned throughput.
6361

6462
### How to disable access to global deployments in your subscription
6563

0 commit comments

Comments
 (0)