SQL: Move the SQL ODBC client applications pages from the ODBC section into the general ES SQL Client Applications page (#37004)

docs/reference/sql/endpoints/client-apps/excel.asciidoc

@@ -1,6 +1,6 @@
 [role="xpack"]
 [testenv="platinum"]
-[[sql-odbc-applications-excel]]
+[[sql-client-apps-excel]]
 === Microsoft Excel
 
 experimental[]
@@ -14,8 +14,8 @@ ____
 ==== Prerequisites
 
 * Microsoft Office 2016 or higher
-* {product}
+* {es-sql} <<sql-odbc, ODBC driver>>
-* A preconfigured User or System DSN (see <<sql-odbc-setup>> section on how to configure a DSN).
+* A preconfigured User or System DSN (see <<dsn-configuration,Configuration>> section on how to configure a DSN).
 
 ==== Load data into a spreadsheet
 

docs/reference/sql/endpoints/client-apps/index.asciidoc

@@ -5,19 +5,33 @@
 
 beta[]
 
-Thanks to its <<sql-jdbc, JDBC>> interface, a broad range of third-party applications can use {es}'s SQL capabilities.
+Thanks to its <<sql-jdbc, JDBC>> and <<sql-odbc, ODBC>> interfaces, a broad range of third-party applications can use {es}'s SQL capabilities.
 This section lists, in alphabetical order, a number of them and their respective configuration - the list however is by no means comprehensive (feel free to https://www.elastic.co/blog/art-of-pull-request[submit a PR] to improve it):
 as long as the app can use the {es-sql} driver, it can use {es-sql}.
 
 * <<sql-client-apps-dbeaver, DBeaver>>
 * <<sql-client-apps-dbvis, DbVisualizer>>
+* <<sql-client-apps-excel, Microsoft Excel>>
+* <<sql-client-apps-powerbi, Microsoft Power BI Desktop>>
+* <<sql-client-apps-ps1, Microsoft PowerShell>>
+* <<sql-client-apps-microstrat, MicroStrategy Desktop>>
+* <<sql-client-apps-qlik, Qlik Sense Desktop>>
 * <<sql-client-apps-squirrel, SQuirreL SQL>>
 * <<sql-client-apps-workbench, SQL Workbench>>
+* <<sql-client-apps-tableau, Tableau Desktop>>
 
 NOTE: Each application has its own requirements and license; these are outside the scope of this documentation
 which covers only the configuration aspect with {es-sql}.
 
+WARNING: The support for applications implementing the ODBC 2.x standard and prior is currently limited.
+
 include::dbeaver.asciidoc[]
 include::dbvis.asciidoc[]
+include::excel.asciidoc[]
+include::powerbi.asciidoc[]
+include::ps1.asciidoc[]
+include::microstrat.asciidoc[]
+include::qlik.asciidoc[]
 include::squirrel.asciidoc[]
+include::tableau.asciidoc[]
 include::workbench.asciidoc[]

docs/reference/sql/endpoints/client-apps/microstrat.asciidoc

@@ -1,6 +1,6 @@
 [role="xpack"]
 [testenv="platinum"]
-[[sql-odbc-applications-microstrat]]
+[[sql-client-apps-microstrat]]
 === MicroStrategy Desktop
 
 experimental[]
@@ -14,8 +14,8 @@ ____
 ==== Prerequisites
 
 * MicroStrategy Desktop 11 or higher
-* {product}
+* {es-sql} <<sql-odbc, ODBC driver>>
-* A preconfigured User or System DSN (see <<sql-odbc-setup>> section on how to configure a DSN).
+* A preconfigured User or System DSN (see <<dsn-configuration,Configuration>> section on how to configure a DSN).
 
 ==== Data loading
 

docs/reference/sql/endpoints/client-apps/powerbi.asciidoc

@@ -1,6 +1,6 @@
 [role="xpack"]
 [testenv="platinum"]
-[[sql-odbc-applications-powerbi]]
+[[sql-client-apps-powerbi]]
 === Microsoft Power BI Desktop
 
 experimental[]
@@ -14,8 +14,8 @@ ____
 ==== Prerequisites
 
 * Microsoft Power BI Desktop 2.63 or higher
-* {product}
+* {es-sql} <<sql-odbc, ODBC driver>>
-* A preconfigured User or System DSN (see <<sql-odbc-setup>> section on how to configure a DSN).
+* A preconfigured User or System DSN (see <<dsn-configuration,Configuration>> section on how to configure a DSN).
 
 ==== Data loading
 

docs/reference/sql/endpoints/client-apps/ps1.asciidoc

@@ -1,6 +1,6 @@
 [role="xpack"]
 [testenv="platinum"]
-[[sql-odbc-applications-ps1]]
+[[sql-client-apps-ps1]]
 === Microsoft PowerShell
 
 experimental[]
@@ -16,8 +16,8 @@ connect to {es}.
 ==== Prerequisites
 
 * Microsoft PowerShell
-* {product}
+* {es-sql} <<sql-odbc, ODBC driver>>
-* A preconfigured User or System DSN (see <<sql-odbc-setup>> section on how to configure a DSN).
+* A preconfigured User or System DSN (see <<dsn-configuration,Configuration>> section on how to configure a DSN).
 
 ==== Writing a script
 

docs/reference/sql/endpoints/client-apps/qlik.asciidoc

@@ -1,6 +1,6 @@
 [role="xpack"]
 [testenv="platinum"]
-[[sql-odbc-applications-qlik]]
+[[sql-client-apps-qlik]]
 === Qlik Sense Desktop
 
 experimental[]
@@ -15,8 +15,8 @@ ____
 ==== Prerequisites
 
 * Qlik Sense Desktop November 2018 or higher
-* {product}
+* {es-sql} <<sql-odbc, ODBC driver>>
-* A preconfigured User or System DSN (see <<sql-odbc-setup>> section on how to configure a DSN).
+* A preconfigured User or System DSN (see <<dsn-configuration,Configuration>> section on how to configure a DSN).
 
 ==== Data loading
 

docs/reference/sql/endpoints/client-apps/tableau.asciidoc

@@ -1,6 +1,6 @@
 [role="xpack"]
 [testenv="platinum"]
-[[sql-odbc-applications-tableau]]
+[[sql-client-apps-tableau]]
 === Tableau Desktop
 
 experimental[]
@@ -14,8 +14,8 @@ ____
 ==== Prerequisites
 
 * Tableau 2018 or higher
-* {product}
+* {es-sql} <<sql-odbc, ODBC driver>>
-* A preconfigured User or System DSN (see <<sql-odbc-setup>> section on how to configure a DSN).
+* A preconfigured User or System DSN (see <<dsn-configuration,Configuration>> section on how to configure a DSN).
 
 ==== Data loading
 

docs/reference/sql/endpoints/odbc.asciidoc

@@ -20,10 +20,8 @@ It is a core level driver, exposing all of the functionality accessible through
 
 * <<sql-odbc-installation, Driver installation>>
 * <<sql-odbc-setup, Configuration>>
-* <<sql-odbc-applications, ODBC client applications>>
 
 include::odbc/installation.asciidoc[]
 include::odbc/configuration.asciidoc[]
-include::odbc/applications.asciidoc[]
 
 // vim: set noet fenc=utf-8 ff=dos sts=0 sw=4 ts=4 tw=138

docs/reference/sql/endpoints/odbc/applications.asciidoc

@@ -1,32 +0,0 @@
-[role="xpack"]
-[testenv="platinum"]
-[[sql-odbc-applications]]
-=== ODBC client applications
-
-experimental[]
-
-Thanks to a standardized API, a broad range of third-party ODBC-enabled applications can access {es} using {product}.
-This section will collect alphabetically an increasing list of such applications along with the configuration steps that need to be taken
-within them.
-
-* <<sql-odbc-applications-excel, Microsoft Excel>>
-* <<sql-odbc-applications-powerbi, Microsoft Power BI Desktop>>
-* <<sql-odbc-applications-ps1, Microsoft PowerShell>>
-* <<sql-odbc-applications-microstrat, MicroStrategy Desktop>>
-* <<sql-odbc-applications-qlik, Qlik Sense Desktop>>
-* <<sql-odbc-applications-tableau, Tableau Desktop>>
-
-NOTE: Each application has its own requirements and licensing; these are outside the scope of this documentation which only covers the
-configuration aspect of integration with {es-sql}.
-
-WARNING: The support for applications implementing the ODBC 2.x standard and prior is currently limited.
-
-include::applications-excel.asciidoc[]
-include::applications-powerbi.asciidoc[]
-include::applications-ps1.asciidoc[]
-include::applications-microstrat.asciidoc[]
-include::applications-qlik.asciidoc[]
-include::applications-tableau.asciidoc[]
-
-
-// vim: set noet fenc=utf-8 ff=dos sts=0 sw=4 ts=4 tw=138 columns=140