Skip to content

Commit 7ecf50e

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/sql-docs-pr (branch live)
2 parents ccb0e7f + 02d4416 commit 7ecf50e

146 files changed

Lines changed: 1117 additions & 674 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: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,16 @@
730730
"redirect_url": "/sql/database-engine/availability-groups/windows/configure-flexible-automatic-failover-policy",
731731
"redirect_document_id": true
732732
},
733+
{
734+
"source_path": "docs/database-engine/install-windows/are-you-upgrading-from-sql-server-2005.md",
735+
"redirect_url": "/sql/sql-server/end-of-support/sql-server-end-of-life-overview",
736+
"redirect_document_id": true
737+
},
738+
{
739+
"source_path": "docs/lp/sql-server/load-move-data.md",
740+
"redirect_url": "/sql/sql-server/migrate/",
741+
"redirect_document_id": true
742+
},
733743
{
734744
"source_path": "docs/2014/2014-toc/books-online-for-sql-server-2014.md",
735745
"redirect_url": "/sql/2014-toc/index?view=sql-server-2014",
@@ -16501,4 +16511,4 @@
1650116511
"redirect_document_id": false
1650216512
}
1650316513
]
16504-
}
16514+
}

docs/database-engine/install-windows/are-you-upgrading-from-sql-server-2005.md

Lines changed: 0 additions & 76 deletions
This file was deleted.
6.58 KB
Loading

docs/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ conceptualContent:
132132
itemType: overview
133133
footerLink:
134134
text: See more
135-
url: lp/sql-server/load-move-data.md
135+
url: sql-server/migrate/index.yml
136136

137137

138138
additionalContent:

docs/integration-services/devops/ssis-devops-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ But whether the specific authentication type is supported depends on destination
9191

9292
| |Microsoft-hosted agent|Self-hosted agent|
9393
|---------|---------|---------|
94-
|Self-hosted agent|N/A|Windows Authentication|
95-
|Azure SQL|SQL Server Authentication <br> Active Directory - Password|<br> SQL Server Authentication <br> Active Directory - Password <br> Active Directory - Integrated|
94+
|SQL server on-premises or VM |N/A|Windows Authentication|
95+
|Azure SQL|SQL Server Authentication <br> Active Directory - Password|SQL Server Authentication <br> Active Directory - Password <br> Active Directory - Integrated|
9696

9797
#### Domain name
9898

0 commit comments

Comments
 (0)