Merge branch 'main' into release-arc-data

Author: v-alje

docs/database-engine/install-windows/install-sql-server-from-the-command-prompt.md

@@ -1,10 +1,10 @@
 ---
 title: "Shrink a database"
-description: Learn how to shrink a database by using Object in SQL Server by using SQL Server Management Studio or Transact-SQL.
+description: Learn how to shrink a database in SQL Server by using SQL Server Management Studio or Transact-SQL.
 author: WilliamDAssafMSFT
 ms.author: wiassaf
 ms.reviewer: randolphwest
-ms.date: 04/04/2023
+ms.date: 11/01/2023
 ms.service: sql
 ms.subservice: supportability
 ms.topic: conceptual
@@ -54,8 +54,12 @@ Requires membership in the **sysadmin** fixed server role or the **db_owner** fi
 
 Shrink operations in progress can block other queries on the database, and can be blocked by queries already in progress. Introduced in [!INCLUDE[sssql22-md](../../includes/sssql22-md.md)], shrink database operations have a WAIT_AT_LOW_PRIORITY option. This feature is a new additional option for `DBCC SHRINKDATABASE` and `DBCC SHRINKFILE`. If a new shrink operation in WAIT_AT_LOW_PRIORITY mode can't obtain the necessary locks due to a long-running query already in progress, the shrink operation will eventually time out after one minute and silently exit, preventing other queries from being blocked. For more information, see [DBCC SHRINKDATABASE](../../t-sql/database-console-commands/dbcc-shrinkdatabase-transact-sql.md).
 
+For information on file management and shrink operations specific to Azure SQL Database, see [Manage file space for databases in Azure SQL Database](/azure/azure-sql/database/file-space-manage?view=azuresql-db&preserve-view=true).
+
 ## <a id="SSMSProcedure"></a> Use SQL Server Management Studio
 
+**Applies to:** SQL Server, Azure SQL Managed Instance
+
 #### Shrink a database
 
 1. In **Object Explorer**, connect to an instance of the [!INCLUDE[ssDEnoversion](../../includes/ssdenoversion-md.md)], and then expand that instance.
@@ -98,21 +102,19 @@ Shrink operations in progress can block other queries on the database, and can b
 
 [!code-sql[DBCC#DBCC_SHRINKDB1](codesnippet/tsql/shrink-a-database_1.sql)]
 
-## <a id="FollowUp"></a> Follow Up: After you shrink a database
+## <a id="FollowUp"></a> After you shrink a database
 
  Data that is moved to shrink a file can be scattered to any available location in the file. This causes index fragmentation and can slow the performance of queries that search a range of the index. To eliminate the fragmentation, consider rebuilding the indexes on the file after shrinking. For more information, see [Rebuild an index](../../relational-databases/indexes/reorganize-and-rebuild-indexes.md#rebuild-an-index).
 
-## See also
+## Related content
 
 - [Shrink the tempdb database](shrink-tempdb-database.md)
 - [Considerations for the autogrow and autoshrink settings in SQL Server](/troubleshoot/sql/admin/considerations-autogrow-autoshrink)
 - [Database Files and Filegroups](database-files-and-filegroups.md)
 - [sys.databases (Transact-SQL)](../../relational-databases/system-catalog-views/sys-databases-transact-sql.md)
 - [sys.database_files (Transact-SQL)](../../relational-databases/system-catalog-views/sys-database-files-transact-sql.md)
-
-## Next steps
-
 - [DBCC SHRINKDATABASE (Transact-SQL)](../../t-sql/database-console-commands/dbcc-shrinkdatabase-transact-sql.md)
 - [DBCC SHRINKFILE (Transact-SQL)](../../t-sql/database-console-commands/dbcc-shrinkfile-transact-sql.md)
 - [Delete Data or Log Files from a Database](delete-data-or-log-files-from-a-database.md)
 - [Shrink a file](shrink-a-file.md)
+- [Manage file space for databases in Azure SQL Database](/azure/azure-sql/database/file-space-manage?view=azuresql-db&preserve-view=true)

docs/relational-databases/databases/shrink-a-database.md

@@ -281,9 +281,9 @@ When `NULL` is returned for the linked server login, it indicates that the login
 
 If you're using Azure SQL Managed Instance, see the following examples from [sp_addlinkedserver (Transact-SQL)](../system-stored-procedures/sp-addlinkedserver-transact-sql.md):
 
-- [Create SQL Managed Instance linked server with managed identity Microsoft Entra authentication](../system-stored-procedures/sp-addlinkedserver-transact-sql.md#h-create-sql-managed-instance-linked-server-with-managed-identity-azure-ad-authentication)
+- [Create SQL Managed Instance linked server with managed identity Microsoft Entra authentication](../system-stored-procedures/sp-addlinkedserver-transact-sql.md#managed-identity-authentication)
 
-- [Create SQL Managed Instance linked server with pass-through Microsoft Entra authentication](../system-stored-procedures/sp-addlinkedserver-transact-sql.md#i-create-sql-managed-instance-linked-server-with-pass-through-azure-ad-authentication)
+- [Create SQL Managed Instance linked server with pass-through Microsoft Entra authentication](../system-stored-procedures/sp-addlinkedserver-transact-sql.md#pass-through-authentication)
 
 ## Next steps