You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/03/23 00:31:24 UTC

[3/8] incubator-trafodion git commit: Fixes for TRAFODION-1898 and TRAFODION-1894.

Fixes for TRAFODION-1898 and TRAFODION-1894.

The Client Install guide has been updated to support Windows 10. In
addition, the content has been tested and changed accordingly. Finally, I
added a blurb about how to handle the fact that the WinODBC driver is not
part of the download package. (TRAFODION-1898)

The Command Interface guide was updated to used the correct default port
number (23400) and to allow code examples to be downloaded.

The documentation page was updated to link to select wiki pages for UDF
and manageability.

The download page was updated to clarify the content of the Client
download package. (TRAFODION-1894).

Please rebuild the 1.3.0 and 2.0.0 documentation. Once done, please
refresh the Trafodion web site.


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c4207744
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c4207744
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c4207744

Branch: refs/heads/master
Commit: c42077441dce5f41f438cdeb782c6dfecdd7fce2
Parents: 2f31eec
Author: Gunnar Tapper <gt...@esgyn.local>
Authored: Thu Mar 17 17:27:39 2016 -0600
Committer: Gunnar Tapper <gt...@esgyn.local>
Committed: Thu Mar 17 17:27:39 2016 -0600

----------------------------------------------------------------------
 .../src/asciidoc/_chapters/about.adoc           | 11 +--
 .../src/asciidoc/_chapters/introduction.adoc    | 19 ++--
 .../src/asciidoc/_chapters/jdbct4.adoc          | 23 ++---
 .../src/asciidoc/_chapters/odbc_linux.adoc      |  9 +-
 .../src/asciidoc/_chapters/odbc_windows.adoc    | 91 ++++++++++++--------
 .../src/asciidoc/_chapters/trafci.adoc          | 17 ++--
 docs/client_install/src/asciidoc/index.adoc     |  3 +
 .../src/asciidoc/_chapters/perlpython.adoc      | 60 +++----------
 docs/command_interface/src/asciidoc/index.adoc  |  4 +
 .../src/resources/source/sample.pl              | 19 ++++
 .../src/resources/source/sample.py              | 29 +++++++
 docs/src/site/markdown/documentation.md         |  4 +
 docs/src/site/markdown/download.md              |  2 +-
 pom.xml                                         |  4 +-
 14 files changed, 170 insertions(+), 125 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c4207744/docs/client_install/src/asciidoc/_chapters/about.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/_chapters/about.adoc b/docs/client_install/src/asciidoc/_chapters/about.adoc
index e29d926..1f42ab3 100644
--- a/docs/client_install/src/asciidoc/_chapters/about.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/about.adoc
@@ -30,7 +30,7 @@ This manual describes how to install and configure client applications that enab
 This manual is intended for users who want to connect to and use a Trafodion database.
 
 == New and Changed Information
-This manual shows updated versions for Trafodion Release 1.3.0. It also provides instructions on how to download and install <<odb,Trafodion odb>>, a
+This manual shows updated versions for Trafodion Release {project-version}. It also provides instructions on how to download and install <<odb,Trafodion odb>>, a
 new multi-threaded, ODBC-based command-line tool for parallel data loading and extracting.
 
 == Notation Conventions
@@ -133,6 +133,7 @@ For example:
 "{" module-name [, module-name] ... "}"
 ```
 
+<<<
 * Item Spacing
 +
 Spaces shown between items are required unless one of the items is a punctuation symbol such as a parenthesis or a comma.
@@ -147,7 +148,6 @@ If there is no space between two items, spaces are not permitted. In this exampl
 myfile.sh
 ```
 
-<<<
 * Line Spacing
 +
 If the syntax of a command is too long to fit on a single line, each continuation line is indented three spaces and is separated from the preceding line by a blank line.
