Skip to content

Commit 0ba32c4

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into us370875-cli-posh-nat
2 parents 59ed841 + 15cbcde commit 0ba32c4

File tree

91 files changed

+1248
-264
lines changed

Some content is hidden

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

91 files changed

+1248
-264
lines changed

.github/policies/disallow-edits.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,4 +177,18 @@ configuration:
177177
label: do-not-merge
178178
- removeLabel:
179179
label: ready-to-merge
180-
180+
181+
- description: Write a message if the breadcrumb file is modified in the azure-docs-pr repository.
182+
if:
183+
- payloadType: Pull_Request
184+
- isAction:
185+
action: Opened
186+
- filesMatchPattern:
187+
matchAny: true
188+
pattern: bread/*
189+
190+
then:
191+
- addReply:
192+
reply: >-
193+
@${issueAuthor} - This PR modifies the breadcrumb file for the entire repository: bread/toc.yml. This file supports the on-site navigation for 100s of services. Please make sure your changes to the breadcrumb file are intentional. Do not delete this file.
194+

.github/workflows/stale.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Mark stale pull requests
2+
3+
permissions:
4+
issues: write
5+
pull-requests: write
6+
7+
on:
8+
schedule:
9+
- cron: "0 */6 * * *"
10+
11+
jobs:
12+
stale:
13+
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- uses: actions/stale@v3
18+
with:
19+
repo-token: ${{ secrets.GITHUB_TOKEN }}
20+
days-before-pr-stale: 14
21+
days-before-pr-close: 90
22+
stale-pr-label: inactive
23+
close-pr-label: auto-close
24+
exempt-pr-labels: keep-open
25+
operations-per-run: 1300
26+
ascending: false
27+
# start-date: '2021-03-19'
28+
stale-pr-message: >
29+
This pull request has been inactive for at least 14 days.
30+
31+
If you are finished with your changes, don't forget to sign off. See the [platform guide](https://review.learn.microsoft.com/help/platform/prmerger-hashtag-commands?branch=main) for instructions.
32+
33+
[Get Help](https://review.learn.microsoft.com/help/platform/help-options?branch=main)
34+
35+
[Learn Support Teams Channel](https://teams.microsoft.com/l/channel/19%3a7ecffca1166a4a3986fed528cf0870ee%40thread.skype/General?groupId=de9ddba4-2574-4830-87ed-41668c07a1ca&tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47)
36+
37+
[Resolve Merge Conflicts](https://review.learn.microsoft.com/help/contribute/resolve-merge-conflicts?branch=main)
38+
close-pr-message: >
39+
This pull request has been inactive for 90 days, and an `auto-close` label has been added. At this time, the system is closing the PR automatically. If you decide to continue working on your changes, scroll to the bottom of the pull request comments and select the **Reopen pull request** button.
40+
<br/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ This article describes how [Azure App Service](overview.md) runs Python apps, ho
1919

2020
The App Service deployment engine automatically activates a virtual environment and runs `pip install -r requirements.txt` for you when you deploy a [Git repository](deploy-local-git.md), or when you deploy a [zip package](deploy-zip.md) [with build automation enabled](deploy-zip.md#enable-build-automation-for-zip-deploy).
2121

22+
> [!NOTE]
23+
> Currently App Service requires `requirements.txt` in your project's root directory, even if you're using modern Python packaging tools such as `pyproject.toml`.
24+
2225
This guide provides key concepts and instructions for Python developers who use a built-in Linux container in App Service. If you've never used Azure App Service, first follow the [Python quickstart](quickstart-python.md) and [Flask](tutorial-python-postgresql-app-flask.md), [Django](tutorial-python-postgresql-app-django.md), or [FastAPI](tutorial-python-postgresql-app-fastapi.md) with PostgreSQL tutorial.
2326

2427
You can use either the [Azure portal](https://portal.azure.com) or the Azure CLI for configuration:

articles/azure-netapp-files/azure-government.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ description: Learn how to connect to Azure Government to use Azure NetApp Files
44
services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
7-
ms.custom: devx-track-azurecli, has-azure-ad-ps-ref
7+
ms.custom: devx-track-azurecli, no-azure-ad-ps-ref
88
ms.topic: conceptual
9-
ms.date: 07/17/2024
9+
ms.date: 02/13/2025
1010
ms.author: anfdocs
1111
---
1212

@@ -70,10 +70,11 @@ When you connect to Azure Government through PowerShell, you must specify an env
7070

7171
| Connection type | Command |
7272
| --- | --- |
73-
| [Azure](/powershell/module/az.accounts/Connect-AzAccount) commands |`Connect-AzAccount -EnvironmentName AzureUSGovernment` |
74-
| [Microsoft Entra ID](/powershell/module/azuread/connect-azuread) commands |`Connect-AzureAD -AzureEnvironmentName AzureUSGovernment` |
75-
| [Azure (Classic deployment model)](/powershell/module/servicemanagement/azure/add-azureaccount) commands |`Add-AzureAccount -Environment AzureUSGovernment` |
76-
| [Microsoft Entra ID (Classic deployment model)](/previous-versions/azure/jj151815(v=azure.100)) commands |`Connect-MsolService -AzureEnvironment UsGovernment` |
73+
| [Azure](/powershell/module/az.accounts/Connect-AzAccount) commands | `Connect-AzAccount -EnvironmentName AzureUSGovernment` |
74+
| [Microsoft Graph PowerShell](/powershell/microsoftgraph/authentication-commands) | `Connect-MgGraph -Environment USGov` |
75+
| [Microsoft Entra PowerShell](/powershell/module/microsoft.entra/connect-entra) | `Connect-Entra -Environment USGov` |
76+
| [Azure (Classic deployment model)](/powershell/module/servicemanagement/azure/add-azureaccount) commands | `Add-AzureAccount -Environment AzureUSGovernment` |
77+
| [Microsoft Entra ID (Classic deployment model)](/previous-versions/azure/jj151815(v=azure.100)) commands | `Connect-MsolService -AzureEnvironment UsGovernment` |
7778

7879
For more information, see [Connect to Azure Government with PowerShell](../azure-government/documentation-government-get-started-connect-with-ps.md).
7980

@@ -83,4 +84,4 @@ For more information, see [Connect to Azure Government with PowerShell](../azure
8384
* [What's new in Azure NetApp Files](whats-new.md)
8485
* [Compare Azure Government and global Azure](../azure-government/compare-azure-government-global-azure.md)
8586
* [Azure NetApp Files REST API](azure-netapp-files-develop-with-rest-api.md)
86-
* [Azure NetApp Files REST API using PowerShell](develop-rest-api-powershell.md)
87+
* [Azure NetApp Files REST API using PowerShell](develop-rest-api-powershell.md)

articles/azure-web-pubsub/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,5 +320,5 @@
320320
href: resource-faq.md
321321
- name: Microsoft Q&A
322322
href: /answers/topics/azure-web-pubsub.html
323-
- name: StackOverflow
323+
- name: Stack Overflow
324324
href: https://stackoverflow.com/questions/tagged/azure-web-pubsub

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

Lines changed: 2 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: 02/12/2025
5+
ms.date: 02/13/2025
66
ms.service: azure-backup
77
author: jyothisuri
88
ms.author: jsuri
@@ -27,7 +27,6 @@ For more information about the supported scenarios, limitations, and availabilit
2727

2828
- Vaulted backup of blobs is a managed offsite backup solution that transfers data to the backup vault and retains as per the retention configured in the backup policy. You can retain data for a maximum of *10 years*.
2929
- Currently, you can use the vaulted backup solution to restore data to a different storage account only. While performing restores, ensure that the target storage account doesn't contain any *containers* with the same name as those backed up in a recovery point. If any conflicts arise due to the same name of containers, the restore operation fails.
30-
- **Ensure the storage accounts that need to be backed up have cross-tenant replication enabled. You can check this by navigating to the storage account > Object replication > Advanced settings. Once here, ensure that the check-box is enabled.**
3130

3231
For more information about the supported scenarios, limitations, and availability, See the [support matrix](blob-backup-support-matrix.md).
3332

@@ -157,7 +156,7 @@ You can use [Azure Business Continuity Center](../business-continuity-center/bus
157156
- As we've seen above, you can use it for creating Backup vaults and policies. You can also view all vaults and policies under the selected subscriptions.
158157
- Azure Business Continuity Center gives you an easy way to [monitor the state of protection](../business-continuity-center/tutorial-monitor-protection-summary.md) of protected storage accounts as well as storage accounts for which [backup isn't currently configured](../business-continuity-center/quick-understand-protection-estate.md#identify-unprotected-resources).
159158
- You can configure backup for any storage accounts using the **+Configure protection** button.
160-
- You can initiate restores using the **Restore** button and track restores using **Jobs**. For more information on performing restores, see [Restore Azure Blobs](blob-backup-support-matrix.md).
159+
- You can initiate restores using the **Restore** button and track restores using **Jobs**. For more information on performing restores, see [Restore Azure Blobs](blob-restore.md?tabs=vaulted-backup).
161160
- Analyze your backup usage using Backup reports.
162161

163162
:::image type="content" source="./media/blob-backup-configure-manage/manage-azure-blob-backup.png" alt-text="Screenshot shows the Azure Business Continuity Center console to manage the Azure Blob backups." lightbox="./media/blob-backup-configure-manage/manage-azure-blob-backup.png":::

articles/communication-services/quickstarts/advanced-messaging/whatsapp/includes/interactive/messages-quickstart-interactive-messages-java.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Follow these steps to add required code snippets to the main function of your `A
6464
Follow these steps to add required code snippets to the main function of your `App.java` file.
6565
- [Send an Interactive List options message to a WhatsApp user](#send-an-interactive-reply-button-message-to-a-whatsapp-user).
6666
- [Send an Interactive Reply Button message to a WhatsApp user](#send-an-interactive-reply-button-message-to-a-whatsapp-user).
67-
- [Send an Interactive Click-to-action Url based message to a WhatsApp user](#send-an-interactive-click-to-action-url-based-message-to-a-whatsapp-user)
67+
- [Send an Interactive Click-to-action Url based message to a WhatsApp user](#send-an-interactive-call-to-action-url-based-message-to-a-whatsapp-user)
6868

6969
### Send an Interactive List options message to a WhatsApp user
7070

@@ -144,7 +144,7 @@ for (MessageReceipt messageReceipt : textMessageResult.getReceipts()) {
144144
}
145145
```
146146

147-
### Send an Interactive Click-to-action Url based message to a WhatsApp user
147+
### Send an Interactive Call-To-Action Url based message to a WhatsApp user
148148

149149
The Messages SDK enables Contoso to send interactive WhatsApp messages, when initiated by a WhatsApp users. To send interactive messages:
150150
- [WhatsApp Channel ID](#set-channel-registration-id).

articles/communication-services/quickstarts/advanced-messaging/whatsapp/includes/interactive/messages-quickstart-interactive-messages-javascript.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Follow these steps to add required code snippets to your `send-messages.js` file
5959
Follow these steps to add required code snippets to your `send-messages.js` file.
6060
- [Send an Interactive List options message to a WhatsApp user](#send-an-interactive-reply-button-message-to-a-whatsapp-user).
6161
- [Send an Interactive Reply Button message to a WhatsApp user](#send-an-interactive-reply-button-message-to-a-whatsapp-user).
62-
- [Send an Interactive Click-to-action Url based message to a WhatsApp user](#send-an-interactive-click-to-action-url-based-message-to-a-whatsapp-user)
62+
- [Send an Interactive Click-to-action Url based message to a WhatsApp user](#send-an-interactive-call-to-action-url-based-message-to-a-whatsapp-user)
6363

6464

6565
### Send an Interactive List options message to a WhatsApp user
@@ -245,7 +245,7 @@ main().catch((error) => {
245245
});
246246
```
247247

248-
### Send an Interactive Click-to-action Url based message to a WhatsApp user
248+
### Send an Interactive Call-To-Action Url based message to a WhatsApp user
249249

250250
The Messages SDK enables Contoso to send interactive WhatsApp messages, when initiated by a WhatsApp users. To send interactive messages:
251251
- [WhatsApp Channel ID](#set-channel-registration-id).

articles/communication-services/quickstarts/advanced-messaging/whatsapp/includes/interactive/messages-quickstart-interactive-messages-net.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ The Messages SDK supports the following WhatsApp Interactive messages:
5959

6060
- [Send an Interactive List options message to a WhatsApp user](#send-an-interactive-list-options-message-to-a-whatsapp-user).
6161
- [Send an Interactive Reply Button message to a WhatsApp user](#send-an-interactive-reply-button-message-to-a-whatsapp-user).
62-
- [Send an Interactive Click-to-action URL-based message to a WhatsApp user](#send-an-interactive-click-to-action-url-based-message-to-a-whatsapp-user).
62+
- [Send an Interactive Click-to-action URL-based message to a WhatsApp user](#send-an-interactive-call-to-action-url-based-message-to-a-whatsapp-user).
6363

6464
### Send an Interactive List options message to a WhatsApp user
6565

@@ -168,14 +168,13 @@ public async Task SendWhatsAppReplyButtonMessage()
168168
}
169169
```
170170

171-
### Send an Interactive Click-to-action URL-based message to a WhatsApp user
171+
### Send an Interactive Call-To-Action URL-based message to a WhatsApp user
172172

173173
To send Click-To-Action or URL-based messages:
174174

175175
- [WhatsApp Channel ID](#set-channel-registration-id).
176176
- [Recipient Phone Number in E.164 format](#set-recipient-list).
177-
178-
Click-To-Action Messages can be created using the following properties:
177+
- Call-To-Action Messages can be created using the following properties:
179178

180179
| Action type | Description |
181180
| --- | --- |

articles/communication-services/quickstarts/advanced-messaging/whatsapp/includes/interactive/messages-quickstart-interactive-messages-python.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ The Messages SDK supports the following WhatsApp Interactive messages:
6262

6363
- [Send an Interactive List options message to a WhatsApp user](#send-an-interactive-list-options-message-to-a-whatsapp-user).
6464
- [Send an Interactive Reply Button message to a WhatsApp user](#send-an-interactive-reply-button-message-to-a-whatsapp-user).
65-
- [Send an Interactive Click-to-action Url based message to a WhatsApp user](#send-an-interactive-click-to-action-url-based-message-to-a-whatsapp-user).
65+
- [Send an Interactive Click-to-action Url based message to a WhatsApp user](#send-an-interactive-call-to-action-url-based-message-to-a-whatsapp-user).
6666

6767
### Send an Interactive List options message to a WhatsApp user
6868

@@ -207,12 +207,12 @@ To run `send_whatsappreplybutton_message()`, update the [main method](#basic-pro
207207

208208
:::image type="content" source="../../media/interactive-reaction-sticker/reply-button-interactive-message.jpg" lightbox="../../media/interactive-reaction-sticker/reply-button-interactive-message.jpg" alt-text="Screenshot that shows WhatsApp Reply Button interactive message from Business to User.":::
209209

210-
### Send an Interactive Click-to-action Url based message to a WhatsApp user
210+
### Send an Interactive Call-To-Action Url based message to a WhatsApp user
211211

212212
The Messages SDK enables Contoso to send image WhatsApp messages to WhatsApp users. To send image embedded messages:
213213
- [WhatsApp Channel ID](#set-channel-registration-id)
214214
- [Recipient Phone Number in E16 format](#set-recipient-list)
215-
- Click-To-Action or Link content Message can be created using given properties:
215+
- Call-To-Action or Link content can be created using given properties:
216216

217217
| Action type | Description |
218218
| --- | --- |

0 commit comments

Comments
 (0)