Skip to content

Commit 619b1ba

Browse files
rwestMSFTrwestMSFT
committed
Merge branch 'main' into rw-0610-deprecated-articles
2 parents cb702a7 + 77107e6 commit 619b1ba

5,352 files changed

Lines changed: 61252 additions & 52563 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.

‎.github/workflows/stale.yml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,17 @@ jobs:
2020
exempt-pr-labels: keep-open
2121
stale-pr-message: >
2222
This pull request has been inactive for 14 days.
23-
If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.docs.microsoft.com/en-us/help/contribute/contribute-how-to-write-pull-request-automation) for instructions.
23+
If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.docs.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation?branch=main) for instructions.
2424
If this PR is inactive for 14 more days, it will be closed automatically. Thank you!
2525
26-
SQL Docs Team
26+
SQL Docs Team: [Contact Us](mailto:rogue1@microsoft.com)
2727
28-
[Contact Us](mailto:rogue1@microsoft.com)
29-
30-
[Contributor Guide](https://review.docs.microsoft.com/en-us/help/contribute/sql-server-docs-contribute?branch=master)
28+
[Contributor Guide](https://review.docs.microsoft.com/en-us/help/contribute/sql-server-docs-contribute?branch=main)
3129
close-pr-message: >
3230
This pull request has been inactive for 28 days. At this time, we are closing the PR.
3331
If you decide to continue working on your change, you can reopen the PR and continue working. Thank you!
3432
35-
SQL Docs Team
36-
37-
[Contact Us](mailto:rogue1@microsoft.com)
33+
SQL Docs Team: [Contact Us](mailto:rogue1@microsoft.com)
3834
39-
[Contributor Guide](https://review.docs.microsoft.com/en-us/help/contribute/sql-server-docs-contribute?branch=master)
35+
[Contributor Guide](https://review.docs.microsoft.com/en-us/help/contribute/sql-server-docs-contribute?branch=main)
4036

‎.openpublishing.redirection.azure-sql.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,16 @@
539539
"source_path_from_root": "/azure-sql/database/predictive-model-build-compare-tutorial.md",
540540
"redirect_url": "/sql/machine-learning/tutorials/r-predictive-model-train?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
541541
"redirect_document_id": false
542+
},
543+
{
544+
"source_path_from_root": "/azure-sql/managed-instance/custom-dns-configure.md",
545+
"redirect_url": "/azure/azure-sql/managed-instance/resolve-private-domain-names",
546+
"redirect_document_id": false
547+
},
548+
{
549+
"source_path_from_root": "/azure-sql/managed-instance/synchronize-vnet-dns-servers-setting-on-virtual-cluster.md",
550+
"redirect_url": "/azure/azure-sql/managed-instance/resolve-private-domain-names",
551+
"redirect_document_id": false
542552
}
543553
]
544554
}

‎.openpublishing.redirection.json‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41280,6 +41280,11 @@
4128041280
"redirect_url": "/sql/sql-server/",
4128141281
"redirect_document_id": false
4128241282
},
41283+
{
41284+
"source_path": "docs/relational-databases/integrated-acceleration/intel-quickassist.md",
41285+
"redirect_url": "/sql/relational-databases/integrated-acceleration/use-integrated-acceleration-and-offloading",
41286+
"redirect_document_id": false
41287+
},
4128341288
{
4128441289
"source_path": "docs/relational-databases/system-catalog-views/sys-sql-feature-restrictions.md",
4128541290
"redirect_url": "/sql/sql-server/what-s-new-in-sql-server-ver15",
@@ -41591,7 +41596,7 @@
4159141596
"redirect_document_id": false
4159241597
},
4159341598
{
41594-
"source_path": " docs/big-data-cluster/reference-azdata-bdc-spark-session.md",
41599+
"source_path": "docs/big-data-cluster/reference-azdata-bdc-spark-session.md",
4159541600
"redirect_url": "/sql/azdata/reference/reference-azdata-bdc-spark-session",
4159641601
"redirect_document_id": false
4159741602
},
@@ -59449,6 +59454,21 @@
5944959454
"source_path": "docs/tools/sqlpackage/troubleshooting-import-export-sqlpackage.md",
5945059455
"redirect_url": "/sql/tools/sqlpackage/troubleshooting-issues-and-performance-with-sqlpackage",
5945159456
"redirect_document_id": false
59457+
},
59458+
{
59459+
"source_path": "docs/sql-server/partner-big-data-cluster.md",
59460+
"redirect_url": "/sql/big-data-cluster/partner-big-data-cluster",
59461+
"redirect_document_id": false
59462+
},
59463+
{
59464+
"source_path": "azure-sql/database/ledger-digest-management-and-database-verification.md",
59465+
"redirect_url": "/sql/relational-databases/security/ledger/ledger-digest-management",
59466+
"redirect_document_id": false
59467+
},
59468+
{
59469+
"source_path": "docs/linux/sql-server-linux-release-notes.md",
59470+
"redirect_url": "/sql/linux/sql-server-linux-release-notes-2017",
59471+
"redirect_document_id": false
5945259472
}
5945359473
]
5945459474
}

