Skip to content

Commit c18f665

Browse files
authored
Merge pull request #1 from MicrosoftDocs/main
Merge with master
2 parents 4ca340b + 253a464 commit c18f665

4,751 files changed

Lines changed: 79103 additions & 64494 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.publish.config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@
181181
"enable_pull_request_custom_validation": true,
182182
"redirection_files": [
183183
".openpublishing.redirection.azure-sql.json",
184-
".openpublishing.redirection.azure-data-studio.json"
184+
".openpublishing.redirection.azure-data-studio.json",
185+
".openpublishing.redirection.powershell.json"
185186
]
186187
}

.openpublishing.redirection.azure-sql.json

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,21 @@
100100
"redirect_url": "/azure/azure-sql/database/service-tiers-vcore",
101101
"redirect_document_id": false
102102
},
103+
{
104+
"source_path_from_root": "/azure-sql/database/high-availability-sla.md",
105+
"redirect_url": "/azure/azure-sql/database/high-availability-sla-local-zone-redundancy",
106+
"redirect_document_id": true
107+
},
108+
{
109+
"source_path_from_root": "/azure-sql/managed-instance/high-availability-sla.md",
110+
"redirect_url": "/azure/azure-sql/managed-instance/high-availability-sla-local-zone-redundancy",
111+
"redirect_document_id": true
112+
},
113+
{
114+
"source_path_from_root": "/azure-sql/managed-instance/november-2022-feature-wave-enroll.md",
115+
"redirect_url": "/azure/azure-sql/managed-instance/doc-changes-updates-release-notes-whats-new#november-2022-feature-wave",
116+
"redirect_document_id": false
117+
},
103118
{
104119
"source_path_from_root": "/azure-sql/managed-instance/azure-app-sync-network-configuration.md",
105120
"redirect_url": "/azure/azure-sql/managed-instance/",
@@ -710,6 +725,81 @@
710725
"redirect_url": "/azure/azure-sql/database/authentication-mfa-ssms-overview",
711726
"redirect_document_id": false
712727
},
728+
{
729+
"source_path_from_root": "/azure-sql/migration-guides/managed-instance/sql-server-to-managed-instance-guide.md",
730+
"redirect_url": "/data-migration/sql-server/managed-instance/guide",
731+
"redirect_document_id": false
732+
},
733+
{
734+
"source_path_from_root": "/azure-sql/migration-guides/managed-instance/sql-server-to-managed-instance-overview.md",
735+
"redirect_url": "/data-migration/sql-server/managed-instance/overview",
736+
"redirect_document_id": false
737+
},
738+
{
739+
"source_path_from_root": "/azure-sql/migration-guides/managed-instance/sql-server-to-sql-managed-instance-assessment-rules.md",
740+
"redirect_url": "/data-migration/sql-server/managed-instance/assessment-rules",
741+
"redirect_document_id": false
742+
},
743+
{
744+
"source_path_from_root": "/azure-sql/migration-guides/managed-instance/sql-server-to-managed-instance-performance-baseline.md",
745+
"redirect_url": "/data-migration/sql-server/managed-instance/performance-baseline",
746+
"redirect_document_id": false
747+
},
748+
{
749+
"source_path_from_root": "/azure-sql/migration-guides/database/sql-server-to-sql-database-guide.md",
750+
"redirect_url": "/data-migration/sql-server/database/guide",
751+
"redirect_document_id": false
752+
},
753+
{
754+
"source_path_from_root": "/azure-sql/migration-guides/database/sql-server-to-sql-database-overview.md",
755+
"redirect_url": "/data-migration/sql-server/database/overview",
756+
"redirect_document_id": false
757+
},
758+
{
759+
"source_path_from_root": "/azure-sql/migration-guides/database/sql-server-to-sql-database-assessment-rules.md",
760+
"redirect_url": "/data-migration/sql-server/database/assessment-rules",
761+
"redirect_document_id": false
762+
},
763+
{
764+
"source_path_from_root": "/azure-sql/migration-guides/virtual-machines/sql-server-to-sql-on-azure-vm-individual-databases-guide.md",
765+
"redirect_url": "/data-migration/sql-server/virtual-machines/guide",
766+
"redirect_document_id": false
767+
},
768+
{
769+
"source_path_from_root": "/azure-sql/migration-guides/virtual-machines/sql-server-to-sql-on-azure-vm-migration-overview.md",
770+
"redirect_url": "/data-migration/sql-server/virtual-machines/overview",
771+
"redirect_document_id": false
772+
},
773+
{
774+
"source_path_from_root": "/azure-sql/migration-guides/virtual-machines/sql-server-availability-group-to-sql-on-azure-vm.md",
775+
"redirect_url": "/data-migration/sql-server/virtual-machines/availability-group-migrate",
776+
"redirect_document_id": false
777+
},
778+
{
779+
"source_path_from_root": "/azure-sql/migration-guides/virtual-machines/sql-server-distributed-availability-group-complete-migration.md",
780+
"redirect_url": "/data-migration/sql-server/virtual-machines/distributed-availability-group-migrate-complete",
781+
"redirect_document_id": false
782+
},
783+
{
784+
"source_path_from_root": "/azure-sql/migration-guides/virtual-machines/sql-server-distributed-availability-group-migrate-ag.md",
785+
"redirect_url": "/data-migration/sql-server/virtual-machines/distributed-availability-group-migrate-availability-group",
786+
"redirect_document_id": false
787+
},
788+
{
789+
"source_path_from_root": "/azure-sql/migration-guides/virtual-machines/sql-server-distributed-availability-group-migrate-prerequisites.md",
790+
"redirect_url": "/data-migration/sql-server/virtual-machines/distributed-availability-group-prerequisites",
791+
"redirect_document_id": false
792+
},
793+
{
794+
"source_path_from_root": "/azure-sql/migration-guides/virtual-machines/sql-server-distributed-availability-group-migrate-standalone-instance.md",
795+
"redirect_url": "/data-migration/sql-server/virtual-machines/distributed-availability-group-migrate-standalone-instance",
796+
"redirect_document_id": false
797+
},
798+
{
799+
"source_path_from_root": "/azure-sql/migration-guides/virtual-machines/sql-server-failover-cluster-instance-to-sql-on-azure-vm.md",
800+
"redirect_url": "/data-migration/sql-server/virtual-machines/failover-cluster-instance-migrate",
801+
"redirect_document_id": false
802+
},
713803
{
714804
"source_path_from_root": "/azure-sql/managed-instance/virtual-cluster-delete.md",
715805
"redirect_url": "/azure/azure-sql/managed-instance/virtual-cluster-architecture",
@@ -734,6 +824,11 @@
734824
"source_path_from_root": "/azure-sql/in-memory-sample.md",
735825
"redirect_url": "/azure/azure-sql/database/in-memory-oltp-sample",
736826
"redirect_document_id": false
827+
},
828+
{
829+
"source_path_from_root": "/azure-sql/database/alerts-insights-configure-portal.md",
830+
"redirect_url": "/azure/azure-sql/database/alerts-create",
831+
"redirect_document_id": false
737832
}
738833
]
739834
}

