Skip to content

Commit b1044c1

Browse files
greg-lindsaygreg-lindsay
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into hub-icons
2 parents 1fb0119 + 3ecac73 commit b1044c1

File tree

609 files changed

+20146
-7866
lines changed

Some content is hidden

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

609 files changed

+20146
-7866
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: 85 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",
@@ -4841,11 +4906,27 @@
48414906
"source_path_from_root": "/articles/event-grid/availability-zones-disaster-recovery.md",
48424907
"redirect_url": "/azure/reliability/reliability-event-grid",
48434908
"redirect_document_id": false
4909+
},
4910+
{
4911+
"source_path_from_root": "/articles/virtual-network/ip-services/add-dual-stack-ipv6-vm-powershell.md",
4912+
"redirect_url": "/azure/virtual-network/ip-services/add-dual-stack-ipv6-vm-portal",
4913+
"redirect_document_id": false
4914+
},
4915+
{
4916+
"source_path_from_root": "/articles/virtual-network/ip-services/add-dual-stack-ipv6-vm-cli.md",
4917+
"redirect_url": "/azure/virtual-network/ip-services/add-dual-stack-ipv6-vm-portal",
4918+
"redirect_document_id": false
4919+
},
4920+
{
4921+
"source_path_from_root": "/articles/virtual-network/ip-services/create-vm-dual-stack-ipv6-cli.md",
4922+
"redirect_url": "/azure/virtual-network/ip-services/create-vm-dual-stack-ipv6-portal",
4923+
"redirect_document_id": true
4924+
},
4925+
{
4926+
"source_path_from_root": "/articles/virtual-network/ip-services/create-vm-dual-stack-ipv6-powershell.md",
4927+
"redirect_url": "/azure/virtual-network/ip-services/create-vm-dual-stack-ipv6-portal",
4928+
"redirect_document_id": false
48444929
}
48454930

4846-
4847-
4848-
4849-
48504931
]
48514932
}

‎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/TOC.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,19 @@ items:
66
items:
77
- name: What are Azure AI services?
88
href: what-are-ai-services.md
9-
displayName: applied, cognitive, form recognizer
9+
displayName: applied, cognitive, form
1010
- name: Language support
1111
href: language-support.md
1212
- name: Pricing
1313
href: https://azure.microsoft.com/pricing/details/cognitive-services/
1414
- name: Quickstarts
1515
items:
16-
- name: Create a multi-service resource
16+
- name: Create an Azure AI services resource
1717
href: multi-service-resource.md
18-
displayName: cognitive
18+
displayName: applied, cognitive, form
1919
- name: Create a new resource using Bicep
20-
displayName: Resource Manager, ARM, Template
2120
href: create-account-bicep.md
2221
- name: Create a new resource using an ARM template
23-
displayName: Resource Manager
2422
href: create-account-resource-manager-template.md
2523
- name: Create a new resource using Terraform
2624
href: create-account-terraform.md

‎articles/ai-services/includes/ai-services-intro.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
title: include file
3+
description: include file
4+
ms.service: azure-ai-services
5+
ms.topic: include
6+
author: eric-urban
7+
ms.author: eur
8+
ms.date: 8/1/2024
9+
ms.custom: include
10+
---
11+
12+
Azure AI services help developers and organizations rapidly create intelligent, cutting-edge, market-ready, and responsible applications with out-of-the-box and prebuilt and customizable APIs and models. Example applications include natural language processing for conversations, search, monitoring, translation, speech, vision, and decision-making.
13+
14+
> [!TIP]
15+
> Try Azure AI services including Azure OpenAI, Content Safety, Speech, Vision, and more in [Azure AI Studio](https://ai.azure.com). For more information, see [What is Azure AI Studio?](../../ai-studio/what-is-ai-studio.md).
16+
17+
Most [Azure AI services](../../ai-services/index.yml) are available through REST APIs and client library SDKs in popular development languages. For more information, see each service's documentation.

0 commit comments

Comments
 (0)