Skip to content

Commit fa4aaf6

Browse files
authored
Merge branch 'main' into weather-service
2 parents 0d2679c + bd2a411 commit fa4aaf6

File tree

412 files changed

+4975
-4838
lines changed

Some content is hidden

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

412 files changed

+4975
-4838
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/cdn/cdn-http-variables.md",
5+
"redirect_url": "/previous-versions/azure/cdn/cdn-http-variables",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/cdn/cdn-advanced-http-reports.md",
510
"redirect_url": "/previous-versions/azure/cdn/cdn-advanced-http-reports",
@@ -6804,5 +6809,10 @@
68046809
"redirect_url": "/azure/azure-functions/migration/migrate-lambda-workloads-overview",
68056810
"redirect_document_id": false
68066811
},
6812+
{
6813+
"source_path": "articles/storage/files/storage-files-enable-soft-delete.md",
6814+
"redirect_url": "/azure/storage/files/storage-files-prevent-file-share-deletion",
6815+
"redirect_document_id": false
6816+
}
68076817
]
68086818
}

articles/app-service/app-service-hybrid-connections.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to create and use hybrid connections in Azure App Service
44
author: madsd
55
ms.assetid: 66774bde-13f5-45d0-9a70-4e9536a4f619
66
ms.topic: article
7-
ms.date: 01/31/2025
7+
ms.date: 04/10/2025
88
ms.author: madsd
99
ms.custom: "UpdateFrequency3, fasttrack-edit"
1010
#customer intent: As an app developer, I want to understand the usage of Hybrid Connections to provide access to apps in Azure App Service.
@@ -115,15 +115,18 @@ In addition to there being an App Service plan SKU requirement, there's an extra
115115

116116
## Hybrid Connection Manager
117117