.openpublishing.redirection.json

Lines changed: 65 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2676,7 +2676,7 @@
26762676
"redirect_document_id": false
26772677
},
26782678
{
2679-
"source_path_from_root": "/docs/database-engine/determining-the-correct-bucket-count-for-hash-indexes.md",
2679+
"source_path": "docs/database-engine/determining-the-correct-bucket-count-for-hash-indexes.md",
26802680
"redirect_url": "/sql/relational-databases/sql-server-index-design-guide",
26812681
"redirect_document_id": false
26822682
},
@@ -20220,6 +20220,11 @@
2022020220
"redirect_url": "/previous-versions/sql/2014/relational-databases/databases/publish-a-database-sql-server-management-studio",
2022120221
"redirect_document_id": false
2022220222
},
20223+
{
20224+
"source_path": "docs/relational-databases/databases/publish-a-database-sql-server-management-studio.md",
20225+
"redirect_url": "/previous-versions/sql/2014/relational-databases/databases/publish-a-database-sql-server-management-studio",
20226+
"redirect_document_id": false
20227+
},
2022320228
{
2022420229
"source_path": "docs/2014/relational-databases/databases/rebuild-system-databases.md",
2022520230
"redirect_url": "/previous-versions/sql/2014/relational-databases/databases/rebuild-system-databases",
@@ -33570,6 +33575,41 @@
3357033575
"redirect_url": "/previous-versions/sql/2014/reporting-services/lesson-1-create-a-new-web-site",
3357133576
"redirect_document_id": false
3357233577
},
33578+
{
33579+
"source_path": "docs/reporting-services/lesson-1-creating-a-report-server-project-reporting-services.md",
33580+
"redirect_url": "/sql/reporting-services/tutorial-step-01-create-report-server-project-reporting-services",
33581+
"redirect_document_id": false
33582+
},
33583+
{
33584+
"source_path": "docs/reporting-services/lesson-2-specifying-connection-information-reporting-services.md",
33585+
"redirect_url": "/sql/reporting-services/tutorial-step-02-specify-connection-information-reporting-services",
33586+
"redirect_document_id": false
33587+
},
33588+
{
33589+
"source_path": "docs/reporting-services/tutorial-step-01-creating-report-server-project-reporting-services.md",
33590+
"redirect_url": "/sql/reporting-services/docs/reporting-services/tutorial-step-01-create-report-server-project-reporting-services",
33591+
"redirect_document_id": false
33592+
},
33593+
{
33594+
"source_path": "docs/reporting-services/lesson-3-defining-a-dataset-for-the-table-report-reporting-services.md",
33595+
"redirect_url": "/sql/reporting-services/tutorial-step-03-define-dataset-for-table-report-reporting-services",
33596+
"redirect_document_id": false
33597+
},
33598+
{
33599+
"source_path": "docs/reporting-services/lesson-4-adding-a-table-to-the-report-reporting-services.md",
33600+
"redirect_url": "/sql/reporting-services/tutorial-step-04-add-table-to-the-report-reporting-services",
33601+
"redirect_document_id": false
33602+
},
33603+
{
33604+
"source_path": "docs/reporting-services/lesson-5-formatting-a-report-reporting-services.md",
33605+
"redirect_url": "/sql/reporting-services/tutorial-step-05-format-report-reporting-services",
33606+
"redirect_document_id": false
33607+
},
33608+
{
33609+
"source_path": "docs/reporting-services/lesson-6-adding-grouping-and-totals-reporting-services.md",
33610+
"redirect_url": "/sql/reporting-services/tutorial-step-06-add-grouping-and-totals-reporting-services",
33611+
"redirect_document_id": false
33612+
},
3357333613
{
3357433614
"source_path": "docs/2014/reporting-services/lesson-1-creating-a-report-server-project-reporting-services.md",
3357533615
"redirect_url": "/previous-versions/sql/2014/reporting-services/lesson-1-creating-a-report-server-project-reporting-services",
@@ -41724,7 +41764,7 @@
4172441764
"source_path": "docs/tools/sql-server-profiler/sql-server-profiler-f1-help.md",
4172541765
"redirect_url": "/sql/tools/sql-server-profiler/sql-server-profiler",
4172641766
"redirect_document_id": false
41727-
},
41767+
},
4172841768
{
4172941769
"source_path": "docs/2014/ssms/visual-db-tools/modify-join-operators-visual-database-tools.md",
4173041770
"redirect_url": "/previous-versions/sql/2014/ssms/visual-db-tools/modify-join-operators-visual-database-tools",
@@ -44260,6 +44300,11 @@
4426044300
"redirect_url": "/sql/sql-server/azure-arc/connect-at-scale-script",
4426144301
"redirect_document_id": false
4426244302
},
44303+
{
44304+
"source_path": "docs/sql-server/azure-arc/patch.md",
44305+
"redirect_url": "/sql/sql-server/azure-arc/update",
44306+
"redirect_document_id": false
44307+
},
4426344308
{
4426444309
"source_path": "docs/azdata/reference/reference-azdata-arc.md",
4426544310
"redirect_url": "/azure/azure-arc/data/reference/overview",
@@ -46067,7 +46112,7 @@
4606746112
},
4606846113
{
4606946114
"source_path": "docs/2014/2014-toc/books-online-for-sql-server-2014.md",
46070-
"redirect_url": "/sql/2014-toc/index?view=sql-server-2014",
46115+
"redirect_url": "/sql/sql-server/previous-versions-sql-server?view=sql-server-ver16",
4607146116
"redirect_document_id": false
4607246117
},
4607346118
{
@@ -62584,7 +62629,7 @@
6258462629
"source_path": "docs/ssdt/release-notes-ssdt.md",
6258562630
"redirect_url": "/sql/ssdt/previous-releases-of-sql-server-data-tools-ssdt-and-ssdt-bi",
6258662631
"redirect_document_id": false
62587-
},
62632+
},
6258862633
{
6258962634
"source_path": "docs/odbc/microsoft/aggregate-function-limitations.md",
6259062635
"redirect_url": "/sql/odbc/microsoft/limitations",
@@ -62714,6 +62759,21 @@
6271462759
"source_path": "docs/ssms/release-notes-ssms-20.md",
6271562760
"redirect_url": "/sql/ssms/release-notes-ssms",
6271662761
"redirect_document_id": false
62762+
},
62763+
{
62764+
"source_path": "docs/t-sql/language-elements/continue-transact-sql.md",
62765+
"redirect_url": "/sql/t-sql/language-elements/while-transact-sql",
62766+
"redirect_document_id": false
62767+
},
62768+
{
62769+
"source_path": "docs/connect/php/configuring-iis-for-php-sql-driver.md",
62770+
"redirect_url": "/sql/connect/php/download-drivers-php-sql-server",
62771+
"redirect_document_id": false
62772+
},
62773+
{
62774+
"source_path": "docs/ssdt/how-to-clone-an-existing-database.md",
62775+
"redirect_url": "/sql/t-sql/statements/create-table-as-clone-of-transact-sql",
62776+
"redirect_document_id": false
6271762777
}
62718-
]
62778+
]
6271962779
}
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path": "docs/powershell/download-sql-server-ps-module.md",
5+
"redirect_url": "/powershell/sql-server/download-sql-server-ps-module",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "docs/powershell/encode-and-decode-sql-server-identifiers.md",
10+
"redirect_url": "/powershell/sql-server/encode-and-decode-sql-server-identifiers",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "docs/powershell/escape-sql-server-identifiers.md",
15+
"redirect_url": "/powershell/sql-server/escape-sql-server-identifiers",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "docs/powershell/how-to-enable-tcp-sqlps.md",
20+
"redirect_url": "/powershell/sql-server/how-to-enable-tcp-sqlps",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "docs/powershell/load-the-smo-assemblies-in-windows-powershell.md",
25+
"redirect_url": "/powershell/sql-server/load-the-smo-assemblies-in-windows-powershell",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "docs/powershell/manage-authentication-in-database-engine-powershell.md",
30+
"redirect_url": "/powershell/sql-server/manage-authentication-in-database-engine-powershell",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "docs/powershell/manage-tab-completion-sql-server-powershell.md",
35+
"redirect_url": "/powershell/sql-server/manage-tab-completion-sql-server-powershell",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "docs/powershell/navigate-sql-server-powershell-paths.md",
40+
"redirect_url": "/powershell/sql-server/navigate-sql-server-powershell-paths",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "docs/powershell/query-expressions-and-uniform-resource-names.md",
45+
"redirect_url": "/powershell/sql-server/query-expressions-and-uniform-resource-names",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "docs/powershell/run-windows-powershell-from-sql-server-management-studio.md",
50+
"redirect_url": "/powershell/sql-server/run-windows-powershell-from-sql-server-management-studio",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "docs/powershell/run-windows-powershell-steps-in-sql-server-agent.md",
55+
"redirect_url": "/powershell/sql-server/run-windows-powershell-steps-in-sql-server-agent",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "docs/powershell/specify-instances-in-the-sql-server-powershell-provider.md",
60+
"redirect_url": "/powershell/sql-server/specify-instances-in-the-sql-server-powershell-provider",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "docs/powershell/sql-server-identifiers-in-powershell.md",
65+
"redirect_url": "/powershell/sql-server/sql-server-identifiers-in-powershell",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "docs/powershell/sql-server-powershell-provider.md",
70+
"redirect_url": "/powershell/sql-server/sql-server-powershell-provider",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "docs/powershell/sql-server-powershell.md",
75+
"redirect_url": "/powershell/sql-server/sql-server-powershell",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path": "docs/powershell/work-with-sql-server-powershell-paths.md",
80+
"redirect_url": "/powershell/sql-server/work-with-sql-server-powershell-paths",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path": "docs/database-engine/install-windows/install-sql-server-powershell.md",
85+
"redirect_url": "/powershell/sql-server/download-sql-server-ps-module",
86+
"redirect_document_id": false
87+
}
88+
]
89+
}

