Skip to content

Commit 8f46514

Browse files
authored
Merge pull request #292636 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 707590b + 11f2e9e commit 8f46514

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ If you happened to accidentally delete your app in Azure App Service, you can re
1515
> [!NOTE]
1616
> - Deleted apps are purged from the system 30 days after the initial deletion. After an app is purged, it can't be recovered.
1717
> - Undelete functionality isn't supported for function apps hosted on the Consumption plan or Elastic Premium plan.
18-
> - App Service apps running in an App Service Environment don't support snapshots. Therefore, undelete functionality and clone functionality aren't supported for App Service apps running in an App Service Environment.
19-
>
18+
2019

2120
## Re-register App Service resource provider
2221

articles/storage/blobs/secure-file-transfer-protocol-support.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ The following clients have compatible algorithm support with SFTP for Azure Blob
209209
- WinSCP 5.10+
210210
- Workday
211211
- XFB.Gateway
212+
- Apache NiFi
212213

213214
<sup>1</sup> Must set `AllowPKCS12KeystoreAutoOpen` option to `no`.
214215

0 commit comments

Comments
 (0)