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

Commit 86d229b

Browse files
author
MightyPen
committed
docs/reporting-services/mobile-reports/ SUBfolder in docfx.json. Also, post-merge-conflicts fix-ups in sql-server-technical-documentation.md.
1 parent bcf4949 commit 86d229b

2 files changed

Lines changed: 26 additions & 12 deletions

File tree

docs/docfx.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
"mdx/**/*.md": ">= sql-analysis-services-2016 || = sqlallproducts-allversions",
7676
"powershell/**/*.md": ">= aps-pdw-2016 || = azure-sqldw-latest || = azuresqldb-current || >= sql-server-2016 || = sqlallproducts-allversions",
7777
"relational-databases/**/*.md": ">= sql-server-2016 || = sqlallproducts-allversions",
78+
"reporting-services/mobile-reports/**/*.md": ">= sql-server-2017 || = sqlallproducts-allversions",
7879
"reporting-services/**/*.md": ">= sql-server-2016 || = sqlallproducts-allversions",
7980
"samples/**/*.md": "= azuresqldb-current || >= sql-server-2016 || = sqlallproducts-allversions",
8081
"sql-server/**/*.md": ">= sql-server-2016 || = sqlallproducts-allversions",

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

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,52 +24,65 @@ author: craigg-msft
2424
ms.author: craigg
2525
manager: jhubbard
2626
ms.workload: "Active"
27-
monikerRange: ">= sql-server-2016 || = sqlallproducts-allversions"
27+
monikerRange: ">= sql-server-linux-2017 || >= sql-server-2016 || = sqlallproducts-allversions"
2828
---
29-
3029
# SQL Server Documentation
3130
[!INCLUDE[appliesto-ss-xxxx-xxxx-xxx-md](../includes/appliesto-ss-xxxx-xxxx-xxx-md.md)]
3231

33-
::: moniker range=">= sql-analysis-services-2017 || >= sql-server-linux-2017 || >= sql-server-2017 || = sqlallproducts-allversions"
32+
::: moniker range=">= sql-server-linux-2017 || >= sql-server-2017 || = sqlallproducts-allversions"
3433
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 both Windows and Linux. The content includes end-to-end examples, code samples, and videos. For SQL Server language topics, see [Language Reference](../t-sql/language-reference.md).
3534
::: moniker-end
3635

37-
::: moniker range="= sql-analysis-services-2016 || = sql-server-2016"
36+
::: moniker range="= sql-server-2016"
3837
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 Windows. The content includes end-to-end examples, code samples, and videos. For SQL Server language topics, see [Language Reference](../t-sql/language-reference.md).
3938
::: moniker-end
4039

40+
41+
42+
43+
44+
<!-- Moniker assignments nicely designed so that exactly 1 of these next 3 little WhatsNew tables will be displayed
45+
at any one time, regardless of user's moniker choice.
46+
-->
47+
4148
::: moniker range="= sqlallproducts-allversions"
4249
|What's new | Release notes |
4350
|---------|---------|
4451
|[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) |
4552
|[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) |
4653
::: moniker-end
47-
::: moniker range="= sql-analysis-services-2017 || = sql-server-linux-2017 || = sql-server-2017"
54+
55+
::: moniker range="= sql-server-linux-2017 || = sql-server-2017"
4856
|What's new | Release notes |
4957
|---------|---------|
5058
|[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) |
5159
::: moniker-end
52-
::: moniker range="=sql-server-2016 || =sqlallproducts-allversions"
60+
61+
::: moniker range="=sql-server-2016"
5362
|What's new | Release notes |
5463
|---------|---------|
5564
|[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) |
5665
::: moniker-end
5766

