Merge branch 'master' of https://github.com/microsoft/sql-server-samples

Author: pmasl

media/demos/sql-sampledb/sampledb1/README.md

@@ -1,3 +1,3 @@
 # Sample Database 1 (Employee DB Dummy Data)
 
-This is a fundamental database that houses data based on a conventinal Sales environment. Sourced from progress.com with slight modifications.
+This is a fundamental database that houses data based on a conventional Sales environment. Sourced from progress.com with slight modifications.

samples/databases/README.md

@@ -1,6 +1,6 @@
 # Sample databases
 
-Contains samples databases for Microsoft's SQL databases include SQL Server, Azure SQL Database, and Azure SQL Data Warehouse.
+Contains sample databases for Microsoft's SQL databases include SQL Server, Azure SQL Database, and Azure SQL Data Warehouse.
 
 __[wide-world-importers](wide-world-importers/)__
 
@@ -12,4 +12,4 @@ Sample data warehouse that illustrates loading data into Azure SQL Data Warehous
 
 __[AdventureWorks](adventure-works/)__
 
-Sample databases and Analysis Services models for use with SQL Server. 
+Sample databases and Analysis Services models for use with SQL Server. 

samples/features/reporting-services/ssrs-migration-rss/ssrs_migration.rss

@@ -27,7 +27,7 @@
 '			-v tu="domain\username" -v tp="password"		'Credentials for target server. OPTIONAL, default credentials are used if missing.
 '			-v tst="SITE"						'Specifies SharePoint site, in case target server is in SharePoint integrated mode
 '			-v tf="TARGETFOLDER"					'Set to "/" for migrating into the root level, or to something like "/folder/subfolder" for copying into some folder, which must be already existing. Everything within "SOURCEFOLDER" will be copied into "TARGETFOLDER". OPTIONAL, default is "/".
-'			-v security= "True/False"				'If set to “False”, destination catalog items will inherit security setting according to the settings of the target system. Default is false.
+'			-v security= "True/False"				'If set to "False", destination catalog items will inherit security setting according to the settings of the target system. Default is false.
 '			
 ' Example: rs.exe -i ssrs_migration.rss -e Mgmt2010 -s http://server1/reportserver -v ts="http://server2/_vti_bin/reportserver"
 ' Example: rs.exe -i ssrs_migration.rss -e Mgmt2010 -s http://server1/reportserver -u domain1\user1 -p password1 -v f="/SOURCEFOLDER" -v ts="http://server2/_vti_bin/reportserver" -v tu="domain1\user2" -v tp="password2" -v tf="/TARGETFOLDER"
@@ -1067,4 +1067,4 @@ Sub WriteSuccess()
 	Console.ForegroundColor = ConsoleColor.Green
 	Console.WriteLine(" ... SUCCESS")
 	Console.ResetColor()
-End Sub
+End Sub