Merge branch 'master' into mb-cppcx2

sinemakinci1 · Mar 20, 2017 · 0d37ec8 · 0d37ec8
2 parents 8652d0c + 9bc5171
commit 0d37ec8
Show file tree

Hide file tree

Showing 6 changed files with 136 additions and 107 deletions.
diff --git a/docs/cpp-conformance-improvements-2017.md b/docs/cpp-conformance-improvements-2017.md
@@ -31,7 +31,7 @@ translation.priority.ht:
 # C++ conformance improvements in [!INCLUDE[vs_dev15_md](misc/includes/vs_dev15_md.md)]
 
 ## New language features  
-With support for generalized constexpr and NSDMI for aggregates, the compiler is now complete for features added in the C++14 Standard. Note that the compiler still lacks a few features from the C++11 and C++98 Standards.
+With support for generalized constexpr and NSDMI for aggregates, the compiler is now complete for features added in the C++14 Standard. Note that the compiler still lacks a few features from the C++11 and C++98 Standards. See [Visual C++ Language Conformance](visual-cpp-language-conformance.md) for a table that shows the current state of the compiler.
 
 ### C++11:
 **Expression SFINAE support in more libraries** 

diff --git a/docs/data/index.md b/docs/data/index.md
@@ -198,6 +198,7 @@ Since 2011 Microsoft has aligned on ODBC as the standard for native applications
                 <div class="card">
                     <div class="cardText">
                         <h3><a href="https://www.microsoft.com/download/details.aspx?id=53339" title="Microsoft® ODBC Driver 13.1 for SQL Server® - Windows Download Page">ODBC Driver 13.1 for SQL Server</a></h3>
+                        <p>The Microsoft ODBC Driver 13.1 for SQL Server is a single dynamic-link library (DLL) containing run-time support for applications using native-code APIs to connect to Microsoft SQL Server 2008, SQL Server 2008 R2, SQL Server 2012, SQL Server 2016, Analytics Platform System, Azure SQL Database and Azure SQL Data Warehouse. Download the driver here.</p>
                     </div>
                 </div>
             </div>

diff --git a/...e/deploying-visual-cpp-application-by-using-the-vcpp-redistributable-package.md b/...e/deploying-visual-cpp-application-by-using-the-vcpp-redistributable-package.md
@@ -48,9 +48,8 @@ This step-by-step article describes how to use the Visual C++ Redistributable Pa
 
 2.  Create a file, name it setup.bat, and add the following commands to it. Change `MyMFCApplication` to the name of your project.  
 
-    ```  
-  
-              @echo off  
+    ```cmd
+    @echo off  
     vcredist_x86.exe  
     mkdir "C:\Program Files\MyMFCApplication"  
     copy MyMFCApplication.exe "C:\Program Files\MyMFCApplication"