Skip to content

Commit 1e2fa59

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/sql-docs-pr into WI-45775-Update-ASC-branding-to-MDC
2 parents c8f16af + a1471bc commit 1e2fa59

2,044 files changed

Lines changed: 5856 additions & 5082 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58910,6 +58910,11 @@
5891058910
"redirect_url": "/sql/ssms/menu-help/sql-server-management-studio-menu-help",
5891158911
"redirect_document_id": false
5891258912
},
58913+
{
58914+
"source_path": "docs/ssms/output-window.md",
58915+
"redirect_url": "/sql/ssms/menu-help/options-output-window-page",
58916+
"redirect_document_id": true
58917+
},
5891358918
{
5891458919
"source_path": "docs/ssms/object/index.md",
5891558920
"redirect_url": "/sql/ssms/object/object-explorer",

azure-sql/database/active-geo-replication-configure-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ To configure active geo-replication, you need a database in Azure SQL Database.
3939

4040
Prepare your environment for the Azure CLI.
4141

42-
[!INCLUDE [azure-cli-prepare-your-environment-no-header](../includes/azure-cli-prepare-your-environment-no-header.md)]
42+
[!INCLUDE [azure-cli-prepare-your-environment-no-header](~/../azure-sql/reusable-content/azure-cli/azure-cli-prepare-your-environment-no-header.md)]
4343

4444
---
4545

azure-sql/database/automated-backups-change-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ To change the PITR backup retention period or the differential backup frequency
6161

6262
Prepare your environment for the Azure CLI:
6363

64-
[!INCLUDE[azure-cli-prepare-your-environment-no-header](../includes/azure-cli-prepare-your-environment-no-header.md)]
64+
[!INCLUDE[azure-cli-prepare-your-environment-no-header](~/../azure-sql/reusable-content/azure-cli/azure-cli-prepare-your-environment-no-header.md)]
6565

6666
Change the PITR backup retention and differential backup frequency for active databases by using the following example:
6767

azure-sql/database/az-cli-script-samples-content-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ You can configure Azure SQL Database and SQL Managed Instance by using the <a hr
3333

3434
[!INCLUDE [quickstarts-free-trial-note](../includes/quickstarts-free-trial-note.md)]
3535

36-
[!INCLUDE [azure-cli-prepare-your-environment.md](../includes/azure-cli-prepare-your-environment.md)]
36+
[!INCLUDE [azure-cli-prepare-your-environment.md](~/../azure-sql/reusable-content/azure-cli/azure-cli-prepare-your-environment.md)]
3737

3838
## Samples
3939

azure-sql/database/azure-defender-for-sql.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,6 @@ To view and manage Microsoft Defender for SQL settings:
9898

9999
## Next steps
100100

101-
- Learn more about [Vulnerability Assessment](sql-vulnerability-assessment.md)
101+
- Learn more about [Vulnerability Assessment](/azure/defender-for-cloud/sql-azure-vulnerability-assessment-overview)
102102
- Learn more about [Advanced Threat Protection](threat-detection-configure.md)
103-
- Learn more about [Microsoft Defender for Cloud](/azure/defender-for-cloud/defender-for-cloud-introduction)
103+
- Learn more about [Microsoft Defender for Cloud](/azure/defender-for-cloud/defender-for-cloud-introduction)

azure-sql/database/connect-query-nodejs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ To complete this quickstart, you need:
3232
| Action | SQL Database | SQL Managed Instance | SQL Server on Azure VM |
3333
|:--- |:--- |:---|:---|
3434
| Create| [Portal](single-database-create-quickstart.md) | [Portal](../managed-instance/instance-create-quickstart.md) | [Portal](../virtual-machines/windows/sql-vm-create-portal-quickstart.md)
35-
|| [CLI](scripts/create-and-configure-database-cli.md) | [Bicep](/azure/azure-sql/managed-instance/create-bicep-quickstart) |
35+
|| [CLI](scripts/create-and-configure-database-cli.md) | [Bicep](../managed-instance/create-bicep-quickstart.md) |
3636
|| [PowerShell](scripts/create-and-configure-database-powershell.md) | [PowerShell](../managed-instance/scripts/create-configure-managed-instance-powershell.md) | [PowerShell](../virtual-machines/windows/sql-vm-create-powershell-quickstart.md)
3737
| Configure | [Server-level IP firewall rule](firewall-create-server-level-portal-quickstart.md)| [Connectivity from a VM](../managed-instance/connect-vm-instance-configure.md)|
3838
|||[Connectivity from on-premises](../managed-instance/point-to-site-p2s-configure.md) | [Connect to a SQL Server instance](../virtual-machines/windows/sql-vm-create-portal-quickstart.md)

azure-sql/database/elastic-jobs-tsql-create-manage.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1340,11 +1340,8 @@ Shows all members of all target groups.
13401340
|**elastic_pool_name**|nvarchar(128)|Name of the Elastic pool contained in the target group. Specified only when target_type is 'SqlElasticPool'.|
13411341
|**shard_map_name**|nvarchar(128)|Name of the shard maps contained in the target group. Specified only when target_type is 'SqlShardMap'.|
13421342

1343-
## Resources
1344-
1345-
- ![Topic link icon](/sql/database-engine/configure-windows/media/topic-link.gif "Topic link icon") [Transact-SQL Syntax Conventions](/sql/t-sql/language-elements/transact-sql-syntax-conventions-transact-sql)
1346-
13471343
## Next steps
13481344

1345+
- [Transact-SQL syntax conventions](/sql/t-sql/language-elements/transact-sql-syntax-conventions-transact-sql)
13491346
- [Create and manage Elastic Jobs using PowerShell](elastic-jobs-powershell-create.md)
13501347
- [Authorization and Permissions](/dotnet/framework/data/adonet/sql/authorization-and-permissions-in-sql-server)

azure-sql/database/elastic-transactions-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,9 @@ The following limitations currently apply to elastic database transactions in *S
265265
* Only client-coordinated transactions from a .NET application are supported. Server-side support for T-SQL such as BEGIN DISTRIBUTED TRANSACTION is planned, but not yet available.
266266
* Transactions across WCF services aren't supported. For example, you have a WCF service method that executes a transaction. Enclosing the call within a transaction scope will fail as a [System.ServiceModel.ProtocolException](/dotnet/api/system.servicemodel.protocolexception).
267267

268-
The following limitations currently apply to distributed transactions in *SQL Managed Instance*:
268+
The following limitations currently apply to distributed transactions (also known as elastic transactions or natively supported distributed transactions) in *SQL Managed Instance*:
269269

270-
* Only transactions across databases in managed instances are supported. Other [X/Open XA](https://en.wikipedia.org/wiki/X/Open_XA) resource providers and databases outside of Azure SQL Managed Instance can't participate in distributed transactions. That means that distributed transactions can't stretch across on-premises SQL Server and Azure SQL Managed Instance. For distributed transactions on premises, continue to use MSDTC.
270+
* With this technology, only transactions across databases in managed instances are supported. For all other scenarios that may include [X/Open XA](https://en.wikipedia.org/wiki/X/Open_XA) resource providers and databases outside of Azure SQL Managed Instance you should configure [DTC for Azure SQL Managed Instance](../managed-instance/distributed-transaction-coordinator-dtc.md).
271271
* Transactions across WCF services aren't supported. For example, you have a WCF service method that executes a transaction. Enclosing the call within a transaction scope will fail as a [System.ServiceModel.ProtocolException](/dotnet/api/system.servicemodel.protocolexception).
272272
* Azure SQL Managed Instance must be part of a [Server trust group](../managed-instance/server-trust-group-overview.md) in order to participate in distributed transaction.
273273
* Limitations of [Server trust groups](../managed-instance/server-trust-group-overview.md) affect distributed transactions.

azure-sql/database/high-availability-sla.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ The zone-redundant version of the high availability architecture is illustrated
9595
- For zone redundant availability, choosing a [maintenance window](./maintenance-window.md) other than the default is currently available in [select regions](maintenance-window.md#azure-region-support).
9696

9797
> [!IMPORTANT]
98-
> For zone redundant availability, choosing a [maintenance window](/azure/azure-sql/database/maintenance-window) other than the default is currently available in [select regions](/azure/azure-sql/database/maintenance-window?view=azuresql&preserve-view=true#azure-region-support).
98+
> For zone redundant availability, choosing a [maintenance window](./maintenance-window.md) other than the default is currently available in [select regions](./maintenance-window.md?preserve-view=true&view=azuresql#azure-region-support).
9999
100100
During preview, zone redundancy for SQL Managed Instance is available in the Business Critical service tier and supported in the following regions:
101101

@@ -277,4 +277,4 @@ Azure SQL Database and Azure SQL Managed Instance feature a built-in high availa
277277
- Learn about [Service Fabric](/azure/service-fabric/service-fabric-overview)
278278
- Learn about [Azure Traffic Manager](/azure/traffic-manager/traffic-manager-overview)
279279
- Learn [How to initiate a manual failover on SQL Managed Instance](../managed-instance/user-initiated-failover.md)
280-
- For more options for high availability and disaster recovery, see [Business Continuity](business-continuity-high-availability-disaster-recover-hadr-overview.md)
280+
- For more options for high availability and disaster recovery, see [Business Continuity](business-continuity-high-availability-disaster-recover-hadr-overview.md)

azure-sql/database/hyperscale-database-create-quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ The Azure CLI code blocks in this section create a resource group, server, singl
8181

8282
[!INCLUDE [quickstarts-free-trial-note](../includes/quickstarts-free-trial-note.md)]
8383

84-
[!INCLUDE [azure-cli-prepare-your-environment.md](../includes/azure-cli-prepare-your-environment-h3.md)]
84+
[!INCLUDE [azure-cli-prepare-your-environment.md](~/../azure-sql/reusable-content/azure-cli/azure-cli-prepare-your-environment-h3.md)]
8585

8686
[!INCLUDE [cli-launch-cloud-shell-sign-in.md](../includes/cli-launch-cloud-shell-sign-in.md)]
8787

0 commit comments

Comments
 (0)