azure-sql/azure-hybrid-benefit.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,8 @@ SQL Database and SQL Managed Instance customers have the following rights associ
120120

121121
|License footprint|What does Azure Hybrid Benefit for SQL Server get you?|
122122
|---|---|
123-
|SQL Server Enterprise Edition core customers with SA|<li>Can pay base rate on Hyperscale, General Purpose, or Business Critical SKU</li><br><li>One core on-premises = Four vCores in Hyperscale SKU<sup>1</sup></li><br><li>One core on-premises = Four vCores in General Purpose SKU</li><br><li>One core on-premises = One vCore in Business Critical SKU</li>|
124-
|SQL Server Standard Edition core customers with SA|<li>Can pay base rate on Hyperscale, General Purpose, or Business Critical SKU</li><br><li>One core on-premises = One vCore in Hyperscale SKU<sup>1</sup></li><br><li>One core on-premises = One vCore in General Purpose SKU</li><br><li>Four cores on-premises = One vCore in Business Critical SKU</li>|
125-
126-
<sup>1</sup> Simplified pricing for SQL Database Hyperscale coming soon. Review the [Hyperscale pricing blog](https://aka.ms/hsignite2023) for details.
123+
|SQL Server Enterprise Edition core customers with SA|<li>Can pay base rate on General Purpose or Business Critical SKU</li><li>One core on-premises = Four vCores in General Purpose SKU</li><li>One core on-premises = One vCore in Business Critical SKU</li>|
124+
|SQL Server Standard Edition core customers with SA|<li>Can pay base rate on General Purpose or Business Critical SKU</li><li>One core on-premises = One vCore in General Purpose SKU</li><li>Four cores on-premises = One vCore in Business Critical SKU</li>|
127125

128126
## Next steps
129127

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
@@ -84,7 +84,7 @@ With SQL Server, built-in features and functionality often require extensive con
8484

8585
Azure SQL Database offers the following deployment options:
8686
- As a [*single database*](database/single-database-overview.md) with its own set of resources managed via a [logical server](database/logical-servers.md). A single database is similar to a [contained database](/sql/relational-databases/databases/contained-databases) in SQL Server. This option is optimized for modern application development of new cloud-born applications. [Hyperscale](database/service-tier-hyperscale.md) and [serverless](database/serverless-tier-overview.md) options are available.
87-
- An [*elastic pool*](database/elastic-pool-overview.md), which is a collection of databases with a shared set of resources managed via a [logical server](database/logical-servers.md). Single databases can be moved into and out of an elastic pool. This option is optimized for modern application development of new cloud-born applications using the multi-tenant SaaS application pattern. Elastic pools provide a cost-effective solution for managing the performance of multiple databases that have variable usage patterns. [Elastic pools for Hyperscale](database/hyperscale-elastic-pool-overview.md) are currently in preview
87+
- An [*elastic pool*](database/elastic-pool-overview.md), which is a collection of databases with a shared set of resources managed via a [logical server](database/logical-servers.md). Single databases can be moved into and out of an elastic pool. This option is optimized for modern application development of new cloud-born applications using the multi-tenant SaaS application pattern. Elastic pools provide a cost-effective solution for managing the performance of multiple databases that have variable usage patterns. [Elastic pools for Hyperscale](database/hyperscale-elastic-pool-overview.md) are currently in preview.
8888

8989

9090
### Azure SQL Managed Instance

0 commit comments

Comments
 (0)