Merge branch 'main' into release-dallas

v-alje · v-alje · commit ba132b22688d · 2022-05-05T18:11:46.000-07:00
diff --git a/azure-sql/database/active-geo-replication-configure-portal.md b/azure-sql/database/active-geo-replication-configure-portal.md
@@ -6,8 +6,8 @@ ms.service: sql-database
 ms.subservice: high-availability
 ms.custom: sqldbrb=1, devx-track-azurecli
 ms.topic: tutorial
-author: emlisa
-ms.author: emlisa
+author: rajeshsetlem
+ms.author: rsetlem
 ms.reviewer: kendralittle, mathoma
 ms.date: 08/20/2021
 ---
diff --git a/azure-sql/database/active-geo-replication-overview.md b/azure-sql/database/active-geo-replication-overview.md
@@ -5,8 +5,8 @@ ms.service: sql-database
 ms.subservice: high-availability
 ms.custom: sqldbrb=1
 ms.topic: conceptual
-author: emlisa
-ms.author: emlisa
+author: rajeshsetlem
+ms.author: rsetlem
 ms.reviewer: kendralittle, mathoma
 ms.date: 4/14/2022
 ---
diff --git a/azure-sql/database/active-geo-replication-security-configure.md b/azure-sql/database/active-geo-replication-security-configure.md
@@ -7,8 +7,8 @@ ms.subservice: high-availability
 ms.custom: sqldbrb=1
 ms.devlang: 
 ms.topic: how-to
-author: emlisa
-ms.author: emlisa
+author: rajeshsetlem
+ms.author: rsetlem
 ms.reviewer: kendralittle, mathoma, vanto
 ms.date: 12/18/2018
 ---
diff --git a/azure-sql/database/auto-failover-group-sql-db.md b/azure-sql/database/auto-failover-group-sql-db.md
@@ -6,8 +6,8 @@ ms.service: sql-database
 ms.subservice: high-availability
 ms.custom: sql-db-mi-split
 ms.topic: conceptual
-author: emlisa
-ms.author: emlisa
+author: rajeshsetlem
+ms.author: rsetlem
 ms.reviewer: kendralittle, mathoma
 ms.date: 03/01/2022
 ---
diff --git a/azure-sql/database/business-continuity-high-availability-disaster-recover-hadr-overview.md b/azure-sql/database/business-continuity-high-availability-disaster-recover-hadr-overview.md
@@ -9,8 +9,8 @@ ms.subservice: high-availability
 ms.custom: sqldbrb=2
 ms.devlang: 
 ms.topic: conceptual
-author: emlisa
-ms.author: emlisa
+author: rajeshsetlem
+ms.author: rsetlem
 ms.reviewer: kendralittle, mathoma
 ms.date: 10/18/2021
 monikerRange: "=azuresql||=azuresql-db||=azuresql-mi"
diff --git a/azure-sql/database/disaster-recovery-drills.md b/azure-sql/database/disaster-recovery-drills.md
@@ -7,8 +7,8 @@ ms.subservice: high-availability
 ms.custom: 
 ms.devlang:
 ms.topic: conceptual
-author: emlisa
-ms.author: emlisa
+author: rajeshsetlem
+ms.author: rsetlem
 ms.reviewer: kendralittle, mathoma
 ms.date: 12/18/2018
 ---
diff --git a/azure-sql/database/disaster-recovery-guidance.md b/azure-sql/database/disaster-recovery-guidance.md
@@ -7,8 +7,8 @@ ms.subservice: high-availability
 ms.custom: sqldbrb=1
 ms.devlang:
 ms.topic: conceptual
-author: emlisa
-ms.author: emlisa
+author: rajeshsetlem
+ms.author: rsetlem
 ms.reviewer: kendralittle, mathoma
 ms.date: 06/21/2019
 ---
diff --git a/azure-sql/database/disaster-recovery-strategies-for-applications-with-elastic-pool.md b/azure-sql/database/disaster-recovery-strategies-for-applications-with-elastic-pool.md
@@ -7,8 +7,8 @@ ms.subservice: elastic-pools
 ms.custom: sqldbrb-1
 ms.devlang:
 ms.topic: conceptual
