Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

Commit a9a7276

Browse files
committed
Adding Linux to versioning of main SQL topic
1 parent f7b7b9f commit a9a7276

2 files changed

Lines changed: 23 additions & 10 deletions

File tree

docs/sql-server/TOC.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
# [Database Engine](../database-engine/sql-server-database-engine-overview.md)
3131
# [Data Quality Services](../data-quality-services/data-quality-services.md)
3232
# [Failover clusters](../sql-server/failover-clusters/install/sql-server-failover-cluster-installation.md)
33-
# [Install](../sql-server/install/planning-a-sql-server-installation.md)
33+
# [Install (Windows)](../sql-server/install/planning-a-sql-server-installation.md)
34+
# [Install (Linux)](../linux/setup.sql-server-linux-setup.md)
3435
# [Integration Services](../integration-services/sql-server-integration-services.md)
3536
# [Master Data Services](../master-data-services/master-data-services-overview-mds.md)
3637
# [Reporting Services](../reporting-services/create-deploy-and-manage-mobile-and-paginated-reports.md)

docs/sql-server/sql-server-technical-documentation.md

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "SQL Server Documentation | Microsoft Docs"
3-
ms.date: "02/28/2018"
3+
ms.date: "04/23/2018"
44
ms.prod: "sql"
55
ms.prod_service: "sql"
66
ms.reviewer: ""
@@ -24,26 +24,33 @@ author: craigg-msft
2424
ms.author: craigg
2525
manager: jhubbard
2626
ms.workload: "Active"
27-
monikerRange: '>= sql-server-2014 || = sqlallproducts-allversions'
27+
monikerRange: ">= sql-analysis-services-2016 || >= sql-server-2014 || >= sql-server-linux-2017 || = sqlallproducts-allversions"
2828
---
2929

3030
# SQL Server Documentation
3131
[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
3232

33-
SQL Server is a central part of the Microsoft data platform. SQL Server is an industry leader in operational database management systems (ODBMS). This documentation helps you install, configure, and use SQL Server. The content includes end-to-end examples, code samples, and videos. For SQL Server language topics, see [Language Reference](../t-sql/language-reference.md).
33+
SQL Server is a central part of the Microsoft data platform. SQL Server is an industry leader in operational database management systems (ODBMS). This documentation helps you install, configure, and use SQL Server on
34+
::: moniker range=">= sql-analysis-services-2017 || >= sql-server-linux-2017 || >= sql-server-2017 || = sqlallproducts-allversions"
35+
both Windows and Linux.
36+
::: moniker-end
37+
::: moniker range="= sql-analysis-services-2016 || = sql-server-2014 || = sql-server-2016"
38+
Windows.
39+
::: moniker-end
40+
The content includes end-to-end examples, code samples, and videos. For SQL Server language topics, see [Language Reference](../t-sql/language-reference.md).
3441

35-
::: moniker range="=sql-server-2017"
42+
::: moniker range=">= sql-server-linux-2017 || >= sql-server-2016 || = sqlallproducts-allversions"
3643
|What's new | Release notes |
3744
|---------|---------|
45+
::: moniker-end
46+
::: moniker range="= sql-server-linux-2017 || = sqlallproducts-allversions"
3847
|[What's New in SQL Server 2017](../sql-server/what-s-new-in-sql-server-2017.md) | [SQL Server 2017 Release Notes](../sql-server/sql-server-2017-release-notes.md) |
3948
::: moniker-end
40-
::: moniker range="=sql-server-2016"
41-
|What's new | Release notes |
42-
|---------|---------|
49+
::: moniker range="= sql-server-2016 || = sqlallproducts-allversions"
4350
|[What's New in SQL Server 2016](../sql-server/what-s-new-in-sql-server-2016.md) | [SQL Server 2016 Release Notes](../sql-server/sql-server-2016-release-notes.md) |
4451
::: moniker-end
4552

46-
::: moniker range="=sql-server-2014"
53+
::: moniker range="= sql-server-2014 || = sqlallproducts-allversions"
4754
![info_tip](../sql-server/media/info-tip.png) The SQL Server 2014 content will soon be merged into the .docs site. For now, see:
4855
- [Books Online for SQL Server 2014](https://msdn.microsoft.com/en-us/library/ms130214(v=sql.120).aspx)
4956
- [What's New in SQL Server 2014](https://msdn.microsoft.com/library/bb500435(v=sql.120).aspx)
@@ -52,7 +59,12 @@ SQL Server is a central part of the Microsoft data platform. SQL Server is an in
5259
::: moniker-end
5360

5461
**Try SQL Server!**
55-
+ [![Download from Evaluation Center](../includes/media/download2.png)](http://go.microsoft.com/fwlink/?LinkID=829477) [Download SQL Server](http://go.microsoft.com/fwlink/?LinkID=829477)
62+
::: moniker range=">= sql-server-2014 || = sqlallproducts-allversions"
63+
+ [![Download from Evaluation Center](../includes/media/download2.png)](http://go.microsoft.com/fwlink/?LinkID=829477) [Download SQL Server for Windows](http://go.microsoft.com/fwlink/?LinkID=829477)
64+
::: moniker-end
65+
::: moniker range=">= sql-server-linux-2017 || = sqlallproducts-allversions"
66+
+ [![Install SQL Server on Linux](../includes/media/download2.png)](../linux/sql-server-linux-setup.md) [Install SQL Server on Linux](../linux/sql-server-linux-setup.md)
67+
::: moniker-end
5668
+ [![Download from Evaluation Center](../includes/media/download2.png)](../ssms/download-sql-server-management-studio-ssms.md) [Download SQL Server Management Studio (SSMS)](../ssms/download-sql-server-management-studio-ssms.md)
5769
+ [![Download from Evaluation Center](../includes/media/download2.png)](../ssdt/download-sql-server-data-tools-ssdt.md) [Download SQL Server Data Tools (SSDT)](../ssdt/download-sql-server-data-tools-ssdt.md)
5870
+ [![Create Virtual Machine](../includes/media/azure-vm.png)](https://azure.microsoft.com/services/virtual-machines/sql-server/?wt.mc_id=sqL16_vm) [Get a Virtual Machine with SQL Server](https://azure.microsoft.com/services/virtual-machines/sql-server/?wt.mc_id=sqL16_vm)

0 commit comments

Comments
 (0)