Skip to content

Commit 61fc9f8

Browse files
authored
Merge pull request #4131 from MicrosoftDocs/master
11/29 AM Publish
2 parents d122a41 + 5431ae9 commit 61fc9f8

11 files changed

Lines changed: 32 additions & 33 deletions

File tree

docs/connect/homepage-sql-connection-programming.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "Homepage for SQL client programming | Microsoft Docs"
33
description: "Hub page with annotated links to downloads and documentation for numerous combinations of languages and operating systems, for connecting to SQL Server or to Azure SQL Database."
44
author: "MightyPen"
5-
ms.date: "09/13/2017"
5+
ms.date: "11/29/2017"
66
ms.prod: "sql-non-specified"
77
ms.prod_service: "drivers"
88
ms.service: ""
@@ -53,7 +53,7 @@ In the following table, each language image is a link to detail about using the
5353
|   |   |   |
5454
| :-- | :-- | :-- |
5555
|   [![C# logo][image-ref-320-csharp]](#an-110-ado-net-docu) |   [![ORM Entity Framework, of .NET Framework][image-ref-333-ef]](#an-116-csharp-ef-orm) |   [![Java logo][image-ref-330-java]](#an-130-jdbc-docu) |
56-
|   [![Node.js logo][image-ref-340-node]](#an-140-node-js-docu) |   [**`ODBC for C++`**](#an-160-odbc-cpp-docu) |   [![PHP logo][image-ref-360-php]](#an-170-php-docu) |
56+
| &nbsp; [![Node.js logo][image-ref-340-node]](#an-140-node-js-docu) | &nbsp; [**`ODBC for C++`**](#an-160-odbc-cpp-docu)<br/>[![cpp-big-plus][image-ref-322-cpp]](#an-160-odbc-cpp-docu) | &nbsp; [![PHP logo][image-ref-360-php]](#an-170-php-docu) |
5757
| &nbsp; [![Python logo][image-ref-370-python]](#an-180-python-docu) | &nbsp; [![Ruby logo][image-ref-380-ruby]](#an-190-ruby-docu) | &nbsp; ... |
5858
| &nbsp; | &nbsp; | <br />|
5959

@@ -180,7 +180,7 @@ The Node.js connection driver for SQL Server is implemented in JavaScript. The d
180180

181181
## ODBC for C++
182182

183-
![ODBC logo][image-ref-350-odbc]
183+
![ODBC logo][image-ref-350-odbc] ![cpp-big-plus][image-ref-322-cpp]
184184

185185
Open database connectivity (ODBC) was developed in the 1990s, and it predates .NET Framework. ODBC is designed to be independent of any particular database system, and independent of operating system.
186186

@@ -360,7 +360,6 @@ This section provides links about other development options. These include using
360360

361361
<!-- Image references. -->
362362

363-
[image-ref-310-ado-net]: ./media/homepage-sql-connection-drivers/gm-ado-net-an51.png
364363
[image-ref-322-cpp]: ./media/homepage-sql-connection-drivers/gm-cpp-4point-p61f.png
365364
[image-ref-320-csharp]: ./media/homepage-sql-connection-drivers/gm-csharp-c10c.png
366365
[image-ref-333-ef]: ./media/homepage-sql-connection-drivers/gm-entity-framework-ef20d.png

docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ms.technology:
6868
<h3 class="bgdAccent1" style="padding:20px;">Develop</h3>
6969
<h4>Design</h4>
7070
<ul class="noBullet">
71-
<li><a class="barLink" href="/proxy/https/github.com/sql/connect/sql-connection-%3Cspan%20class="x x-first x-last">libraries">Connect with client applications</a></li>
71+
<li><a class="barLink" href="/proxy/https/github.com/sql/connect/%3Cspan%20class="x x-first x-last">homepage-sql-connection-programming">Connect with client applications</a></li>
7272
<li><a class="barLink" href=/proxy/https/github.com/MicrosoftDocs/sql-docs/commit/&quot;/sql/relational-databases/database-features&quot;&gt;Relational database concepts</a></li>
7373
</ul>
7474
<h4>Tools</h4>

docs/linux/sql-server-linux-release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ The following table lists the release history for SQL Server 2017.
5050
| [CU1](#CU1) | 14.0.3006.16 | 10-2017 |
5151
| [GA](#GA) | 14.0.1000.169 | 10-2017 |
5252

53-
## How to install cumulative updates
53+
## <a id="cuinstall"></a> How to install cumulative updates
5454

5555
If you have configured the Cumulative Update repository, then you will get the latest cumulative update of SQL Server packages when you perform new installations. The Cumulative Update repository is the default for all package installation articles for SQL Server on Linux. For more information about repository configuration, see [Source repositories](sql-server-linux-setup.md#repositories).
5656

-1.35 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.

docs/relational-databases/system-dynamic-management-views/sys-dm-os-wait-stats-transact-sql.md

Lines changed: 27 additions & 27 deletions
Large diffs are not rendered by default.
-67.9 KB
Binary file not shown.
-132 KB
Binary file not shown.

docs/ssma/media/query-timeout.png

-154 KB
Binary file not shown.

0 commit comments

Comments
 (0)