Skip to content

Commit ab5b4c9

Browse files
committed
Merge branch 'main' of https://github.com/microsoftdocs/azure-docs-pr into redis5
2 parents 9e1c888 + 293a6c1 commit ab5b4c9

File tree

148 files changed

+1218
-1022
lines changed

Some content is hidden

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

148 files changed

+1218
-1022
lines changed

articles/api-center/includes/api-center-service-limits.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ms.custom: Include file
1414

1515
| Resource | Free plan<sup>1</sup> | Standard plan<sup>2</sup> |
1616
| ---------------------------------------------------------------------- | -------------------------- |-------------|
17+
| Maximum number of APIs | 200 | 10,000 |
1718
| Maximum number of versions per API | 5 | 100 |
1819
| Maximum number of definitions per version | 5 | 5 |
1920
| Maximum number of deployments per API | 10 | 10 |

articles/app-service/configure-authentication-provider-aad.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Configure Microsoft Entra Authentication
33
description: Learn how to configure Microsoft Entra authentication as an identity provider for your App Service or Azure Functions app.
44
ms.assetid: 6ec6a46c-bce4-47aa-b8a3-e133baef22eb
55
ms.topic: how-to
6-
ms.date: 01/28/2025
6+
ms.date: 03/28/2025
77
ms.custom: fasttrack-edit, AppServiceIdentity
88
author: cephalin
99
ms.author: cephalin

