Skip to content

Commit c0bea1b

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into dns-azdns
2 parents a6bc80e + 23c79af commit c0bea1b

22 files changed

+363
-277
lines changed

articles/ai-services/document-intelligence/concept-composed-models.md

Lines changed: 88 additions & 35 deletions
Large diffs are not rendered by default.

articles/ai-services/document-intelligence/overview.md

Lines changed: 76 additions & 127 deletions
Large diffs are not rendered by default.

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,12 @@ items:
230230
- name: Custom model overview
231231
displayName: table, label, ocr, confidence, template, neural
232232
href: concept-custom.md
233-
- name: Custom model lifecycle
234-
displayName: custom, train, modelId, model ID, expiration, train, build
235-
href: concept-custom-lifecycle.md
233+
- name: 🆕 Composed models
234+
displayName: custom, assign, modelId, model ID
235+
href: concept-composed-models.md
236+
- name: 🆕 Incremental classifier
237+
displayName: custom, classification, training
238+
href: concept-incremental-classifier.md
236239
- name: Custom template model
237240
displayName: structure, selection, labels, tables, tabular, train, template, neural, build mode, signatures, custom
238241
href: concept-custom-template.md
@@ -242,18 +245,15 @@ items:
242245
- name: Custom classification model
243246
displayName: custom, train, classification, splitting
244247
href: concept-custom-classifier.md
245-
- name: 🆕 Incremental classifier
246-
displayName: custom, classification, training
247-
href: concept-incremental-classifier.md
248248
- name: Custom labels
249249
displayName: structure, selection, labels, tables, tabular, train
250250
href: concept-custom-label.md
251251
- name: Custom labeling tips
252252
displayName: structure, selection, labels, tables, tabular, train, tips
253253
href: concept-custom-label-tips.md
254-
- name: Composed models
255-
displayName: custom, assign, modelId, model ID
256-
href: concept-composed-models.md
254+
- name: Custom model lifecycle
255+
displayName: custom, train, modelId, model ID, expiration, train, build
256+
href: concept-custom-lifecycle.md
257257
- name: Code samples
258258
items:
259259
- name: "C#/.NET"
@@ -328,4 +328,4 @@ items:
328328
- name: Support and help options
329329
href: ../../ai-services/cognitive-services-support-options.md?context=/azure/ai-services/document-intelligence/context/context
330330
- name: Privacy and cookies
331-
href: https://privacy.microsoft.com/en-US/privacystatement
331+
href: https://privacy.microsoft.com/en-US/privacystatement