118-
The Hybrid Connections feature requires a relay agent in the network that hosts your Hybrid Connection endpoint. That relay agent is called the Hybrid Connection Manager (HCM). To download HCM:
118+
> [!NOTE]
119+
> The new version of the Hybrid Connection Manager is in public preview and supports both Windows and Linux. To download and learn more about the new version, see [Announcing the Public Preview of the New Hybrid Connection Manager](https://techcommunity.microsoft.com/blog/appsonazureblog/announcing-the-public-preview-of-the-new-hybrid-connection-manager-hcm/4401657).
120+
>
119121
120-
1. In the [Azure portal], select your app. Select **Settings** > **Networking**.
121-
1. Next to **Hybrid connections**, select the link to open the **Hybrid connections page**.
122-
1. Select **Download connection manager**.
122+
The Hybrid Connections feature requires a relay agent in the network that hosts your Hybrid Connection endpoint. That relay agent is called the Hybrid Connection Manager (HCM). To download the HCM:
123+
124+
> [!div class="nextstepaction"]
125+
> [Download the Hybrid Connection Manager](https://download.microsoft.com/download/0/e/4/0e48d57b-c563-4877-8acb-cb740c7c6a78/HybridConnectionManager-0.7.9.msi)
123126
124127
This tool runs on Windows Server 2012 and later. The HCM runs as a service and connects outbound to Azure Relay on port 443.
125128

126-
After you install HCM, you can run *HybridConnectionManagerUi.exe* to use the UI for the tool. This file is in the Hybrid Connection Manager installation directory. In Windows 10, you can also search for *Hybrid Connection Manager UI* in your search box.
129+
After you install HCM, you can run *HybridConnectionManagerUi.exe* to use the UI for the tool. This file is in the Hybrid Connection Manager installation directory. In Windows 10 and later, you can also search for *Hybrid Connection Manager UI* in your search box.
127130

128131
:::image type="content" source="media/app-service-hybrid-connections/hybrid-connections-hcm.png" alt-text="Screenshot of Hybrid Connection Manager.":::
129132

articles/app-service/quickstart-wordpress.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ keywords: app service, azure app service, wordpress, wordpress hosting, azure wo
66
author: msangapu-msft
77
ms.subservice: wordpress
88
ms.topic: quickstart
9-
ms.date: 02/21/2025
10-
# ms.devlang: wordpress
9+
ms.date: 04/11/2025
1110
ms.author: msangapu
1211
ms.custom: mvc, linux-related-content
1312
---
@@ -29,6 +28,8 @@ To complete this quickstart, you need an Azure account with an active subscripti
2928

3029
1. <a name="wordpress-setup"></a>Under **WordPress setup**, choose your preferred **Site Language**, then type an **Admin Email**, **Admin Username**, and **Admin Password**. The **Admin Email** is used for WordPress administrative sign-in only.
3130

31+
1. (_Optional_) Select the **Add-ins** tab. Recommended settings (including Managed Identity) are already enabled by default. Clear the checkboxes if you're unfamiliar with these settings. See [Configure WordPress add-ins](#configure-wordpress-add-ins) for more information.
32+
3233
1. Select the **Review + create** tab. After validation runs, select the **Create** button at the bottom of the page to create the WordPress site.
3334

3435
:::image type="content" source="./media/quickstart-wordpress/09-wordpress-create.png?text=WordPress create button" alt-text="Screenshot of WordPress create button on Azure App Service.":::
@@ -54,6 +55,15 @@ When no longer needed, you can delete the resource group, App service, and all r
5455

5556
:::image type="content" source="./media/quickstart-wordpress/delete-resource-group.png" alt-text="Delete resource group.":::
5657

58+
## Configure WordPress add-ins
59+
60+
In the Add-ins tab, recommended settings are already enabled by default:
61+
- Managed Identities remove the overhead of managing sensitive credentials to access Azure resources, making your website highly secure.
62+
- Azure Communication Service enables application-to-person, high-volume emails with Azure Communication Services.
63+
- Azure Content Delivery Network helps in improving performance, availability, and security by using a distributed network of servers that can store cached content in point-of-presence locations, close to end users.
64+
- Azure Front Door (AFD) provides dynamic site acceleration that reduces response times while also allowing content delivery by caching at nearest edge servers for faster media downloads.
65+
- Azure Blob Storage allows you to store and access images, videos and other files. This effectively reduces the load on your web server thereby improving performance and user experience.
66+
5767
## Manage the MySQL flexible server, username, or password (optional)
5868

5969
- The MySQL Flexible Server is created behind a private [Virtual Network](../virtual-network/virtual-networks-overview.md) and can't be accessed directly. To access or manage the database, use phpMyAdmin that's deployed with the WordPress site. You can access phpMyAdmin by following these steps:

articles/app-service/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ items:
428428
- name: Restore deleted app
429429
href: app-service-undelete.md
430430
- name: Relocate app to another region
431-
href: ../operational-excellence/relocation-app-service.md?toc=/azure/app-service/toc.json
431+
href: ../azure-resource-manager/management/relocation/relocation-app-service.md?toc=/azure/app-service/toc.json
432432
- name: Move app between subscriptions
433433
href: ../azure-resource-manager/management/move-resource-group-and-subscription.md?toc=/azure/app-service/toc.json#checklist-before-moving-resources
434434
- name: About cost management

articles/app-service/webjobs-create.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ If instead of the Azure App Service, you're using Visual Studio to develop and d
2828

2929
WebJobs is a feature of [Azure App Service](index.yml) that enables you to run a program or script in the same instance as a web app. All app service plans support WebJobs. There's no extra cost to use WebJobs.
3030

31-
[!INCLUDE [regionalization-note](./includes/regionalization-note.md)]
32-
3331
You can use the Azure WebJobs SDK with WebJobs to simplify many programming tasks. For more information, see [What is the WebJobs SDK](https://github.com/Azure/azure-webjobs-sdk/wiki).
3432

3533
Azure Functions provides another way to run programs and scripts. For a comparison between WebJobs and Functions, see [Choose between Flow, Logic Apps, Functions, and WebJobs](../azure-functions/functions-compare-logic-apps-ms-flow-webjobs.md).

articles/application-gateway/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@
284284
- name: Relocate
285285
items:
286286
- name: Relocate to another region
287-
href: ../operational-excellence/relocation-app-gateway.md?toc=/azure/application-gateway/toc.json
287+
href: ../azure-resource-manager/management/relocation/relocation-app-gateway.md?toc=/azure/application-gateway/toc.json
288288
- name: Migrate to availability zone support
289289
href: ../reliability/migrate-app-gateway-v2.md?toc=/azure/application-gateway/toc.json
290290
- name: Proxy buffer configuration

articles/automanage/virtual-machines-custom-profile.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
---
22
title: Create a custom profile in Azure Automanage for VMs
33
description: Learn how to create a custom profile in Azure Automanage and select your services and settings.
4-
author: johnmarco
54
ms.service: azure-automanage
65
ms.custom: devx-track-arm-template
76
ms.topic: how-to
87
ms.date: 07/01/2023
9-
ms.author: johnmarc
108
---
119

1210

articles/automation/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
- name: Move Automation account to another subscription
135135
href: how-to/move-account.md
136136
- name: Move Automation account to another region
137-
href: ../operational-excellence/relocation-automation.md?toc=/azure/private-link/toc.json
137+
href: ../azure-resource-manager/management/relocation/relocation-automation.md?toc=/azure/private-link/toc.json
138138
- name: Manage Automation account
139139
href: delete-account.md
140140
- name: Migrate from Orchestrator to Azure Automation (Beta)

articles/automation/delete-run-as-account.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Delete an Azure Automation Run As account
33
description: This article tells how to delete a Run As account with PowerShell or from the Azure portal.
44
services: automation
55
ms.subservice: process-automation
6-
ms.date: 04/08/2025
6+
ms.date: 04/11/2025
77
ms.topic: how-to
88
ms.service: azure-automation
99
---
@@ -13,7 +13,7 @@ ms.service: azure-automation
1313
> [!IMPORTANT]
1414
> Azure Automation Run as accounts, including Classic Run as accounts have retired on **30 September 2023** and replaced with [Managed Identities](automation-security-overview.md#managed-identities). You would no longer be able to create or renew Run as accounts through the Azure portal. For more information, see [migrating from an existing Run As accounts to managed identity](migrate-run-as-accounts-managed-identity.md?tabs=run-as-account#sample-scripts).
1515
16-
Run As accounts in Azure Automation provide authentication for managing resources on the Azure Resource Manager or Azure Classic deployment model using Automation runbooks and other Automation features. This article describes how to delete a Run As or Classic Run As account. When you perform this action, the Automation account is retained. After you delete the Run As account, you can re-create it in the Azure portal or with the provided PowerShell script.
16+
Run As accounts in Azure Automation provide authentication for managing resources on the Azure Resource Manager or Azure Classic deployment model using Automation runbooks and other Automation features. This article describes how to delete a Run As or Classic Run As account. When you perform this action, the Automation account is retained.
1717

1818
## Permissions for Run As accounts and Classic Run As accounts
1919

0 commit comments

Comments
 (0)