@@ -159,13 +159,6 @@ match-value [NOT] LIKE _pattern
    [ESCAPE esc-char-expression] 
 ```
 
-== Publishing History
-[cols="2*",options="header"]
-|===
-| Product Version | Publication Date
-| Trafodion Release 1.3.0 | To be announced.
-|===
-
 == Comments Encouraged
 The Trafodion community encourages your comments concerning this document. We are committed to providing documentation that meets your
 needs. Send any errors found, suggestions for improvement, or compliments to:

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c4207744/docs/client_install/src/asciidoc/_chapters/introduction.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/_chapters/introduction.adoc b/docs/client_install/src/asciidoc/_chapters/introduction.adoc
index aed0070..0d88d72 100644
--- a/docs/client_install/src/asciidoc/_chapters/introduction.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/introduction.adoc
@@ -33,8 +33,8 @@ The following table lists JDBC-based clients supported by Trafodion.
 [cols="30%,70%",options="header"]
 |===
 | Client Name | Description
-| *Trafodion JDBC Type 4 Driver* | A driver that enables Java applications that run on a client workstation to connect to a Trafodion database.
-
+| *Trafodion JDBC Type 4 Driver* | A driver that enables Java applications that run on a client workstation to connect to a Trafodion database. +
+ +
 *NOTE:* The Trafodion Command Interface (TrafCI), DbVisualizer, and SQuirreL SQL Client require this driver to be installed on the client
 workstation.
 | *Trafodion Command Interface (TrafCI)* | A command-line interface that allows you to connect to a Trafodion database and run SQL statements and other commands interactively or from
@@ -52,7 +52,7 @@ The following table lists ODBC-based clients supported by Trafodion.
 | Client Name | Description
 | *Trafodion ODBC Driver for Linux* | A driver that enables applications, which were developed for the Microsoft ODBC API and run on a Linux workstation, to connect to a
 Trafodion database.
-| *Trafodion ODBC Driver for Windows* | *[Not included in this release]* +
+| *Trafodion ODBC Driver for Windows* | *[Not included in this release]*^1^ +
  +
 A driver that enables applications, which were developed for the Microsoft Open Database Connectivity (ODBC) application programming
 interface (API) and which run on a Windows workstation, to connect to a Trafodion database.
@@ -60,6 +60,10 @@ interface (API) and which run on a Windows workstation, to connect to a Trafodio
 http://trafodion.incubator.apache.org/docs/odb_user/index.html[Trafodion odb User Guide].
 |===
 
+^1^ License issues prevent us from including the ODBC Driver for Windows in this release. Contact the
+Trafodion user e-mail list (user@trafodion.incubator.apache.org) for help obtaining the driver.
+
+<<<
 [[introduction-download]]
 == Download Installation Package
 The Trafodion client software is available from the http://http://trafodion.apache.org/download.html[Trafodion Download] page. There is one
@@ -72,14 +76,14 @@ binaries are located in the Clients folder, which contains the following files:
 |===
 | File                             | Usage
 | odbc64_linux.tar.gz              | Trafodion odb tool.
-| TFODBC64-*.msi                   | *[Not included in this release]*^1^ Trafodion ODBC Driver for Windows.
+| TFODBC64-*.exe                   | *[Not included in this release]*^1^ Trafodion ODBC Driver for Windows.
 | TRAF_ODBC_Linux_Driver_64.tar.gz | Trafodion ODBC driver for Linux.
 | trafci.zip                       | The Trafodion command interpreter `trafci`.
 | JDBCT4.zip                       | Trafodion JDBC Type 4 Driver.
 |===
 
 ^1^ License issues prevent us from including the ODBC Driver for Windows in this release. Contact the
-Trafodion developers' e-mail list (dev@trafodion.incubator.apache.org) to obtain the driver.
+Trafodion user e-mail list (user@trafodion.incubator.apache.org) for help obtaining the driver.
 
 [[introduction-windows-download]]
 === Windows Download
@@ -102,10 +106,7 @@ an `apache-trafodion-clients-*.tar` file.
 the `clients` folder, which has the following content:
 +
 ```
-JDBCT4.zip
-odb64_linux.tar.gz
-trafci.zip
-TRAF_ODBC_Linux_Driver_64.tar.gz
+JDBCT4.zip odb64_linux.tar.gz trafci.zip TRAF_ODBC_Linux_Driver_64.tar.gz
 ```
 +
 You use these files to install the different Trafodion clients.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c4207744/docs/client_install/src/asciidoc/_chapters/jdbct4.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/_chapters/jdbct4.adoc b/docs/client_install/src/asciidoc/_chapters/jdbct4.adoc
index 52f0545..451446e 100644
--- a/docs/client_install/src/asciidoc/_chapters/jdbct4.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/jdbct4.adoc
@@ -1,4 +1,4 @@
-////
+a////
 /**
  *@@@ START COPYRIGHT @@@
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -58,6 +58,7 @@ C:\>
 The Java version should be *1.7* or higher. If the returned version is not supported, please refer to
 <<jdbct4-install-java, Installing a Supported Java Version>> below.
 
+<<<
 If you see this message:
 
 ```
@@ -178,16 +179,10 @@ You download and extract the Trafodion client package using the instructions in
 ```
 unzip JDBCT4.zip -d $HOME/jdbc
 ```
-+
-The command creates these subdirectories and files:
-+
-[cols="65%,35%",options="header"]
-|===
-| Default Installation Directory                                  | Client Operating System
-| _<user-specified directory>_ (For example: $HOME/jdbc)          | Windows or Linux
-|===
 
-[cols="30%l,25%l,45%",options="header"]
+The content of the target directory is as follows:
+
+[cols="33%l,30%l,37%",options="header"]
 |===
 | Installation Folder                | Files                        | Description
 | /lib                               | jdbcT4.jar                   | Product JAR file.
@@ -223,6 +218,7 @@ replacing `_jdbc-installation-directory_` with the name of the directory where y
 
 ^1^ Enclose the _jdk-directory_ in quotes to ensure that Windows can find the directory correctly. You can use the `set <variable>` command to verify the setting.
 
+<<<
 === Configure Applications
 
 Edit the `t4jdbc.properties` file in the `samples` folder. Refer to the `README` file in the `samples` folder for instructions.
@@ -256,6 +252,7 @@ url = jdbc:t4jdbc://trafodion.host.com:23400/:
 
 NOTE: The driver’s class name is `org.trafodion.jdbc.t4.T4Driver`.
 
+<<<
 [[jdbct4-test-programs]]
 == Test Programs
 
