Skip to content

Commit b24d3cf

Browse files
MashaMSFTMashaMSFT
committed
CSAT OKR
1 parent 4b1a04b commit b24d3cf

10 files changed

Lines changed: 77 additions & 166 deletions

‎.openpublishing.redirection.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,15 @@
5050
"redirect_url": "/sql/big-data-cluster/reference-azdata",
5151
"redirect_document_id": false
5252
},
53+
{
54+
"source_path": "docs/database-engine/install-windows/installation-for-sql-server.md",
55+
"redirect_url": "/sql/database-engine/install-windows/install-sql-server",
56+
"redirect_document_id": false
57+
},
5358
{
5459
"source_path": "docs/database-engine/discontinued-database-engine-functionality-in-sql-server-2016.md",
5560
"redirect_url": "/sql/database-engine/discontinued-database-engine-functionality-in-sql-server",
56-
"redirect_document_id": false
61+
"redirect_document_id": true
5762
},
5863
{
5964
"source_path": "docs/sql-server/sql-server-technical-documentation.md",

‎docs/database-engine/install-windows/install-sql-server-from-the-installation-wizard-setup.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Install SQL Server 2016 from the Installation Wizard (Setup) | Microsoft Docs"
2+
title: "Install SQL Server using the Installation media GUI from the setup media"
33
ms.custom: ""
44
ms.date: 07/26/2019
55
ms.prod: sql

‎docs/database-engine/install-windows/install-sql-server.md‎

Lines changed: 58 additions & 41 deletions
Large diffs are not rendered by default.

‎docs/database-engine/install-windows/installation-for-sql-server.md‎

Lines changed: 0 additions & 83 deletions
This file was deleted.

‎docs/includes/getssmedia.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
The download location for [!INCLUDE[ssnoversion](ssnoversion-md.md)] depends on the edition:
22

3+
34
* **SQL Server Enterprise, Standard, and Express Editions** are licensed for production use. For the Enterprise and Standard Editions, contact your software vendor for the installation media. You can find purchasing information and a directory of Microsoft partners on the [Microsoft purchasing website](https://www.microsoft.com/en-us/server-cloud/products/sql-server/overview.aspx).
4-
* **Free editions** are available at [SQL Server downloads](https://www.microsoft.com/sql-server/sql-server-downloads).
5+
* [The latest free edition](https://www.microsoft.com/sql-server/sql-server-downloads).

‎docs/samples/sql-samples-where-are.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,8 @@ The database downloads and samples are in the [SQL Server Samples](https://githu
3939

4040
## AdventureWorks sample database
4141

42-
AdventureWorks databases are available in the [SQL Server Samples](https://github.com/Microsoft/sql-server-samples) GitHub repository. The following download locations include all the various versions of AdventureWorks.
42+
AdventureWorks databases can be found in the [installation](adventureworks-install-configure.md) article or directly within the [SQL Server Samples](https://github.com/Microsoft/sql-server-samples) GitHub repository.
4343

44-
- [AdventureWorks downloads for SQL Server 2014 and later](https://github.com/Microsoft/sql-server-samples/releases/tag/adventureworks). Includes .bak files for the 2012 releases.
45-
- [AdventureWorks downloads for SQL Server 2012](https://github.com/Microsoft/sql-server-samples/releases/tag/adventureworks2012).
46-
- [AdventureWorks downloads for SQL Server 2008R2](https://github.com/Microsoft/sql-server-samples/releases/tag/adventureworks2008r2).
4744

4845
## Azure Samples and templates
4946
There are a number of Microsoft Azure code samples and examples available on Github in .NET, Java, Python, Node.js, PHP and Ruby. Additionally, Azure Resource Manager allows you to provision your applications using a declarative template. In a single template, you can deploy multiple services along with their dependencies. You use the same template to repeatedly deploy your application during every stage of the application lifecycle.

‎docs/sql-server/editions-and-components-of-sql-server-2016.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ ms.author: "mikeray"
3939

4040
This topic provides details of features supported by the SQL Server editions.
4141

42-
For information about older versions, see:
42+
For information about other versions, see:
4343

44-
* [SQL Server 2016](editions-and-components-of-sql-server-2016.md).
44+
* [SQL Server 2019](editions-and-components-of-sql-server-version-15.md).
45+
* [SQL Server 2017](editions-and-components-of-sql-server-2017.md).
4546
* [SQL Server 2014](https://docs.microsoft.com/sql/getting-started/features-supported-by-the-editions-of-sql-server-2014?view=sql-server-2014).
4647

4748
Installation requirements vary based on your application needs. The different editions of [!INCLUDE[ssNoVersion](../includes/ssnoversion-md.md)] accommodate the unique performance, runtime, and price requirements of organizations and individuals. The [!INCLUDE[ssNoVersion](../includes/ssnoversion-md.md)] components that you install also depend on your specific requirements. The following sections help you understand how to make the best choice among the editions and components available in [!INCLUDE[ssNoVersion](../includes/ssnoversion-md.md)].

‎docs/sql-server/editions-and-components-of-sql-server-2017.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ monikerRange: ">= sql-server-2017 || = sqlallproducts-allversions"
3939

4040
This topic provides details of features supported by the various editions of SQL Server 2017.
4141

42-
For information about older versions, see:
42+
For information other versions, see:
4343

44+
* [SQL Server 2019](editions-and-components-of-sql-server-version-15.md).
4445
* [SQL Server 2016](editions-and-components-of-sql-server-2016.md).
4546
* [SQL Server 2014](https://msdn.microsoft.com/library/cc645993(v=sql.120).aspx).
4647

‎docs/sql-server/install/hardware-and-software-requirements-for-installing-sql-server-ver15.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,16 @@ The following table shows which editions of SQL Server 2019 are compatible with
121121

122122

123123
| SQL Server edition: | Enterprise | Developer | Standard | Web | Express |
124-
| :------------------------ | :--------- | :-------- | :------- | :-- | :------ |
124+
| :------------------------ | :--------- | :-------- | :------- | :-- | :------ |
125125
| Windows Server 2019 Datacenter | Yes | Yes | Yes | Yes | Yes |
126126
| Windows Server 2019 Standard | Yes | Yes | Yes | Yes | Yes |
127127
| Windows Server 2019 Essentials | Yes | Yes | Yes | Yes | Yes |
128128
| Windows Server 2016 Datacenter | Yes | Yes | Yes | Yes | Yes |
129129
| Windows Server 2016 Standard | Yes | Yes | Yes | Yes | Yes |
130130
| Windows Server 2016 Essentials | Yes | Yes | Yes | Yes | Yes |
131+
| Windows 10 Enterprise | Yes | Yes | Yes | Yes | Yes |
132+
| Windows 10 Professional | Yes | Yes | Yes | Yes | Yes |
133+
| Windows 10 Home | Yes | Yes | Yes | Yes | Yes |
131134
|   |   |
132135

133136

‎docs/sql-server/install/hardware-and-software-requirements-for-installing-sql-server.md‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -116,19 +116,6 @@ The following requirements apply to all installations:
116116

117117
**Server Core Support:**
118118

119-
::: moniker range=">=sql-server-ver15||=sqlallproducts-allversions"
120-
121-
Installing SQL Server 2019 on Server Core mode is supported by the following editions of Windows Server:
122-
123-
| | |
124-
| :------------------------ | :------------------------------|
125-
| Windows Server 2019 Standard | Windows Server 2019 Datacenter |
126-
| Windows Server 2016 Standard | Windows Server 2016 Datacenter |
127-
|   |   |
128-
129-
::: moniker-end
130-
131-
::: moniker range=">=sql-server-2016 <=sql-server-2017||=sqlallproducts-allversions"
132119

133120
Installing SQL Server 2016 and 2017 on Server Core mode is supported by the following editions of Windows Server:
134121

@@ -139,7 +126,6 @@ Installing SQL Server 2016 and 2017 on Server Core mode is supported by the foll
139126
| Windows Server 2012 R2 Standard | Windows Server 2012 R2 Datacenter|
140127
| Windows Server 2012 Standard | Windows Server 2012 Datacenter |
141128
| &nbsp; | &nbsp; |
142-
::: moniker-end
143129

144130
For more information on installing SQL Server on Server Core, see [Install SQL Server on Server Core](../../database-engine/install-windows/install-sql-server-on-server-core.md).
145131

@@ -162,22 +148,6 @@ For more information on installing SQL Server on Server Core, see [Install SQL S
162148

163149
### <a name="TOP_Principal"></a> OS Compatibility
164150

165-
::: moniker range=">=sql-server-ver15||=sqlallproducts-allversions"
166-
The following table shows which editions of SQL Server 2019 are compatible with which versions of Windows:
167-
168-
169-
| SQL Server edition: | Enterprise | Developer | Standard | Web | Express |
170-
| :------------------------ | :--------- | :-------- | :------- | :-- | :------ |
171-
| Windows Server 2019 Datacenter | Yes | Yes | Yes | Yes | Yes |
172-
| Windows Server 2019 Standard | Yes | Yes | Yes | Yes | Yes |
173-
| Windows Server 2019 Essentials | Yes | Yes | Yes | Yes | Yes |
174-
| Windows Server 2016 Datacenter | Yes | Yes | Yes | Yes | Yes |
175-
| Windows Server 2016 Standard | Yes | Yes | Yes | Yes | Yes |
176-
| Windows Server 2016 Essentials | Yes | Yes | Yes | Yes | Yes |
177-
| &nbsp; | &nbsp; |
178-
::: moniker-end
179-
180-
::: moniker range=">=sql-server-2016 <=sql-server-2017||=sqlallproducts-allversions"
181151

182152
The following table shows which editions of SQL Server 2016 and 2017 are compatible with which versions of Windows:
183153

@@ -212,7 +182,6 @@ The following table shows which editions of SQL Server 2016 and 2017 are compati
212182
>
213183
>- [!INCLUDE[ssRSnoversion](../../includes/ssrsnoversion-md.md)] - SharePoint
214184
>- [!INCLUDE[ssRSnoversion](../../includes/ssrsnoversion-md.md)] Add-in for SharePoint products
215-
::: moniker-end
216185
217186

218187

0 commit comments

Comments
 (0)