Skip to content

Commit b468bad

Browse files
author
gitName
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ptk
2 parents 8fe4f5c + 75854a2 commit b468bad

File tree

281 files changed

+2051
-739
lines changed

Some content is hidden

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

281 files changed

+2051
-739
lines changed

articles/app-service/app-service-undelete.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.topic: article
88
ms.custom: devx-track-azurepowershell
99
---
1010

11-
# Restore deleted App Service app Using PowerShell
11+
# Restore Deleted App Service App Using PowerShell
1212

1313
If you happened to accidentally delete your app in Azure App Service, you can restore it using the commands from the [Az PowerShell module](/powershell/azure/).
1414

articles/app-service/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,11 +403,11 @@
403403
href: deploy-intelligent-apps.md
404404
- name: WordPress
405405
items:
406+
- name: WordPress overview
407+
href: overview-wordpress.md
406408
- name: WordPress architecture
407409
displayName: WordPress on App Service architecture
408410
href: /azure/architecture/example-scenario/infrastructure/wordpress-app-service
409-
- name: WordPress overview
410-
href: overview-wordpress.md
411411
- name: Deploy WordPress
412412
displayName: Create a WordPress site
413413
href: quickstart-wordpress.md

articles/app-service/tutorial-python-postgresql-app.md

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -142,22 +142,6 @@ python manage.py runserver
142142

143143
## 1. Create App Service and PostgreSQL
144144

145-
146-
### [Flask](#tab/flask)
147-
148-
```bash
149-
git clone https://github.com/Azure-Samples/msdocs-flask-postgresql-sample-app.git
150-
```
151-
152-
### [Django](#tab/django)
153-
154-
```bash
155-
git clone https://github.com/Azure-Samples/msdocs-django-postgresql-sample-app.git
156-
```
157-
158-
-----
159-
160-
161145
In this step, you create the Azure resources. The steps used in this tutorial create a set of secure-by-default resources that include App Service and Azure Database for PostgreSQL. For the creation process, you'll specify:
162146

163147
* The **Name** for the web app. It's the name used as part of the DNS name for your webapp in the form of `https://<app-name>.azurewebsites.net`.

articles/azure-cache-for-redis/cache-how-to-premium-vnet.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ ms.date: 12/12/2024
2828
- potential data loss
2929
- failure of management operations like scaling
3030
- intermittent or complete SSL/TLS failures
31+
- failure to apply updates, including important security and reliability improvements
32+
3133
- in the most severe scenarios, loss of availability
3234
- VNet injected caches are only available for Premium-tier Azure Cache for Redis, not other tiers.
3335
- When using a VNet injected cache, you must change your VNet to cache dependencies such as Certificate Revocation Lists/Public Key Instructure, Azure Key Vault, Azure Storage, Azure Monitor, and more.

articles/azure-resource-manager/bicep/bicep-extension.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This article describes how to use Bicep extensions.
1616
The syntax for importing Bicep extensions is:
1717

1818
```bicep
19-
extionsion <extension-name>
19+
extension <extension-name>
2020
```
2121

