Skip to content

Commit 59f815d

Browse files
MashaMSFTMashaMSFT
authored
Merge pull request #24404 from MicrosoftDocs/main
Updating upstream branch with changes from main
2 parents a554183 + c806678 commit 59f815d

958 files changed

Lines changed: 13756 additions & 7132 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.azure-sql.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,21 @@
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
552+
},
553+
{
554+
"source_path_from_root": "/azure-sql/virtual-machines/windows/migrate-to-vm-from-sql-server.md",
555+
"redirect_url": "/azure/azure-sql/migration-guides/virtual-machines/sql-server-to-sql-on-azure-vm-individual-databases-guide",
556+
"redirect_document_id": false
542557
}
543558
]
544559
}

‎.openpublishing.redirection.json‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41596,7 +41596,7 @@
4159641596
"redirect_document_id": false
4159741597
},
4159841598
{
41599-
"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",
4160041600
"redirect_url": "/sql/azdata/reference/reference-azdata-bdc-spark-session",
4160141601
"redirect_document_id": false
4160241602
},
@@ -59454,6 +59454,21 @@
5945459454
"source_path": "docs/tools/sqlpackage/troubleshooting-import-export-sqlpackage.md",
5945559455
"redirect_url": "/sql/tools/sqlpackage/troubleshooting-issues-and-performance-with-sqlpackage",
5945659456
"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
5945759472
}
5945859473
]
5945959474
}

‎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 [SQL Server technical documentation](https://docs.microsoft.com/sql).
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 [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/azure-sql-iaas-vs-paas-what-is-overview.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Azure SQL is built upon the familiar SQL Server engine, so you can migrate appli
3131
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.
3232

3333
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):
34-
> [!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]
3535
3636

3737

‎azure-sql/database/analyze-prevent-deadlocks.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,5 +815,5 @@ Learn more about performance in Azure SQL Database:
815815
- [Transaction Locking and Row Versioning Guide](/sql/relational-databases/sql-server-transaction-locking-and-row-versioning-guide)
816816
- [SET TRANSACTION ISOLATION LEVEL](/sql/t-sql/statements/set-transaction-isolation-level-transact-sql)
817817
- [Azure SQL Database: Improving Performance Tuning with Automatic Tuning](/Shows/Data-Exposed/Azure-SQL-Database-Improving-Performance-Tuning-with-Automatic-Tuning)
818-
- [Deliver consistent performance with Azure SQL](/learn/modules/azure-sql-performance/)
818+
- [Deliver consistent performance with Azure SQL](/training/modules/azure-sql-performance/)
819819
- [Retry logic for transient errors](troubleshoot-common-connectivity-issues.md#retry-logic-for-transient-errors).

0 commit comments

Comments
 (0)