Merge pull request MicrosoftDocs#1582 from corob-msft/cr-dedupe-data-topic

GitHubber17 · web-flow · commit 8cd71a466f9f · 2018-11-18T15:38:17.000-08:00
Remove duplicate topic, update TOC and redirection
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -6700,6 +6700,11 @@
             "redirect_url": "/cpp/porting/visual-cpp-porting-and-upgrading-guide",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/porting/porting-data-applications.md",
+            "redirect_url": "/cpp/data/data-access-programming-mfc-atl",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/preprocessor/index.md",
             "redirect_url": "/cpp/preprocessor/c-cpp-preprocessor-reference",
diff --git a/docs/data/data-access-programming-mfc-atl.md b/docs/data/data-access-programming-mfc-atl.md
@@ -1,6 +1,6 @@
 ---
 title: "Data Access Programming (MFC-ATL)"
-ms.date: "11/04/2016"
+ms.date: "11/16/2018"
 helpviewer_keywords: ["MFC [C++], data access applications", "databases [C++], MFC", "OLE DB [C++], data access technologies", "data [C++], data access technologies", "data access [C++], class libraries for databases"]
 ms.assetid: def97b2c-b5a6-445f-afeb-308050fd4852
 ---
@@ -10,9 +10,11 @@ Over the years, Visual C++ has provided several ways to work with databases. In
 
 OLE DB is a low-level, high-performance API based on the COM specification, and is only supported on Windows. Use OLE DB if your program is accessing [linked servers](/sql/relational-databases/linked-servers/linked-servers-database-engine). ATL provides OLE DB templates that make it easier to create custom OLE DB providers and consumers. The most recent version of OLE DB shipped in SQL Native Client 11.
 
+## Porting data applications
+
 If your legacy application uses OLE DB or the higher-level ADO interface to connect to SQL Server, and you are not accessing linked servers, you should consider migrating to ODBC in the near future. If you do not require cross-platform portability or the latest SQL Server features, you can possibly use the Microsoft OLE DB Provider for ODBC (MSDASQL).  MSDASQL allows applications that are built on OLE DB and ADO (which uses OLEDB internally) to access data sources through an ODBC driver. As with any translation layer, MSDASQL can impact database performance. You should test to determine whether the impact is significant for your application. MSDASQL ships with the Windows operating system, and Windows Server 2008 & Windows Vista SP1 are the first Windows releases to include a 64-bit version of the technology.
 
-The SQL Native Client component (SNAC), which packages OLE DB and ODBC drivers in a single DLL, is deprecated for ODBC applications. The SQL Server 2012 version of SNAC (SQLNCLI11.DLL) ships with SQL Server 2016 because other SQL Server components depend on it. However, new C++ applications that connect to SQL Server or Azure SQL Database via ODBC should use [the most recent ODBC driver](https://docs.microsoft.com/sql/connect/odbc/download-odbc-driver-for-sql-server). For more information, see [SQL Server Native Client Programming](/sql/relational-databases/native-client/sql-server-native-client-programming)
+The SQL Native Client component (SNAC), which packages OLE DB and ODBC drivers in a single DLL, is deprecated for ODBC applications. The SQL Server 2012 version of SNAC (SQLNCLI11.DLL) ships with SQL Server 2016 because other SQL Server components depend on it. However, new C++ applications that connect to SQL Server or Azure SQL Database via ODBC should use [the most recent ODBC driver](/sql/connect/odbc/download-odbc-driver-for-sql-server). For more information, see [SQL Server Native Client Programming](/sql/relational-databases/native-client/sql-server-native-client-programming)
 
 If you use C++/CLI, you can continue to use ADO.NET as always. For more information, see [Data Access Using ADO.NET (C++/CLI)](../dotnet/data-access-using-adonet-cpp-cli.md), and [Accessing data in Visual Studio](/visualstudio/data-tools/accessing-data-in-visual-studio).
 
@@ -23,5 +25,4 @@ For more information about the history of data access technologies on Microsoft
 ## See Also
 
 [Data Access](data-access-in-cpp.md)<br/>
-[Microsoft Open Database Connectivity (ODBC)](https://docs.microsoft.com/sql/odbc/microsoft-open-database-connectivity-odbc)<br/>
-[Data Access Technologies Road Map](https://msdn.microsoft.com/library/ms810810.aspx)
+[Microsoft Open Database Connectivity (ODBC)](/sql/odbc/microsoft-open-database-connectivity-odbc)<br/>
diff --git a/docs/porting/TOC.md b/docs/porting/TOC.md
@@ -4,7 +4,7 @@
 ## [C++ Binary Compatibility between 2015 and 2017](binary-compat-2015-2017.md)
 ## [Overview of potential upgrade issues (Visual C++)](overview-of-potential-upgrade-issues-visual-cpp.md)
 ## [Porting 3rd-party libraries](porting-third-party-libraries.md)
-## [Porting data applications](porting-data-applications.md)
+## [Porting data applications](../data/data-access-programming-mfc-atl.md)
 ## [Porting and Upgrading: Examples and Case Studies](porting-and-upgrading-examples-and-case-studies.md)
 ### [Porting Guide: MFC Scribble](porting-guide-mfc-scribble.md)
 ### [Porting Guide: COM Spy](porting-guide-com-spy.md)
diff --git a/docs/porting/porting-data-applications.md b/docs/porting/porting-data-applications.md