-author: emlisa
-ms.author: emlisa
+author: rajeshsetlem
+ms.author: rsetlem
 ms.reviewer: kendralittle, mathoma
 ms.date: 01/25/2019
 ---
diff --git a/azure-sql/database/failover-group-add-elastic-pool-tutorial.md b/azure-sql/database/failover-group-add-elastic-pool-tutorial.md
@@ -6,8 +6,8 @@ ms.service: sql-database
 ms.subservice: high-availability
 ms.custom: seo-lt-2019 sqldbrb=1, devx-track-azurecli
 ms.topic: tutorial
-author: emlisa
-ms.author: emlisa
+author: rajeshsetlem
+ms.author: rsetlem
 ms.reviewer: kendralittle, mathoma
 ms.date: 01/26/2022 
 ---
diff --git a/azure-sql/database/failover-group-add-single-database-tutorial.md b/azure-sql/database/failover-group-add-single-database-tutorial.md
@@ -6,8 +6,8 @@ ms.service: sql-database
 ms.subservice: high-availability
 ms.custom: sqldbrb=1, devx-track-azurecli
 ms.topic: tutorial
-author: emlisa
-ms.author: emlisa
+author: rajeshsetlem
+ms.author: rsetlem
 ms.reviewer: kendralittle, mathoma
 ms.date: 01/26/2022 
 ---
diff --git a/azure-sql/database/geo-distributed-application-configure-tutorial.md b/azure-sql/database/geo-distributed-application-configure-tutorial.md
@@ -6,8 +6,8 @@ ms.service: sql-database
 ms.subservice: high-availability
 ms.custom: sqldbrb=1, devx-track-azurecli, devx-track-azurepowershell
 ms.topic: conceptual
-author: emlisa
-ms.author: emlisa
+author: rajeshsetlem
+ms.author: rsetlem
 ms.reviewer: kendralittle, mathoma
 ms.date: 03/12/2019
 ---
diff --git a/azure-sql/database/high-availability-sla.md b/azure-sql/database/high-availability-sla.md
@@ -8,8 +8,8 @@ ms.subservice: high-availability
 ms.custom: sqldbrb=2, references_regions
 ms.devlang: 
 ms.topic: conceptual
-author: emlisa
-ms.author: emlisa
+author: rajeshsetlem
+ms.author: rsetlem
 ms.reviewer: kendralittle, mathoma, emlisa
 ms.date: 04/13/2022
 monikerRange: "=azuresql||=azuresql-db||=azuresql-mi"
diff --git a/azure-sql/database/read-scale-out.md b/azure-sql/database/read-scale-out.md
@@ -7,8 +7,8 @@ ms.subservice: scale-out
 ms.custom: sqldbrb=1, devx-track-azurepowershell
 ms.devlang: 
 ms.topic: conceptual
-author: emlisa
-ms.author: emlisa
+author: rajeshsetlem
+ms.author: rsetlem
 ms.reviewer: kendralittle, mathoma
 ms.date: 1/20/2022
 monikerRange: "=azuresql||=azuresql-db||=azuresql-mi"
diff --git a/docs/dma/dma-assess-sql-data-estate-to-sqldb-commandline.md b/docs/dma/dma-assess-sql-data-estate-to-sqldb-commandline.md
@@ -18,7 +18,7 @@ ms.custom:
 ---
 # DMACMD: Assess readiness of a SQL Server data estate migrating to Azure SQL 
 
-With many organizations trying to migrate to Azure, it is critical to assess existing on-premise SQL Server instances and identify the right Azure SQL target - Azure SQL Database, Azure SQL Managed Instance, or SQL Server on Azure VMs. 
+With many organizations trying to migrate to Azure, it is critical to assess existing on-premises SQL Server instances and identify the right Azure SQL target - Azure SQL Database, Azure SQL Managed Instance, or SQL Server on Azure VMs. 
 
 [Data Migration Assistant (DMA)](dma-overview.md) helps assess a SQL Server instance for a specific Azure SQL target, and gauges the readiness of SQL Server databases migrating to Azure SQL. Upload DMA assessment results to Azure Migrate hub for a centralized readiness view of the entire data estate. 
 
