Merge conflicts

Jim Vance · Jim Vance · commit df6131e49b32 · 2017-01-30T17:44:04.000-08:00
diff --git a/docs/ado/guide/ado-history.md b/docs/ado/guide/ado-history.md
@@ -6,6 +6,7 @@ ms.reviewer: ""
 ms.suite: ""
 ms.tgt_pltfrm: ""
 ms.prod: "sql-non-specified"
+ms.technology: “drivers”
 ms.topic: "article"
 helpviewer_keywords: 
   - "ADO, what's new"
diff --git a/docs/ado/guide/ado-introduction.md b/docs/ado/guide/ado-introduction.md
@@ -6,6 +6,7 @@ ms.reviewer: ""
 ms.suite: ""
 ms.tgt_pltfrm: ""
 ms.prod: "sql-non-specified"
+ms.technology: “drivers”
 ms.topic: "article"
 helpviewer_keywords: 
   - "ADO, programming"
diff --git a/docs/ado/guide/ado-programmer-s-guide.md b/docs/ado/guide/ado-programmer-s-guide.md
@@ -5,6 +5,7 @@ ms.date: "01/19/2017"
 ms.reviewer: ""
 ms.suite: ""
 ms.prod: "sql-non-specified"
+ms.technology: "drivers"
 ms.tgt_pltfrm: ""
 ms.topic: "article"
 helpviewer_keywords: 
diff --git a/docs/ado/guide/ado-security-design-issues.md b/docs/ado/guide/ado-security-design-issues.md
@@ -6,6 +6,7 @@ ms.reviewer: ""
 ms.suite: ""
 ms.tgt_pltfrm: ""
 ms.prod: "sql-non-specified"
+ms.technology: “drivers”
 ms.topic: "article"
 helpviewer_keywords: 
   - "ADO, security"
diff --git a/docs/ado/guide/ado-task-table.md b/docs/ado/guide/ado-task-table.md
@@ -6,6 +6,7 @@ ms.reviewer: ""
 ms.suite: ""
 ms.tgt_pltfrm: ""
 ms.prod: "sql-non-specified"
+ms.technology: “drivers”
 ms.topic: "article"
 helpviewer_keywords: 
   - "tasks [ADO]"
diff --git a/docs/ado/guide/ado-technology-table.md b/docs/ado/guide/ado-technology-table.md
@@ -6,6 +6,7 @@ ms.reviewer: ""
 ms.suite: ""
 ms.tgt_pltfrm: ""
 ms.prod: "sql-non-specified"
+ms.technology: “drivers”
 ms.topic: "article"
 helpviewer_keywords: 
   - "ADO, technologies"
diff --git a/docs/ado/guide/prerequisites-for-using-the-ado-documentation.md b/docs/ado/guide/prerequisites-for-using-the-ado-documentation.md
@@ -6,6 +6,7 @@ ms.reviewer: ""
 ms.suite: ""
 ms.tgt_pltfrm: ""
 ms.prod: "sql-non-specified"
+ms.technology: “drivers”
 ms.topic: "article"
 helpviewer_keywords: 
   - "ADO, prerequisites"
diff --git a/docs/ado/guide/referencing-the-ado-libraries-in-a-visual-basic-6-application.md b/docs/ado/guide/referencing-the-ado-libraries-in-a-visual-basic-6-application.md
@@ -6,6 +6,7 @@ ms.reviewer: ""
 ms.suite: ""
 ms.tgt_pltfrm: ""
 ms.prod: "sql-non-specified"
+ms.technology: “drivers”
 ms.topic: "article"
 dev_langs: 
   - "VB"
diff --git a/docs/ado/guide/referencing-the-ado-libraries-in-a-visual-c-application.md b/docs/ado/guide/referencing-the-ado-libraries-in-a-visual-c-application.md
@@ -5,6 +5,7 @@ ms.date: "01/19/2017"
 ms.reviewer: ""
 ms.suite: ""
 ms.prod: "sql-non-specified"
+ms.technology: “drivers”
 ms.tgt_pltfrm: ""
 ms.topic: "article"
 dev_langs: 