2222
The syntax for importing Bicep extensions, which require configuration is:
@@ -35,4 +35,4 @@ For examples, see [Bicep Kubernetes extension](./bicep-kubernetes-extension.md)
3535
- To learn about Bicep functions, see [Bicep functions](./bicep-functions.md).
3636
- To learn how to use the Bicep Kubernetes extension, see [Bicep Kubernetes extension](./bicep-kubernetes-extension.md).
3737
- To go through a Kubernetes extension tutorial, see [Quickstart: Deploy Azure applications to Azure Kubernetes Services by using the Bicep Kubernetes extension](/azure/aks/learn/quick-kubernetes-deploy-bicep-kubernetes-extension).
38-
- To learn Microsoft Graph extension, see [Microsoft Graph extension](https://aka.ms/graphbicep).
38+
- To learn Microsoft Graph extension, see [Microsoft Graph extension](https://aka.ms/graphbicep).

articles/azure-vmware/toc.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ items:
5353
href: enable-sql-azure-hybrid-benefit.md
5454
- name: Save costs with a reserved instance
5555
href: reserved-instance.md
56-
- name: Azure hybrid benefit for Windows Server, SQL Server, and Linux subscriptions
57-
href: sql-server-hybrid-benefit.md
5856
- name: VMware Cloud Foundations (VCF) license portability on Azure VMware Solution
5957
href: vmware-cloud-foundations-license-portability.md
6058
- name: Architecture

articles/batch/pool-endpoint-configuration.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Configure node endpoints in Azure Batch pool
33
description: How to configure node endpoints such as access to SSH or RDP ports on compute nodes in an Azure Batch pool.
44
ms.topic: how-to
5-
ms.date: 11/08/2024
5+
ms.date: 12/16/2024
66
---
77

88
# Configure remote access to compute nodes in an Azure Batch pool
@@ -12,10 +12,11 @@ externally to a compute node in a Batch pool. For example, a user can connect by
1212
compute node in a Windows pool. Similarly, by default, a user can connect by Secure Shell (SSH) on port 22 to a compute
1313
node in a Linux pool.
1414

15-
> [!TIP]
16-
> As of API version `2024-07-01`, Batch no longer automatically maps common remote access ports for SSH and RDP.
17-
> If you wish to allow remote access to your Batch compute nodes with pools created with API version `2024-07-01` or later,
18-
> then you must manually configure the pool endpoint configuration to enable such access.
15+
> [!NOTE]
16+
> As of API version `2024-07-01` (and all pools created after **30 November 2025** regardless of API version), Batch no
17+
> longer automatically maps common remote access ports for SSH and RDP. If you wish to allow remote access to your Batch
18+
> compute nodes with pools created with API version `2024-07-01` or later (and after 30 November 2025), then you must
19+
> manually configure the pool endpoint configuration to enable such access.
1920
2021
In your environment, you might need to enable, restrict, or disable external access settings or any other ports you wish
2122
on the Batch pool. You can modify these settings by using the Batch APIs to set the
@@ -167,4 +168,4 @@ class AzureBatch(object):
167168
## Next steps
168169

169170
- Learn about the [Batch service workflow and primary resources](batch-service-workflow-features.md) such as pools, nodes, jobs, and tasks.
170-
- For more information about NSG rules in Azure, see [Filter network traffic with network security groups](../virtual-network/network-security-groups-overview.md).
171+
- Learn more about NSG rules in Azure with [Filtering network traffic with network security groups](../virtual-network/network-security-groups-overview.md).

articles/business-continuity-center/index.yml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
ms.topic: landing-page
1414
author: AbhishekMallick-MS
1515
ms.author: v-abhmallick
16-
ms.date: 11/19/2024
16+
ms.date: 12/16/2024
1717
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
1818

1919
landingContent:
@@ -31,10 +31,34 @@ landingContent:
3131
- text: Azure Business Continuity center support matrix
3232
url: business-continuity-center-support-matrix.md
3333

34+
# Card (optional)
35+
- title: Manage data protection
36+
linkLists:
37+
- linkListType: quickstart
38+
links:
39+
- text: Understand the protection estate
40+
url: quick-understand-protection-estate.md
41+
- linkListType: tutorial
42+
links:
43+
- text: Configure protection for data sources
44+
url: tutorial-configure-protection-datasource.md
45+
- text: Recover deleted items
46+
url: tutorial-recover-deleted-item.md
47+
- text: Configure and view reports
48+
url: tutorial-reporting-for-data-insights.md
49+
3450
# Card (optional)
3551
- title: Monitor protection
3652
linkLists:
3753
- linkListType: how-to-guide
3854
links:
3955
- text: Monitor protection summary
4056
url: tutorial-monitor-protection-summary.md
57+
58+
# Card (optional)
59+
- title: Azure Business Continuity Center Copilot (preview)
60+
linkLists:
61+
- linkListType: tutorial
62+
links:
63+
- text: Manage BCDR estate (preview)
64+
url: tutorial-manage-data-using-copilot.md

articles/cloud-services/cloud-services-troubleshoot-common-issues-which-cause-roles-recycle.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ If a role in your application relies on any assembly that isn't part of the .NET
2424

2525
Before you build and package your application, verify the following statements are true:
2626

27-
* If using Visual studio, make sure the **Copy Local** property is set to **True** for each referenced assembly in your project that isn't part of the Azure SDK or the .NET Framework.
27+
* If using Visual Studio, make sure the **Copy Local** property is set to **True** for each referenced assembly in your project that isn't part of the Azure SDK or the .NET Framework.
2828
* Make sure the web.config file doesn't reference any unused assemblies in the compilation element.
2929
* The **Build Action** of every .cshtml file is set to **Content**. This setting ensures that the files appear correctly in the package and enables other referenced files to appear in the package.
3030

articles/communication-services/concepts/voice-video-calling/pre-call-diagnostics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.topic: conceptual
1111
ms.service: azure-communication-services
1212
---
1313

14-
# Pre-call diagnostic
14+
# Pre-call diagnostic overview
1515

1616
[!INCLUDE [Public Preview Disclaimer](../../includes/public-preview-include.md)]
1717

0 commit comments

Comments
 (0)