Repository: trafodion Updated Branches: refs/heads/master 5fea1ac88 -> e718915a3
Correct the descriptions of how to launch ODBC in *Trafodion Client Installation Guide* Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/da53fa61 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/da53fa61 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/da53fa61 Branch: refs/heads/master Commit: da53fa61a0ca762bf1e1f09ccde252ed65074b5a Parents: aec5108 Author: liu.yu <[email protected]> Authored: Thu Mar 1 14:52:55 2018 +0800 Committer: liu.yu <[email protected]> Committed: Thu Mar 1 14:52:55 2018 +0800 ---------------------------------------------------------------------- .../src/asciidoc/_chapters/odbc_windows.adoc | 18 +++++++++--------- .../src/asciidoc/_chapters/preparation.adoc | 2 ++ 2 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/da53fa61/docs/client_install/src/asciidoc/_chapters/odbc_windows.adoc ---------------------------------------------------------------------- diff --git a/docs/client_install/src/asciidoc/_chapters/odbc_windows.adoc b/docs/client_install/src/asciidoc/_chapters/odbc_windows.adoc index 67e2d6d..bb85eca 100644 --- a/docs/client_install/src/asciidoc/_chapters/odbc_windows.adoc +++ b/docs/client_install/src/asciidoc/_chapters/odbc_windows.adoc @@ -106,9 +106,9 @@ image:{images}/winodbc_install_finished.jpg[Windows ODBC Install Finished Screen == Set Up ODBC Data Source 1. Start the Microsoft ODBC Administrator: -* On Windows 7: *Start>All Programs>{project-name} ODBC _version_>MS ODBC Administrator* -* On Windows 8: Right-click the *{project-name} ODBC _version_* icon on the desktop and select MS ODBC Administrator. -* On Windows 10: Click the Windows icon in the menu bar. Type *Set up ODBC data sources (64-bit)*. Click on the found item. +* On Windows 7: *Start > All Programs>{project-name} ODBC _version_ > MS ODBC Administrator* +* On Windows 8: *Start > Control Panel > System and Security > Administrative Tool > ODBC Data Sources (64-bit)* +* On Windows 10: Click the Windows icon in the menu bar. Select *Control Panel*. Search for *Set up ODBC data sources (64-bit)*. Click on the found item. + image:{images}/winodbc_admin_intro.jpg[Windows ODBC Admin Intro Screen] + @@ -167,9 +167,9 @@ the {project-name} Database Connectivity Services (DCS) server over a TCP/IP net To enable compression in the ODBC driver or to change the compression setting, follow these steps: 1. Launch the MS ODBC Administrator. -* On Windows 7: *Start>All Programs>{project-name} ODBC _version_>MS ODBC Administrator* -* On Windows 8: Right-click the *{project-name} ODBC _version_* icon on the desktop and select MS ODBC Administrator. -* On Windows 10: Right-click the Windows icon in the menu bar. Select *Settings*. Search for *Set up ODBC data sources (64-bit)*. Click on the found item. +* On Windows 7: *Start > All Programs > {project-name} ODBC _version_ > MS ODBC Administrator* +* On Windows 8: *Start > Control Panel > System and Security > Administrative Tools > ODBC Data Sources (64-bit)* +* On Windows 10: Right-click the Windows icon in the menu bar. Select *Control Panel*. Search for *Set up ODBC data sources (64-bit)*. Click on the found item. 2. In the *ODBC Data Source Administrator* dialog box, select the *User DSN* tab, select the name of your data source under *User Data Sources*, and click *Configure*. If you did not create a data source, please refer to @@ -233,9 +233,9 @@ To reinstall the driver, we recommend that you fully remove your ODBC driver and [[win_odbc_uninstall]] == Uninstalling Windows ODBC Driver 1. Start to remove the ODBC driver: -* On Windows 7: *Start>All Programs>{project-name} ODBC _version_>Remove TRAF ODBC _version_* -* On Windows 8: Right-click the *{project-name} ODBC _version_* icon on the desktop and select *Remove TRAF ODBC _version_*. -* On Windows 10: Right-click the Windows icon in the menu bar. Select *Control Panel*. Click on *Uninstall a program*. Locate *{project-name} ODBC64 _version_* and select it. Click on *Uninstall*. +* On Windows 7: *Start > All Programs>{project-name} ODBC _version_ > Remove TRAF ODBC _version_* +* On Windows 8: *Start* > *Control Panel* > *Uninstall a program* > Locate *{project-name} ODBC64 _version_* > *Uninstall {project-name} ODBC64 _version_* +* On Windows 10: Right-click the Windows icon in the menu bar. Select *Control Panel*. Click on *Apps and features*. Locate *{project-name} ODBC64 _version_* and right-click it. Select *Uninstall*. 2. When the *Windows Installer* dialog box asks you if you want to uninstall this product, click *Yes*. 3. The *{project-name} ODBC _version_* dialog box displays the status and asks you to wait while `Windows configures {project-name} ODBC _version_` (that is, removes http://git-wip-us.apache.org/repos/asf/trafodion/blob/da53fa61/docs/client_install/src/asciidoc/_chapters/preparation.adoc ---------------------------------------------------------------------- diff --git a/docs/client_install/src/asciidoc/_chapters/preparation.adoc b/docs/client_install/src/asciidoc/_chapters/preparation.adoc index 9b635b3..c55023f 100644 --- a/docs/client_install/src/asciidoc/_chapters/preparation.adoc +++ b/docs/client_install/src/asciidoc/_chapters/preparation.adoc @@ -104,10 +104,12 @@ The {project-name} Client binaries are in the `clients` folder, which contains t |=== | File | Usage | `JDBCT4.zip` | {project-name} JDBC Type 4 Driver. +| `DISCLAIMER` | Apache disclaimer. | `LICENCE` | Apache license. | `NOTICE` | Apache notice. | `odbc64_linux.tar.gz` | {project-name} odb tool. | `TRAF_ODBC_Linux_Driver_64.tar.gz` | {project-name} ODBC driver for Linux. +| `TRAFODB-2.2.0.exe` | Trafodion odb tool for windows. | `trafci.zip` | The {project-name} command interpreter `trafci`. | `TFODBC64-*.exe` | *[Not included in this release]*^1^ {project-name} ODBC Driver for Windows. |===