@@ -274,7 +271,7 @@ C:\Development Tools\Trafodion JDBCT4\samples>cd StatementSample
 C:\Development Tools\Trafodion JDBCT4\samples\StatementSample>%JAVA_HOME%\bin\javac -classpath ..\..\lib\jdbcT4.jar *.java ..\common\*.java
 Note: ..\common\sampleUtils.java uses or overrides a deprecated API.
 Note: Recompile with -Xlint:deprecation for details.
-
+v
 C:\Development Tools\Trafodion JDBCT4\samples\StatementSample>%JAVA_HOME%\bin\java -classpath ..\..\lib\jdbcT4.jar;..;. -Dt4jdbc.properties=..\t4jdbc.properties StatementSample
 Mar 16, 2016 9:36:54 PM common.sampleUtils getPropertiesConnection
 INFO: DriverManager.getConnection(url, props) passed
@@ -347,6 +344,7 @@ End of Data
 C:\Development Tools\Trafodion JDBCT4\samples\StatementSample>
 ```
 
+<<<
 == Uninstall JDBC Type-4 Driver
 Run one of these sets of commands to remove the Trafodion JDBC Type 4 Driver:
 
@@ -369,6 +367,8 @@ del <jdbc-installation-directory>
 rmdir <jdbc-installation-directory>
 ```
 +
+<<<
++
 *Example*
 +
 Windows uninstall
@@ -404,6 +404,7 @@ JDBC, Are you sure (Y/N)? Y
 C:\>
 ```
 
+<<<
 == Reinstall JDBC Type-4 Driver
 
 1. Close all applications running on the workstation, except the Web browser.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c4207744/docs/client_install/src/asciidoc/_chapters/odbc_linux.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/_chapters/odbc_linux.adoc b/docs/client_install/src/asciidoc/_chapters/odbc_linux.adoc
index 94b07b6..e0419e3 100644
--- a/docs/client_install/src/asciidoc/_chapters/odbc_linux.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/odbc_linux.adoc
@@ -63,7 +63,6 @@ NOTE: The following header files are not packaged with the Trafodion ODBC driver
  +
 To install those header files, <<win_odbc_client_env, Setting Up the Client Environment>>..
 
-<<<
 === Install/Reinstall Linux ODBC Driver
 
 NOTE: You must have root access to install the Trafodion ODBC Driver for Linux at the default system location.
@@ -92,6 +91,7 @@ Except for the sample file, the `install.sh` script saves a copy (`.SAV`) of you
 6.  Enter a directory for the data-source template file, or press *Enter* to use the default directory (`/etc/odbc`).
 7.  Enter a directory for the sample program, or press *Enter* to use the default directory (`/etc/odbc`).
 
+<<<
 === Set Up Client Environment
 
 If you selected default options during installation, ensure that:
@@ -166,6 +166,7 @@ NOTE: For better performance, we recommend that you use at least version `2.3._x
 * For information on the necessary data-source configuration options, you will need to add to the respective configuration files (for example,
 to `odbc.ini`).
 
+<<<
 === Run Sample Program (`connect_test`)
 
 NOTE: The examples after each step assume that you have default installation directories.
@@ -211,6 +212,8 @@ SQL_ATTR_CONNECTION_TIMEOUT = SYSTEM_DEFAULT
 SQL_LOGIN_TIMEOUT = SYSTEM_DEFAULT
 SQL_QUERY_TIMEOUT = NO_TIMEOUT
 ```
++
+<<<
 
 4.  Compile the sample program.
 +
@@ -255,8 +258,6 @@ export LD_LIBRARY_PATH=<path-to-odbc-driver-dlls>
 
 3.  In the `/etc/odbc/TRAFDSN` file, add the correct IP address to the `Server` parameter for the `Default_DataSource`. For example:
 +
-<<<
-+
 *Example*
 +
 ```
