Skip to content

Commit bec0613

Browse files
authored
Merge pull request #301434 from MicrosoftDocs/main
6/17/2025 AM Publish
2 parents 1670176 + 8f9dd4c commit bec0613

File tree

45 files changed

+231
-196
lines changed

Some content is hidden

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

45 files changed

+231
-196
lines changed

articles/application-gateway/ingress-controller-annotations.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ For AGIC to observe an ingress resource, the resource *must be annotated* with `
3737
| [appgw.ingress.kubernetes.io/use-private-ip](#use-private-ip) | `bool` | `false` ||
3838
| [appgw.ingress.kubernetes.io/override-frontend-port](#override-frontend-port) | `bool` | `false` ||
3939
| [appgw.ingress.kubernetes.io/cookie-based-affinity](#cookie-based-affinity) | `bool` | `false` ||
40-
| [appgw.ingress.kubernetes.io/request-timeout](#request-timeout) | `int32` (seconds) | `30` ||
40+
| [appgw.ingress.kubernetes.io/request-timeout]
41+
(#request-timeout) | `int32` (seconds) | `30` ||
4142
| [appgw.ingress.kubernetes.io/use-private-ip](#use-private-ip) | `bool` | `false` ||
4243
| [appgw.ingress.kubernetes.io/backend-protocol](#backend-protocol) | `string` | `http` | `http`, `https` |
4344
| [appgw.ingress.kubernetes.io/hostname-extension](#hostname-extension) | `string` | `nil` ||
@@ -121,7 +122,7 @@ spec:
121122

122123
## Custom Health Probe
123124

124-
You can [configure Application Gateway](./application-gateway-probe-overview.md) to send custom health probes to the backend address pool. When the following annotations are present, the Kubernetes ingress controller [creates a custom probe](./application-gateway-create-probe-portal.md) to monitor the backend application. The controller then applies the changes to Application Gateway.
125+
You can [configure Application Gateway](./application-gateway-probe-overview.md) to send custom health probe to the backend address pool. When the following annotations are present, the Kubernetes ingress controller [creates a custom probe](./application-gateway-create-probe-portal.md) to monitor the backend application. The controller then applies the changes to Application Gateway.
125126

126127
- `health-probe-hostname`: This annotation allows a custom hostname on the health probe.
127128
- `health-probe-port`: This annotation configures a custom port for the health probe.

articles/azure-functions/functions-deployment-technologies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ You can use FTP/S to directly transfer files to Azure Functions, although this d
210210
211211
>__When to use it:__ To reduce the chance of errors, you should avoid using deployment methods that require the additional step of [manually syncing triggers](#trigger-syncing). Use [zip deployment](run-functions-from-deployment-package.md) when possible.
212212
213-
>__Where app content is stored:__ App content is stored on the file system. FTP/FTPS deployments fail when your app's file system is backed by Azure Files in the default host storage account. FTP/FTPS fails with Azure Files as mounted storage bacause of [FTP limitations](../app-service/configure-connect-to-azure-storage.md#limitations).
213+
>__Where app content is stored:__ App content is stored on the file system. FTP/FTPS deployments fail when your app's file system is backed by Azure Files in the default host storage account. FTP/FTPS fails with Azure Files as mounted storage because of [FTP limitations](../app-service/configure-connect-to-azure-storage.md#limitations).
214214
215215
### Portal editing
216216

articles/azure-signalr/signalr-concept-azure-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Some common scenarios for real-time serverless messaging that you can implement
4040

4141
The SignalR Service bindings for Azure Functions allow an Azure Function app to publish messages to clients connected to SignalR Service. Clients can connect to the service using a SignalR client SDK that is available in .NET, JavaScript, and Java, with more languages coming soon.
4242

43-
<!-- Are there more lanaguages now? -->
43+
<!-- Are there more languages now? -->
4444

4545
### An example scenario
4646

articles/backup/backup-azure-dataprotection-use-rest-api-backup-blobs.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Back up blobs in a storage account using Azure Data Protection REST API.
33
description: In this article, learn how to configure, initiate, and manage backup operations of blobs using REST API.
44
ms.topic: how-to
5-
ms.date: 02/12/2025
5+
ms.date: 06/17/2025
66
ms.assetid: 7c244b94-d736-40a8-b94d-c72077080bbe
77
ms.service: azure-backup
88
ms.custom: engagement-fy23
@@ -557,6 +557,10 @@ GET "https://management.azure.com/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx
557557

558558
For more information on the Azure Backup REST APIs, see the following documents:
559559

560-
- [Azure Data Protection Provider REST API](/rest/api/dataprotection/)
561-
- [Get started with Azure REST API](/rest/api/azure/)
562-
- [Manage backup and restore jobs](backup-azure-arm-userestapi-managejobs.md)
560+
- [Azure Data Protection Provider REST API](/rest/api/dataprotection/).
561+
- [Get started with Azure REST API](/rest/api/azure/).
562+
- [Manage backup and restore jobs](backup-azure-arm-userestapi-managejobs.md).
563+
564+
## Related content
565+
566+
Restore Azure Blobs by Azure Backup using [Azure portal](blob-restore.md), [Azure PowerShell](restore-blobs-storage-account-ps.md), [Azure CLI](restore-blobs-storage-account-cli.md).

articles/backup/backup-azure-dataprotection-use-rest-api-restore-blobs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Restore blobs in a storage account using Azure Data Protection REST API
33
description: In this article, learn how to restore blobs of a storage account using REST API.
44
ms.topic: how-to
5-
ms.date: 02/09/2025
5+
ms.date: 06/17/2025
66
ms.custom: engagement-fy24
77
ms.assetid: 9b8d21e6-3e23-4345-bb2b-e21040996afd
88
author: jyothisuri
@@ -11,7 +11,7 @@ ms.author: jsuri
1111

1212
# Restore Azure blobs to point-in-time using Azure Data Protection REST API
1313

14-
This article describes how to restore [blobs](blob-backup-overview.md) using Azure Backup.
14+
This article describes how to restore [blobs](blob-backup-overview.md) by Azure Backup using REST API. You can also restore Azure Blobs by Azure Backup using [Azure portal](blob-restore.md), [Azure PowerShell](restore-blobs-storage-account-ps.md), [Azure CLI](restore-blobs-storage-account-cli.md).
1515

1616
> [!IMPORTANT]
1717
> Before proceeding to restore Azure blobs using Azure Backup, see [important points](blob-restore.md#before-you-start).

articles/backup/backup-blobs-storage-account-arm-template.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Quickstart - Back up blobs in a storage account via ARM template using Az
33
description: Learn how to back up blobs in a storage account with an ARM template.
44
ms.topic: quickstart
55
ms.custom: devx-track-arm-template
6-
ms.date: 02/12/2025
6+
ms.date: 06/17/2025
77
author: jyothisuri
88
ms.author: jsuri
99
---
@@ -439,4 +439,5 @@ This template allows you to configure backup for two containers in a storage acc
439439

440440
## Next step
441441

442-
Learn [how to create ARM templates](../azure-resource-manager/templates/template-tutorial-create-first-template.md).
442+
- [Create ARM templates](../azure-resource-manager/templates/template-tutorial-create-first-template.md).
443+
- Restore Azure Blobs by Azure Backup using [Azure portal](blob-restore.md), [Azure PowerShell](restore-blobs-storage-account-ps.md), [Azure CLI](restore-blobs-storage-account-cli.md), [REST API](backup-azure-dataprotection-use-rest-api-restore-blobs.md).

articles/backup/backup-blobs-storage-account-bicep.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ms.topic: quickstart
55
ms.custom:
66
- devx-track-bicep
77
- build-2025
8-
ms.date: 02/12/2025
8+
ms.date: 06/17/2025
99
author: jyothisuri
1010
ms.author: jsuri
1111
---
@@ -362,4 +362,5 @@ resource backupInstance 'Microsoft.DataProtection/backupVaults/backupInstances@2
362362

363363
## Next step
364364

365-
Learn [how to create Bicep files](../azure-resource-manager/bicep/quickstart-create-bicep-use-visual-studio-code.md?tabs=CLI).
365+
- [Create Bicep files](../azure-resource-manager/bicep/quickstart-create-bicep-use-visual-studio-code.md?tabs=CLI).
366+
- Restore Azure Blobs by Azure Backup using [Azure portal](blob-restore.md), [Azure PowerShell](restore-blobs-storage-account-ps.md), [Azure CLI](restore-blobs-storage-account-cli.md), [REST API](backup-azure-dataprotection-use-rest-api-restore-blobs.md).

articles/backup/backup-blobs-storage-account-cli.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Back up Azure Blobs using Azure CLI
33
description: Learn how to back up Azure Blobs using Azure CLI.
44
ms.topic: how-to
55
ms.custom: devx-track-azurecli
6-
ms.date: 04/17/2025
6+
ms.date: 06/17/2025
77
author: jyothisuri
88
ms.author: jsuri
99
---
@@ -253,5 +253,8 @@ To update the backup instance, run the following command:
253253
254254
## Next steps
255255
256-
- [Restore Azure Blobs using Azure CLI](restore-blobs-storage-account-cli.md).
257-
- [Restore Azure Blob using REST API](backup-azure-dataprotection-use-rest-api-restore-blobs.md).
256+
[Restore Azure Blobs using Azure CLI](restore-blobs-storage-account-cli.md).
257+
258+
## Related content
259+
260+
Restore Azure Blobs by Azure Backup using [Azure portal](blob-restore.md), [Azure PowerShell](restore-blobs-storage-account-ps.md), [REST API](backup-azure-dataprotection-use-rest-api-restore-blobs.md).

articles/backup/backup-blobs-storage-account-ps.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Back up Azure blobs within a storage account using Azure PowerShell
33
description: Learn how to back up all Azure blobs within a storage account using Azure PowerShell.
44
ms.topic: how-to
55
ms.custom: devx-track-azurepowershell
6-
ms.date: 04/17/2025
6+
ms.date: 05/17/2025
77
author: jyothisuri
88
ms.author: jsuri
99
---
@@ -248,5 +248,8 @@ To update the backup instance, run the following cmdlets:
248248
249249
## Next steps
250250
251-
- [Restore Azure blobs using Azure PowerShell](restore-blobs-storage-account-ps.md).
252-
- [Restore Azure Blob using REST API](backup-azure-dataprotection-use-rest-api-restore-blobs.md).
251+
[Restore Azure blobs using Azure PowerShell](restore-blobs-storage-account-ps.md).
252+
253+
## Related content
254+
255+
Restore Azure Blobs by Azure Backup using [Azure portal](blob-restore.md), [Azure CLI](restore-blobs-storage-account-cli.md), [REST API](backup-azure-dataprotection-use-rest-api-restore-blobs.md).

articles/backup/blob-backup-configure-manage.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Configure and manage backup for Azure Blobs using Azure Backup
33
description: Learn how to configure and manage operational and vaulted backups for Azure Blobs.
44
ms.topic: how-to
5-
ms.date: 05/30/2025
5+
ms.date: 06/17/2025
66
ms.service: azure-backup
77
author: jyothisuri
88
ms.author: jsuri
@@ -205,5 +205,8 @@ To update the backup instance, follow these steps:
205205

206206
## Next steps
207207

208-
- [Restore Azure Blobs](blob-restore.md).
209-
- [Restore Azure Blob using REST API](backup-azure-dataprotection-use-rest-api-restore-blobs.md).
208+
[Restore Azure Blobs using Azure portal](blob-restore.md).
209+
210+
## Related content
211+
212+
Restore Azure Blobs by Azure Backup using [Azure PowerShell](restore-blobs-storage-account-ps.md), [Azure CLI](restore-blobs-storage-account-cli.md), [REST API](backup-azure-dataprotection-use-rest-api-restore-blobs.md).

0 commit comments

Comments
 (0)