Skip to content

Commit 812a3ef

Browse files
asudbringasudbring
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-mtu-size
commit.
2 parents 2a3faea + de4b728 commit 812a3ef

File tree

572 files changed

+19631
-7066
lines changed

Some content is hidden

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

572 files changed

+19631
-7066
lines changed

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1515,6 +1515,46 @@
15151515
"redirect_url": "/azure/azure-monitor/app/usage-workbooks",
15161516
"redirect_document_id": false
15171517
},
1518+
{
1519+
"source_path_from_root": "/articles/azure-monitor/app/usage-overview.md",
1520+
"redirect_url": "/azure/azure-monitor/app/usage",
1521+
"redirect_document_id": false
1522+
},
1523+
{
1524+
"source_path_from_root": "/articles/azure-monitor/app/usage-segmentation.md",
1525+
"redirect_url": "/azure/azure-monitor/app/usage",
1526+
"redirect_document_id": false
1527+
},
1528+
{
1529+
"source_path_from_root": "/articles/azure-monitor/app/usage-funnels.md",
1530+
"redirect_url": "/azure/azure-monitor/app/usage",
1531+
"redirect_document_id": false
1532+
},
1533+
{
1534+
"source_path_from_root": "/articles/azure-monitor/app/usage-cohorts.md",
1535+
"redirect_url": "/azure/azure-monitor/app/usage",
1536+
"redirect_document_id": false
1537+
},
1538+
{
1539+
"source_path_from_root": "/articles/azure-monitor/app/usage-impact.md",
1540+
"redirect_url": "/azure/azure-monitor/app/usage",
1541+
"redirect_document_id": false
1542+
},
1543+
{
1544+
"source_path_from_root": "/articles/azure-monitor/app/usage-retention.md",
1545+
"redirect_url": "/azure/azure-monitor/app/usage",
1546+
"redirect_document_id": false
1547+
},
1548+
{
1549+
"source_path_from_root": "/articles/azure-monitor/app/usage-flows.md",
1550+
"redirect_url": "/azure/azure-monitor/app/usage",
1551+
"redirect_document_id": false
1552+
},
1553+
{
1554+
"source_path_from_root": "/articles/azure-monitor/app/usage-heart.md",
1555+
"redirect_url": "/azure/azure-monitor/app/usage",
1556+
"redirect_document_id": false
1557+
},
15181558
{
15191559
"source_path_from_root": "/articles/application-insights/app-insights-visual-studio.md",
15201560
"redirect_url": "/azure/azure-monitor/app/visual-studio",

‎.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
}

‎.openpublishing.redirection.json