diff --git a/docs/ado/guide/referencing-the-ado-libraries.md b/docs/ado/guide/referencing-the-ado-libraries.md
@@ -6,6 +6,7 @@ ms.reviewer: ""
 ms.suite: ""
 ms.tgt_pltfrm: ""
 ms.prod: "sql-non-specified"
+ms.technology: “drivers”
 ms.topic: "article"
 helpviewer_keywords: 
   - "libraries [ADO]"
diff --git a/docs/ado/microsoft-activex-data-objects-ado.md b/docs/ado/microsoft-activex-data-objects-ado.md
@@ -5,6 +5,7 @@ ms.date: "01/19/2017"
 ms.reviewer: ""
 ms.suite: ""
 ms.prod: "sql-non-specified"
+ms.technology: "drivers"
 ms.tgt_pltfrm: ""
 ms.topic: "article"
 helpviewer_keywords: 
diff --git a/docs/ado/reference/ado-glossary.md b/docs/ado/reference/ado-glossary.md
@@ -6,6 +6,7 @@ ms.reviewer: ""
 ms.suite: ""
 ms.tgt_pltfrm: ""
 ms.prod: "sql-non-specified"
+ms.technology: “drivers”
 ms.topic: "article"
 helpviewer_keywords: 
   - "ADO, glossary"
diff --git a/docs/ado/reference/ado-programmer-s-reference.md b/docs/ado/reference/ado-programmer-s-reference.md
@@ -6,6 +6,7 @@ ms.reviewer: ""
 ms.suite: ""
 ms.tgt_pltfrm: ""
 ms.prod: "sql-non-specified"
+ms.technology: “drivers”
 ms.topic: "article"
 helpviewer_keywords: 
   - "ADO, reference"
diff --git a/docs/breadcrumb/toc.yml b/docs/breadcrumb/toc.yml
@@ -1,4 +1,4 @@
-- name: Docs
+- name: SQL
   href: /sql/
   homepage: /sql/
   items:
@@ -26,7 +26,7 @@
         homepage: /sql/connect/php
       - name: Python
         href: /sql/connect/python/
-        homepage: /sql/connect/oython
+        homepage: /sql/connect/python
       - name: Ruby
         href: /sql/connect/ruby/
         homepage: /sql/connect/ruby
@@ -36,6 +36,33 @@
   - name: ODBC
     href: /sql/odbc/
     homepage: /sql/odbc
+    items:
+      - name: Administration
+        href: /sql/sample/admin
+        homepage: /sql/sample/reference
+      - name: Microsoft Drivers
+        href: /sql/sample/microsoft
+        homepage: /sql/sample/microsoft
+      - name: Reference
+        href: /sql/sample/admin
+        homepage: /sql/sample/reference
+        items:
+          - name: Appendix
+            href: /sql/sample/refernce/appendixes
+            homepage: /sql/sample/reference/appendixes
+          - name: Develop Applications
+            href: /sql/sample/reference/develop-app
+            homepage: /sql/sample/reference/develop-app
+          - name: Develop Drivers
+            href: /sql/sample/reference/develop-driver
+            homepage: /sql/sample/reference/develop-driver
+          - name: Installation
+            href: /sql/sample/reference/install
+            homepage: /sql/sample/reference/install
+          - name: Syntax
+            href: /sql/sample/reference/syntax
+            homepage: /sql/sample/reference/syntax
+  - name: SQL Server Data Tools
   - name: SQL Server Samples
     href: /sql/sample/
     homepage: /sql/sample
@@ -56,7 +83,7 @@
       - name: DB2 to SQL Server
         href: /sql/ssma/db2
         homepage: /sql/ssma/db2
-      - name: NySQL to SQL Server
+      - name: MySQL to SQL Server
         href: /sql/ssma/mysql
         homepage: /sql/ssma/access
       - name: Oracle to SQL Server
diff --git a/docs/connect/jdbc/connecting-using-azure-active-directory-authentication.md b/docs/connect/jdbc/connecting-using-azure-active-directory-authentication.md
@@ -6,6 +6,8 @@ ms.reviewer: ""
 ms.suite: ""
 ms.tgt_pltfrm: ""
 ms.prod: "sql-non-specified"
