Merge remote-tracking branch 'refs/remotes/Microsoft/master'

Author: JocaPC

samples/README.md

@@ -1,25 +1,25 @@
 # Sample Categories
 
-__[applications] (applications/)__
+__[applications](applications/)__
 
 End-to-end sample applications that illustrate the use of SQL Server for specific application scenarios.
 
-__[databases] (databases/)__
+__[databases](databases/)__
 
 Sample databases for SQL Server, Azure SQL Database, and Azure SQL Data Warehouse.
 
-__[demos] (demos/)__
+__[demos](demos/)__
 
 Demos of various SQL features and capabilities that were presented at conferences, in Webcasts, etc...
 
-__[features] (features/)__
+__[features](features/)__
 
 Samples illustrating specific SQL Server and Azure SQL Database features, including In-Memory OLTP, Master Data Services (MDS), and R Services.
 
-__[management] (manage/)__
+__[management](manage/)__
 
 Samples that help with the management of SQL Server and Azure SQL Database.
 
-__[tutorials] (tutorials/)__
+__[tutorials](tutorials/)__
 
 Samples showing how to connect to SQL databases using various programming languages, including Python, C#, Java, Ruby, Node.js, and PHP.

samples/features/machine-learning-services/python/getting-started/rental-prediction/README.md

@@ -23,7 +23,7 @@ In this sample, you will learn how to create a predictive model in python and op
 
 <!-- Delete the ones that don't apply -->
 - **Applies to:** SQL Server 2017 CTP2.0 or higher
-- **Key features:**SQL Server Machine Learning Services 
+- **Key features:** SQL Server Machine Learning Services 
 - **Workload:** SQL Server Machine Learning Services
 - **Programming Language:** T-SQL, Python
 - **Authors:** Nellie Gustafsson
@@ -34,17 +34,17 @@ In this sample, you will learn how to create a predictive model in python and op
 ## Before you begin
 
 To run this sample, you need the following prerequisites: </br>
-Download a DB backup file and restore it using Setup.sql. [Download DB](https://deve2e.azureedge.net/sqlchoice/static/TutorialDB.bak)
+[Download this DB backup file](https://deve2e.azureedge.net/sqlchoice/static/TutorialDB.bak) and restore it using Setup.sql. 
 
 **Software prerequisites:**
 
 <!-- Examples -->
-1. SQL Server 2017 CTP2.0 (or higher) with Machine Learning Services (Python) installed
-2. SQL Server Management Studio
-3. Python Tools for Visual Studio or another Python IDE
+1. [SQL Server 2017 CTP2.0](https://www.microsoft.com/en-us/sql-server/sql-server-2017) (or higher) with Machine Learning Services (Python) installed
+2. [SQL Server Management Studio](https://docs.microsoft.com/en-us/sql/ssms/download-sql-server-management-studio-ssms)
+3. [Python Tools for Visual Studio](https://www.visualstudio.com/vs/python/) or another Python IDE
 
 ## Run this sample
-1. From SQL Server Management Studio or SQL Server Data Tools connect to your SQL Server vNext database and execute setup.sql to restore the sample DB you have downloaded </br>
+1. From SQL Server Management Studio, or SQL Server Data Tools, connect to your SQL Server 2017 database and execute setup.sql to restore the sample DB you have downloaded </br>
 2. From SQL Server Management Studio or SQL Server Data Tools, open the rental_prediction.sql script </br>
 This script sets up: </br>
 Necessary tables </br>

samples/features/machine-learning-services/python/getting-started/rental-prediction/Setup.sql

@@ -6,8 +6,8 @@
 USE master;
 GO
 RESTORE DATABASE TutorialDB
-   FROM DISK = 'C:\Program Files\Microsoft SQL Server\MSSQL13.MSSQLSERVER\MSSQL\Backup\TutorialDB.bak'
+   FROM DISK = 'C:\Program Files\Microsoft SQL Server\MSSQL14.MSSQLSERVER\MSSQL\Backup\TutorialDB.bak'
    WITH
-                MOVE 'TutorialDB' TO 'C:\Program Files\Microsoft SQL Server\MSSQL13.MSSQLSERVER\MSSQL\DATA\TutorialDB.mdf'
-                ,MOVE 'TutorialDB_log' TO 'C:\Program Files\Microsoft SQL Server\MSSQL13.MSSQLSERVER\MSSQL\DATA\TutorialDB.ldf';
-GO
+                MOVE 'TutorialDB' TO 'C:\Program Files\Microsoft SQL Server\MSSQL14.MSSQLSERVER\MSSQL\DATA\TutorialDB.mdf'
+                ,MOVE 'TutorialDB_log' TO 'C:\Program Files\Microsoft SQL Server\MSSQL14.MSSQLSERVER\MSSQL\DATA\TutorialDB.ldf';
+GO