Skip to content

Commit e04d165

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into hubsql
2 parents 279a4a4 + 52eb272 commit e04d165

28 files changed

Lines changed: 817 additions & 233 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: 2 additions & 2 deletions
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
@@ -21,7 +21,7 @@ monikerRange: ">=sql-server-2016||=sqlallproducts-allversions"
2121

2222
This article explains how to install SQL Server with the Installation Wizard. It applies to [!INCLUDE[SQLServer2016](../../includes/sssql15-md.md)] and [!INCLUDE[SQLServer2017](../../includes/sssqlv14-md.md)].
2323

24-
This article provides a step-by-step procedure for installing a new instance of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] by using the [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Setup Installation Wizard. The Installation Wizard provides a single feature tree for installation of all [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] components so that you don't have to install them individually. To install the [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] components individually, see [Install SQL Server](../../database-engine/install-windows/install-sql-server.md#how-to-install-individual-components).
24+
This article provides a step-by-step procedure for installing a new instance of [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] by using the [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] Setup Installation Wizard. The Installation Wizard provides a single feature tree for installation of all [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] components so that you don't have to install them individually. To install the [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] components individually, see [Install SQL Server](../../database-engine/install-windows/install-sql-server.md#individual-component-installation).
2525

2626
For other ways to install [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], see:
2727

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

Lines changed: 65 additions & 53 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).
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
title: include file
3+
description: include file
4+
ms.prod: reporting-services
5+
ms.technology: reporting-services
6+
author: maggiesMSFT
7+
ms.topic: include
8+
ms.date: 11/19/2019
9+
ms.author: maggies
10+
ms.custom: include file
11+
---
12+
13+
14+
![yes](media/yes.png)SQL Server Reporting Services (2019 and later)

docs/index.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
### YamlMime:Hub
22
title: Microsoft SQL documentation
3-
summary: Learn how to use Microsoft SQL Server to address your database needs, both on-premises, and in the cloud!
3+
summary: Learn how to use Microsoft SQL Server to address your database needs, both on-premises and in the cloud.
44
brand: sql
55
metadata:
66
title: Microsoft SQL documentation | Microsoft Docs
7-
description: Learn how to use Microsoft SQL Server to manage your database needs, both on-premises, and in the cloud!
7+
description: Learn how to use Microsoft SQL Server to manage your database needs, both on-premises and in the cloud.
88
ms.topic: hub-page
99

1010
# itemType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
@@ -73,10 +73,10 @@ conceptualContent:
7373
- title: What's new
7474
links:
7575
- text: SQL Server 2019
76-
url: https://docs.microsoft.com/sql/sql-server/what-s-new-in-sql-server-ver15?view=sql-server-ver15
76+
url: https://docs.microsoft.com/sql/sql-server/what-s-new-in-sql-server-ver15
7777
itemType: whats-new
7878
- text: SQL Server Big Data Cluster
79-
url: https://docs.microsoft.com/sql/big-data-cluster/big-data-cluster-overview?view=sql-server-ver15
79+
url: https://docs.microsoft.com/sql/big-data-cluster/big-data-cluster-overview
8080
itemType: whats-new
8181
- text: Azure Data Studio
8282
url: azure-data-studio/what-is.md
@@ -196,7 +196,7 @@ additionalContent:
196196
- title: Big data
197197
links:
198198
- text: SQL Server 2019 Big Data Clusters
199-
url: https://docs.microsoft.com/sql/big-data-cluster/big-data-cluster-overview?view=sql-server-ver15
199+
url: https://docs.microsoft.com/sql/big-data-cluster/big-data-cluster-overview
200200
- text: Data Virtualization with Polybase
201201
url: relational-databases/polybase/polybase-guide.md
202202
- text: Azure Synapse Analytics (SQL DW)

0 commit comments

Comments
 (0)