‎CONTRIBUTING.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Thank you for taking the time to contribute to the Microsoft SQL Server documentation.
44

5-
This guide covers some general topics around contribution and refers out to our [contributors guide](https://docs.microsoft.com/contribute) for more detailed explanations where relevant.
5+
This guide covers some general topics around contribution and refers out to our [contributors guide](https://learn.microsoft.com/contribute) for more detailed explanations where relevant.
66

77
## Code of Conduct
88

@@ -15,14 +15,14 @@ There are many ways to contribute to the documentation, review the sections belo
1515

1616
### Editing in GitHub
1717

18-
Anyone can submit edits to our documentation. For more information, see [Quick edits to existing documents](https://docs.microsoft.com/contribute/#quick-edits-to-existing-documents) in our contributors guide.
18+
Anyone can submit edits to our documentation. For more information, see [Quick edits to existing documents](https://learn.microsoft.com/contribute/#quick-edits-to-existing-documents) in our contributors guide.
1919

2020
### Pull Request
2121

22-
Review the guidance for [Pull Requests](https://docs.microsoft.com/contribute/how-to-write-workflows-major#pull-request-processing) in our contributors guide.
22+
Review the guidance for [Pull Requests](https://learn.microsoft.com/contribute/how-to-write-workflows-major#pull-request-processing) in our contributors guide.
2323

2424
### Reporting Bugs and Suggesting Enhancements
2525

2626
Please use the Feedback tool at the bottom of any article to submit bugs and suggestions.
2727

28-
![Feedback Tool](media/feedback-tool.png)
28+
![Feedback Tool](media/feedback-tool.png)

‎ReadMe.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ For more information, see the [Code of Conduct FAQ](https://opensource.microsoft
1313

1414
# Microsoft SQL Server Technical Documentation
1515

16-
You've found the GitHub repository that houses the source for the SQL Server technical documentation published on [https://docs.microsoft.com](https://docs.microsoft.com).
16+
You've found the GitHub repository that houses the source for [SQL Server technical documentation](https://learn.microsoft.com/sql).
1717

1818
## Contribute to documentation
1919

2020
Anyone can submit changes to the SQL Server documentation. For more information, see [How to contribute to SQL Server Documentation](https://aka.ms/editsqldocs).
2121

2222
### Minor corrections
23-
Minor corrections or clarifications that you submit for documentation and code examples in this repo are covered by the [docs.microsoft.com - Terms of Use](https://docs.microsoft.com/legal/termsofuse).
23+
Minor corrections or clarifications that you submit for documentation and code examples in this repo are covered by the [Terms of Use](https://learn.microsoft.com/legal/termsofuse).
2424

2525
### Larger submissions
2626
If you submit a pull request with new content or significant changes to documentation or code examples and you are not an employee of Microsoft, we'll send a comment in GitHub asking you to submit an online Contribution License Agreement (CLA). We will need you to complete the online form before we can accept your pull request.
@@ -30,4 +30,4 @@ If you submit a pull request with new content or significant changes to document
3030
Explore the following resources:
3131

3232
- [How to contribute to SQL Server Documentation](https://aka.ms/editsqldocs)
33-
- [SQL Server documentation home](https://docs.microsoft.com/sql/index)
33+
- [SQL Server documentation home](https://learn.microsoft.com/sql/index)

‎azure-sql/accelerated-database-recovery.md‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
---
22
title: Accelerated database recovery
3-
titleSuffix: Azure SQL
4-
description: Accelerated database recovery provides fast and consistent database recovery, instantaneous transaction rollback, and aggressive log truncation for databases in the Azure SQL portfolio.
5-
ms.service: sql-database
6-
ms.subservice: backup-restore
7-
ms.custom: sqldbrb=4
8-
ms.devlang:
9-
ms.topic: conceptual
3+
titleSuffix: Azure SQL
4+
description: Accelerated database recovery provides fast and consistent database recovery, instantaneous transaction rollback, and aggressive log truncation for databases in the Azure SQL portfolio.
105
author: kfarlee
116
ms.author: kfarlee
127
ms.reviewer: mathoma, kendralittle, nvraparl, wiassaf
138
ms.date: 02/18/2022
9+
ms.service: sql-database
10+
ms.subservice: backup-restore
11+
ms.topic: conceptual
12+
ms.custom: sqldbrb=4
1413
monikerRange: "=azuresql||=azuresql-db||=azuresql-mi"
1514
---
1615
# Accelerated Database Recovery in Azure SQL

‎azure-sql/azure-hybrid-benefit.md‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
---
2-
title: Azure Hybrid Benefit
3-
titleSuffix: Azure SQL Database & SQL Managed Instance
2+
title: Azure Hybrid Benefit
3+
titleSuffix: Azure SQL Database & SQL Managed Instance
44
description: Use existing SQL Server licenses for Azure SQL Database and SQL Managed Instance discounts.
5-
services: sql-database
6-
ms.service: sql-db-mi
7-
ms.subservice: service-overview
8-
ms.custom: sqldbrb=4
9-
ms.topic: conceptual
105
author: rothja
116
ms.author: jroth
127
ms.reviewer: sashan, moslake, mathoma
138
ms.date: 11/09/2021
9+
ms.service: sql-db-mi
10+
ms.subservice: service-overview
11+
ms.topic: conceptual
12+
ms.custom: sqldbrb=4
1413
monikerRange: "=azuresql||=azuresql-db||=azuresql-mi"
1514
---
1615
# Azure Hybrid Benefit - Azure SQL Database & SQL Managed Instance

‎azure-sql/azure-sql-iaas-vs-paas-what-is-overview.md‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
---
22
title: "What is Azure SQL?"
3-
description: "Learn about the different options within the Azure SQL family of services: Azure SQL Database, Azure SQL Managed Instance, and SQL Server on Azure VM."
4-
services: sql-database
5-
ms.service: sql-database
6-
ms.subservice: service-overview
7-
ms.custom: sqldbrb=4
8-
ms.devlang:
9-
ms.topic: overview
10-
keywords: SQL Server cloud, SQL Server in the cloud, PaaS database, cloud SQL Server, DBaaS, IaaS
3+
description: "Learn about the different options within the Azure SQL family of services: Azure SQL Database, Azure SQL Managed Instance, and SQL Server on Azure VM."
114
author: MashaMSFT
125
ms.author: mathoma
136
ms.reviewer: kendralittle
147
ms.date: 03/18/2022
8+
ms.service: sql-database
9+
ms.subservice: service-overview
10+
ms.topic: overview
11+
ms.custom: sqldbrb=4
12+
keywords:
13+
- SQL Server cloud
14+
- SQL Server in the cloud
15+
- PaaS database
16+
- cloud SQL Server
17+
- DBaaS
18+
- IaaS
1519
---
1620
# What is Azure SQL?
1721
[!INCLUDE[appliesto-asf](includes/appliesto-asf.md)]
@@ -27,7 +31,7 @@ Azure SQL is built upon the familiar SQL Server engine, so you can migrate appli
2731
Learn how each product fits into Microsoft's Azure SQL data platform to match the right option for your business requirements. Whether you prioritize cost savings or minimal administration, this article can help you decide which approach delivers against the business requirements you care about most.
2832

2933
If you're new to Azure SQL, check out the *What is Azure SQL* video from our in-depth [Azure SQL video series](/shows/Azure-SQL-for-Beginners/?WT.mc_id=azuresql4beg_azuresql-ch9-niner):
30-
> [!VIDEO https://docs.microsoft.com/shows/Azure-SQL-for-Beginners/What-is-Azure-SQL-3-of-61/player]
34+
> [!VIDEO https://learn.microsoft.com/shows/Azure-SQL-for-Beginners/What-is-Azure-SQL-3-of-61/player]
3135
3236

3337

‎azure-sql/capacity-errors-troubleshoot.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
---
22
title: Resolve capacity errors with Azure SQL resources
3-
description: Learn how to resolve possible capacity errors when attempting to deploy or scale Azure SQL Database or Azure SQL Managed Instance resources.
4-
services: sql-database
5-
ms.service: sql-db-mi
6-
ms.subservice: deployment-configuration
7-
ms.topic: how-to
3+
description: Learn how to resolve possible capacity errors when attempting to deploy or scale Azure SQL Database or Azure SQL Managed Instance resources.
84
author: sachinpMSFT
95
ms.author: sachinp
106
ms.reviewer: mathoma, kendralittle
117
ms.date: 09/03/2021
8+
ms.service: sql-db-mi
9+
ms.subservice: deployment-configuration
10+
ms.topic: how-to
1211
ms.custom: references_regions
1312
---
1413

‎azure-sql/database/active-directory-interactive-connect-azure-sql-db.md‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
---
22
title: ActiveDirectoryInteractive connects to SQL
33
description: "C# Code example, with explanations, for connecting to Azure SQL Database by using SqlAuthenticationMethod.ActiveDirectoryInteractive mode."
4-
services:
5-
- "sql-database"
4+
author: GithubMirek
5+
ms.author: MirekS
6+
ms.reviewer: wiassaf, vanto, mathoma
7+
ms.date: 04/06/2022
68
ms.service: sql-database
79
ms.subservice: security
10+
ms.topic: conceptual
811
ms.custom:
912
- "active directory"
1013
- "has-adal-ref"
1114
- "sqldbrb=1"
12-
ms.topic: conceptual
13-
author: GithubMirek
14-
ms.author: MirekS
15-
ms.reviewer: wiassaf, vanto, mathoma
16-
ms.date: 04/06/2022
1715
---
1816
# Connect to Azure SQL Database with Azure AD Multi-Factor Authentication
1917
[!INCLUDE[appliesto-sqldb](../includes/appliesto-sqldb.md)]

0 commit comments

Comments
 (0)