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

README.md

@@ -6,6 +6,8 @@ Note that certain features like In-Memory OLTP are edition specific for SQL Serv
 ## Working in GitHub
 To work in GitHub, go to https://github.com/microsoft/sql-server-samples and fork the repository. Work in your own fork and when you are ready to submit to make a change or publish your sample for the first time, submit a pull request into the master branch of sql-server-samples. One of the approvers will review your request and accept or reject the pull request.
 
+Each sample should be in its own folder with a README.md file that follows the [template](README_samples_template.md). Generated files (e.g., .exe or .bacpac) and user configuration settings (e.g., .user) should not be committed to GitHub.
+
 ## License
 These samples and templates are all licensed under the MIT license. See the license.txt file in the root.
 

samples/README.md

@@ -12,6 +12,6 @@ __[features] (features/)__
 
 Samples illustrating specific SQL Server and Azure SQL Database features, including In-Memory OLTP, Master Data Services (MDS), and R Services.
 
-__[management] (management/)__
+__[management] (manage/)__
 
 Samples that help with the management of SQL Server and Azure SQL Database.

samples/manage/windows-containers/mssql-server-2014-express-windows/dockerfile

@@ -22,9 +22,9 @@ RUN powershell -Command (New-Object System.Net.WebClient).DownloadFile('%sql_exp
 
 RUN powershell -Command \
         set-strictmode -version latest ; \
-        stop-service MSSQL`$%sqlinstance% ; \
+        stop-service MSSQL`$SQLEXPRESS ; \
         set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql12.SQLEXPRESS\mssqlserver\supersocketnetlib\tcp\ipall' -name tcpdynamicports -value '' ; \
         set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql12.SQLEXPRESS\mssqlserver\supersocketnetlib\tcp\ipall' -name tcpport -value 1433 ; \
         set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql12.SQLEXPRESS\mssqlserver\' -name LoginMode -value 2 ; 
 
-CMD powershell ./start %sa_password%
+CMD powershell ./start %sa_password%