Skip to content

Commit 1c8be23

Browse files
author
RoseHJM
committed
Merge
2 parents 7c6bf98 + d717c13 commit 1c8be23

File tree

215 files changed

+2393
-2411
lines changed

Some content is hidden

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

215 files changed

+2393
-2411
lines changed

.openpublishing.redirection.json

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4950,6 +4950,16 @@
49504950
"redirect_url": "/azure/virtual-network/ip-services/create-vm-dual-stack-ipv6-portal",
49514951
"redirect_document_id": false
49524952
},
4953+
{
4954+
"source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-cli.md",
4955+
"redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-portal",
4956+
"redirect_document_id": false
4957+
},
4958+
{
4959+
"source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-powershell.md",
4960+
"redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-portal",
4961+
"redirect_document_id": false
4962+
},
49534963
{
49544964
"source_path_from_root": "/articles/virtual-network/ip-services/routing-preference-powershell.md",
49554965
"redirect_url": "/azure/virtual-network/ip-services/routing-preference-portal",
@@ -4964,7 +4974,17 @@
49644974
"source_path_from_root":"/articles/container-registry/manual-regional-move.md",
49654975
"redirect_url":"/azure/operational-excellence/relocation-container-registry",
49664976
"redirect_document_id":false
4967-
}
4977+
},
4978+
{
4979+
"source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6-powershell.md",
4980+
"redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6--portal",
4981+
"redirect_document_id": false
4982+
},
4983+
{
4984+
"source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6-cli.md",
4985+
"redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6--portal",
4986+
"redirect_document_id": false
4987+
}
49684988

49694989
]
49704990
}

articles/active-directory-b2c/direct-signin.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ The domain hint query string parameter can set to one of the following domains:
6969
- linkedin.com
7070
- microsoft.com
7171
- qq.com
72-
- twitter.com
7372
- wechat.com
7473
- weibo.com
74+
- x.com
7575
- For [Generic OpenID Connect](identity-provider-generic-openid-connect.md), see [Domain hint](identity-provider-generic-openid-connect.md#response-mode).
7676

7777
::: zone-end
@@ -89,4 +89,4 @@ To support domain hint parameter, you can configure the domain name using the `<
8989
...
9090
```
9191

92-
::: zone-end
92+
::: zone-end

articles/ai-services/document-intelligence/toc.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -236,16 +236,16 @@ items:
236236
- name: Composed models
237237
displayName: custom, assign, modelId, model ID
238238
href: concept-composed-models.md
239-
- name: Samples
239+
- name: Code samples
240240
items:
241241
- name: "C#/.NET"
242-
href: /dotnet/api/overview/azure/ai.formrecognizer-readme?view=azure-dotnet#examples&preserve-view=true
242+
href: https://github.com/Azure-Samples/document-intelligence-code-samples/blob/main/.NET(v4.0)/README.md
243243
- name: "Java"
244-
href: /java/api/overview/azure/ai-formrecognizer-readme?view=azure-java-stable#examples&preserve-view=true
244+
href: https://github.com/Azure-Samples/document-intelligence-code-samples/blob/main/Java(v4.0)/README.md
245245
- name: "Python"
246-
href: /python/api/overview/azure/ai-formrecognizer-readme?view=azure-python#examples&preserve-view=true
246+
href: https://github.com/Azure-Samples/document-intelligence-code-samples/blob/main/Python(v4.0)/Layout_model/README.md
247247
- name: "JavaScript"
248-
href: /javascript/api/overview/azure/ai-form-recognizer-readme?view=azure-node-latest#examples&preserve-view=true
248+
href: https://github.com/Azure-Samples/document-intelligence-code-samples/blob/main/JavaScript(v4.0)/README.md
249249
- name: Responsible AI
250250
items:
251251
- name: Transparency note

articles/api-management/api-management-howto-deploy-multi-region.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how to deploy a Premium tier Azure API Management instance to
55
author: dlepow
66
ms.service: api-management
77
ms.topic: how-to
8-
ms.date: 05/15/2024
8+
ms.date: 07/29/2024
99
ms.author: danlep
1010
---
1111

@@ -168,7 +168,7 @@ This section provides considerations for multi-region deployments when the API M
168168

169169
### IP addresses
170170

171-
* A public virtual IP address is created in every region added with a virtual network. For virtual networks in either [external mode](api-management-using-with-vnet.md) or [internal mode](api-management-using-with-internal-vnet.md), this public IP address is required for management traffic on port `3443`.
171+
* A public virtual IP address is created in every region added with a virtual network. For virtual networks in either [external mode](api-management-using-with-vnet.md) or [internal mode](api-management-using-with-internal-vnet.md), this public IP address is used for management traffic on port `3443`.
172172

173173
* **External VNet mode** - The public IP addresses are also required to route public HTTP traffic to the API gateways.
174174

@@ -178,7 +178,7 @@ This section provides considerations for multi-region deployments when the API M
178178

179179
* **External VNet mode** - Routing of public HTTP traffic to the regional gateways is handled automatically, in the same way it is for a non-networked API Management instance.
180180

181-
* **Internal VNet mode** - Private HTTP traffic isn't routed or load-balanced to the regional gateways by default. Users own the routing and are responsible for bringing their own solution to manage routing and private load balancing across multiple regions. Example solutions include Azure Application Gateway and Azure Traffic Manager.
181+
* **Internal VNet mode** - Private HTTP traffic isn't routed or load-balanced to the regional gateways by default. Users own the routing and are responsible for bringing their own solution to manage routing and private load balancing across multiple regions.
182182

183183
## Next steps
184184

articles/app-service/language-support-policy.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,24 @@ To learn more about specific timelines for the language support policy, see the
4141
- [PHP](https://aka.ms/phprelease)
4242
- [Go](https://aka.ms/gorelease)
4343

44+
## Support status
45+
46+
App Service supports languages on both Linux and Windows operating systems. See the following resources for the list of OS support for each language:
47+
48+
- [.NET](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/dot_net_core.md#support-timeline)
49+
- [Java](#jdk-versions-and-maintenance)
50+
- [Node](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/node_support.md#support-timeline)
51+
- [Python](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/python_support.md#support-timeline)
52+
- [PHP](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/php_support.md#support-timeline)
53+
54+
4455
## Configure language versions
4556

4657
To learn more about how to update language versions for your App Service applications, see the following resources:
4758

4859
- [.NET](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/dot_net_core.md#how-to-update-your-app-to-target-a-different-version-of-net-or-net-core)
49-
- [Node](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/node_support.md#node-on-linux-app-service)
5060
- [Java](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/java_support.md#java-on-app-service)
61+
- [Node](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/node_support.md#node-on-linux-app-service)
5162
- [Python](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/python_support.md#how-to-update-your-app-to-target-a-different-version-of-python)
5263
- [PHP](https://github.com/Azure/app-service-linux-docs/blob/master/Runtime_Support/php_support.md#how-to-update-your-app-to-target-a-different-version-of-php)
5364

0 commit comments

Comments
 (0)