diff --git a/docs/relational-databases/backup-restore/restore-database-options-page.md b/docs/relational-databases/backup-restore/restore-database-options-page.md
@@ -39,11 +39,18 @@ ms.author: kendralittle
 >  Use this option only after careful consideration. For more information, see [RESTORE Arguments &#40;Transact-SQL&#41;](../../t-sql/statements/restore-statements-arguments-transact-sql.md).  
   
  **Preserve the replication settings [WITH KEEP_REPLICATION]**  
- Preserves the replication settings when restoring a published database to a server other than the server where the database was created. This option is relevant only if the database was replicated when the backup was created.  
+ Preserves the replication settings when doing a restore using a backup file of a published database to a server other than the server where the database was created. This option is relevant only if the database was replicated when the backup was created.  
   
  This option is available only with the **Leave the database ready for use by rolling back the uncommitted transactions** option (described later in this table), which is equivalent to restoring a backup with the RECOVERY option.  
   
  Selecting this option is equivalent to using the KEEP_REPLICATION option in a [RESTORE](../../t-sql/statements/restore-statements-transact-sql.md) statement.  
+ 
+ When doing a restore using a backup file of a published database to the same server where the database was created and with same database name, KEEP_REPLICATION is not needed.
+
+
+When running RESTORE WITH RECOVERY and not restoring from a backup file, add the KEEP_REPLICATION option to preserve replication settings.
+
+
   
  For more information, see [Back Up and Restore Replicated Databases](../../relational-databases/replication/administration/back-up-and-restore-replicated-databases.md).  
   
diff --git a/docs/relational-databases/system-stored-procedures/sp-lock-transact-sql.md b/docs/relational-databases/system-stored-procedures/sp-lock-transact-sql.md
@@ -56,7 +56,7 @@ sp_lock [ [ @spid1 = ] 'session ID1' ] [ , [@spid2 = ] 'session ID2' ]
 |**ObjId**|**int**|The identification number of the object on which the lock is held. You can use the OBJECT_NAME() function in the related database to identify the object. A value of 99 is a special case that indicates a lock on one of the system pages used to record the allocation of pages in a database.|  
 |**IndId**|**smallint**|The identification number of the index on which the lock is held.|  
 |**Type**|**nchar(4)**|The lock type:<br /><br /> RID = Lock on a single row in a table identified by a row identifier (RID).<br /><br /> KEY = Lock within an index that protects a range of keys in serializable transactions.<br /><br /> PAG = Lock on a data or index page.<br /><br /> EXT = Lock on an extent.<br /><br /> TAB = Lock on an entire table, including all data and indexes.<br /><br /> DB = Lock on a database.<br /><br /> FIL = Lock on a database file.<br /><br /> APP = Lock on an application-specified resource.<br /><br /> MD = Locks on metadata, or catalog information.<br /><br /> HBT = Lock on a heap or B-Tree (HoBT). This information is incomplete in [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)].<br /><br /> AU = Lock on an allocation unit. This information is incomplete in [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)].|  
