Skip to content

Commit b81b9be

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into release-sqlseattle
2 parents 5de41b9 + e27ad64 commit b81b9be

7 files changed

Lines changed: 33 additions & 9 deletions

File tree

docs/2014/2014-toc/books-online-for-sql-server-2014.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ manager: craigg
2323
# Books Online for SQL Server 2014
2424

2525
Welcome to [!INCLUDE[msCoName](../includes/msconame-md.md)]® Books Online for [!INCLUDE[msCoName](../includes/msconame-md.md)] [!INCLUDE[ssCurrent](../includes/sscurrent-md.md)]®. Books Online contains the task descriptions and reference documentation that describes how to perform data management and business intelligence work by using [!INCLUDE[ssNoVersion](../includes/ssnoversion-md.md)].
26-
26+
27+
SQL Server 2016, and later versions, are documented [here](https://docs.microsoft.com/sql/sql-server/index). SQL Server 2012, and older versions, are documented [here](#previous-versions-gm2014). <!-- ?view= defaults to the latest GA version, to resolve the https '/index' address ambiguity. So '2014' will always be too old to be the default. -->
28+
2729
**Try it out:**
2830
![Azure Virtual Machine small](../sql-server/media/what-s-new-in-sql-server-2016/azure-virtual-machine-small.png) Have an Azure account? Then go **[Here](https://ms.portal.azure.com/?flight=1#create/Microsoft.SQLServer2016RTMEnterpriseWindowsServer2012R2)** to spin up a Virtual Machine with SQL Server 2014 Service Pack 1 (SP1) already installed. For more information on SQL Server 2014 (SP1), see [SQL Server 2014 Service Pack 1 release information](https://support.microsoft.com/en-us/kb/3058865).
2931

@@ -58,7 +60,11 @@ manager: craigg
5860
- [Data Platform Developer Center](https://go.microsoft.com/fwlink/?LinkId=17386)
5961

6062
- [XML Developer Center](https://go.microsoft.com/fwlink/?LinkId=42458)
61-
63+
64+
## <a name="previous-versions-gm2014"></a> SQL Server 2005, 2008, 2012, 2016+
65+
66+
[!INCLUDE[???](../includes/paragraph-content/previous-versions-archive-documentation-sql-server.md)]
67+
6268
## See Also
6369

6470
[SQL Server Configuration Manager Help](../tools/configuration-manager/sql-server-configuration-manager-help.md)
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11

2+
We accumulate and retain documentation for very old versions of SQL Server in a set of archive webpages. The archived webpages are not processed by search engines, such as Bing.com and Google.com. But you can see these archives at our Docs _previous-versions/_ address:
23

3-
We accumulate and retain documentation for very old versions of SQL Server in a set of archive webpages. You can see these archives at [SQL Server previous versions documentation](https://docs.microsoft.com/previous-versions/sql/).
4+
- [https://docs.microsoft.com/previous-versions/sql/](https://docs.microsoft.com/previous-versions/sql/)
5+
6+
These archives include the documentation for at least the following older versions:
47

5-
As of November 2018, these archives include the documentation for at least the following:
68
- SQL Server 2012
79
- SQL Server 2008 R2
810
- SQL Server 2008
911
- SQL Server 2005
1012

13+
[SQL Server 2014 documentation](https://docs.microsoft.com/sql/2014-toc/index?view=sql-server-2014) is still processed by search engines.
14+
15+
SQL Server 2016, and later versions, are documented [here](https://docs.microsoft.com/sql/sql-server/index).

docs/advanced-analytics/install/sql-ml-component-install-without-internet-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Release | Microsoft R Open | Microsoft R Server |
6060
---------|-----------------|---------------------|
6161
**SQL Server 2016 RTM** | [SRO_3.2.2.803_1033.cab](https://go.microsoft.com/fwlink/?LinkId=761266) |[SRS_8.0.3.0_1033.cab](https://go.microsoft.com/fwlink/?LinkId=735051) |
6262
**SQL Server 2016 SP 1** | [SRO_3.2.2.15000_1033.cab](https://go.microsoft.com/fwlink/?LinkId=824879) |[SRS_8.0.3.15000_1033.cab](https://go.microsoft.com/fwlink/?LinkId=824881) |
63-
**SQL Server 2016 SP 2** |[SRO_3.2.2.20000_1033.cab](https://go.microsoft.com/fwlink/?LinkId=866039) |[SRS_8.0.3.20000_1033.cab](https://go.microsoft.com/fwlink/?LinkId=866038) |
63+
**SQL Server 2016 SP 2** |[SRO_3.2.2.16000_1033.cab](https://go.microsoft.com/fwlink/?LinkId=866039) |[SRS_8.0.3.17000_1033.cab](https://go.microsoft.com/fwlink/?LinkId=850317) |
6464

6565
### 2 - Get SQL Server 2016 installation media
6666

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11

2+
We accumulate and retain documentation for very old versions of SQL Server in a set of archive webpages. The archived webpages are not processed by search engines, such as Bing.com and Google.com. But you can see these archives at our Docs _previous-versions/_ address:
23

3-
We accumulate and retain documentation for very old versions of SQL Server in a set of archive webpages. You can see these archives at [SQL Server previous versions documentation](https://docs.microsoft.com/previous-versions/sql/).
4+
- [https://docs.microsoft.com/previous-versions/sql/](https://docs.microsoft.com/previous-versions/sql/)
5+
6+
These archives include the documentation for at least the following older versions:
47

5-
As of November 2018, these archives include the documentation for at least the following:
68
- SQL Server 2012
79
- SQL Server 2008 R2
810
- SQL Server 2008
911
- SQL Server 2005
1012

13+
[SQL Server 2014 documentation](https://docs.microsoft.com/sql/2014-toc/index?view=sql-server-2014) is still processed by search engines.

docs/relational-databases/xml/xml-data-type-and-columns-sql-server.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "XML Data Type and Columns (SQL Server) | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "03/14/2017"
4+
ms.date: "05/17/2019"
55
ms.prod: sql
66
ms.prod_service: "database-engine"
77
ms.reviewer: ""
@@ -13,6 +13,7 @@ ms.author: genemi
1313
manager: craigg
1414
---
1515
# XML Data Type and Columns (SQL Server)
16+
1617
[!INCLUDE[tsql-appliesto-ss2008-xxxx-xxxx-xxx-md](../../includes/tsql-appliesto-ss2008-xxxx-xxxx-xxx-md.md)]
1718
This topic discusses the advantages and the limitations of the **xml** data type in [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)], and helps you to choose how to store XML data.
1819

@@ -169,6 +170,8 @@ manager: craigg
169170
- It cannot be used as a parameter to any scalar, built-in functions other than ISNULL, COALESCE, and DATALENGTH.
170171

171172
- It cannot be used as a key column in an index. However, it can be included as data in a clustered index or explicitly added to a nonclustered index by using the INCLUDE keyword when the nonclustered index is created.
173+
174+
- XML elements can be nested up to 128 levels.
172175

173176
## See Also
174177
[Examples of Bulk Import and Export of XML Documents &#40;SQL Server&#41;](../../relational-databases/import-export/examples-of-bulk-import-and-export-of-xml-documents-sql-server.md)

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ SQL Server is a central part of the Microsoft data platform. SQL Server is an in
3333
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).
3434
::: moniker-end
3535

36+
SQL Server 2014, and older versions including SQL Server 2005, have documentation available [here](#previous-versions-gm66).
37+
3638
<!-- Moniker assignments nicely designed so that exactly 1 of these next 3 little WhatsNew tables will be displayed
3739
at any one time, regardless of user's moniker choice.
3840
-->
@@ -132,6 +134,10 @@ SQL Server is a central part of the Microsoft data platform. SQL Server is an in
132134
- [AdventureWorks sample databases and scripts for SQL Server 2016](https://docs.microsoft.com/sql/samples/sql-samples-where-are)
133135
- [SQL Server samples on GitHub](https://github.com/Microsoft/sql-server-samples)
134136

137+
## <a name="previous-versions-gm66"></a> SQL Server 2014, 2012, 2008, 2005
138+
139+
[!INCLUDE[previous-versions](../includes/paragraph-content/previous-versions-archive-documentation-sql-server.md)]
140+
135141
[!INCLUDE[get-help-options](../includes/paragraph-content/get-help-options.md)]
136142

137143
[!INCLUDE[contribute-to-content](../includes/paragraph-content/contribute-to-content.md)]

docs/t-sql/functions/datediff-transact-sql.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ If only a time value is assigned to a date data type variable, `DATEDIFF` sets t
102102
If *startdate* and *enddate* have different date data types, and one has more time parts or fractional seconds precision than the other, `DATEDIFF` sets the missing parts of the other to 0.
103103

104104
## datepart boundaries
105-
The following statements have the same *startdate* and the same *enddate* values. Those dates are adjacent and they differ in time by one microsecond (.0000001 second). The difference between the *startdate* and *enddate* in each statement crosses one calendar or time boundary of its *datepart*. Each statement returns 1. If *startdate* and *enddate* have different year values but they have the same calendar week values, `DATEDIFF` will return 0 for *datepart* **week**.
105+
The following statements have the same *startdate* and the same *enddate* values. Those dates are adjacent and they differ in time by a hundred nanoseconds (.0000001 second). The difference between the *startdate* and *enddate* in each statement crosses one calendar or time boundary of its *datepart*. Each statement returns 1. If *startdate* and *enddate* have different year values but they have the same calendar week values, `DATEDIFF` will return 0 for *datepart* **week**.
106106

107107
```sql
108108
SELECT DATEDIFF(year, '2005-12-31 23:59:59.9999999', '2006-01-01 00:00:00.0000000');
@@ -115,6 +115,7 @@ SELECT DATEDIFF(hour, '2005-12-31 23:59:59.9999999', '2006-01-01 00:00:00
115115
SELECT DATEDIFF(minute, '2005-12-31 23:59:59.9999999', '2006-01-01 00:00:00.0000000');
116116
SELECT DATEDIFF(second, '2005-12-31 23:59:59.9999999', '2006-01-01 00:00:00.0000000');
117117
SELECT DATEDIFF(millisecond, '2005-12-31 23:59:59.9999999', '2006-01-01 00:00:00.0000000');
118+
SELECT DATEDIFF(microsecond, '2005-12-31 23:59:59.9999999', '2006-01-01 00:00:00.0000000');
118119
```
119120

120121
## Remarks

0 commit comments

Comments
 (0)