67+
68+
69+
70+
5871
![info_tip](../sql-server/media/info-tip.png) The SQL Server 2014 content will soon be merged into the .docs site. For now, see:
5972
- [Books Online for SQL Server 2014](https://msdn.microsoft.com/en-us/library/ms130214(v=sql.120).aspx)
6073
- [What's New in SQL Server 2014](https://msdn.microsoft.com/library/bb500435(v=sql.120).aspx)
6174
- [SQL Server 2014 Release Notes](../sql-server/sql-server-2014-release-notes.md)
6275
- [Previous Versions](https://docs.microsoft.com/en-us/previous-versions/sql/)
6376

64-
::: moniker range="= sql-analysis-services-2016 || = sql-server-2016"
77+
::: moniker range="= sql-server-2016"
6578
**Try SQL Server!**
6679
- [![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)
6780
- [![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)
6881
- [![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)
6982
- [![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)
7083
::: moniker-end
7184

72-
::: moniker range=">= sql-analysis-services-2017 || >= sql-server-2017 || >= sql-server-linux-2017 || = sqlallproducts-allversions"
85+
::: moniker range=">= sql-server-2017 || >= sql-server-linux-2017 || = sqlallproducts-allversions"
7386
**Try SQL Server!**
7487
- [![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)
7588
- [![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)
@@ -78,7 +91,7 @@ SQL Server is a central part of the Microsoft data platform. SQL Server is an in
7891
- [![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)
7992
::: moniker-end
8093

81-
::: moniker range=">= sql-analysis-services-2016 || >= sql-server-linux-2017 || >=sql-server-2016 || = sqlallproducts-allversions"
94+
::: moniker range=">= sql-server-linux-2017 || >=sql-server-2016 || = sqlallproducts-allversions"
8295
## SQL Server Technologies
8396

8497
|||
@@ -93,15 +106,15 @@ SQL Server is a central part of the Microsoft data platform. SQL Server is an in
93106
|![Master Data Services](../sql-server/media/master-data-services.png)|**[Master Data Services](../master-data-services/master-data-services-installation-and-configuration.md)**<br /><br /> [!INCLUDE[ssMDSshort](../includes/ssmdsshort-md.md)] is the [!INCLUDE[ssNoVersion](../includes/ssnoversion-md.md)] solution for master data management. A solution built on [!INCLUDE[ssMDSshort](../includes/ssmdsshort-md.md)] helps ensure that reporting and analysis is based on the right information. Using [!INCLUDE[ssMDSshort](../includes/ssmdsshort-md.md)], you create a central repository for your master data and maintain an auditable, securable record of that data as it changes over time.|
94107
::: moniker-end
95108

96-
::: moniker range="= sql-analysis-services-2016 || = sql-server-2016"
109+
::: moniker range="= sql-server-2016"
97110
## Migrate and move data
98111

99112
- [Import and Export Data with the SQL Server Import and Export Wizard](../integration-services/import-export-data/import-and-export-data-with-the-sql-server-import-and-export-wizard.md)
100113
- [Migrate your SQL Server database to Azure SQL Database](https://docs.microsoft.com/azure/sql-database/sql-database-migrate-your-sql-server-database)
101114
- [Microsoft Data Migration Assistant](https://www.microsoft.com/download/details.aspx?id=53595)
102115
::: moniker-end
103116

104-
::: moniker range=">= sql-analysis-services-2017 || >= sql-server-2017 || >= sql-server-linux-2017 || = sqlallproducts-allversions"
117+
::: moniker range=">= sql-server-2017 || >= sql-server-linux-2017 || = sqlallproducts-allversions"
105118
## Migrate and move data
106119

107120
- [Import and Export Data with the SQL Server Import and Export Wizard](../integration-services/import-export-data/import-and-export-data-with-the-sql-server-import-and-export-wizard.md)
@@ -122,4 +135,4 @@ SQL Server is a central part of the Microsoft data platform. SQL Server is an in
122135

123136
[!INCLUDE[get-help-options](../includes/paragraph-content/get-help-options.md)]
124137

125-
[!INCLUDE[contribute-to-content](../includes/paragraph-content/contribute-to-content.md)]
138+
[!INCLUDE[contribute-to-content](../includes/paragraph-content/contribute-to-content.md)]

0 commit comments

Comments
 (0)