Skip to content

Commit ce4abbb

Browse files
authored
Merge pull request #310606 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents cea8434 + 7908a2d commit ce4abbb

3 files changed

Lines changed: 9 additions & 2 deletions

File tree

articles/container-apps/rule-based-routing.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,13 @@ ROUTE_CONFIG_NAME="my-route-config"
131131
132132
This configuration defines two routing rules for HTTP traffic.
133133
134+
> [!NOTE]
135+
> The order of the routing rules matters.
136+
>
137+
> More specific prefixes need to be before less specific prefixes.
138+
>
139+
> For example, if the first rule matches the prefix /api, that will be used even if the second rule uses the prefix /api/v1.
140+
134141
| Property | Description |
135142
|---|---|
136143
| `description` | Human-readable label for the rule |

articles/expressroute/expressroute-introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Connectivity can be from an any-to-any (IP VPN) network, a point-to-point Ethern
3030
* Dynamic routing between your network and Microsoft via BGP.
3131
* Built-in redundancy in every peering location for higher reliability.
3232
* Connection uptime [SLA](https://azure.microsoft.com/support/legal/sla/).
33-
* QoS support for Skype for Business.
33+
* QoS support for Microsoft Teams.
3434

3535
For more information, see the [ExpressRoute FAQ](expressroute-faqs.md).
3636

articles/expressroute/metro.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ The following diagram allows for a comparison between the standard ExpressRoute
6666

6767
### Create an ExpressRoute Metro circuit
6868

69-
You can create an ExpressRoute Metro circuit in the Azure portal in any of the three metropolitan areas. Within the portal, specify one of the Metro peering locations and the corresponding service provider supported in that location. For more information, see [Create an ExpressRoute circuit](expressroute-howto-circuit-portal-resource-manager.md?pivots=expressroute-preview).
69+
You can create an ExpressRoute Metro circuit in the Azure portal in any of the metropolitan areas. Within the portal, specify one of the Metro peering locations and the corresponding service provider supported in that location. For more information, see [Create an ExpressRoute circuit](expressroute-howto-circuit-portal-resource-manager.md?pivots=expressroute-preview).
7070

7171
:::image type="content" source="./media/metro/create-metro-circuit.png" alt-text="Screenshot of creating an ExpressRoute Metro circuit.":::
7272

0 commit comments

Comments
 (0)