@@ -271,6 +272,8 @@ SQL_ATTR_CONNECTION_TIMEOUT = SYSTEM_DEFAULT
 SQL_LOGIN_TIMEOUT = SYSTEM_DEFAULT
 SQL_QUERY_TIMEOUT = NO_TIMEOUT
 ```
++
+<<<
 
 4.  Compile the sample program.
 +

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c4207744/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 98c2636..19545d9 100644
--- a/docs/client_install/src/asciidoc/_chapters/odbc_windows.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/odbc_windows.adoc
@@ -23,8 +23,8 @@
 [[install-windows-odbc-driver]]
 = Install Windows ODBC Driver
 
-NOTE: License issues prevent us from including the ODBC Driver for Windows in this release. Contact the
-Trafodion developers' e-mail list (dev@trafodion.incubator.apache.org) to obtain the driver.
+WARNING: License issues prevent us from including the ODBC Driver for Windows in this release. Contact the
+Trafodion user e-mail list (user@trafodion.incubator.apache.org) for help obtaining the driver.
 
 == Installation Requirements
 
@@ -34,7 +34,7 @@ Trafodion developers' e-mail list (dev@trafodion.incubator.apache.org) to obtain
 | Computer         | Windows compatible PC workstation
 | Memory           | Recommended minimum 32 MB
 | Disk Space       | Minimum 30 MB additional free space
-| Operating System | x64 Edition of Microsoft Windows 7, Windows 8, or Windows Server 2008
+| Operating System | x64 Edition of Microsoft Windows 7, Windows 8, Windows 10, or Windows Server 2008
 | Network Software | TCP/IP
 |===
 
@@ -47,7 +47,7 @@ NOTE: To install the driver on your PC, you must be logged on with a user ID tha
 
 You download and extract the Trafodion client package using the instructions in <<introduction-download, Download Installation Package>> above.
 
-The ODBC client installation file, `TFODBC64-*.msi`, installs or links to multiple client components:
+The ODBC client installation file, `TFODBC64-*.exe`, which installs or links to multiple client components:
 
 [cols="40%s,60%",options="header"]
 |===
@@ -64,7 +64,7 @@ during installation:
 [cols="40%l,60%",options="header"]
 |===
 | Default Installation Directory    | Client Operating System
-| C:\Program Files\Trafodion\TRAF   | ODBC 1.0 Windows 64-bit
+| C:\Program Files\Trafodion\TRAF   | ODBC _version_ Windows 64-bit
 |===
 
 === Start the InstallShield wizard
@@ -75,42 +75,44 @@ Please refer to <<win_odbc_interactive_mode,Interactive Mode Installation>> belo
 [[win_odbc_interactive_mode]]
 ==== Interactive Mode Installation
 
-1.  Double-click the `.msi` distribution file to start the InstallShield wizard.
+1.  Double-click the `TFODBC64-*.exe` distribution file to start the InstallShield wizard.
 2.  On the *Welcome* page, click *Next*.
-3.  On the *Destination Folder* page, click *Next* to select the default location: `C:\Program Files\Trafodion\TRAF ODBC 1.0\` 
+3.  Read and select the *I accept the agreement* radio button. Click *Next*. 
+4.  On the *Destination Folder* page, click *Install* to select the default location: `C:\Program Files\Trafodion\TRAF ODBC _version_\` 
 +
 This location is the installation directory for ODBC header and help files. All other ODBC files are installed in `%SYSTEMROOT%\system32`.
-4.  On the *Set Certificate Directory* page, click *Next* to accept the default location for the security certificate (`SYSTEM_DEFAULT`).
-5.  On the *Ready to Install the Program* page, click *Install*. The installation begins. The *Installing Trafodion ODBC64 1.0* page displays a
-progress bar.
-6.  On the *InstallShield Wizard Completed* page, click *Finish* to exit the wizard. Do not add a new `Trafodion ODBC` data source to the MS ODBC
-Administrator until you have restarted your system.
+
+5. Read and accept the Microsoft C++ license agreement by checking the *I agree to the license terms and conditions*. Click *Install*.
+6. Click *Close*.
+7. Click *Finish* to exit the installation wizard.
 
 === Add a client data source
 1.  Start the Microsoft ODBC Administrator:
-* On Windows 7: *Start>All Programs>Trafodion ODBC 1.0>MS ODBC Administrator*
-* On Windows 8: Right-click the *Trafodion ODBC 1.0* icon on the desktop and select MS ODBC Administrator.
-* On Windows 10:
+* On Windows 7: *Start>All Programs>Trafodion ODBC _version_>MS ODBC Administrator*
+* On Windows 8: Right-click the *Trafodion 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. 
 
 2.  In the *ODBC Data Source Administrator* dialog box, click *Add*.
-3.  Select *TRAF ODBC 1.0*, and then click *Finish* to start the *Create a New Trafodion ODBC Data Source* wizard.
+3.  Select *TRAF ODBC _version_*, and then click *Finish* to start the *Create a New Trafodion ODBC Data Source* wizard.
 4.  Enter the data source name (for example, `Default_DataSource_Schema1`) and an optional description, and click *Next*.
-5.  Enter the `IP address` or `host name` for the database platform. Enter the port number as *37800*. Leave the defaults as is, and click *Next*.
+5.  Enter the `IP address` or `host name` for the database platform. Enter the default port number as *23400*^1^. Leave the defaults as is, and click *Next*.
 6.  Enter the schema name. The default schema name is `SEABASE`. Click *Next*.
 7.  Enter the translate DLL name and its option, if you have one. If not, leave it blank. Leave the localization defaults as is.
 +
 The Replacement Character replaces any character that is incompatible for translation when retrieving data. It is one character (one or two
 bytes long). The Replacement Character is assumed to be in the character set specified in the Client/Server Character Set Interaction. If it is not specified, `?` is used as the default.
 +
-Click *Next*.
+Click *Finish*.
 
-8.  Select the trace options, if desired. Change the *Log File Path* to the location you want, or leave the default as is, and click *Finish*.
-9.  The wizard gives you an opportunity to test the connection. Click *Test Connection* and click *OK*.
-10.  The server ID and schema are filled in for you. Enter a valid user name and password, and click *OK*.
+8.  The wizard gives you an opportunity to test the connection. Click *Test Connection* and click *OK*.
+9.  The server ID and schema are filled in for you. Enter a valid user name and password, and click *OK*.
 +
 The wizard attempts to connect to the data source and displays a message stating whether it was successful or not.
-11.  Click *OK* to save the data source, or click *Cancel* _twice_ to quit the *Create Data Source* wizard.
+10.  Click *OK* to save the data source, or click *Cancel* _twice_ to quit the *Create Data Source* wizard.
+
+^1^ Your specific installation may use a different port number. Check with your Trafodion administrator.
 
+<<<
 [[win_odbc_client_env]]
 === Set Up Client Environment
 All client data sources connect to the pre-configured server data source on the database platform, which is `Default_DataSource`. 
@@ -128,25 +130,32 @@ definitions with different schemas on the workstation. The client data source wi
 To create a data source on the client workstation, follow these steps:
 
 1.  Launch the *MS ODBC Administrator*. 
-+
-For example, on Windows 7, select *Start>All Programs>Trafodion ODBC 1.0>MS ODBC Administrator*.
+* On Windows 7: *Start>All Programs>Trafodion ODBC _version_>MS ODBC Administrator*
+* On Windows 8: Right-click the *Trafodion 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. 
+
 2.  In the *ODBC Data Source Administrator* dialog box, select the *User DSN* tab, and click *Add*.
-3.  Select the *TRAF ODBC 1.0* driver, and then click *Finish*.
+3.  Select the *TRAF ODBC _version_* driver, and then click *Finish*.
 +
 A new dialog box appears, prompting you to create a new data source.
 4.  Enter the name of the data source, `Default_DataSource`, and click *Next* to continue.
-5.  Enter the IP address and port number of the Trafodion system to which will be connecting. The port number must be *37800*. 
+5.  Enter the IP address and port number of the Trafodion system to which will be connecting. By default, the port number is *23400*^1^. 
 Click *Next* to continue.
-6.  Select the default schema. If you do not select a schema, the default is `USR`. Click Next to continue.
+6.  Select the default schema. If you do not select a schema, the default is `SEABASE`. Click *Next* to continue.
++
+<<<
 7.  If desired, configure the *translate dll*, which translates data from one character set to another, and configure the localization. By
-default, the client error message language is English, and the client’s local character set is used. Click *Next* to continue.
-8.  If desired, set the trace options and the file path of the trace log. Click *Finish*.
+default, the client error message language is English, and the client’s local character set is used. Click *Finish* to continue.
 +
 The *Test Trafodion ODBC Connection* dialog box appears, allowing you to test the connection using the data source that you created.
-9.  Click *Test Connection*.
-10.  When prompted, enter your user name and password, and click *OK*.
+
+8.  Click *Test Connection*.
+9.  When prompted, enter your user name and password, and, optionally, schema. Click *OK*.
 +
 If the connection is successful, you will see `Connected Successfully` in the *Test Trafodion ODBC Connection* dialog box.
+10.  Click *OK* to save the data source, or click *Cancel* _twice_ to quit the *Create Data Source* wizard.
+
+^1^ Your specific installation may use a different port number. Check with your Trafodion administrator.
 
 === Enable Compression
 When compression is enabled in the ODBC driver, the ODBC driver can send and receive large volumes of data quickly and efficiently to and from
@@ -154,12 +163,18 @@ the Trafodion Database Connectivity Services (DCS) server over a TCP/IP network.
 
 To enable compression in the ODBC driver or to change the compression setting, follow these steps:
 
-1.  Launch the MS ODBC Administrator. For example, on Windows 7, select *Start>All Programs>Trafodion ODBC 1.0>MS ODBC Administrator*.
+1.  Launch the MS ODBC Administrator. 
+* On Windows 7: *Start>All Programs>Trafodion ODBC _version_>MS ODBC Administrator*
+* On Windows 8: Right-click the *Trafodion 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. 
+
 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 
 <<win_odbc_client_env, Setting Up the Client Environment>>.
 +
 A new dialog box appears, showing the configuration of your data source.
++
+<<<
 3.  Select the *Network* tab, and then select one of these values for *Compression*:
 * `SYSTEM_DEFAULT`, which is the same as no compression
 * `no compression`
@@ -171,6 +186,7 @@ maximum available compression
 4.  Click *OK* to accept the change.
 5.  Click *OK* to exit the *ODBC Data Source Administrator* dialog box.
 
+<<<
 [[win_odbc_run_basicsql]]
 === Run Sample Program (`basicsql`)
 NOTE: The Basic SQL sample program is not currently bundled with the ODBC Windows driver. To obtain the source code and the build and run
@@ -207,6 +223,7 @@ Data selected: 1000 CREATE REPORTS 2014-3-22
 Basic SQL ODBC Test Passed!
 ```
 
