Skip to content

Commit 1ef44bb

Browse files
author
mikeblome
committed
merge conflict
2 parents b421236 + 7bad761 commit 1ef44bb

5,648 files changed

Lines changed: 7482 additions & 35347 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/data/atl-database-classes-ole-db-templates.md‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22
title: "ATL Database Classes (OLE DB Templates) | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-windows"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
5+
ms.technology: ["cpp-data"]
6+
ms.topic: "conceptual"
107
dev_langs: ["C++"]
118
helpviewer_keywords: ["OLE DB templates [C++], ATL database classes", "database classes [C++], OLE DB", "database classes [C++], ATL"]
129
ms.assetid: 219766aa-e18a-405f-9e36-d7a0fdb31b2b
13-
caps.latest.revision: 14
1410
author: "mikeblome"
1511
ms.author: "mblome"
16-
manager: "ghogen"
1712
ms.workload: ["cplusplus", "data-storage"]
1813
---
1914
# ATL Database Classes (OLE DB Templates)

‎docs/data/catalog-information-mfc-data-access.md‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22
title: "Catalog Information (MFC Data Access) | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-windows"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
5+
ms.technology: ["cpp-data"]
6+
ms.topic: "conceptual"
107
dev_langs: ["C++"]
118
helpviewer_keywords: ["tables [C++], catalog information", "tables [C++]", "ODBC [C++], catalog information", "catalog information database [C++]", "databases [C++], catalog information database"]
129
ms.assetid: c184e80f-ff17-409f-9df8-05275080bb8d
13-
caps.latest.revision: 8
1410
author: "mikeblome"
1511
ms.author: "mblome"
16-
manager: "ghogen"
1712
ms.workload: ["cplusplus", "data-storage"]
1813
---
1914
# Catalog Information (MFC Data Access)

‎docs/data/changes-you-might-make-to-the-default-code-mfc-data-access.md‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22
title: "Changes You Might Make to the Default Code (MFC Data Access) | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-windows"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
5+
ms.technology: ["cpp-data"]
6+
ms.topic: "conceptual"
107
dev_langs: ["C++"]
118
helpviewer_keywords: ["record views [C++], customizing default code"]
129
ms.assetid: 9992ed37-a6bf-45a5-a572-5c14e42b6628
13-
caps.latest.revision: 8
1410
author: "mikeblome"
1511
ms.author: "mblome"
16-
manager: "ghogen"
1712
ms.workload: ["cplusplus", "data-storage"]
1813
---
1914
# Changes You Might Make to the Default Code (MFC Data Access)

‎docs/data/command-handlers-for-record-scrolling-mfc-data-access.md‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22
title: "Command Handlers for Record Scrolling (MFC Data Access) | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-windows"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
5+
ms.technology: ["cpp-data"]
6+
ms.topic: "conceptual"
107
dev_langs: ["C++"]
118
helpviewer_keywords: ["record views [C++], scrolling", "record scrolling [C++]", "scrolling records"]
129
ms.assetid: f8b13477-2a37-459e-a30c-806fb78165ac
13-
caps.latest.revision: 8
1410
author: "mikeblome"
1511
ms.author: "mblome"
16-
manager: "ghogen"
1712
ms.workload: ["cplusplus", "data-storage"]
1813
---
1914
# Command Handlers for Record Scrolling (MFC Data Access)

‎docs/data/data-access-in-cpp.md‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22
title: "Data Access in Visual C++ | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "03/28/2017"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-windows"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
5+
ms.technology: ["cpp-data"]
6+
ms.topic: "conceptual"
107
dev_langs: ["C++"]
118
helpviewer_keywords: ["Visual C++, data access applications", "databases [C++]", "OLE DB [C++], data access technologies", "data [C++], data access technologies", "data access [C++], class libraries for databases"]
129
ms.assetid: 95da6237-bbe2-480a-ae50-3a520051ceff
13-
caps.latest.revision: 14
1410
author: "mikeblome"
1511
ms.author: "mblome"
16-
manager: "ghogen"
1712
ms.workload: ["cplusplus", "data-storage"]
1813
---
1914

