Skip to content

Commit 65c448d

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into newreg
2 parents f234ef6 + 489a8f1 commit 65c448d

104 files changed

Lines changed: 1292 additions & 406 deletions

File tree

Some content is hidden

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

articles/api-management/api-management-region-availability.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Information in the following table is updated regularly. Capacity availability i
3131
| Australia East |||||
3232
| Australia Southeast ||| | |
3333
| Brazil South ||| | |
34-
| Canada Central ||| | |
34+
| Canada Central ||| | |
3535
| Central India ||| | |
3636
| Central US ||| | |
3737
| East Asia ||| ||

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ This container has the following characteristics:
228228
- Apps are run by the [Gunicorn WSGI HTTP Server](https://gunicorn.org/) with the extra arguments `--bind=0.0.0.0 --timeout 600`.
229229
- You can provide configuration settings for Gunicorn by [customizing the startup command](#customize-startup-command).
230230

231-
- To protect your web app from accidental or deliberate DDOS attacks, Gunicorn is run behind an Nginx reverse proxy, as described in [Deploying Gunicorn](https://docs.gunicorn.org/en/latest/deploy.html).
231+
- To protect your web app from accidental or deliberate DDOS attacks, Gunicorn is run behind an Nginx reverse proxy, as described in [Deploying Gunicorn](https://gunicorn.org/deploy).
232232

233233
- By default, the base container image includes only the Flask web framework, but the container supports other frameworks that are WSGI-compliant and compatible with Python 3.6 and later, such as Django.
234234

@@ -316,7 +316,7 @@ App Service ignores any errors that occur when processing a custom startup comma
316316
gunicorn --bind=0.0.0.0 --timeout 600 --workers=4 --chdir <module_path> <module>.wsgi
317317
```
318318
319-
For more information, see [Running Gunicorn](https://docs.gunicorn.org/en/stable/run.html). If you're using autoscale rules to scale your web app up and down, you should also dynamically set the number of Gunicorn workers by using the `NUM_CORES` environment variable in your startup command. For example, `--workers $((($NUM_CORES*2)+1))`. For more information on setting the recommended number of Gunicorn workers, see [the Gunicorn FAQ](https://docs.gunicorn.org/en/stable/design.html#how-many-workers).
319+
For more information, see [Running Gunicorn](https://gunicorn.org/run/). If you're using autoscale rules to scale your web app up and down, you should also dynamically set the number of Gunicorn workers by using the `NUM_CORES` environment variable in your startup command. For example, `--workers $((($NUM_CORES*2)+1))`. For more information on setting the recommended number of Gunicorn workers, see [the Gunicorn FAQ](https://gunicorn.org/design/#how-many-workers).
320320
321321
- **Enable production logging for Django**: Add the `--access-logfile '-'` and `--error-logfile '-'` arguments to the command line:
322322
@@ -327,7 +327,7 @@ App Service ignores any errors that occur when processing a custom startup comma
327327
328328
These logs will appear in the [App Service log stream](#access-diagnostic-logs).
329329
330-
For more information, see [Gunicorn logging](https://docs.gunicorn.org/en/stable/settings.html#logging).
330+
For more information, see [Gunicorn logging](https://gunicorn.org/deploy/#logging).
331331
332332
- **Custom Flask main module**: By default, App Service assumes that a Flask app's main module is *application.py* or *app.py*. If your main module uses a different name, you must customize the startup command. For example, if you have a Flask app whose main module is *hello.py* and the Flask app object in that file is named *myapp*, this is the command:
333333

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

Lines changed: 2 additions & 2 deletions
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: 01/23/2026
5+
ms.date: 02/25/2026
66
author: cephalin
77
ms.author: cephalin
88
ms.service: azure-app-service
@@ -53,7 +53,7 @@ The following environment variables are related to the app environment in genera
5353
| `WEBSITE_SCM_SEPARATE_STATUS` | Read-only. Shows whether the Kudu app is running in a separate process (`1`) or not (`0`). |
5454
| `WEBSITE_DNS_ATTEMPTS` | Number of times to try name resolution. |
5555
| `WEBSITE_DNS_TIMEOUT` | Number of seconds to wait for name resolution. |
56-
| `WEBSITES_CONTAINER_START_TIME_LIMIT` | Amount of time (in seconds) that the platform waits for a container to become ready on startup. This setting applies to both code-based and container-based apps on App Service for Linux. The default value is `230`.<br/><br/>When a container starts up, repeated pings are made against the container to gauge its readiness to serve organic traffic. (See `WEBSITE_WARMUP_PATH` and `WEBSITE_WARMUP_STATUSES`.) These pings are continuously made until either a successful response is received or the start time limit is reached. If the container isn't deemed ready within the configured timeout, the platform fails the startup attempt and retries, which results in 503 errors.<br/><br/>For App Service for Windows containers, the default start time limit is `10 mins`. You can change the start time limit by specifying a time span. For example, `00:05:00` indicates 5 minutes. |
56+
| `WEBSITES_CONTAINER_START_TIME_LIMIT` | Amount of time (in seconds) that the platform waits for a container to become ready on startup. This setting applies to both code-based and container-based apps on App Service for Linux. The default value is `230`.<br/><br/>When a container starts up, repeated pings are made against the container to gauge its readiness to serve organic traffic. (See `WEBSITE_WARMUP_PATH` and `WEBSITE_WARMUP_STATUSES`.) These pings are continuously made until either a successful response is received or the start time limit is reached. If the container isn't deemed ready within the configured timeout, the platform fails the startup attempt and retries, which results in 503 errors.<br/><br/>For App Service for Windows containers, the default start time limit is `10 mins`. You can change the start time limit by specifying a time span. For example, `00:05:00` indicates 5 minutes. The time span for Windows Containers must be between a minimum of `00:01:00` - 1 minute, and maximum of `00:15:00` - 15 minutes. |
5757

5858
<!--
5959
WEBSITE_PROACTIVE_STACKTRACING_ENABLED

articles/azure-functions/durable/durable-task-scheduler/durable-task-scheduler-dedicated-sku.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ An e-commerce application experiences dynamic workload scaling during promotiona
138138

139139
## Next steps
140140

141-
- [Understand pricing for Durable Task Scheduler.](https://azure.microsoft.com/pricing/details/function)
141+
- [Understand pricing for Durable Task Scheduler.](https://azure.microsoft.com/pricing/details/functions/)
142142
- View [throughput performance benchmarks](./durable-task-scheduler-work-item-throughput.md)
143143
- [Choose your orchestration framework](./choose-orchestration-framework.md)
144144
- Try out the [Durable Functions quickstart sample](quickstart-durable-task-scheduler.md).

articles/azure-government/documentation-government-csp-list.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ The following tables contain lists of all the authorized Cloud Solution Provider
206206
|[Hendrix Corporation](https://www.hendrixcorp.com/)|
207207
|[Hewlett Packard Enterprise](https://www.hpe.com)|
208208
|[Hiscomp](http://www.hiscompllc.com/)|
209-
|[Hitachi Vantara](https://www.hitachivantarafederal.com/services/cloud-services/)|
209+
|[Hitachi Vantara](https://www.hitachivantara.com/content/hitachivantara/en_us/services/cloud-infrastructure-services.html)|
210210
|[HTS Voice & Data Systems, Inc.](https://www.hts-tx.com/)|
211211
|[HumanTouch LLC](https://www.humantouchllc.com/)|
212212
|[Hyertek Inc.](https://www.hyertek.com)|
@@ -310,7 +310,7 @@ The following tables contain lists of all the authorized Cloud Solution Provider
310310
|[Om Group, Inc.](http://www.omgroupinc.us/)|
311311
|[OneNeck IT Solutions](https://www.oneneck.com)|
312312
|[Onyx Point, Inc.](https://www.onyxpoint.com)|
313-
|[Opsgility](https://www.opsgility.com)|
313+
|[Opsgility](https://opsgility.com/)|
314314
|[OpsPro](https://opspro.com/)|
315315
|[Optuminsight Inc.](https://www.optum.com)|
316316
|[Orion Communications, Inc.](https://www.orioncom.com)|
@@ -557,7 +557,7 @@ The following tables contain lists of all the authorized Cloud Solution Provider
557557
|[NeoSystems LLC](https://www.neosystemscorp.com/solutions-services/microsoft-licenses/microsoft-365-licenses/)|
558558
|[Nimbus Logic, LLC](https://www.nimbus-logic.com/)|
559559
|[Northrop Grumman](https://www.northropgrumman.com/)|
560-
|[Novetta](https://www.novetta.com)|
560+
|[Novetta](https://www.linkedin.com/company/novetta/)|
561561
|[Orbis](https://orbisops.com)|
562562
|[PAX 8](https://www.pax8.com)|
563563
|[Peraton](https://www.peraton.com/)|

articles/azure-signalr/signalr-concept-serverless-development-config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Develop & configure Azure Functions app - Azure SignalR
33
description: Details on how to develop and configure serverless real-time applications using Azure Functions and Azure SignalR Service
44
author: vicancy
55
ms.service: azure-signalr-service
6-
ms.topic: conceptual
6+
ms.topic: concept-article
77
ms.date: 04/02/2024
88
ms.author: lianwei
99
ms.devlang: csharp

articles/azure-web-pubsub/concept-availability-zones.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Availability zones support in Azure Service
33
description: Azure availability zones and zone redundancy in Azure Web PubSub Service
44
author: ArchangelSDY
55
ms.service: azure-web-pubsub
6-
ms.topic: conceptual
6+
ms.topic: concept-article
77
ms.date: 07/06/2022
88
ms.author: dayshen
99
---

articles/backup/azure-data-lake-storage-backup-support-matrix.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Vaulted backups of Azure Data Lake Storage are available in the following region
2626

2727
| Availability type | Region |
2828
| --- | --- |
29-
| **General availability** | Australia East, Central US, East Asia, France South, Germany West Central, Southeast US, Switzerland North, Switzerland West, UAE North, UK West, West India, Central India, North Central US, South India, UK South, West Central US, West US 3, West Europe, North Europe, West US, West US 2, East US, East US 2, Southeast Asia, Australia Central, Australia Southeast, Brazil South, Brazil Southeast, Canada Central, Canada East, Denmark East, East US 3, France Central, Germany North, Indonesia Central, Jio India West, Japan East, Korea Central, Korea South, Malaysia South, Malaysia West, Norway East, New Zealand North, South Central US, Sweden Central, Sweden South, Spain Central, Southwest US, UAE Central, South Central US 2, Southeast US 5. |
29+
| **General availability** | Vaulted backup for Azure Data Lake Storage is available in all public cloud regions. |
3030

3131
## Supported storage accounts
3232

articles/backup/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
items:
173173
- name: Reliability
174174
items:
175-
- name: Availability zone and disaster recovery
175+
- name: Reliability in Azure Backup
176176
href: /azure/reliability/reliability-backup?toc=/azure/backup/toc.json&bc=/azure/backup/breadcrumb/toc.json
177177
- name: Migrate to availability zone support
178178
href: /azure/reliability/migrate-recovery-services-vault?toc=/azure/backup/toc.json&bc=/azure/backup/breadcrumb/toc.json

articles/batch/batch-application-packages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,5 +293,5 @@ foreach (ApplicationSummary app in applications)
293293

294294
## Next steps
295295

296-
- The [Batch REST API](/rest/api/batchservice) also provides support to work with application packages. For example, see the [applicationPackageReferences](/rest/api/batchservice/pools/create-pool#batchapplicationpackagereference) element for how to specify packages to install, and [Applications](/rest/api/batchservice/application) for how to obtain application information.
296+
- The [Batch REST API](/rest/api/batchservice) also provides support to work with application packages. For example, see the [applicationPackageReferences](/rest/api/batchservice/pools/create-pool#batchapplicationpackagereference) element for how to specify packages to install, and [Applications](/rest/api/batchservice/applications) for how to obtain application information.
297297
- Learn how to programmatically [manage Azure Batch accounts and quotas with Batch Management .NET](batch-management-dotnet.md). The [Batch Management .NET](batch-management-dotnet.md#create-and-delete-batch-accounts) library can enable account creation and deletion features for your Batch application or service.

0 commit comments

Comments
 (0)