Lines changed: 102 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,70 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/application-gateway/resource-manager-template-samples.md",
5+
"redirect_url": "/previous-versions/azure/application-gateway/resource-manager-template-samples",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/application-gateway/cli-samples.md",
10+
"redirect_url": "/previous-versions/azure/application-gateway/cli-samples",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/application-gateway/scripts/create-vmss-cli.md",
15+
"redirect_url": "/previous-versions/azure/application-gateway/scripts/create-vmss-cli",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/application-gateway/scripts/create-vmss-powershell.md",
20+
"redirect_url": "/previous-versions/azure/application-gateway/scripts/create-vmss-powershell",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/application-gateway/scripts/waf-custom-rules-powershell.md",
25+
"redirect_url": "/previous-versions/azure/application-gateway/scripts/waf-custom-rules-powershell",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/dns/scripts/dns-cli-create-dns-zone-record.md",
30+
"redirect_url": "/previous-versions/azure/dns/scripts/dns-cli-create-dns-zone-record",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/dns/scripts/find-unhealthy-dns-records.md",
35+
"redirect_url": "/previous-versions/azure/dns/scripts/find-unhealthy-dns-records",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/dns/cli-samples.md",
40+
"redirect_url": "/previous-versions/azure/dns/cli-samples",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/traffic-manager/scripts/traffic-manager-powershell-websites-high-availability.md",
45+
"redirect_url": "/previous-versions/azure/traffic-manager/scripts/traffic-manager-powershell-websites-high-availability",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/traffic-manager/cli-samples.md",
50+
"redirect_url": "/previous-versions/azure/traffic-manager/cli-samples",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/expressroute/about-public-peering.md",
55+
"redirect_url": "/previous-versions/azure/expressroute/about-public-peering",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/expressroute/how-to-npm.md",
60+
"redirect_url": "/previous-versions/azure/expressroute/how-to-npm",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "articles/expressroute/how-to-move-peering.md",
65+
"redirect_url": "/previous-versions/azure/expressroute/how-to-move-peering",
66+
"redirect_document_id": false
67+
},
368
{
469
"source_path": "articles/networking/connectivity-interoperability-configuration.md",
570
"redirect_url": "/previous-versions/azure/networking/connectivity-interoperability-configuration",
@@ -4813,6 +4878,13 @@
48134878
"redirect_document_id": false
48144879
},
48154880
{
4881+
4882+
"source_path_from_root": "/articles/backup/azure-backup-move-vaults-across-regions.md",
4883+
"redirect_url": "/azure/operational-excellence/relocation-backup",
4884+
"redirect_document_id": false
4885+
},
4886+
{
4887+
48164888
"source_path_from_root": "/articles/cosmos-db/how-to-move-regions.md",
48174889
"redirect_url": "/azure/operational-excellence/relocation-cosmos-db",
48184890
"redirect_document_id": false
@@ -4841,11 +4913,37 @@
48414913
"source_path_from_root": "/articles/event-grid/availability-zones-disaster-recovery.md",
48424914
"redirect_url": "/azure/reliability/reliability-event-grid",
48434915
"redirect_document_id": false
4916+
},
4917+
{
4918+
"source_path_from_root": "/articles/virtual-network/ip-services/add-dual-stack-ipv6-vm-powershell.md",
4919+
"redirect_url": "/azure/virtual-network/ip-services/add-dual-stack-ipv6-vm-portal",
4920+
"redirect_document_id": false
4921+
},
4922+
{
4923+
"source_path_from_root": "/articles/virtual-network/ip-services/add-dual-stack-ipv6-vm-cli.md",
4924+
"redirect_url": "/azure/virtual-network/ip-services/add-dual-stack-ipv6-vm-portal",
4925+
"redirect_document_id": false
4926+
},
4927+
{
4928+
"source_path_from_root": "/articles/virtual-network/ip-services/create-vm-dual-stack-ipv6-cli.md",
4929+
"redirect_url": "/azure/virtual-network/ip-services/create-vm-dual-stack-ipv6-portal",
4930+
"redirect_document_id": true
4931+
},
4932+
{
4933+
"source_path_from_root": "/articles/virtual-network/ip-services/create-vm-dual-stack-ipv6-powershell.md",
4934+
"redirect_url": "/azure/virtual-network/ip-services/create-vm-dual-stack-ipv6-portal",
4935+
"redirect_document_id": false
4936+
},
4937+
{
4938+
"source_path_from_root": "/articles/virtual-network/ip-services/routing-preference-powershell.md",
4939+
"redirect_url": "/azure/virtual-network/ip-services/routing-preference-portal",
4940+
"redirect_document_id": false
4941+
},
4942+
{
4943+
"source_path_from_root": "/articles/virtual-network/ip-services/routing-preference-cli.md",
4944+
"redirect_url": "/azure/virtual-network/ip-services/routing-preference-portal",
4945+
"redirect_document_id": false
48444946
}
48454947

4846-
4847-
4848-
4849-
48504948
]
48514949
}

‎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: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Azure OpenAI offers three types of deployments. These provide a varied level of
3535
| **Getting started** | [Model deployment](./create-resource.md) | [Model deployment](./create-resource.md) | [Provisioned onboarding](./provisioned-throughput-onboarding.md) |
3636
| **Cost** | [Global deployment pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) | [Regional pricing](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) | May experience cost savings for consistent usage |
3737
| **What you get** | Easy access to all new models with highest default pay-per-call limits.<br><br> Customers with high volume usage may see higher latency variability | Easy access with [SLA on availability](https://azure.microsoft.com/support/legal/sla/). Optimized for low to medium volume workloads with high burstiness. <br><br>Customers with high consistent volume may experience greater latency variability. | Regional access with very high & predictable throughput. Determine throughput per PTU using the provided [capacity calculator](./provisioned-throughput-onboarding.md#estimate-provisioned-throughput-and-cost) |
38-
| **What you don’t get** | ❌Data residency guarantees | ❌High volume w/consistent low latency | ❌Pay-per-call flexibility |
38+
| **What you don’t get** |❌Data processing guarantee<br> <br> 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/) | ❌High volume w/consistent low latency | ❌Pay-per-call flexibility |
3939
| **Per-call Latency** | Optimized for real-time calling & low to medium volume usage. Customers with high volume usage may see higher latency variability. Threshold set per model | Optimized for real-time calling & low to medium volume usage. Customers with high volume usage may see higher latency variability. Threshold set per model | Optimized for real-time. |
4040
| **Sku Name in code** | `GlobalStandard` | `Standard` | `ProvisionedManaged` |
4141
| **Billing model** | Pay-per-token | Pay-per-token | Monthly Commitments |
@@ -52,11 +52,12 @@ Standard deployments are optimized for low to medium volume workloads with high
5252

5353
## Global standard
5454

55-
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.
55+
> [!IMPORTANT]
56+
> 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/).
5657
57-
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).
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.
5859

59-
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.
6061

6162
### How to disable access to global deployments in your subscription
6263

0 commit comments

Comments
 (0)