Skip to content

Commit f785b0c

Browse files
authored
Merge pull request #23844 from MicrosoftDocs/FromPublicRepo
Confirm merge from FromPublicRepo to main to sync with https://github.com/MicrosoftDocs/sql-docs (branch live)
2 parents 71dc03f + 19de7e5 commit f785b0c

3 files changed

Lines changed: 3 additions & 5 deletions

File tree

azure-sql/virtual-machines/windows/automated-backup-sql-2014.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ The following table describes the options that can be configured for Automated B
5858
| Setting | Range (Default) | Description |
5959
| --- | --- | --- |
6060
| **Automated Backup** | Enable/Disable (Disabled) | Enables or disables Automated Backup for an Azure VM running SQL Server 2014 Standard or Enterprise. |
61-
| **Retention Period** | 1-30 days (30 days) | The number of days to retain a backup. |
61+
| **Retention Period** | 1-90 days (90 days) | The number of days to retain a backup. |
6262
| **Storage Account** | Azure storage account | An Azure storage account to use for storing Automated Backup files in blob storage. A container is created at this location to store all backup files. The backup file naming convention includes the date, time, and machine name. |
6363
| **Encryption** | Enable/Disable (Disabled) | Enables or disables encryption. When encryption is enabled, the certificates used to restore the backup are located in the specified storage account in the same `automaticbackup` container using the same naming convention. If the password changes, a new certificate is generated with that password, but the old certificate remains to restore prior backups. |
6464
| **Password** | Password text | A password for encryption keys. This is only required if encryption is enabled. In order to restore an encrypted backup, you must have the correct password and related certificate that was used at the time the backup was taken. |

docs/azure-data-studio/release-notes-azure-data-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ You can reference [Azure Data Studio feedback](https://github.com/microsoft/azur
7676
| [April 2021](#april-2021) | 1.28.0 | April 15, 2021 | N/A |
7777
| [March 2021](#march-2021) | 1.27.0 | March 17, 2021 | N/A |
7878
| [February 2021](#february-2021) | 1.26.0 | February 18, 2021 | N/A |
79-
| [December 2020](#december-2020) | 1.27.0 | December 9, 2020 | [hotfix](#december-2020-hotfix) |
79+
| [December 2020](#december-2020) | 1.25.0 | December 9, 2020 | [hotfix](#december-2020-hotfix) |
8080
| [November 2020](#november-2020) | 1.24.0 | November 12, 2020 | N/A |
8181
| [October 2020](#october-2020) | 1.23.0 | October 14, 2020 | N/A |
8282
| [September 2020](#september-2020) | 1.22.0 | September 22, 2020 | [hotfix](#september-2020-hotfix) |

docs/sql-server/end-of-support/sql-server-extended-security-updates.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,7 @@ ESUs are available to customers running their workload in Azure, on-premises, or
8989

9090
If you migrate your workloads to an Azure service (see the [Overview](#overview) for more information), you'll have access to ESUs for [!INCLUDE[ssSQL11](../../includes/sssql11-md.md)] for up to three years after the End of Support, at **no additional charges** above the cost of running the Azure service. You don't need Software Assurance to receive ESUs in Azure.
9191

92-
Azure services running [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] will receive ESUs automatically through existing [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] update channels, when the service is configured to use [automated patching](/azure/azure-sql/virtual-machines/windows/automated-patching).
93-
94-
Azure services that have ***not* been configured for [automated patching](/azure/azure-sql/virtual-machines/windows/automated-patching)** will need to manually download and deploy ESU patches as described in the [on-premises or hosted environments](#on-premises-or-hosted-environments) section.
92+
Azure services running [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] will receive ESUs automatically through existing [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] update channels or Windows Update. You don't need to install the SQL Server IaaS Agent extension to download ESU patches on an Azure SQL Virtual Machine.
9593

9694
### On-premises or hosted environments
9795

0 commit comments

Comments
 (0)