‎docs/data/data-access-programming-mfc-atl.md‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22
title: "Data Access Programming (MFC-ATL) | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-windows"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
5+
ms.technology: ["cpp-data"]
6+
ms.topic: "conceptual"
107
dev_langs: ["C++"]
118
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"]
129
ms.assetid: def97b2c-b5a6-445f-afeb-308050fd4852
13-
caps.latest.revision: 14
1410
author: "mikeblome"
1511
ms.author: "mblome"
16-
manager: "ghogen"
1712
ms.workload: ["cplusplus", "data-storage"]
1813
---
1914
# Data Access Programming (MFC/ATL)

‎docs/data/data-exchange-for-record-views-mfc-data-access.md‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22
title: "Data Exchange for Record Views (MFC Data Access) | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-windows"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
5+
ms.technology: ["cpp-data"]
6+
ms.topic: "conceptual"
107
dev_langs: ["C++"]
118
helpviewer_keywords: ["RFX (record field exchange), data exchange mechanism", "RFX (record field exchange), record views", "record views, data exchange", "DDX (dialog data exchange), record views", "RFX (record field exchange)"]
129
ms.assetid: abc52ca7-6997-47a7-98f3-f347f52b1f72
13-
caps.latest.revision: 9
1410
author: "mikeblome"
1511
ms.author: "mblome"
16-
manager: "ghogen"
1712
ms.workload: ["cplusplus", "data-storage"]
1813
---
1914
# Data Exchange for Record Views (MFC Data Access)

‎docs/data/designing-and-creating-a-record-view-mfc-data-access.md‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22
title: "Designing and Creating a Record View (MFC Data Access) | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-windows"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
5+
ms.technology: ["cpp-data"]
6+
ms.topic: "conceptual"
107
dev_langs: ["C++"]
118
helpviewer_keywords: ["designing forms", "record views, creating", "forms [C++], designing", "record views, designing", "application wizards [C++], creating record view classes", "designing record views"]
129
ms.assetid: 1d6f5439-754f-4b8b-a19d-841a4657827b
13-
caps.latest.revision: 9
1410
author: "mikeblome"
1511
ms.author: "mblome"
16-
manager: "ghogen"
1712
ms.workload: ["cplusplus", "data-storage"]
1813
---
1914
# Designing and Creating a Record View (MFC Data Access)

‎docs/data/features-of-record-view-classes-mfc-data-access.md‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22
title: "Features of Record View Classes (MFC Data Access) | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-windows"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
5+
ms.technology: ["cpp-data"]
6+
ms.topic: "conceptual"
107
dev_langs: ["C++"]
118
helpviewer_keywords: ["record views, classes", "record view classes"]
129
ms.assetid: e7b2820f-09c4-483f-83c0-317e8be42bdf
13-
caps.latest.revision: 8
1410
author: "mikeblome"
1511
ms.author: "mblome"
16-
manager: "ghogen"
1712
ms.workload: ["cplusplus", "data-storage"]
1813
---
1914
# Features of Record View Classes (MFC Data Access)

‎docs/data/filling-a-list-box-from-a-second-recordset-mfc-data-access.md‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22
title: "Filling a List Box from a Second Recordset (MFC Data Access) | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-windows"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
5+
ms.technology: ["cpp-data"]
6+
ms.topic: "conceptual"
107
dev_langs: ["C++"]
118
helpviewer_keywords: ["record views, filling list boxes", "list boxes, filling from second recordset", "recordsets [C++], filling list boxes or combo boxes", "CComboBox class, filling object from second rowset", "ODBC recordsets [C++], filling list boxes or combo boxes", "combo boxes [C++], filling from second recordset", "CListCtrl class, filling from second recordset"]
129
ms.assetid: 360c0834-da6b-4dc0-bcea-80e9acd611f0
13-
caps.latest.revision: 9
1410
author: "mikeblome"
1511
ms.author: "mblome"
16-
manager: "ghogen"
1712
ms.workload: ["cplusplus", "data-storage"]
1813
---
1914
# Filling a List Box from a Second Recordset (MFC Data Access)

0 commit comments

Comments
 (0)