Merge branch 'main' into 20221004-copy-hyperscale-georeplica

Author: WilliamDAssafMSFT

azure-sql/database/transparent-data-encryption-byok-key-rotation.md

@@ -5,7 +5,7 @@ description: Learn how to rotate the Transparent data encryption (TDE) protector
 author: rwestMSFT
 ms.author: randolphwest
 ms.reviewer: wiassaf, vanto, mathoma
-ms.date: 08/18/2022
+ms.date: 10/04/2022
 ms.service: sql-database
 ms.subservice: security
 ms.topic: how-to
@@ -16,7 +16,7 @@ ms.custom:
 ---
 # Rotate the Transparent data encryption (TDE) protector
 
-[!INCLUDE[appliesto-sqldb-asa](../includes/appliesto-sqldb-asa.md)]
+[!INCLUDE[appliesto-sqldb-sqlmi-asa](../includes/appliesto-sqldb-sqlmi-asa.md)]
 
 This article describes key rotation for a [server](logical-servers.md) using a TDE protector from Azure Key Vault. Rotating the logical TDE protector for a server means to switch to a new asymmetric key that protects the databases on the server. Key rotation is an online operation and should only take a few seconds to complete, because this only decrypts and re-encrypts the database's data encryption key, not the entire database.
 

docs/relational-databases/system-catalog-views/sys-query-store-plan-transact-sql.md

@@ -105,7 +105,7 @@ SELECT TOP 1000
        , q.context_settings_id
        , c.set_options
        , c.status
-    ROM sys.query_store_plan p
+    FROM sys.query_store_plan p
     JOIN sys.query_store_query q ON p.query_id = q.query_id
        JOIN sys.query_context_settings c ON c.context_settings_id = q.context_settings_id
        LEFT JOIN sys.query_store_query_text t ON q.query_text_id = t.query_text_id