Skip to content

Commit 1363677

Browse files
authored
Merge pull request #25677 from MicrosoftDocs/FromPublicRepo
Confirm merge from FromPublicRepo to main to sync with https://github.com/MicrosoftDocs/sql-docs (branch live)
2 parents 0c1382e + ad90c1a commit 1363677

6 files changed

Lines changed: 13 additions & 8 deletions

File tree

azure-sql/database/service-tiers-sql-database-vcore.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The vCore purchasing model used by Azure SQL Database provides several benefits
4141

4242
## Service tiers
4343

44-
Service tier options in the vCore purchasing model include General Purpose, Business Critical, and Hyperscale. The service tier generally service tier defines hardware, storage type and IOPS, high availability and disaster recovery options, and other features like memory optimized object types.
44+
Service tier options in the vCore purchasing model include General Purpose, Business Critical, and Hyperscale. The service tier generally defines hardware, storage type and IOPS, high availability and disaster recovery options, and other features like memory optimized object types.
4545

4646
For greater details, review resource limits for [logical server](resource-limits-logical-server.md), [single databases](resource-limits-vcore-single-databases.md), and [pooled databases](resource-limits-vcore-elastic-pools.md).
4747

azure-sql/managed-instance/log-replay-service-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ You start the migration by starting LRS. You can start the service in either aut
125125

126126
We recommend using autocomplete mode for passive workloads for which data catch-up isn't required.
127127

128-
* **Autocomplete mode**. When you use continuous mode, the service continuously scans the Azure Blob Storage folder and restores any new backup files that are added while the migration is in progress.
128+
* **Continuous mode**. When you use continuous mode, the service continuously scans the Azure Blob Storage folder and restores any new backup files that are added while the migration is in progress.
129129

130130
The migration finishes only after the manual cutover has been requested.
131131

docs/relational-databases/security/encryption/transparent-data-encryption.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ The following example shows encryption and decryption of the `AdventureWorks2012
101101
USE master;
102102
GO
103103
CREATE MASTER KEY ENCRYPTION BY PASSWORD = '<UseStrongPasswordHere>';
104-
go
104+
GO
105105
CREATE CERTIFICATE MyServerCert WITH SUBJECT = 'My DEK Certificate';
106-
go
106+
GO
107107
USE AdventureWorks2012;
108108
GO
109109
CREATE DATABASE ENCRYPTION KEY
@@ -348,4 +348,4 @@ If the column `pvt_key_last_backup_date` is NULL, the database corresponding to
348348
- [Security Center for SQL Server Database Engine and Azure SQL Database](../../../relational-databases/security/security-center-for-sql-server-database-engine-and-azure-sql-database.md)
349349
- [FILESTREAM (SQL Server)](../../../relational-databases/blob/filestream-sql-server.md)
350350
- [SQL Server Encryption](../../../relational-databases/security/encryption/sql-server-encryption.md)
351-
- [SQL Server and Database Encryption Keys (Database Engine)](../../../relational-databases/security/encryption/sql-server-and-database-encryption-keys-database-engine.md)
351+
- [SQL Server and Database Encryption Keys (Database Engine)](../../../relational-databases/security/encryption/sql-server-and-database-encryption-keys-database-engine.md)

docs/relational-databases/security/ledger/ledger-how-to-configure-ledger-database.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ This article provides information on configuring a [ledger database](ledger-over
3030

3131
## Enable ledger database
3232

33+
> [!NOTE]
34+
> Enabling the ledger functionality at the database level will make all tables in this database updatable ledger tables. This option cannot be changed after the database is created. Creating a table with the option `LEDGER = OFF` will throw an error message.
35+
3336
# [Portal](#tab/Portal)
3437

3538
1. Open the [Azure portal](https://portal.azure.com/) and [create an Azure SQL Database](/azure/azure-sql/database/single-database-create-quickstart?tabs=azure-portal) .

docs/relational-databases/security/ledger/ledger-verify-database.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ In this article, you'll verify the integrity of the data in your ledger tables.
118118

119119
> [!TIP]
120120
> Running ledger verification with the latest digest will only verify the database from the time the digest was generated until the time the verification was run. To verify that the historical data in your database wasn't tampered with, run verification by using multiple database digest files. Start with the point in time for which you want to verify the database. An example of a verification passing multiple digests would look similar to the following query.
121+
>
122+
> **SNAPSHOT ISOLATION** should be enabled before running the verification procedure `sp_verify_database_ledger`.
121123
122124
```sql
123125
EXECUTE sp_verify_database_ledger N'
@@ -150,4 +152,4 @@ In this article, you'll verify the integrity of the data in your ledger tables.
150152
- [sys.database_ledger_digest_locations](../../system-catalog-views/sys-database-ledger-digest-locations-transact-sql.md)
151153
- [sp_verify_database_ledger_from_digest_storage](../../system-stored-procedures/sys-sp-verify-database-ledger-from-digest-storage-transact-sql.md)
152154
- [sp_verify_database_ledger](../../system-stored-procedures/sys-sp-verify-database-ledger-transact-sql.md)
153-
- [sp_generate_database_ledger_digest](../../system-stored-procedures/sys-sp-generate-database-ledger-digest-transact-sql.md)
155+
- [sp_generate_database_ledger_digest](../../system-stored-procedures/sys-sp-generate-database-ledger-digest-transact-sql.md)

docs/t-sql/functions/cryptographic-functions-transact-sql.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ These functions support digital signing, digital signature validation, encryptio
102102
[SIGNBYASYMKEY](../../t-sql/functions/signbyasymkey-transact-sql.md)
103103
:::column-end:::
104104
:::column:::
105-
[VERIFYSIGNEDBYASMKEY](../../t-sql/functions/verifysignedbyasymkey-transact-sql.md)
105+
[VERIFYSIGNEDBYASYMKEY](../../t-sql/functions/verifysignedbyasymkey-transact-sql.md)
106106
:::column-end:::
107107
:::row-end:::
108108
:::row:::
109109
:::column:::
110110
[SIGNBYCERT](../../t-sql/functions/signbycert-transact-sql.md)
111111
:::column-end:::
112112
:::column:::
113-
[VERIGYSIGNEDBYCERT](../../t-sql/functions/verifysignedbycert-transact-sql.md)
113+
[VERIFYSIGNEDBYCERT](../../t-sql/functions/verifysignedbycert-transact-sql.md)
114114
:::column-end:::
115115
:::row-end:::
116116
:::row:::

0 commit comments

Comments
 (0)