-|**Resource**|**nchar(32)**|The value identifying the resource that is locked. The format of the value depends on the type of resource identified in the **Type** column:<br /><br /> **Type** Value: **Resource** Value<br /><br /> RID: An identifier in the format fileid:pagenumber:rid, where fileid identifies the file containing the page, pagenumber identifies the page containing the row, and rid identifies the specific row on the page. fileid matches the **file_id** column in the **sys.database_files** catalog view.<br /><br /> KEY: A hexadecimal number used internally by the [!INCLUDE[ssDE](../../includes/ssde-md.md)].<br /><br /> PAG: A number in the format fileid:pagenumber, where fileid identifies the file containing the page, and pagenumber identifies the page.<br /><br /> EXT: A number identifying the first page in the extent. The number is in the format fileid:pagenumber.<br /><br /> TAB: No information provided because the table is already identified in the **ObjId** column.<br /><br /> DB: No information provided because the database is already identified in the **dbid** column.<br /><br /> FIL: The identifier of the file, which matches the **file_id** column in the **sys.database_files** catalog view.<br /><br /> APP: An identifier unique to the application resource being locked. In the format DbPrincipleId:\<first two to 16 characters of the resource string>\<hashed value>.<br /><br /> MD: varies by resource type. For more information, see the description of the **resource_description** column in [sys.dm_tran_locks &#40;Transact-SQL&#41;](../../relational-databases/system-dynamic-management-views/sys-dm-tran-locks-transact-sql.md).<br /><br /> HBT: No information provided. Use the **sys.dm_tran_locks** dynamic management view instead.<br /><br /> AU: No information provided. Use the **sys.dm_tran_locks** dynamic management view instead.|  
+|**Resource**|**nchar(32)**|The value identifying the resource that is locked. The format of the value depends on the type of resource identified in the **Type** column:<br /><br /> **Type** Value: **Resource** Value<br /><br /> RID: An identifier in the format fileid:pagenumber:rid, where fileid identifies the file containing the page, pagenumber identifies the page containing the row, and rid identifies the specific row on the page. fileid matches the **file_id** column in the **sys.database_files** catalog view.<br /><br /> KEY: A hexadecimal number used internally by the [!INCLUDE[ssDE](../../includes/ssde-md.md)].<br /><br /> PAG: A number in the format fileid:pagenumber, where fileid identifies the file containing the page, and pagenumber identifies the page.<br /><br /> EXT: A number identifying the first page in the extent. The number is in the format fileid:pagenumber.<br /><br /> TAB: No information provided because the table is already identified in the **ObjId** column.<br /><br /> DB: No information provided because the database is already identified in the **dbid** column.<br /><br /> FIL: The identifier of the file, which matches the **file_id** column in the **sys.database_files** catalog view.<br /><br /> APP: An identifier unique to the application resource being locked. In the format DbPrincipalId:\<first two to 16 characters of the resource string>\<hashed value>.<br /><br /> MD: varies by resource type. For more information, see the description of the **resource_description** column in [sys.dm_tran_locks &#40;Transact-SQL&#41;](../../relational-databases/system-dynamic-management-views/sys-dm-tran-locks-transact-sql.md).<br /><br /> HBT: No information provided. Use the **sys.dm_tran_locks** dynamic management view instead.<br /><br /> AU: No information provided. Use the **sys.dm_tran_locks** dynamic management view instead.|  
 |**Mode**|**nvarchar(8)**|The lock mode requested. Can be:<br /><br /> NULL = No access is granted to the resource. Serves as a placeholder.<br /><br /> Sch-S = Schema stability. Ensures that a schema element, such as a table or index, is not dropped while any session holds a schema stability lock on the schema element.<br /><br /> Sch-M = Schema modification. Must be held by any session that wants to change the schema of the specified resource. Ensures that no other sessions are referencing the indicated object.<br /><br /> S = Shared. The holding session is granted shared access to the resource.<br /><br /> U = Update. Indicates an update lock acquired on resources that may eventually be updated. It is used to prevent a common form of deadlock that occurs when multiple sessions lock resources for potential update at a later time.<br /><br /> X = Exclusive. The holding session is granted exclusive access to the resource.<br /><br /> IS = Intent Shared. Indicates the intention to place S locks on some subordinate resource in the lock hierarchy.<br /><br /> IU = Intent Update. Indicates the intention to place U locks on some subordinate resource in the lock hierarchy.<br /><br /> IX = Intent Exclusive. Indicates the intention to place X locks on some subordinate resource in the lock hierarchy.<br /><br /> SIU = Shared Intent Update. Indicates shared access to a resource with the intent of acquiring update locks on subordinate resources in the lock hierarchy.<br /><br /> SIX = Shared Intent Exclusive. Indicates shared access to a resource with the intent of acquiring exclusive locks on subordinate resources in the lock hierarchy.<br /><br /> UIX = Update Intent Exclusive. Indicates an update lock hold on a resource with the intent of acquiring exclusive locks on subordinate resources in the lock hierarchy.<br /><br /> BU = Bulk Update. Used by bulk operations.<br /><br /> RangeS_S = Shared Key-Range and Shared Resource lock. Indicates serializable range scan.<br /><br /> RangeS_U = Shared Key-Range and Update Resource lock. Indicates serializable update scan.<br /><br /> RangeI_N = Insert Key-Range and Null Resource lock. Used to test ranges before inserting a new key into an index.<br /><br /> RangeI_S = Key-Range Conversion lock. Created by an overlap of RangeI_N and S locks.<br /><br /> RangeI_U = Key-Range Conversion lock created by an overlap of RangeI_N and U locks.<br /><br /> RangeI_X = Key-Range Conversion lock created by an overlap of RangeI_N and X locks.<br /><br /> RangeX_S = Key-Range Conversion lock created by an overlap of RangeI_N and RangeS_S. locks.<br /><br /> RangeX_U = Key-Range Conversion lock created by an overlap of RangeI_N and RangeS_U locks.<br /><br /> RangeX_X = Exclusive Key-Range and Exclusive Resource lock. This is a conversion lock used when updating a key in a range.|  
 |**Status**|**nvarchar(5)**|The lock request status:<br /><br /> CNVRT: The lock is being converted from another mode, but the conversion is blocked by another process holding a lock with a conflicting mode.<br /><br /> GRANT: The lock was obtained.<br /><br /> WAIT: The lock is blocked by another process holding a lock with a conflicting mode.|  
   
diff --git a/docs/sql-server/migrate/guides/oracle-to-sql-server.md b/docs/sql-server/migrate/guides/oracle-to-sql-server.md
@@ -19,6 +19,9 @@ In this guide, you learn how to migrate your Oracle databases to SQL Server by u
 
 For other migration guides, see [Azure Database Migration Guides](/data-migration). 
 
+>[!important]
+> Try new [Database Migration Assessment for Oracle extension in Azure Data Studio](../../../azure-data-studio/extensions/database-migration-assessment-for-oracle-extension.md) for Oracle to SQL pre-assessment and workload categorization. If you are in early phase of Oracle to SQL migration and would need to do a high level workload assessment , interested in sizing Azure SQL target for the Oracle workload  or understand feature migration parity, try the new extension. For detailed code assessment and conversion, continue with SSMA for Oracle.
+
 ## Prerequisites 
 
 Before you begin migrating your Oracle database to SQL Server, do the following:
diff --git a/docs/ssma/oracle/migrating-oracle-databases-to-sql-server-oracletosql.md b/docs/ssma/oracle/migrating-oracle-databases-to-sql-server-oracletosql.md
@@ -15,7 +15,10 @@ manager: madhuriy
 ---
 # Migrating Oracle Databases to SQL Server (OracleToSQL)
 [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Migration Assistant (SSMA) for Oracle is a comprehensive environment that helps you quickly migrate Oracle databases to [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], Azure SQL Database, or Azure Synapse Analytics. By using SSMA for Oracle, you can review database objects and data, assess databases for migration, migrate database objects to [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], Azure SQL Database, or Azure Synapse Analytics, and then migrate data to [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], Azure SQL Database, or Azure Synapse Analytics. Note that you cannot migrate SYS and SYSTEM Oracle schemas.
-  
+
+>[!Note]
+> Try new [Database Migration Assessment for Oracle extension in Azure Data Studio](../../azure-data-studio/extensions/database-migration-assessment-for-oracle-extension.md) for Oracle to SQL pre-assessment and workload categorization. If you are in early phase of Oracle to SQL migration and would need to do a high level workload assessment , interested in sizing Azure SQL target for the Oracle workload  or understand feature migration parity, try the new extension. For detailed code assessment and conversion, continue with SSMA for Oracle.
+
 ## Recommended Migration Process  
 To successfully migrate objects and data from Oracle databases to [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], Azure SQL Database, or Azure Synapse Analytics, use the following process:
   
diff --git a/docs/ssma/oracle/sql-server-migration-assistant-for-oracle-oracletosql.md b/docs/ssma/oracle/sql-server-migration-assistant-for-oracle-oracletosql.md
@@ -20,6 +20,9 @@ manager: madhuriy
   
 This documentation introduces you to SSMA for Oracle and provides step-by-step instructions for migrating Oracle databases to [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)]. The following table shows articles to help you learn more:  
   
+>[!Note]
+> Try new [Database Migration Assessment for Oracle extension in Azure Data Studio](../../azure-data-studio/extensions/database-migration-assessment-for-oracle-extension.md) for Oracle to SQL pre-assessment and workload categorization. If you are in early phase of Oracle to SQL migration and would need to do a high level workload assessment , interested in sizing Azure SQL target for the Oracle workload  or understand feature migration parity, try the new extension. For detailed code assessment and conversion, continue with SSMA for Oracle.
+
 ## Contents  
   
 |Section|Description|