articles/app-service/configure-custom-container.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,9 @@ Set-AzWebApp -ResourceGroupName <group-name> -Name <app-name> -AppSettings @{"WE
226226

227227
You can use the */home* directory in your custom container file system to persist files across restarts and share them across instances. The */home* directory is provided to enable your custom container to access persistent storage. Saving data within */home* contributes to the [storage space quota](../azure-resource-manager/management/azure-subscription-service-limits.md#azure-app-service-limits) included with your App Service Plan.
228228

229-
When persistent storage is disabled, writes to the *C:\home* directory aren't persisted across app restarts or across multiple instances. When persistent storage is enabled, all writes to the *\home* directory persist. All instances of a scaled-out app can access them. Any existing files already present on the persistent storage when the container starts overwrite any contents in the *\home* directory of the container.
229+
When persistent storage is disabled, writes to the */home* directory aren't persisted across app restarts or across multiple instances. When persistent storage is enabled, all writes to the */home* directory persist. All instances of a scaled-out app can access them. Any existing files already present on the persistent storage when the container starts overwrite any contents in the */home* directory of the container.
230230

231-
The only exception is the *\home\LogFiles* directory. This directory stores the container and application logs. This folder always persists upon app restarts if [application logging is enabled](troubleshoot-diagnostic-logs.md#enable-application-logging-linuxcontainer) with the **File System** option, whether or not persistent storage is enabled. In other words, enabling or disabling the persistent storage doesn't affect the application logging behavior.
231+
The only exception is the */home/LogFiles* directory. This directory stores the container and application logs. This folder always persists upon app restarts if [application logging is enabled](troubleshoot-diagnostic-logs.md#enable-application-logging-linuxcontainer) with the **File System** option, whether or not persistent storage is enabled. In other words, enabling or disabling the persistent storage doesn't affect the application logging behavior.
232232

233233
We recommend that you write data to */home* or a [mounted Azure storage path](configure-connect-to-azure-storage.md?tabs=portal&pivots=container-linux). Data written outside these paths isn't persistent during restarts. The data is saved to platform-managed host disk space separate from the App Service Plans file storage quota.
234234

articles/app-service/deploy-authentication-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Authentication Types by Deployment Methods
33
description: Learn the available types of authentication with Azure App Service when you're deploying application code.
44
ms.topic: concept-article
5-
ms.date: 01/24/2025
5+
ms.date: 03/28/2025
66
author: cephalin
77
ms.author: cephalin
88
#customer intent: As an app developer, I want to understand the authentication options available for different deployment methods in Azure App Service.

articles/app-service/deploy-staging-slots.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Set Up Staging Environments
33
description: Learn how to deploy apps to a nonproduction slot and automatically swap into production. Increase the reliability and eliminate app downtime from deployments.
44
ms.assetid: e224fc4f-800d-469a-8d6a-72bcde612450
55
ms.topic: how-to
6-
ms.date: 01/24/2025
6+
ms.date: 03/28/2025
77
author: cephalin
88
ms.author: cephalin
99
ms.custom: fasttrack-edit, devx-track-azurepowershell, devx-track-azurecli, ai-video-demo

articles/app-service/includes/regionalization-note.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ ms.subservice: web-apps
1212
> [!NOTE]
1313
> Starting June 1, 2024, newly created App Service apps can generate a unique default host name that uses the naming convention `<app-name>-<random-hash>.<region>.azurewebsites.net`. For example: `myapp-ds27dh7271aah175.westus-01.azurewebsites.net`. Existing app names remain unchanged.
1414
>
15-
> For more information, see the [blog post about creating a web app with a unique default host name](https://techcommunity.microsoft.com/t5/apps-on-azure-blog/public-preview-creating-web-app-with-a-unique-default-hostname/ba-p/4156353).
15+
> For more information, see the [blog post about creating a web app with a unique default host name](https://techcommunity.microsoft.com/blog/appsonazureblog/secure-unique-default-hostnames-ga-on-app-service-web-apps-and-public-preview-on/4303571).

articles/app-service/reference-app-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Environment Variables and App Settings Reference
33
description: This article describes the commonly used environment variables in Azure App Service, and which ones can be modified with app settings.
44
ms.topic: conceptual
5-
ms.date: 03/19/2025
5+
ms.date: 03/28/2025
66
author: cephalin
77
ms.author: cephalin
88
---

articles/application-gateway/configuration-http-settings.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application-gateway
55
author: greg-lindsay
66
ms.service: azure-application-gateway
77
ms.topic: concept-article
8-
ms.date: 03/19/2025
8+
ms.date: 04/14/2025
99
ms.author: greglin
1010
---
1111

@@ -34,9 +34,7 @@ The default affinity cookie name is *ApplicationGatewayAffinity* and you can cha
3434
3535
## Connection draining
3636

37-
Connection draining helps you gracefully remove backend pool members during planned service updates. It applies to backend instances that are
38-
- explicitly removed from the backend pool, or
39-
- reported as unhealthy by the health probes.
37+
Connection draining helps you gracefully remove backend pool members during planned service updates. It applies to backend instances that are explicitly removed from the backend pool.
4038

4139
You can apply this setting to all backend pool members by enabling Connection Draining in the Backend Setting. It ensures that all deregistering instances in a backend pool don't receive any new requests/connections while maintaining the existing connections until the configured timeout value. This process is also true for WebSocket connections.
4240

articles/application-gateway/features.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application-gateway
55
author: greg-lindsay
66
ms.service: azure-application-gateway
77
ms.topic: concept-article
8-
ms.date: 03/24/2023
8+
ms.date: 04/14/2025
99
ms.author: greglin
1010
---
1111

@@ -104,15 +104,11 @@ For more information, see [WebSocket support](application-gateway-websocket.md)
104104

105105
## Connection draining
106106

107-
Connection draining helps you achieve graceful removal of backend pool members during planned service updates or problems with backend health. This setting is enabled via the [Backend Setting](configuration-http-settings.md) and is applied to all backend pool members during rule creation. Once enabled, the application gateway ensures all deregistering instances of a backend pool don't receive any new requests while allowing existing requests to complete within a configured time limit. It applies to cases where backend instances are:
108-
- explicitly removed from the backend pool after a configuration change by a user, or
109-
- reported as unhealthy by the health probes
110-
111-
The only exception is when requests continue to be proxied to the deregistering instances because of gateway-managed session affinity.
107+
Connection draining helps you achieve graceful removal of backend pool members during planned service updates or problems with backend health. This setting is enabled via the [Backend Setting](configuration-http-settings.md) and is applied to all backend pool members during rule creation. Once enabled, the application gateway ensures all deregistering instances of a backend pool don't receive any new requests while allowing existing requests to complete within a configured time limit. It applies to cases where backend instances are explicitly removed from the backend pool after a configuration change by a user.
112108

113109
The connection draining is honored for WebSocket connections as well. Connection draining is invoked for every single update to the gateway. To prevent connection loss to existing members of the backend pool, make sure to enable connection draining.
114110

115-
For information on time limits, see [Backend Settings configuration](configuration-http-settings.md#connection-draining).
111+
For more details, see [Backend Settings configuration](configuration-http-settings.md#connection-draining).
116112

117113
## Custom error pages
118114

articles/azure-cache-for-redis/index.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
- ignite-2024
1111

1212

13-
ms.date: 03/11/2025
13+
ms.date: 04/14/2025
1414
appliesto:
1515
- ✅ Azure Cache for Redis
1616

@@ -76,10 +76,10 @@ landingContent:
7676
- linkListType: overview
7777
links:
7878
- text: What is Azure Managed Redis?
79-
url: ../redis/overview.md
79+
url: /azure/redis/overview
8080
- text: What's new?
81-
url: ../redis/whats-new.md
81+
url: /azure/redis/whats-new
8282
- text: Azure Managed Redis architecture
83-
url: ../redis/architecture.md
83+
url: /azure/redis/architecture
8484
- text: Moving to Azure Managed Redis from Azure Cache for Redis
85-
url: ../redis/migrate/migrate-overview.md
85+
url: /azure/redis/migrate/migrate-overview

0 commit comments

Comments
 (0)