+ms.technology: 
+  - "drivers"
 ms.topic: "article"
 ms.assetid: 9c9d97be-de1d-412f-901d-5d9860c3df8c
 caps.latest.revision: 11
diff --git a/docs/connect/odbc/TOC.md b/docs/connect/odbc/TOC.md
@@ -3,7 +3,6 @@
 # [Download ODBC Driver for SQL Server](download-odbc-driver-for-sql-server.md)
 # [Step 1: Configure development environment for C++ development](step-1-configure-development-environment-for-c-development.md)
 # [Step 2: Create a SQL database for C++ development](step-2-create-a-sql-database-for-c-development.md)
-# [Step 3: Proof of concept connecting to SQL using C++](step-3-proof-of-concept-connecting-to-sql-using-c.md)
 
 # [Windows](./linux/TOC.md)
 # [Linux](./windows/TOC.md)
diff --git a/docs/connect/odbc/getting-started-with-odbc-driver-for-sql-server.md b/docs/connect/odbc/getting-started-with-odbc-driver-for-sql-server.md
@@ -1,7 +1,7 @@
 ---
 title: "Getting Started with ODBC Driver for SQL Server | Microsoft Docs"
 ms.custom: ""
-ms.date: "01/19/2017"
+ms.date: "01/30/2017"
 ms.prod: "sql-non-specified"
 ms.reviewer: ""
 ms.suite: ""
@@ -19,4 +19,7 @@ manager: "jhubbard"
 ## Getting Started  
 * [Step 1: Configure development environment for C++ development](../../connect/odbc/step-1-configure-development-environment-for-c-development.md)  
 * [Step 2: Create a SQL database for C++ development](../../connect/odbc/step-2-create-a-sql-database-for-c-development.md)  
-* [Step 3: Proof of concept connecting to SQL using C++](../../connect/odbc/step-3-proof-of-concept-connecting-to-sql-using-c.md)
+
+<!-- TODO
+* [Step 3: Proof of concept connecting to SQL using C++](../../connect/odbc/step-3-proof-of-concept-connecting-to-sql-using-c.md)
+-->
diff --git a/docs/connect/odbc/step-3-proof-of-concept-connecting-to-sql-using-c.md b/docs/connect/odbc/step-3-proof-of-concept-connecting-to-sql-using-c.md
diff --git a/docs/connect/sql-server-driver-documentation.md b/docs/connect/sql-server-driver-documentation.md
@@ -6,6 +6,7 @@ ms.reviewer: ""
 ms.suite: ""
 ms.tgt_pltfrm: ""
 ms.prod: "sql-non-specified"
+ms.technology: “drivers”
 ms.topic: "article"
 ms.assetid: aec3469e-3bdb-4a5a-b814-d37a81291e5e
 caps.latest.revision: 3
diff --git a/docs/odbc/TOC.md b/docs/odbc/TOC.md
@@ -1,8 +1,7 @@
-# [ODBC Glossary](odbc-glossary.md)
-# [ODBC Test](odbc-test.md)
-# [ODBCconf.EXE](odbcconf-exe.md)
 # [Microsoft Open Database Connectivity (ODBC)](microsoft-open-database-connectivity-odbc.md)
-
-# [ODBC Administration](./admin/TOC.md)
 # [Microsoft ODBC Drivers](./microsoft/TOC.md)
+# [ODBC Test](odbc-test.md)
+# [ODBCconf.exe](odbcconf-exe.md)
+# [ODBC Administration](./admin/TOC.md)
 # [ODBC Reference](./reference/TOC.md)
+# [ODBC Glossary](odbc-glossary.md)
diff --git a/docs/odbc/reference/TOC.md b/docs/odbc/reference/TOC.md
diff --git a/docs/sample/microsoft-sql-server-samples.md b/docs/sample/microsoft-sql-server-samples.md
diff --git a/docs/sample/world-wide-importers/data-generation.md b/docs/sample/world-wide-importers/data-generation.md