articles/app-service/configure-language-dotnetcore.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,10 @@ For more information, see [Configure ASP.NET Core to work with proxy servers and
225225

226226
::: zone pivot="platform-linux"
227227

228+
## Rewrite or redirect URL
229+
230+
To rewrite or redirect URL, use the [URL rewriting middleware in ASP.NET Core](/aspnet/core/fundamentals/url-rewriting).
231+
228232
## Open SSH session in browser
229233

230234
[!INCLUDE [Open SSH session in browser](../../includes/app-service-web-ssh-connect-builtin-no-h.md)]

articles/app-service/configure-language-java-deploy-run.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,22 @@ To deploy .ear files, [use FTP](deploy-ftp.md). Your .ear application is deploye
178178
179179
Don't deploy your .war or .jar using FTP. The FTP tool is designed to upload startup scripts, dependencies, or other runtime files. It's not the optimal choice for deploying web apps.
180180
181+
## Rewrite or redirect URL
182+
183+
To rewrite or redirect URL, use one of the available URL rewriters, such as [UrlRewriteFilter](http://tuckey.org/urlrewrite/).
184+
185+
::: zone pivot="java-tomcat"
186+
187+
Tomcat also provides a [rewrite valve](https://tomcat.apache.org/tomcat-10.1-doc/rewrite.html).
188+
189+
::: zone-end
190+
191+
::: zone pivot="java-jboss"
192+
193+
JBoss also provides a [rewrite valve](https://docs.jboss.org/jbossweb/7.0.x/rewrite.html).
194+
195+
::: zone-end
196+
181197
## Logging and debugging apps
182198
183199
Performance reports, traffic visualizations, and health checkups are available for each app through the Azure portal. For more information, see [Azure App Service diagnostics overview](overview-diagnostics.md).

articles/application-gateway/configure-application-gateway-with-private-frontend-ip.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,30 @@
11
---
22
title: Configure an internal load balancer (ILB) endpoint
33
titleSuffix: Azure Application Gateway
4-
description: This article provides information on how to configure Application Gateway Standard v2 with a private frontend IP address
4+
description: This article provides information on how to configure Application Gateway Standard v1 with a private frontend IP address
55
services: application-gateway
66
author: greg-lindsay
77
ms.service: azure-application-gateway
88
ms.topic: how-to
9-
ms.date: 02/07/2024
9+
ms.date: 08/09/2024
1010
ms.author: greglin
1111
---
1212

1313
# Configure an application gateway with an internal load balancer (ILB) endpoint
1414

15-
Azure Application Gateway Standard v2 can be configured with an Internet-facing VIP or with an internal endpoint that isn't exposed to the Internet. An internal endpoint uses a private IP address for the frontend, which is also known as an *internal load balancer (ILB) endpoint*.
15+
Azure Application Gateway Standard v1 can be configured with an Internet-facing VIP or with an internal endpoint that isn't exposed to the Internet. An internal endpoint uses a private IP address for the frontend, which is also known as an *internal load balancer (ILB) endpoint*.
16+
17+
> [!NOTE]
18+
> Application Gateway v1 is being retired. See the [v1 retiredment announcement](/azure/application-gateway/v1-retirement).<br>
19+
> To configure a v2 application gateway with a private frontend IP address, see [Private Application Gateway deployment](/azure/application-gateway/application-gateway-private-deployment).
1620
1721
Configuring the gateway using a frontend private IP address is useful for internal line-of-business applications that aren't exposed to the Internet. It's also useful for services and tiers within a multi-tier application that are in a security boundary that isn't exposed to the Internet but:
1822

1923
- still require round-robin load distribution
2024
- session stickiness
2125
- or Transport Layer Security (TLS) termination (previously known as Secure Sockets Layer (SSL)).
2226

23-
This article guides you through the steps to configure a Standard v2 Application Gateway with an ILB using the Azure portal.
27+
This article guides you through the steps to configure a Standard v1 Application Gateway with an ILB using the Azure portal.
2428

2529
[!INCLUDE [updated-for-az](~/reusable-content/ce-skilling/azure/includes/updated-for-az.md)]
2630

@@ -38,7 +42,7 @@ In this example, you create a new virtual network. You can create a virtual netw
3842
2. Select **Networking** and then select **Application Gateway** in the Featured list.
3943
3. Enter *myAppGateway* for the name of the application gateway and *myResourceGroupAG* for the new resource group.
4044
4. For **Region**, select **Central US**.
41-
5. For **Tier**, select **Standard V2**.
45+
5. For **Tier**, select **Standard**.
4246
6. Under **Configure virtual network** select **Create new**, and then enter these values for the virtual network:
4347
- *myVNet* - for the name of the virtual network.
4448
- *10.0.0.0/16* - for the virtual network address space.
@@ -59,7 +63,7 @@ In this example, you create a new virtual network. You can create a virtual netw
5963
9. Select **Next:Backends**.
6064
10. Select **Add a backend pool**.
6165
11. For **Name**, type *appGatewayBackendPool*.
62-
12. For **Add backend pool without targets**, select **Yes**. You'll add the targets later.
66+
12. For **Add backend pool without targets**, select **Yes**. Targets are added later.
6367
13. Select **Add**.
6468
14. Select **Next:Configuration**.
6569
15. Under **Routing rules**, select **Add a routing rule**.
@@ -80,9 +84,9 @@ In this example, you create a new virtual network. You can create a virtual netw
8084

8185
## Add backend pool
8286

83-
The backend pool is used to route requests to the backend servers that serve the request. The backend can be composed of NICs, virtual machine scale sets, public IP addresses, internal IP addresses, fully qualified domain names (FQDN), and multi-tenant backends like Azure App Service. In this example, you use virtual machines as the target backend. You can either use existing virtual machines or create new ones. In this example, you create two virtual machines that Azure uses as backend servers for the application gateway.
87+
The backend pool is used to route requests to the backend servers that serve the request. The backend can be composed of NICs, virtual machine scale sets, public IP addresses, internal IP addresses, fully qualified domain names (FQDN), and multitenant backends like Azure App Service. In this example, you use virtual machines as the target backend. You can either use existing virtual machines or create new ones. In this example, you create two virtual machines that Azure uses as backend servers for the application gateway.
8488

85-
To do this, you:
89+
To do this:
8690

8791
1. Create two new virtual machines, *myVM* and *myVM2*, used as backend servers.
8892
2. Install IIS on the virtual machines to verify that the application gateway was created successfully.

articles/azure-maps/glossary.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ The following list describes common words used with the Azure Maps services.
151151

152152
## G
153153

154+
<a name="geobias"></a> **Geobias**: A geospatial bias to improve the ranking of results. In some methods, this can be affected by setting the longitude and latitude parameters where available. In other cases it is purely internal.
155+
154156
<a name="geocode"></a> **Geocode**: An address or location that has been converted into a coordinate that can be used to display that location on a map.
155157

156158
<a name="geocoding"></a> **Geocoding**: Or _forward geocoding_, is the process of converting address of location data into coordinates.

0 commit comments

Comments
 (0)