Skip to content

Commit 3f0e6ea

Browse files
Learn Build Service GitHub AppLearn Build Service GitHub App
authored andcommitted
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents b0fc230 + 76d0092 commit 3f0e6ea

File tree

145 files changed

+3289
-2081
lines changed

Some content is hidden

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

145 files changed

+3289
-2081
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,12 @@
236236
"branch": "main",
237237
"branch_mapping": {}
238238
},
239+
{
240+
"path_to_root": "azure-iot-operations-samples-m3",
241+
"url": "https://github.com/Azure-Samples/explore-iot-operations",
242+
"branch": "release-m3",
243+
"branch_mapping": {}
244+
},
239245
{
240246
"path_to_root": "azure-iot-sdk-node",
241247
"url": "https://github.com/Azure/azure-iot-sdk-node",

.openpublishing.redirection.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
{
109109
"source_path_from_root": "/articles/application-insights/app-insights-analytics-diagnostics.md",
110110
"redirect_url": "/azure/application-insights/app-insights-analytics",
111-
"redirect_document_id": true
111+
"redirect_document_id": false
112112
},
113113
{
114114
"source_path_from_root": "/articles/application-insights/app-insights-analytics-reference.md",
@@ -118,7 +118,7 @@
118118
{
119119
"source_path_from_root": "/articles/application-insights/app-insights-azure.md",
120120
"redirect_url": "/azure/application-insights/app-insights-overview",
121-
"redirect_document_id": true
121+
"redirect_document_id": false
122122
},
123123
{
124124
"source_path_from_root": "/articles/application-insights/app-insights-developer-analytics.md",
@@ -133,7 +133,7 @@
133133
{
134134
"source_path_from_root": "/articles/application-insights/app-insights-java-eclipse.md",
135135
"redirect_url": "/azure/application-insights/app-insights-java-quick-start",
136-
"redirect_document_id": true
136+
"redirect_document_id": false
137137
},
138138
{
139139
"source_path_from_root": "/articles/application-insights/app-insights-pricing-enterprise-details.md",

articles/api-management/api-management-howto-mutual-certificates-for-clients.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: dlepow
77

88
ms.service: azure-api-management
99
ms.topic: article
10-
ms.date: 01/12/2023
10+
ms.date: 10/30/2024
1111
ms.author: danlep
1212
ms.custom: engagement-fy23
1313
---
@@ -54,12 +54,12 @@ Using key vault certificates is recommended because it helps improve API Managem
5454

5555
### Developer, Basic, Standard, or Premium tier
5656

57-
To receive and verify client certificates over HTTP/2 in the Developer, Basic, Basic v2, Standard, Standard v2, or Premium tiers, you must enable the **Negotiate client certificate** setting on the **Custom domain** blade as shown below.
57+
To receive and verify client certificates over HTTP/2 in the Developer, Basic, Standard, or Premium tiers, you must enable the **Negotiate client certificate** setting on the **Custom domain** blade as shown below.
5858

5959
![Negotiate client certificate](./media/api-management-howto-mutual-certificates-for-clients/negotiate-client-certificate.png)
6060

61-
### Consumption tier
62-
To receive and verify client certificates in the Consumption tier, you must enable the **Request client certificate** setting on the **Custom domains** blade as shown below.
61+
### Consumption, Basic v2, Standard v2 tier
62+
To receive and verify client certificates in the Consumption, Basic v2, or Standard v2 tier, you must enable the **Request client certificate** setting on the **Custom domains** blade as shown below.
6363

6464
![Request client certificate](./media/api-management-howto-mutual-certificates-for-clients/request-client-certificate.png)
6565

15.5 KB
Loading
7.8 KB
Loading

articles/api-management/redirect-content-urls-policy.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.author: danlep
1414

1515
[!INCLUDE [api-management-availability-all-tiers](../../includes/api-management-availability-all-tiers.md)]
1616

17-
The `redirect-content-urls` policy rewrites (masks) links in the response body so that they point to the equivalent link via the gateway. Use in the outbound section to rewrite response body links to the backend service to make them point to the gateway. Use in the inbound section for an opposite effect.
17+
The `redirect-content-urls` policy rewrites (masks) links in the response body. Use in the outbound section to rewrite response body links to the backend service to make them point to the gateway instead. For example, you might do this to hide URLs of the original backend service when they appear in the response. Use in the inbound section for an opposite effect.
1818

1919
> [!NOTE]
2020
> This policy does not change any header values such as `Location` headers. To change header values, use the [set-header](set-header-policy.md) policy.
@@ -44,6 +44,14 @@ The `redirect-content-urls` policy rewrites (masks) links in the response body s
4444
<redirect-content-urls />
4545
```
4646

47+
For example, consider the following image, which shows an API response body that includes the original backend service URLs.
48+
49+
:::image type="content" source="media/redirect-content-urls-policy/original-response.png" alt-text="Screenshot showing original outbound response in test console in the portal.":::
50+
51+
After the `redirect-content-urls` policy is configured in the outbound section, the response body is rewritten to point to the gateway, in this case, `https://apim-hello-world.azure-api.net`.
52+
53+
:::image type="content" source="media/redirect-content-urls-policy/test-replaced-url.png" alt-text="Screenshot showing replaced URLs in test console in the portal.":::
54+
4755
## Related policies
4856

4957
* [Transformation](api-management-policies.md#transformation)

articles/app-service/configure-authentication-customize-sign-in-out.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ The token format varies slightly according to the provider. See the following ta
6565
> [!NOTE]
6666
> The GitHub provider for App Service authentication does not support customized sign-in and sign-out.
6767
68-
If the provider token is validated successfully, the API returns with an `authenticationToken` in the response body, which is your session token.
68+
If the provider token is validated successfully, the API returns with an `authenticationToken` in the response body, which is your session token. To get more information on the user claims, see [Work with user identities in Azure App Service authentication](configure-authentication-user-identities.md).
6969

7070
```json
7171
{

articles/app-service/overview-hosting-plans.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ The _pricing tier_ of an App Service plan determines what App Service features y
3232

3333
Each tier also provides a specific subset of App Service features. These features include custom domains and TLS/SSL certificates, autoscaling, deployment slots, backups, Traffic Manager integration, and more. The higher the tier, the more features that are available. To find out which features are supported in each pricing tier, see [App Service plan details](https://azure.microsoft.com/pricing/details/app-service/windows/#pricing).
3434

35+
You can find more comparisons between plans at [App Service limits](../azure-resource-manager/management/azure-subscription-service-limits.md#app-service-limits).
36+
3537
<a name="new-pricing-tier-premiumv3"></a>
3638

3739
## PremiumV3 pricing tier

articles/azure-functions/functions-consumption-costs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ In addition to execution time, when using one or more always ready instances, yo
5959
>[!IMPORTANT]
6060
>In this article, prices are only provided to help understand example calculations. Always check the [Azure Functions pricing page](https://azure.microsoft.com/pricing/details/functions/) when estimating costs you might incur while running your functions in the Flex Consumtion plan.
6161
62-
For the examples in this section, consider the example prices in this table for pay-as-you-go in East US.
62+
For the examples in this section, consider the discounted preview pricing in this table for pay-as-you-go in East US.
6363

6464
| Mode | Meter | Free monthly grants | Consumption rates |
6565
| ------------| ----------------- | -------------------------- | ------------------------ |
-32 KB
Loading

0 commit comments

Comments
 (0)