+<<<
 == Reinstall Windows ODBC Driver
 To reinstall the driver, we recommend that you fully remove your ODBC driver and then install the new version. Please refer to
 <<win_odbc_uninstall,Uninstalling the Trafodion ODBC Driver for Windows>> and then <<win_odbc_install, Installing the Trafodion ODBC Driver for Windows>>.
@@ -214,15 +231,15 @@ 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>Trafodion ODBC 1.0>Remove TRAF ODBC 1.0*
-* On Windows 8: Right-click the *Trafodion ODBC 1.0* icon on the desktop and select *Remove TRAF ODBC 1.0*.
-* On Windows 10:
+* On Windows 7: *Start>All Programs>Trafodion ODBC _version_>Remove TRAF ODBC _version_*
+* On Windows 8: Right-click the *Trafodion 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 *Trafodion ODBC64 _version_* and select it. Click on *Uninstall*.
 
 2.  When the *Windows Installer* dialog box asks you if you want to uninstall this product, click *Yes*.
-3.  The *Trafodion ODBC 1.0* dialog box displays the status and asks you to wait while `Windows configures Trafodion ODBC 1.0` (that is, removes
+3.  The *Trafodion ODBC _version_* dialog box displays the status and asks you to wait while `Windows configures Trafodion ODBC _version_` (that is, removes
 the Trafodion ODBC Driver from your Windows workstation).
 +
-After this dialog box disappears, Trafodion ODBC 1.0 is no longer on your workstation.
+After this dialog box disappears, Trafodion ODBC _version_ is no longer on your workstation.
 
 NOTE: Uninstalling the ODBC driver does not remove pre-existing data source definitions from the Windows registry.
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c4207744/docs/client_install/src/asciidoc/_chapters/trafci.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/_chapters/trafci.adoc b/docs/client_install/src/asciidoc/_chapters/trafci.adoc
index 9faf1ec..2a21d2a 100644
--- a/docs/client_install/src/asciidoc/_chapters/trafci.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/trafci.adoc
@@ -27,7 +27,7 @@
 == Installation Requirements
 
 The Trafodion Command Interface (trafci) runs on Windows and Linux. Before installing trafci on the client workstation, 
-ensure that you've installed the JBDC Type-4 driver. See the <<jdbct4, Install JDBC Type-4 Driver>> chapter above.
+ensure that you've installed the JDBC Type-4 driver. See the <<jdbct4, Install JDBC Type-4 Driver>> chapter above.
 
 [[trafci_perl_python]]
 === Install Perl or Python
@@ -45,6 +45,7 @@ If you plan to run the sample scripts provided with trafci, verify that you have
 installed on your client workstation. Use the trafci Installation Wizard to automatically download and install both the Perl JavaServer and
 Jython open source extensions. To download them manually, see the `README` in the samples directory.
 
+<<<
 [[trafci-installation-instructions]]
 == Installation Instructions
 
@@ -268,6 +269,9 @@ Do you want to install the optional components? [Y]:
 
 6.  If you do not wish to download and install the optional components, type *N* at the prompt and press Enter, and your installation
 is complete. Otherwise, type *Y*, press *Enter*, and proceed through the remainder of the installation.
++
+<<<
+
 7.  Type *Y* and press *Enter* if you agree to the terms. If you are doing an optional install only, you are prompted to enter a valid trafci
 installation directory:
 +
@@ -331,6 +335,7 @@ Trafodion Command Interface Installation Complete.
 /home/myname/trafcitemp>
 ```
 
+<<<
 [[trafci-post-installation-instructions]]
 == Post-Installation Instructions
 
@@ -364,7 +369,7 @@ http://trafodion.incubator.apache.com/docs/command_interface/index.html[_Trafodi
 |===
 
 <<<
-=== Test Launching trafci
+== Test Launching trafci
 
 Before launching trafci, make sure that you have set the Java path to the correct location. For more information, see:
 
@@ -381,8 +386,8 @@ momentarily in the trafci window before the trafci window disappears:
 For information about setting up and using trafci, such as choosing the look and feel of the interface or presetting launch parameters, see the
 http://trafodion.incubator.apache.com/docs/command_interface/index.html[Trafodion Command Interface Guide].
 
-
-==== Windows Example
+<<<
+=== Windows Example
 
 On Windows, do the following:
 
@@ -428,7 +433,8 @@ SEABASE   _MD_      _REPOS_   _LIBMGR_
 SQL>
 ```
 
-==== Linux Example
+<<<
+=== Linux Example
 
 On Linux, do the following:
 
@@ -455,6 +461,7 @@ SEABASE   _MD_      _REPOS_   _LIBMGR_
 SQL>
 ```
 
+<<<
 [[trafci-uninstall]]
 == Uninstall trafci
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c4207744/docs/client_install/src/asciidoc/index.adoc
----------------------------------------------------------------------
diff --git a/docs/client_install/src/asciidoc/index.adoc b/docs/client_install/src/asciidoc/index.adoc
index 7e8cee8..3de5837 100644
--- a/docs/client_install/src/asciidoc/index.adoc
+++ b/docs/client_install/src/asciidoc/index.adoc
@@ -58,9 +58,12 @@ specific language governing permissions and limitations under the License.
 
 Microsoft® and Windows® are U.S. registered trademarks of Microsoft Corporation. Java® is a registered trademark of Oracle and/or its affiliates. DbVisualizer™ is a trademark of DbVis Software AB.
 
+*Revision History*
+
 [cols="2",options="header"]
 |===
 | Version    | Date
+| 2.0.0      | To be announced.
 | 1.3.0      | January, 2016  
 |===
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c4207744/docs/command_interface/src/asciidoc/_chapters/perlpython.adoc
----------------------------------------------------------------------
diff --git a/docs/command_interface/src/asciidoc/_chapters/perlpython.adoc b/docs/command_interface/src/asciidoc/_chapters/perlpython.adoc
index 70d018d..2516849 100644
--- a/docs/command_interface/src/asciidoc/_chapters/perlpython.adoc
+++ b/docs/command_interface/src/asciidoc/_chapters/perlpython.adoc
@@ -197,62 +197,26 @@ You can launch the Perl or Python wrapper scripts as shown below:
 <<<
 === Example Perl Program (`sample.pl`)
 
-[source,perl]
-----
-use lib 'C:\\Program Files (x86)\\Apache Software Foundation\\Trafodion Command Interface\\lib\\perl';
-use Session;
-
-# create a new session
-$sess = Session->new();
-
-# connect to the database
-$sess->connect("user1","password","16.123.456.78","23400");
-
-$retval=$sess->execute(" set schema TRAFODION.CI_SAMPLE ");
-print $retval;
+You can download the `sample.pl` example from
+http://trafodion.incubator.apache.org/docs/command_interface/resources/source/sample.pl.
 
-# Execute sample queries
-$retval=$sess->execute("select * from employee"); print $retval;
-$retval=$sess->execute("get statistics"); print $retval;
+Alternatively, copy and paste the following code into a file named `sample.pl`:
 
-# disconnect from the database
-print "\n\nSession 1: Disconnecting first session. \n\n";
-$sess->disconnect();
+[source,perl]
+----
+include::{sourcedir}/sample.pl[]
 ----
 
 <<<
 === Example Python Program (`sample.py`)
 
-[source,python]
-----
-import os import sys
+You can download the `sample.py` example from
+http://trafodion.incubator.apache.org/docs/command_interface/resources/source/sample.py.
 
-## Modify this path
-sys.path.append("C:\\Program Files (x86)\\Apache Software Foundation\\Trafodion Command Interface\\lib\\python")
-import Session
+Alternatively, copy and paste the following code into a file named `sample.py`:
 
-# create a new session
-sess = Session.Session()
-
-# Connect to the database
-x=sess. connect ("user1","password","16.123.456.78","23400")
-
-# Execute sample queries
-
-# execute takes the query string as argument
-setSchema = "set schema TRAFODION.CI_SAMPLE"
-selectTable = "select * from employee"
-getStats = "get statistics"
-
-#Contruct a list of SQL statements to be executed
-queryList = [setSchema, selectTable, getStats] print "\n";
-
-for query in queryList:
-   print sess.execute (query)
-
-# disconnect the session
-sess.disconnect()
-del sess
-sess=None
+[source,python]
+----
+include::{sourcedir}/sample.py[]
 ----
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c4207744/docs/command_interface/src/asciidoc/index.adoc
----------------------------------------------------------------------
diff --git a/docs/command_interface/src/asciidoc/index.adoc b/docs/command_interface/src/asciidoc/index.adoc
index c39e642..a9d1bec 100644
--- a/docs/command_interface/src/asciidoc/index.adoc
+++ b/docs/command_interface/src/asciidoc/index.adoc
@@ -35,6 +35,7 @@
 :title-logo-image: ../../../shared/trafodion-logo.jpg
 
 :images: ../images
+:sourcedir: ../../resources/source
 :leveloffset: 1
 
 // The directory is called _chapters because asciidoctor skips direct
@@ -56,9 +57,12 @@ specific language governing permissions and limitations under the License.
 
 Microsoft® and Windows® are U.S. registered trademarks of Microsoft Corporation. Java® is a registered trademark of Oracle and/or its affiliates. DbVisualizer™ is a trademark of DbVis Software AB.
 
+*Revision History*
+
 [cols="2",options="header"]
 |===
 | Version    | Date
+| 2.0.0      | To be announced.
 | 1.3.0      | January, 2016  
 |===
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c4207744/docs/command_interface/src/resources/source/sample.pl
----------------------------------------------------------------------
diff --git a/docs/command_interface/src/resources/source/sample.pl b/docs/command_interface/src/resources/source/sample.pl
new file mode 100644
index 0000000..8fdfd38
--- /dev/null
+++ b/docs/command_interface/src/resources/source/sample.pl
@@ -0,0 +1,19 @@
+use lib 'C:\\Program Files (x86)\\Apache Software Foundation\\Trafodion Command Interface\\lib\\perl';
+use Session;
+
+# create a new session
+$sess = Session->new();
+
+# connect to the database
+$sess->connect("user1","password","16.123.456.78","23400");
+
+$retval=$sess->execute(" set schema TRAFODION.CI_SAMPLE ");
+print $retval;
+
+# Execute sample queries
+$retval=$sess->execute("select * from employee"); print $retval;
+$retval=$sess->execute("get statistics"); print $retval;
+
+# disconnect from the database
+print "\n\nSession 1: Disconnecting first session. \n\n";
+$sess->disconnect();

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c4207744/docs/command_interface/src/resources/source/sample.py
----------------------------------------------------------------------
diff --git a/docs/command_interface/src/resources/source/sample.py b/docs/command_interface/src/resources/source/sample.py
new file mode 100644
index 0000000..a41283e
--- /dev/null
+++ b/docs/command_interface/src/resources/source/sample.py
@@ -0,0 +1,29 @@
+import os import sys
+
+## Modify this path
+sys.path.append("C:\\Program Files (x86)\\Apache Software Foundation\\Trafodion Command Interface\\lib\\python")
+import Session
+
+# create a new session
+sess = Session.Session()
+
+# Connect to the database
+x=sess. connect ("user1","password","16.123.456.78","23400")
+
+# Execute sample queries
+
+# execute takes the query string as argument
+setSchema = "set schema TRAFODION.CI_SAMPLE"
+selectTable = "select * from employee"
+getStats = "get statistics"
+
+#Contruct a list of SQL statements to be executed
+queryList = [setSchema, selectTable, getStats] print "\n";
+
+for query in queryList:
+   print sess.execute (query)
+
+# disconnect the session
+sess.disconnect()
+del sess
+sess=None

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c4207744/docs/src/site/markdown/documentation.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/documentation.md b/docs/src/site/markdown/documentation.md
index a3848eb..89155b5 100644
--- a/docs/src/site/markdown/documentation.md
+++ b/docs/src/site/markdown/documentation.md
@@ -18,16 +18,20 @@ This page provides links to the per-release Trafodion documentation.
 
 Document                                              | Formats
 ------------------------------------------------------|-----------------------------------
+Scalar UDFs in C                                      | [wiki](https://cwiki.apache.org/confluence/display/TRAFODION/Scalar+UDFs+-+In+C)
 Trafodion Client Installation Guide                   | [Web Book](docs/client_install/index.html),[PDF](docs/client_install/Trafodion_Client_Installation_Guide.pdf)
+Trafodion Code Examples                               | [wiki](https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Code+Examples)
 Trafodion Command Interface Guide                     | [Web Book](docs/command_interface/index.html),[PDF](docs/command_interface/Trafodion_Command_Interface_Guide.pdf)
 Trafodion Control Query Default (CQD) Reference Guide | [Web Book](docs/cqd_reference/index.html),[PDF](docs/cqd_interface/Trafodion_CQD_Reference_Guide.pdf)
 Trafodion Database Connectivity Services Guide        | [Web Book](docs/dcs_reference/index.html),[API](docs/dcs_reference/apidocs/index.html)
 Trafodion Load and Transform Guide                    | [Web Book](docs/load_transform/index.html),[PDF](docs/load_transform/Trafodion_Load_Transform_Guide.pdf)
 Trafodion Messages Guide                              | [Web Book](docs/messages_guide/index.html),[PDF](docs/messages_guide/Trafodion_Messages_Guide.pdf)
+Trafodion Manageability                               | [wiki](https://cwiki.apache.org/confluence/display/TRAFODION/Trafodion+Manageability)
 Trafodion odb User Guide                              | [Web Book](docs/odb/index.html),[PDF](docs/odb/Trafodion_odb_User_Guide.pdf)
 Trafodion Provisioning Guide                          | [Web Book](docs/provisioning_guide/index.html),[PDF](docs/provisioning_guide/Trafodion_Provisioning_Guide.pdf)
 Trafodion REST Server Reference Guide                 | [Web Book](docs/rest_reference/index.html),[API](docs/rest_reference/apidocs/index.html)
 Trafodion SQL Reference Manual                        | [Web Book](docs/sql_reference/index.html),[PDF](docs/sql_reference/Trafodion_SQL_Reference_Manual.pdf)
+UDF Tutorial                                          | [wiki](https://cwiki.apache.org/confluence/display/TRAFODION/Tutorial%3A+The+object-oriented+UDF+interface)
 
 # 2.0.0 (In Development)
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c4207744/docs/src/site/markdown/download.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/download.md b/docs/src/site/markdown/download.md
index 66e0c2f..356e568 100644
--- a/docs/src/site/markdown/download.md
+++ b/docs/src/site/markdown/download.md
@@ -26,7 +26,7 @@ The Trafodion end-user environment is installed using the Trafodion Installer, w
 * [log4c++ RPM](http://traf-builds.esgyn.com/downloads/trafodion/publish/release/1.3.0/log4cxx-0.10.0-13.el6.x86_64.rpm)
 * [Trafodion Installer](http://traf-builds.esgyn.com/downloads/trafodion/publish/release/1.3.0/apache-trafodion-installer-1.3.0-incubating-bin.tar.gz)
 * [Trafodion Server](http://traf-builds.esgyn.com/downloads/trafodion/publish/release/1.3.0/apache-trafodion-1.3.0-incubating-bin.tar.gz)
-* [Trafodion Clients](http://traf-builds.esgyn.com/downloads/trafodion/publish/release/1.3.0/apache-trafodion-clients-1.3.0-incubating-bin.tar.gz)
+* [Trafodion Clients](http://traf-builds.esgyn.com/downloads/trafodion/publish/release/1.3.0/apache-trafodion-clients-1.3.0-incubating-bin.tar.gz) (JDBC, odb, ODBC, trafci)
 
 # Install
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c4207744/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7e2bf84..05f4f5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,7 @@
   </properties>
 
   <modules>
-    <module>docs/client_install</module>
+    <!--module>docs/client_install</module>
     <module>dcs</module>
     <module>core/rest</module>
     <module>docs/command_interface</module>
@@ -141,7 +141,7 @@
     <module>docs/provisioning_guide</module>
     <module>docs/messages_guide</module>
     <module>docs/odb_user</module>
-    <module>docs/sql_reference</module>
+    <module>docs/sql_reference</module-->
   </modules>
 
   <build>