Skip to content

Commit 064ec61

Browse files
authored
Merge pull request #184016 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 39ecbdd + 95fe246 commit 064ec61

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

articles/azure-sql/database/gateway-migration.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,14 @@ ms.date: 07/01/2019
1414
# Azure SQL Database traffic migration to newer Gateways
1515
[!INCLUDE[appliesto-sqldb](../includes/appliesto-sqldb.md)]
1616

17-
As Azure infrastructure improves, Microsoft will periodically refresh hardware to ensure we provide the best possible customer experience. In the coming months, we plan to add gateways built on newer hardware generations, migrate traffic to them, and eventually decommission gateways built on older hardware in some regions.
17+
Microsoft periodically refreshes hardware to optimize the customer experience. During these refreshes, Azure adds gateways built on newer hardware generations, migrates traffic to them, and eventually decommissions gateways built on older hardware in some regions.
1818

19-
Customers will be notified via service health notifications well in advance of any change to gateways available in each region. Customers can [use the Azure portal to set up activity log alerts](../../service-health/alerts-activity-log-service-notifications-portal.md).
2019

21-
The most up-to-date information will be maintained in the [Azure SQL Database gateway IP addresses](connectivity-architecture.md#gateway-ip-addresses) table.
20+
To avoid service disruptions during refreshes, allow the communication with SQL Gateway IP subnet ranges for the region. Review [SQL Gateway IP subnet ranges](connectivity-architecture.md#gateway-ip-addresses) and include the ranges for your region.
21+
22+
23+
Customers can [use the Azure portal to set up activity log alerts](../../service-health/alerts-activity-log-service-notifications-portal.md).
24+
2225

2326
## Status updates
2427

articles/backup/backup-azure-dataprotection-use-rest-api-create-update-backup-vault.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.assetid: 93861379-5bec-4ed5-95d2-46f534a115fd
77
---
88
# Create Azure Backup vault using REST API
99

10-
Azure Backup's new Data Protection platform provides enhanced capabilities for backup and restore for newer workloads such as blobs in storage accounts, managed disk and PostGre SQL server's PaaS platform. It aims to minimize management overhead while making it easy for organizing backups. A 'Backup vault' is the cornerstone of the Data protection platform and this is different from the 'Recovery Services' vault.
10+
Azure Backup's new Data Protection platform provides enhanced capabilities for backup and restore for newer workloads such as blobs in storage accounts, managed disk and PostgreSQL server's PaaS platform. It aims to minimize management overhead while making it easy for organizing backups. A 'Backup vault' is the cornerstone of the Data protection platform and this is different from the 'Recovery Services' vault.
1111

1212
The steps to create an Azure Backup vault using REST API are outlined in [create vault REST API](/rest/api/dataprotection/backup-vaults/create-or-update) documentation. Let's use this document as a reference to create a vault called "testBkpVault" in "West US" and under 'TestBkpVaultRG' resource group.
1313

articles/static-web-apps/build-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
uses: Azure/static-web-apps-deploy@v1
7474
with:
7575
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }}
76-
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
76+
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for GitHub integrations (i.e. PR comments)
7777
action: "upload"
7878
###### Repository/Build Configurations ######
7979
app_location: "src" # App source code path relative to repository root

articles/static-web-apps/publish-jekyll.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ To configure environment variables, such as `JEKYLL_ENV`, add an `env` section t
144144
uses: Azure/static-web-apps-deploy@v1
145145
with:
146146
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }}
147-
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
147+
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for GitHub integrations (i.e. PR comments)
148148
action: "upload"
149149
###### Repository/Build Configurations - These values can be configured to match you app requirements. ######
150150
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig

articles/storage/blobs/monitor-blob-storage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ If you choose to archive your logs to a storage account, you'll pay for the volu
105105
> [!div class="mx-imgBorder"]
106106
> ![Diagnostic settings page archive storage](media/monitor-blob-storage/diagnostic-logs-settings-pane-archive-storage.png)
107107
108-
2. In the **Storage account** drop-down list, select the storage account that you want to archive your logs to, click the **OK** button, and then select the **Save** button.
108+
2. In the **Storage account** drop-down list, select the storage account that you want to archive your logs to, and then select the **Save** button.
109109

110110
[!INCLUDE [no retention policy](../../../includes/azure-storage-logs-retention-policy.md)]
111111

articles/storage/blobs/secure-file-transfer-protocol-known-issues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ SFTP support for Azure Blob Storage currently limits its cryptographic algorithm
119119

120120
- The account needs to be in a [supported regions](secure-file-transfer-protocol-support.md#regional-availability).
121121

122-
- Customer's subscription needs to be signed up for the preview. See this.
122+
- Customer's subscription needs to be signed up for the preview. To enroll in the preview, complete [this form](https://forms.office.com/r/gZguN0j65Y) *and* request to join via 'Preview features' in the Azure portal.
123123

124124
- To resolve the `Home Directory not accessible error.` error, check that:
125125

0 commit comments

Comments
 (0)