Skip to content

Commit 3692098

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rs-portal
2 parents e60ee35 + c20943b commit 3692098

File tree

186 files changed

+2255
-2478
lines changed

Some content is hidden

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

186 files changed

+2255
-2478
lines changed

articles/app-service/manage-backup.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,8 @@ The following table shows which app configurations are restored when you choose
329329
330330
A custom backup (on-demand backup or scheduled backup) includes all content and configuration that's included in an [automatic backup](#whats-included-in-an-automatic-backup), plus any linked database, up to the allowable maximum size.
331331
332+
Each backup contains a .zip file with backup data and an .xml file {siteName}-{dateTime}.xml, which lists the contents, including [custom domains](app-service-web-tutorial-custom-domain.md). When restoring a custom backup, custom domains from the .xml file will be added to the destination app if no DNS conflict exists (i.e., the domain is available for binding), and if the destination app has different custom domains than the .xml file's custom domain list, those custom domains will be removed.
333+
332334
When [backing up over Azure Virtual Network](#back-up-and-restore-over-azure-virtual-network), you can't [back up the linked database](#back-up-and-restore-a-linked-database).
333335
334336
### Why is my linked database not backed up?

articles/app-service/overview-tls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ These suites provide strong encryption and are automatically used when TLS 1.3 i
6464

6565
### TLS 1.2
6666

67-
TLS 1.2 is the **default and recommended** TLS version for App Service. It provides strong encryption and broad compatibility while meeting compliance standards like PCI DSS. New web apps and SCM endpoints are automatically set to TLS 1.2 unless changed.
67+
TLS 1.2 is the **default** TLS version for App Service. It provides strong encryption and broad compatibility while meeting compliance standards like PCI DSS. New web apps and SCM endpoints are automatically set to TLS 1.2 unless changed.
6868

6969
Azure App Service uses a secure set of TLS 1.2 cipher suites to ensure encrypted connections and protect against known vulnerabilities. While TLS 1.0 and 1.1 can be enabled for backward compatibility, they are not recommended.
7070

articles/app-service/routine-maintenance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Maintenance operations upgrade machines iteratively while App Service monitors t
6060

6161
### Are business hours reflected?
6262

63-
Yes, business hours are reflected for the time zone of the region. Maintenance operations are optimized to start outside the standard business hours of 9 AM to 5 PM. Statistically, that's the best time for any interruptions and restarts of workloads because there's less stress on the system (in customer applications and transitively on the platform itself). If resources are still upgrading by 9 AM in a given region, the upgrade will safely pause before the next critical step and until the end of business hours.
63+
Yes, business hours are reflected for the time zone of the region. Maintenance operations are optimized to start outside the standard business hours of 9 AM to 5 PM. Statistically, that's the best time for any interruptions and restarts of workloads because there's less stress on the system (in customer applications and transitively on the platform itself). App Service maintenance makes a best effort to reduce maintenance operations during these business hours. If resources are still upgrading by 9 AM in a given region, the upgrade will continue until reaching a safe stopping point, pausing before the next critical step and until the end of business hours.
6464

6565
### What are my options to control routine maintenance?
6666

articles/application-gateway/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
href: quick-create-terraform.md
2626
- name: Design
2727
items:
28-
- name: Well-Architected review of Application Gateway
28+
- name: Architecture best practices for Azure Application Gateway v2
2929
href: /azure/architecture/framework/services/networking/azure-application-gateway?toc=/azure/application-gateway/toc.json&bc=/azure/application-gateway/breadcrumb/toc.json
3030
- name: Basics
3131
items:

articles/azure-resource-manager/management/azure-subscription-service-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ The following table details the features and limits of the Basic, Standard, and
364364
> [!NOTE]
365365
> Some areas of this service have adjustable limits, and others do not. The following tables use the *Adjustable?* column to represent this condition. When the limit can be adjusted, the *Adjustable?* value is *Yes*.
366366
367-
[!INCLUDE [digital-twins-limits](../../../includes/digital-twins-limits.md)]
367+
[!INCLUDE [digital-twins-limits](../../digital-twins/includes/digital-twins-limits.md)]
368368

369369
## Azure Event Grid limits
370370

articles/cost-management-billing/manage/assign-roles-azure-service-principals.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
title: Assign Enterprise Agreement roles to service principals
33
description: This article helps you assign EA roles to service principals by using PowerShell and REST APIs.
44
author: bandersmsft
5-
ms.reviewer: sapnakeshari
5+
ms.reviewer: prsaini
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: how-to
99
ms.date: 01/22/2025
10-
ms.author: banders
10+
ms.author: prsaini
1111
---
1212

1313
# Assign Enterprise Agreement roles to service principals

articles/cost-management-billing/manage/avoid-charges-free-account.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
title: Avoid charges with your Azure free account
33
description: Understand why you see charges for your Azure free account. Learn ways to avoid these charges.
44
author: bandersmsft
5-
ms.reviewer: amberbhargava
5+
ms.reviewer: shrshett
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: conceptual
99
ms.date: 01/22/2025
10-
ms.author: banders
10+
ms.author: shrshett
1111
---
1212

1313
# Avoid charges with your Azure free account

articles/cost-management-billing/manage/billing-subscription-transfer.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ title: Transfer billing ownership of an MOSP Azure subscription
33
description: Describes how to transfer billing ownership of an MOSP Azure subscription to another account.
44
keywords: transfer azure subscription, azure transfer subscription, move azure subscription to another account,azure change subscription owner, transfer azure subscription to another account, azure transfer billing
55
author: bandersmsft
6-
ms.reviewer: sgautam
6+
ms.reviewer: presharm
77
ms.service: cost-management-billing
88
ms.subservice: billing
99
ms.topic: how-to
1010
ms.date: 01/22/2025
11-
ms.author: banders
11+
ms.author: presharm
1212
---
1313

1414
# Transfer billing ownership of an MOSP Azure subscription to another account

articles/cost-management-billing/manage/create-free-services.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
title: Create free services with Azure free account
33
description: Learn how to create services included with Azure free account. You can create these services in any region where they're available.
44
author: bandersmsft
5-
ms.reviewer: amberrb
5+
ms.reviewer: shrshett
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: conceptual
99
ms.date: 01/22/2025
10-
ms.author: banders
10+
ms.author: shrshett
1111
---
1212

1313
# Create services included with Azure free account

articles/cost-management-billing/manage/ea-direct-portal-get-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
title: Get started with your Enterprise Agreement billing account
33
description: This article explains how Azure Enterprise Agreement (Azure EA) customers can use the Azure portal to manage their billing.
44
author: bandersmsft
5-
ms.reviewer: sapnakeshari
5+
ms.reviewer: prsaini
66
ms.service: cost-management-billing
77
ms.subservice: billing
88
ms.topic: conceptual
99
ms.date: 01/22/2025
10-
ms.author: banders
10+
ms.author: prsaini
1111
---
1212

1313
# Get started with your Enterprise Agreement billing account

0 commit comments

Comments
 (0)