Merge remote-tracking branch 'refs/remotes/origin/master' into jodebrui

license.txt

@@ -1,7 +1,25 @@
-Copyright (c) Microsoft Corporation.  Distributed under the following terms:
- 
-1. Microsoft and any contributors to this project each grants you a license, under its respective copyrights, to the Microsoft SQL Server Sample Documentation under the [Creative Commons Attribution 3.0 United States License](http://creativecommons.org/licenses/by/3.0/us/legalcode).  In addition, with respect to any sample code contained in the documentation, Microsoft and any such contributors grants you an additional license, under its respective intellectual property rights, to use the code to develop or design your software for Microsoft SQL Server and Microsoft Azure.
- 
-2.  Microsoft, Windows, Microsoft SQL Server, Microsoft Azure and/or other Microsoft products and services referenced in the documentation may be either trademarks or registered trademarks of Microsoft in the United States and/or other countries. This license does not grant you rights to use any names, logos, or trademarks. For Microsoft’s general trademark guidelines, go to [http://go.microsoft.com/fwlink/?LinkID=254653](http://go.microsoft.com/fwlink/?LinkID=254653).
- 
-3.  Microsoft and any contributors reserves all others rights, whether under copyrights, patents, or trademarks, or by implication, estoppel or otherwise.
+Microsoft SQL Server Sample Code
+
+Copyright (c) Microsoft Corporation
+
+All rights reserved.
+
+MIT License.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.

samples/in-memory/README.md

@@ -1,11 +1,11 @@
 # SQL Server In-memory
 
 In-Memory OLTP can significantly improve OLTP database application performance. It is a memory-optimized database engine integrated into the SQL Server engine, optimized for OLTP. With In-Memory OLTP you can increase the transaction throughput by up to 30 times, depending on the specifics of the workload. The performance gains come from:
-  - For memory-optimized tables, the design of their structure is free of the physical limitations of hard drives that force design compromises.
+  - Tables use memory-optimized data structures and data access methods.
   - Core transaction processing is completely free of locks.
   - Natively compiled modules execute Transact-SQL statements more efficiently.
 
-Read the following resources for mroe information.
+Read the following resources for more information.
 - [In-Memory OLTP (In-Memory Optimization)] (https://msdn.microsoft.com/en-us/library/dn133186.aspx)
 - [Quick Start 1: In-Memory OLTP Technologies for Faster Transact-SQL Performance] (https://msdn.microsoft.com/en-us/library/mt694156.aspx)
 - [Get started with Columnstore for real time operational analytics] (https://msdn.microsoft.com/en-us/library/dn817827.aspx)

samples/in-memory/ticket-reservations/README.md

@@ -23,7 +23,7 @@ Ticket Reservations is a Windows Forms sample application built on .NET Framewor
   - Click Publish
   - Note: For publishing to Azure SQL you need to change the DB project target platform to **Microsoft Azure SQL Database V12**
 
-7. You can now run and debug the application locally by pressing **F5** in Visual Studio.
+7. Build the app for release and run it. Do not use the debugger, as that will slow down the app.
 
 8. Start the workload with the **Start** button, and run for a while to show perf profile. Then press stop to stop the workload.
 
@@ -46,7 +46,7 @@ The perf gains from In-Memory OLTP as shown by the load generation app depend on
   -	default setting is 10 rows per transaction and 1 read per write
 
 With default settings on one machine with 24 logical cores and relatively slow SSD for the log the app shows around performance 40X gain, and in this case the bottleneck was log IO.
-
+When deploying to Azure SQL Database, make sure to run the app in an Azure VM in the same region as the database.
 
 ## About the code
 The code included in this sample is not intended to be a set of best practices on how to build scalable enterprise grade web applications. This is beyond the scope of this quick start sample.

samples/master-data-services/README.md

@@ -3,3 +3,5 @@
 Master Data Services (MDS) is the SQL Server solution for master data management. Master data management (MDM) enables you organization to discover and define non-transactional lists of data, and compile maintainable, reliable master lists. This article briefly describe the MDS components and provides links to additional information.
 
 For information about the new features in SQL Server 2016, see [What's New in Master Data Services (MDS)] (https://msdn.microsoft.com/en-us/library/ff929136.aspx).
+
+This folder is a placeholder. For now, refer to [http://sqlserversamples.codeplex.com/wikipage?title=SQL%20Server%202012%20Master%20Data%20Services%20](http://sqlserversamples.codeplex.com/wikipage?title=SQL%20Server%202012%20Master%20Data%20Services%20).

samples/r-services/README.md

@@ -1,3 +1,6 @@
 # R Services
 
-[SQL Server 2016 R Services] (http://blogs.microsoft.com/firehose/tag/sql-server-2016-r-services/)
+Placeholder.
+
+For now, refer to:
+[https://github.com/Microsoft/SQL-Server-R-Services-Samples] (https://github.com/Microsoft/SQL-Server-R-Services-Samples)