trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbirds...@apache.org
Subject [5/7] incubator-trafodion git commit: [TRaFODION-1699] Updated web site to rely on Contributor Guide on the wiki. Changed download to point to real binaries hosted on the build-result site. Ran spell checks on all the guides and fixed formatting errors a
Date Tue, 02 Feb 2016 17:04:13 GMT
[TRaFODION-1699] Updated web site to rely on Contributor Guide on the
wiki. Changed download to point to real binaries hosted on the
build-result site. Ran spell checks on all the guides and fixed formatting
errors as I saw then.

The *-redirect.md pages redirects Contribution and Team pages to the wiki
rather than doing a direct link. This is to allow us to track access using
Google Analytics, which is not possible with direct links to the wiki.

Also tried out Steve's new build for the web site, which works very well.
Thanks!

Please publish the documents to 2.0.0 and update the web site. The deleted
.md file can be deleted from the web site's SVN repository, too.


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

Branch: refs/heads/master
Commit: 3063990dc91194c50557d1c803152a4e605f4e3c
Parents: 125ae49
Author: Gunnar Tapper <gtapper@esgyn.local>
Authored: Fri Jan 29 01:02:09 2016 -0700
Committer: Gunnar Tapper <gtapper@esgyn.local>
Committed: Fri Jan 29 01:02:09 2016 -0700

----------------------------------------------------------------------
 .../src/asciidoc/_chapters/odbc_linux.adoc      |   4 +-
 .../src/asciidoc/_chapters/odbc_windows.adoc    |   2 +-
 .../src/asciidoc/_chapters/trafci.adoc          |   8 +-
 .../src/asciidoc/_chapters/commands.adoc        |  44 +--
 .../src/asciidoc/_chapters/interactive.adoc     |   8 +-
 .../src/asciidoc/_chapters/binder_msgs.adoc     | 280 ++++++++---------
 .../src/asciidoc/_chapters/ddl_msgs.adoc        |  21 +-
 .../src/asciidoc/_chapters/executor_msgs.adoc   |   5 +-
 .../asciidoc/_chapters/file_system_errors.adoc  |  10 +-
 .../src/asciidoc/_chapters/optimizer_msgs.adoc  |   4 +-
 .../src/asciidoc/_chapters/parser_msgs.adoc     |  22 +-
 .../src/asciidoc/_chapters/sort_msgs.adoc       |   4 +-
 .../src/asciidoc/_chapters/sqlstate.adoc        |   6 +-
 .../src/asciidoc/_chapters/a_warnings.adoc      |   2 +-
 .../src/asciidoc/_chapters/compare_tables.adoc  |   8 +-
 .../src/asciidoc/_chapters/concepts.adoc        |   6 +-
 .../src/asciidoc/_chapters/install.adoc         | Bin 13594 -> 13598 bytes
 docs/odb_user/src/asciidoc/_chapters/load.adoc  |  44 +--
 .../src/asciidoc/_chapters/query_driver.adoc    |   6 +-
 .../src/asciidoc/_chapters/sql_interpreter.adoc |   4 +-
 .../src/asciidoc/_chapters/cqds.adoc            |  10 +-
 .../src/asciidoc/_chapters/introduction.adoc    |   8 +-
 .../src/asciidoc/_chapters/olap_functions.adoc  |   6 +-
 .../src/asciidoc/_chapters/runtime_stats.adoc   |   4 +-
 .../src/asciidoc/_chapters/sql_clauses.adoc     |   4 +-
 .../sql_functions_and_expressions.adoc          | 198 ++++++------
 .../_chapters/sql_language_elements.adoc        |  70 ++---
 .../src/asciidoc/_chapters/sql_statements.adoc  | 264 ++++++++--------
 .../src/asciidoc/_chapters/sql_utilities.adoc   |  22 +-
 docs/src/site/markdown/advocate.md              |  15 -
 docs/src/site/markdown/build-tools-manual.md    | 197 ------------
 docs/src/site/markdown/build.md                 |  80 -----
 docs/src/site/markdown/code-organization.md     |  27 --
 docs/src/site/markdown/code.md                  |  32 --
 docs/src/site/markdown/contribute.md            |  69 -----
 docs/src/site/markdown/contributing-redirect.md |  18 ++
 .../markdown/cplusplus-coding-guidelines.md     | 310 -------------------
 .../src/site/markdown/create-dev-environment.md | 154 ---------
 docs/src/site/markdown/develop.md               | 253 ---------------
 docs/src/site/markdown/document.md              | 143 ---------
 docs/src/site/markdown/download.md              |  18 +-
 docs/src/site/markdown/index.md                 |  22 +-
 docs/src/site/markdown/install.md               |   5 +-
 .../src/site/markdown/manage-dev-environment.md |  51 ---
 docs/src/site/markdown/merge.md                 | 140 ---------
 docs/src/site/markdown/release.md               | 225 --------------
 .../site/markdown/setup-build-environment.md    | 160 ----------
 docs/src/site/markdown/team-redirect.md         |  18 ++
 docs/src/site/markdown/testing.md               | 179 -----------
 docs/src/site/markdown/tests.md                 |  71 -----
 docs/src/site/markdown/website.md               | 108 -------
 docs/src/site/markdown/wiki.md                  |  23 --
 docs/src/site/site.xml                          |  93 +-----
 53 files changed, 578 insertions(+), 2907 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/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 0d4a7ac..09cad34 100644
--- a/docs/client_install/src/asciidoc/_chapters/odbc_linux.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/odbc_linux.adoc
@@ -71,7 +71,7 @@ If you are building ODBC applications, please use the preferred build platform,
 
 1.  Create a download folder on the client workstation.
 2.  Open a Web browser and navigate to http://trafodion.incubator.apache.org/download.html.
-3.  Click on the `clients-1.3.*_n_*.tar.gz` link to start downloading the Trafodionclients tar file to your workstation.
+3.  Click on the `clients-1.3.*_n_*.tar.gz` link to start downloading the Trafodion clients tar file to your workstation.
 4.  Place the `clients-1.3.*_n_*.tar.gz` file into the download folder.
 5.  Unpack the `clients-1.3.*_n_*.tar.gz` file.
 +
@@ -106,7 +106,7 @@ cd PkgTmp
 Except for the sample file, the `install.sh` script saves a copy (`.SAV`) of your previous installation files if they exist.
 4.  Accept the terms of the license agreement by entering *yes*.
 5.  Enter a directory for the library files, or press Enter to use the default directory (`/usr/lib64`).
-6.  Enter a directory for the datasource template file, or press *Enter* to use the default directory (`/etc/odbc`).
+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

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/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 887d15f..8c20cfd 100644
--- a/docs/client_install/src/asciidoc/_chapters/odbc_windows.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/odbc_windows.adoc
@@ -173,7 +173,7 @@ default, the client error message language is English, and the client’s local
 +
 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 username and password, and click *OK*.
+10.  When prompted, enter your user name and password, and click *OK*.
 +
 If the connection is successful, you will see `Connected Successfully` in the *Test Trafodion ODBC Connection* dialog box.
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/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 b9a8f0a..f670587 100644
--- a/docs/client_install/src/asciidoc/_chapters/trafci.adoc
+++ b/docs/client_install/src/asciidoc/_chapters/trafci.adoc
@@ -394,7 +394,7 @@ Install Jython, a Java implementation of Python? [Y]: Y
 Jython URL (jython_installer-2.2.jar)
 ```
 
-11.  The setup proceeds to download and install the optional open-sourcecomponents. As each component is retrieved, dots (.) are printed to
+11.  The setup proceeds to download and install the optional open-source components. As each component is retrieved, dots (.) are printed to
 indicate the progress of the download.
 +
 ```
@@ -409,7 +409,7 @@ Downloading Perl XML SAX Module [1 of 1] - PerlSAX.pm
 ......................... 100%
 Downloading Jython [1 of 1] - jython_installer-2.2.jar
 ......................... 100%
-Sucessfully Installed Jython. Successfully added settings.py
+Successfully Installed Jython. Successfully added settings.py
 Trafodion Command Interface Installation Complete.
 /home/myname/trafcitemp>
 ```
@@ -447,8 +447,8 @@ http://trafodion.incubator.apache.com/docs/command_interface/index.html[_Trafodi
 |              | sample.sql        | Sample SQL script.
 |              | sampleDDL.py      | Sample Python file that uses Jython to execute DDL statements.
 |              | sampleDML.py      | Sample Python file that uses Jython to execute DML statements.
-|              | sampleTables.pl   | Sample Perl file that lists all tables and respective rowcounts. The file accepts a wildcard argument on the command line.
-|              | sampleTables.py   | Sample Python file that lists all tables and respective rowcounts. The file accepts a wildcard argument on the command line.
+|              | sampleTables.pl   | Sample Perl file that lists all tables and respective row counts. The file accepts a wild-card argument on the command line.
+|              | sampleTables.py   | Sample Python file that lists all tables and respective row counts. The file accepts a wild-card argument on the command line.
 |===
 
 <<<

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/docs/command_interface/src/asciidoc/_chapters/commands.adoc
----------------------------------------------------------------------
diff --git a/docs/command_interface/src/asciidoc/_chapters/commands.adoc b/docs/command_interface/src/asciidoc/_chapters/commands.adoc
index 6ea12f6..cf568bd 100644
--- a/docs/command_interface/src/asciidoc/_chapters/commands.adoc
+++ b/docs/command_interface/src/asciidoc/_chapters/commands.adoc
@@ -27,7 +27,7 @@ TrafCI supports these commands in the command-line interface or in script files
 
 [cols="20%l,50%,30%",options="header"]
 |===
-| Commmand             | Description                                                                                                 | Documentation
+| Command              | Description                                                                                                 | Documentation
 | @                    | Runs the SQL statements and interface commands contained in a specified script file.                        | <<cmd_at_sign, @ Command>>
 | /                    | Runs the previously executed SQL statement.                                                                 | <<cmd_slash, / Command>>
 | ALIAS                | Maps a string to any interface or SQL command.                                                              | <<cmd_alias, ALIAS Command>>
@@ -37,7 +37,7 @@ TrafCI supports these commands in the command-line interface or in script files
 | DISCONNECT           | Terminates the connection to the Trafodion database.                                                        | <<cmd_disconnect, DISCONNECT Command>>
 | ENV                  | Displays attributes of the current TrafCI session.                                                          | <<cmd_env, ENV Command>>
 | EXIT                 | Disconnects from and exits the command-line interface.                                                      | <<cmd_exit, EXIT Command>>
-| FC                   | Edits and reexecutes a previous command. This command is restricted to the command-line
+| FC                   | Edits and re-executes a previous command. This command is restricted to the command-line
 interface and is disallowed in script files.                                                                                         | <<cmd_fc, FC Command>>
 | GET STATISTICS       | Returns formatted statistics for the last executed SQL statement.                                           | <<cmd_get_statistics, GET STATISTICS Command>>
 | GOTO                 | Jumps to a point the command history specified by the <<cmd_label, LABEL Command>>.                         | <<cmd_goto, GOTO Command>>
@@ -52,7 +52,7 @@ interface and is disallowed in script files.
 | QUIT                 | Disconnects from and exits TrafCI.                                                                          | <<cmd_quit, QUIT Command>>
 | RECONNECT            | Creates a new connection to the Trafodion database using the login credentials of the last
 successful connection.                                                                                                               | <<cmd_reconnect, RECONNECT Command>>
-| REPEAT               | Reexecutes a command.                                                                                       | <<cmd_repeat, REPEAT Command>>
+| REPEAT               | Re-executes a command.                                                                                       | <<cmd_repeat, REPEAT Command>>
 | RESET LASTERROR      | Resets the last error code to `0`.                                                                          | <<cmd_reset_lasterror, RESET LASTERROR Command>>
 | RESET PARAM          | Clears all parameter values or a specified parameter value in the current session.                          | <<cmd_reset_param, RESET PARAM Command>>
 | RUN                  | Runs the previously executed SQL statement.                                                                 | <<cmd_run, RUN Command>>
@@ -84,7 +84,7 @@ The default is a semicolon (`;`).
 | SHOW LASTERROR       | Displays the last error of the statement that was executed.                                                 | <<cmd_show_lasterror, SHOW LASTERROR Command>>
 | SHOW LIST_COUNT      | Displays the maximum number of rows to be returned by `SELECT` statements in the current session.           | <<cmd_show_list_count, SHOW LIST_COUNT Command>>
 | SHOW MARKUP          | Displays the value that has been set for the markup option for the current TrafCI session.                  | <<cmd_show_markup, SHOW MARKUP Command>>
-| SHOW PARAM           | isplays the parameters that are set in the current session.                                                 | <<cmd_show_param, SHOW PARAM Command>>
+| SHOW PARAM           | Displays the parameters that are set in the current session.                                                 | <<cmd_show_param, SHOW PARAM Command>>
 | SHOW PREPARED        | Displays the prepared statements in the current TrafCI session.                                             | <<cmd_show_prepared, SHOW PREPARED Command>>
 | SHOW RECCOUNT        | Displays the record count of the previous executed SQL statement.                                           | <<cmd_show_reccount, SHOW RECCOUNT Command>>
 | SHOW REMOTEPROCESS   | Displays the process name of the DCS server that is handling the current connection.                        | <<cmd_show_remoteprocess, SHOW REMOTEPROCESS Command>>
@@ -149,7 +149,7 @@ If you omit `_section-name_`, the `@` command executes the entire script file. F
 SQL> @ddl.sql
 ```
 
-* This `@` command runs the script file in the specified directory on aWindows workstation:
+* This `@` command runs the script file in the specified directory on a Windows workstation:
 +
 ```
  SQL> @c:\my_files\ddl.sql
@@ -226,7 +226,7 @@ is an command or SQL command.
 * `_SQL-terminator_`
 +
 is the default terminator (`;`) or a string value defined for the statement terminator by the
-<<cmd_set_sqlterminator, SET SQLTERMINATOR Command>>. For moreinformation, see
+<<cmd_set_sqlterminator, SET SQLTERMINATOR Command>>. For more information, see
 <<interactive_set_show_terminator, Set and Show the SQL Terminator>>.
 
 === Considerations
@@ -682,7 +682,7 @@ the line below the displayed command line:
 | `I`_characters_   | Inserts characters in front of the character immediately above the letter `I`.
 | `R`_characters_   | Replaces existing characters one-for-one with characters, beginning with the character immediately above the letter `R`.
 | _characters_    | Replaces existing characters one-for-one with characters, beginning with the first character immediately above characters.
-_`characters`_ must begin with a nonblank character.
+_`characters`_ must begin with a non-blank character.
 |===
 
 To specify more than one editing command on a line, separate the editing commands with a double slash (`//`). The end of a line terminates an
@@ -695,7 +695,7 @@ To terminate a command without saving changes to the command, use the double sla
 
 === Examples
 
-* Reexecute the most recent command that begins with SH:
+* Re-execute the most recent command that begins with SH:
 +
 ```
 SQL> FC SH
@@ -842,8 +842,8 @@ GET STATISTICS
 | Records Accessed       | Number of rows returned by disk process to `EID` (Executor In Disk process).
 | Records Used           | Number of rows returned by `EID` after selection.
 | Disk IOs               | Number of actual disk IOs done by disk process.
-| Message Count          | Number of messages sent/received between filesystem and disk process.
-| Message Bytes          | Number of message bytes sent/received between filesystem and disk process.
+| Message Count          | Number of messages sent/received between file system and disk process.
+| Message Bytes          | Number of message bytes sent/received between file system and disk process.
 | Lock Escl              | Number of lock escalations.
 | Lock Wait              | Number of lock waits.
 | Disk Process Busy Time | CPU time for disk process processes for the specified table.
@@ -985,7 +985,7 @@ SQL> HELP SET IDLETIMEOUT
 == HISTORY Command
 
 The `HISTORY` command displays recently executed commands, identifying each command by a number that you can use
-to reexecute or edit the command.
+to re-execute or edit the command.
 
 === Syntax
 
@@ -1000,8 +1000,8 @@ is the number of commands to display. The default number is `10`. The maximum nu
 === Considerations
 
 * You must enter the command on one line. The command does not require an SQL terminator.
-* You can use the `FC` command to edit and reexecute a command in the history buffer, or use the
-`REPEAT` command to reexecute a command without modifying it. See <<cmd_fc,FC Command>> or
+* You can use the `FC` command to edit and re-execute a command in the history buffer, or use the
+`REPEAT` command to re-execute a command without modifying it. See <<cmd_fc,FC Command>> or
 <<cmd_repeat,REPEAT Command>>.
 
 === Example
@@ -1556,7 +1556,7 @@ SQL> OBEY c:\trafci
 ```
 
 * This command executes all files beginning with the word `"script"` and contains one character after the word script
-and ends with `.sql` extenstion. For example: `script1.sql`, `script2.sql`, `scriptZ.sqland` so on.
+and ends with `.sql` extension. For example: `script1.sql`, `script2.sql`, `scriptZ.sqland` so on.
 +
 ```
 SQL> OBEY C:\trafci\script?.sql
@@ -1569,7 +1569,7 @@ SQL> OBEY C:\trafci\test
 ```
 
 * This command executes all files that begin with the word `"script"` and contains one character after the word `"script"` and
-ends with an extenstion prefixed by a dot. For example: `script1.sql`, `script2.bat`, `scriptZ.txt`, and so on.
+ends with an extension prefixed by a dot. For example: `script1.sql`, `script2.bat`, `scriptZ.txt`, and so on.
 +
 ```
 SQL> OBEY C:\trafci\script?.
@@ -1855,7 +1855,7 @@ Connected to Trafodion
 [[cmd_repeat]]
 == REPEAT Command
 
-The `REPEAT` command reexecutes a previous command.
+The `REPEAT` command re-executes a previous command.
 
 === Syntax
 
@@ -1879,15 +1879,15 @@ The HISTORY command displays the commands or statements in the history buffer. S
 == Considerations
 
 * You must enter the command on one line. The command does not require an SQL terminator.
-* To reexecute the immediately preceding command, enter `REPEAT` without specifying a number. If you enter more than one
-command on a line, then the `REPEAT` command reexecutes only the last command on the line.
+* To re-execute the immediately preceding command, enter `REPEAT` without specifying a number. If you enter more than one
+command on a line, then the `REPEAT` command re-executes only the last command on the line.
 * When a command is selected for repeat, and the SQL terminator value has changed since the execution of that command,
 then TrafCI replaces the SQL terminator in the command with the current SQL terminator value and executes the command.
 
 <<<
 === Examples
 
-* Display the previously executed commands and reexecute the second to the last command:
+* Display the previously executed commands and re-execute the second to the last command:
 +
 ```
 SQL> HISTORY
@@ -1913,7 +1913,7 @@ SQL>
 ```
 
 <<<
-* Reexecute the fifth command in the history buffer:
+* Re-execute the fifth command in the history buffer:
 +
 ```
 SQL> REPEAT 5
@@ -1926,7 +1926,7 @@ DEPT     EMPLOYEE   JOB         PROJECT
 SQL> 
 ```
 
-* Reexecute the `SHOW TABLES` command:
+* Re-execute the `SHOW TABLES` command:
 +
 ```
 SQL> REPEAT SHOW
@@ -3609,7 +3609,7 @@ Elapsed time:00:00:00:078
 [[cmd_show_param]]
 == SHOW PARAM Command
 
-The `SHOW PARAM` command displays the parameters that are set in thecurrent TrafCI session.
+The `SHOW PARAM` command displays the parameters that are set in the current TrafCI session.
 
 === Syntax
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/docs/command_interface/src/asciidoc/_chapters/interactive.adoc
----------------------------------------------------------------------
diff --git a/docs/command_interface/src/asciidoc/_chapters/interactive.adoc b/docs/command_interface/src/asciidoc/_chapters/interactive.adoc
index adf237c..ac5abcc 100644
--- a/docs/command_interface/src/asciidoc/_chapters/interactive.adoc
+++ b/docs/command_interface/src/asciidoc/_chapters/interactive.adoc
@@ -26,7 +26,7 @@
 = Run Commands Interactively
 After launching TrafCI, you can run SQL statements and interface commands in the command-line interface.
 
-== User Inteface
+== User Interface
 
 === Product Banner
 
@@ -48,7 +48,7 @@ on one line. If you accidentally break an interface command across more than one
 SQL terminator and then reenter the command on one line.
 
 You can continue any SQL statement over multiple lines, breaking that statement at any point except
-within a word, a numeric literal, or a multicharacter operator (for example, `<&#61;`). To break a string
+within a word, a numeric literal, or a multi-character operator (for example, `<&#61;`). To break a string
 literal in a DML statement, use a concatenation operator (`||`). For more information, see the
 concatenation operator in the
 http://trafodion.incubator.apache.org/docs/sql_reference/index.html[_Trafodion SQL Reference Manual_].
@@ -354,7 +354,7 @@ For more information, see the <<cmd_set_list_count, SET LIST_COUNT Command>> and
 
 To display commands that were recently executed in the TrafCI session, enter the 
 `HISTORY` command. The `HISTORY` command associates each command with a number that 
-you can use to reexecute or edit the command with the `FC` command. See 
+you can use to re-execute or edit the command with the `FC` command. See 
 <<edit_reexecute_command, Edit and Reexecute a Command>>.
 
 *Example*
@@ -375,7 +375,7 @@ To save the session history in a user-specified file, enter the `SAVEHIST` comma
 
 *Example*
 
-This `SAVEHIST` command saves the session history inca file named `history.txt` in the 
+This `SAVEHIST` command saves the session history in a file named `history.txt` in the 
 local directory where you are running TrafCI:
 
 ```

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/docs/messages_guide/src/asciidoc/_chapters/binder_msgs.adoc
----------------------------------------------------------------------
diff --git a/docs/messages_guide/src/asciidoc/_chapters/binder_msgs.adoc b/docs/messages_guide/src/asciidoc/_chapters/binder_msgs.adoc
index bef1c90..04ed528 100644
--- a/docs/messages_guide/src/asciidoc/_chapters/binder_msgs.adoc
+++ b/docs/messages_guide/src/asciidoc/_chapters/binder_msgs.adoc
@@ -164,10 +164,10 @@ between 1 and the <value-2> of SELECT expressions.
 == SQL 4008
 
 ```
-A subquery is not allowed inside an aggregate function.
+A sub query is not allowed inside an aggregate function.
 ```
 
-*Cause:* You specified a subquery within an aggregate function, which is
+*Cause:* You specified a sub query within an aggregate function, which is
 not supported.
 
 *Effect:* The operation fails.
@@ -323,7 +323,7 @@ which is not supported.
 == SQL 4019
 
 ```
-The select list of a subquery in a select list must be scalar (degree of one).
+The select list of a sub query in a select list must be scalar (degree of one).
 ```
 
 *Cause:* You specified a select list that is not scalar.
@@ -350,11 +350,11 @@ constructors, which is not supported.
 == SQL 4021
 
 ```
-The select list contains a nongrouping non-aggregated column, <name>.
+The select list contains a non-grouping non-aggregated column, <name>.
 ```
 
-*Cause:* You specified a select list that contains a nongrouping,
-nonaggregated column <name>, which is not supported.
+*Cause:* You specified a select list that contains a non-grouping,
+non-aggregated column <name>, which is not supported.
 
 *Effect:* The operation fails.
 
@@ -485,8 +485,7 @@ Table or view <name> is not updatable.
 Column <name> has an invalid combination of datetime fields (internal field number, internal field number, internal field number).
 ```
 
-*Cause:* You specified column <name>, which is an invalid combination of
-datetime fields.
+*Cause:* You specified column <name>, which is an invalid combination of datetime fields.
 
 *Effect:* The operation fails.
 
@@ -735,9 +734,8 @@ scale of zero (0), which is required.
 == SQL 4048
 
 ```
-The third operand of a ternary comparison operator must be of type
+The third operand of a ternary comparison operator must be of type BOOLEAN, not <type>.
 ```
-BOOLEAN, not <type>.
 
 *Cause:* You specified the third operand of a ternary comparison
 argument with an invalid <type>. The type must be boolean.
@@ -765,8 +763,8 @@ data types. It must be one of data type.
 
 ```
 The operands of the <name> predicate must be comparable character
-```
 data types (that is, of the same character set and collation).
+```
 
 *Cause:* You specified predicate <name>, whose operands are required to
 be character, with invalid operands.
@@ -851,9 +849,8 @@ SELECT * FROM tblx, tblx;
 == SQL 4057
 
 ```
-Correlation name <name-1> conflicts with qualified identifier of
+Correlation name <name-1> conflicts with qualified identifier of table <name-2>.
 ```
-table <name-2>.
 
 *Cause:* You specified correlation <name-1>, which conflicts with a
 qualified identifier of table <name-2>. For example:
@@ -883,9 +880,9 @@ other than numeric, which is required.
 
 ```
 Reading from and inserting, or updating in, or deleting from the
-```
 same table, <name-1>, is not currently supported. <name-1> is contained by
 view(s) <name-2>.
+```
 
 *Cause:* You attempted to read from and insert, update, or delete within
 the same table <name-1>, which is not supported.
@@ -898,9 +895,8 @@ the same table <name-1>, which is not supported.
 == SQL 4061
 
 ```
-Rows cannot be inserted into, or updated in, an individual table
+Rows cannot be inserted into, or updated in, an individual table partition.
 ```
-partition.
 
 *Cause:* You attempted to insert or update rows in an individual table
 partition, which is not supported.
@@ -928,11 +924,10 @@ computations that this function uses.
 == SQL 4063
 
 ```
-The operands of function <name> must be comparable character data
+The operands of function <name> must be comparable character data types (that is, of the same character set and collation).
 ```
-types (that is, of the same character set and collation).
 
-*Cause:* You specified operands for function <name> with noncomparable
+*Cause:* You specified operands for function <name> with non-comparable
 character data types.
 
 *Effect:* The operation fails.
@@ -944,8 +939,8 @@ character data types.
 
 ```
 The operands of function <name> must be compatible character data
-```
 types (that is, of the same character set).
+```
 
 *Cause:* You specified operands for function <name> with incompatible
 character data types.
@@ -986,9 +981,8 @@ be operands of type character.
 == SQL 4068
 
 ```
-The operand of function <name> must contain an even number of
+The operand of function <name> must contain an even number of characters.
 ```
-characters.
 
 *Cause:* You specified invalid operands for function <name>. They must
 contain an even number of characters.
@@ -1043,9 +1037,8 @@ be datetime.
 == SQL 4072
 
 ```
-The operand of function <name> must be a datetime containing a
+The operand of function <name> must be a datetime containing a <name>.
 ```
-<name>.
 
 *Cause:* You specified an invalid operand for function <name>. It must
 be a datetime operand containing the variable listed in the message.
@@ -1058,9 +1051,8 @@ be a datetime operand containing the variable listed in the message.
 == SQL 4073
 
 ```
-The COLLATE clause may appear only after an expression of character
+The COLLATE clause may appear only after an expression of character data type, not <data-type>.
 ```
-data type, not <data-type>.
 
 *Cause:* You specified the COLLATE clause after an expression that is
 not a character data type.
@@ -1154,8 +1146,9 @@ operands must be numeric.
 [[SQL-4082]]
 == SQL 4082
 
-4082 Table, view or stored procedure <name> does not exist or is
-inaccessible.
+```
+Table, view or stored procedure <name> does not exist or is inaccessible.
+```
 
 *Cause:* You referred to table <name>, which does not exist or is
 inaccessible (for example, on a downed disk volume).
@@ -1210,9 +1203,8 @@ name.
 == SQL 4088
 
 ```
-The number of values in each TRANSPOSE item of a TRANSPOSE set must
+The number of values in each TRANSPOSE item of a TRANSPOSE set must be equal.
 ```
-be equal.
 
 *Cause:* You specified a TRANSPOSE set with an unequal number of values
 in each TRANSPOSE item.
@@ -1225,11 +1217,10 @@ in each TRANSPOSE item.
 == SQL 4089
 
 ```
-Check constraint <name> contains a subquery. This is not yet
+Check constraint <name> contains a sub query. This is not yet supported.
 ```
-supported.
 
-*Cause:* You specified a constraint <name> that contains a subquery,
+*Cause:* You specified a constraint <name> that contains a sub query,
 which is not supported.
 
 *Effect:* The operation fails.
@@ -1240,9 +1231,8 @@ which is not supported.
 == SQL 4093
 
 ```
-The number of output dynamic parameters (<value-1>) must equal the
+The number of output dynamic parameters (<value-1>) must equal the number of selected values (<value-2>).
 ```
-number of selected values (<value-2>).
 
 *Cause:* Trafodion requires that the number of
 output dynamic parameters, <value-1), match the number of selected
@@ -1257,8 +1247,8 @@ values, <value-2>.
 
 ```
 The number of output host variables (<value-1>) must equal the
-```
 number of selected values (<value-2>).
+```
 
 *Cause:* Trafodion requires that the number of
 output host variables, <value-1>, match the number of selected values,
@@ -1287,8 +1277,8 @@ supported.
 
 ```
 A DEFAULT specification is currently allowed only when simply
-```
 contained in the VALUES list of an INSERT.
+```
 
 *Cause:* You specified a DEFAULT value that was not contained in the
 VALUES list of an INSERT.
@@ -1343,9 +1333,8 @@ supported.
 == SQL 4100
 
 ```
-A NULL value is not allowed in a select list unless it is CAST to
+A NULL value is not allowed in a select list unless it is CAST to some data type.
 ```
-some data type.
 
 *Cause:* You specified a NULL value in a select list that is not cast to
 a data type, which is required.
@@ -1359,9 +1348,9 @@ a data type, which is required.
 
 ```
 If <name> is intended to be a further table reference in the FROM
-```
 clause, the preceding join search condition must be enclosed in
 parentheses.
+```
 
 *Cause:* A syntax error has caused the Trafodion database software to
 treat object <name> as an ambiguous entity.
@@ -1378,8 +1367,8 @@ Correct the syntax and resubmit.
 
 ```
 The [FIRST/ANY n] syntax can be used only in an outermost SELECT
-```
 statement that is not contained in a UNION or INSERT.
+```
 
 *Cause:* You attempted to use either a FIRST n or an ANY n clause in
 other than an outermost SELECT statement.
@@ -1391,9 +1380,11 @@ other than an outermost SELECT statement.
 [[SQL-4104]]
 == SQL 4104
 
-4104 If a character literal was intended, you must use the single quote
-delimiter: <literal>. The use of double quotes causes SQL/MX to
+```
+If a character literal was intended, you must use the single quote
+delimiter: <literal>. The use of double quotes causes Trafodion to
 interpret <column-name> as a delimited identifier column name.
+```
 
 Where <column-name> is a delimited ANSI identifier, such as MYCOL.
 
@@ -1435,9 +1426,8 @@ statement.
 == SQL 4106
 
 ```
-The character set for the operand of function <name-1> must be
+The character set for the operand of function <name-1> must be <name-2>.
 ```
-<name-2>.
 
 *Cause:* You specified an operand for function <name-1> with the wrong
 character set <name-2>.
@@ -1465,8 +1455,8 @@ column <name>, but there is no default value for that column.
 
 ```
 Inside a ROWS SINCE, another sequence function contained an invalid
-```
 reference to the THIS function.
+```
 
 *Cause:* A ROWS SINCE function in your statement contained another
 sequence function that, in turn, contained an invalid reference to the
@@ -1491,6 +1481,7 @@ functions (such as RUNNINGSUM, MOVINGSUM, LASTNOTNULL) are supported
 only in the select list or the HAVING clause of the query expression
 containing the SEQUENCE BY clause. For example, these queries are legal:
 
+```
 >>select a, runningcount(b) from T1 sequence by a;
 
 >>select x from (select a, runningcount(b) from T1 sequence by a)
@@ -1509,12 +1500,14 @@ T2(x,y) where y > 10;
 RUNNINGCOUNT(CAT.SCH.HPPARTEST1.B).
 
 *** ERROR[8822] Unable to prepare the statement.
+```
 
 [[SQL-4110]]
 == SQL 4110
 
-4110 The query contains sequence functions but no SEQUENCE BY clause:
-<name>.
+```
+The query contains sequence functions but no SEQUENCE BY clause: <name>.
+```
 
 *Cause:* You specified a query that contains a sequence function <name>
 but no SEQUENCE BY clause, which is not supported. The value of the
@@ -1527,19 +1520,24 @@ unexpected results.
 
 *Recovery:* Correct the syntax and resubmit. For example:
 
+```
 >>select runningsum(a) from t1;
 
-*** ERROR[4110] The query contains sequence functions but no SEQUENCE BY
-clause: RUNNINGSUM(CAT.SCH.T1.A).
+*** ERROR[4110] The query contains sequence functions but no SEQUENCE BY clause: RUNNINGSUM(CAT.SCH.T1.A).
+```
 
 To correct the query, add a SEQUENCE BY clause:
 
+```
 >>select runningsum(a) from t1 sequence by b;
+```
 
 [[SQL-4111]]
 == SQL 4111
 
-4111 The query contains a SEQUENCE BY clause but no sequence functions.
+```
+The query contains a SEQUENCE BY clause but no sequence functions.
+```
 
 *Cause:* You specified a query that contained a SEQUENCE BY clause but
 no sequence functions, which is not supported. The purpose of the
@@ -1554,26 +1552,27 @@ Without sequence functions, the SEQUENCE BY clause has no effect.
 query or by using an ORDER BY (if you intend to order the result set.)
 For example:
 
+```
 >>select a from T1 sequence by a;
 
-*** ERROR[4111] The query contains a SEQUENCE BY clause but no sequence
-functions.
+*** ERROR[4111] The query contains a SEQUENCE BY clause but no sequence functions.
 
 *** ERROR[8822] Unable to prepare the statement.
+```
 
 Correct the syntax with one of these:
 
+```
 >>select a, runningavg(c) from T1 sequence by a;
-
 >>select a from T1 order by a;
+```
 
 [[SQL-4112]]
 == SQL 4112
 
 ```
-Absolute and relative sampling cannot occur in the same BALANCE
+Absolute and relative sampling cannot occur in the same BALANCE expression.
 ```
-expression.
 
 *Cause:* You attempted to perform absolute and relative sampling in the
 same balance expression, which is not supported.
@@ -1666,14 +1665,11 @@ only if the cursor query is updatable.
 This example of a nonupdatable cursor join query does not select the
 target of the update and receives an error:
 
+```
 >>SELECT A.PROD_CODE FROM EXPRODPARAMS A, MSRATES B
-
 +>WHERE CASE WHEN B.UPDATE_FLAG IS NULL THEN 'N' ELSE
-
 B.UPDATE_FLAG END = 'N'
-
 +>AND A.ACC_TYPE = B.ACC_TYPE AND A.PROD_CODE = B.PROD_CODE
-
 +>FOR UPDATE OF UPDATE_FLAG ;
 
 *** ERROR[4001] Column UPDATE_FLAG is not found. Tables in scope: A.
@@ -1681,12 +1677,8 @@ Default schema: CAT.SCH.
 
 *** ERROR[4117] The cursor query expression may be nonupdatable.
 
-[[**_ERROR[8822]_Unable_to_prepare_the_statement._*SQL_4118]]
-[[=_**_ERROR[8822]_Unable_to_prepare_the_statement._*SQL_411]]
-[[=_=_**_ERROR[8822]_Unable_to_prepare_the_statement._*SQL_41]]
-[[=_=_=_**_ERROR[8822]_Unable_to_prepare_the_statement._*SQL_4]]
-[[=_=_=_=_**_ERROR[8822]_Unable_to_prepare_the_statement._*SQL]]
-== = = = = ** ERROR[8822] Unable to prepare the statement. *SQL 
+*** ERROR[8822] Unable to prepare the statement. 
+```
 
 [[118_The_cursor_query_expression_is_not_updatable]]
 == 118 The cursor query expression is not updatable
@@ -1706,11 +1698,11 @@ updatable if all the following are true:
 correlated subquery references to that table. For example, this query is
 updatable:
 
+```
 SELECT A FROM T;
+```
 
-This one is not: SELECT A FROM T WHERE B = (SELECT C FROM U WHERE
-
-T.I. = U.I)
+This one is not: SELECT A FROM T WHERE B = (SELECT C FROM U WHERE T.I. = U.I)
 
 * There are no aggregates.
 * There are no GROUP BY, DISTINCT, or ORDER BY clauses.
@@ -1720,19 +1712,16 @@ T.I. = U.I)
 This example of a nonupdatable cursor join query selects the target of
 the update correctly and receives an error:
 
+```
 >>SELECT A.PROD_CODE, B.UPDATE_FLAG FROM EXPRODPARAMS A, MSRATES B
-
-+>WHERE CASE WHEN B.UPDATE_FLAG IS NULL THEN 'N' ELSE
-
-B.UPDATE_FLAG END = 'N'
-
++>WHERE CASE WHEN B.UPDATE_FLAG IS NULL THEN 'N' ELSE B.UPDATE_FLAG END = 'N'
 +>AND A.ACC_TYPE = B.ACC_TYPE AND A.PROD_CODE = B.PROD_CODE
-
 +>FOR UPDATE OF UPDATE_FLAG ;
 
 *** ERROR[4118] The cursor query expression is not updatable.
 
 *** ERROR[8822] Unable to prepare the statement.
+```
 
 [[SQL-4120]]
 == SQL 4120
@@ -1756,10 +1745,9 @@ GROUP BY clause, or a DISTINCT clause. A column in the ORDER BY clause,
 
 ```
 In a query with a GROUP BY, DISTINCT, or aggregate function, each
-```
 column in the ORDER BY clause must be one of the columns explicitly
-SELECTed by the query. Column in error: <name>. Table in scope:
-<name>.
+SELECTed by the query. Column in error: <name>. Table in scope: <name>.
+```
 
 *Cause:* You attempted to perform a query with an aggregate function, a
 GROUP BY clause, or a DISTINCT clause. A column in the ORDER BY clause,
@@ -1815,13 +1803,13 @@ one table.
 == SQL 4125
 
 ```
-The select list of a subquery in a row value constructor must be
-```
-scalar (degree of one) if the subquery is one of several expressions
+The select list of a sub query in a row value constructor must be
+scalar (degree of one) if the sub query is one of several expressions
 rather than the only expression in the constructor.
+```
 
-*Cause:* You specified a subquery, consisting of several expressions,
-whose select list is not scalar. If the subquery is not the only
+*Cause:* You specified a sub query, consisting of several expressions,
+whose select list is not scalar. If the sub query is not the only
 expression in the constructor, it must be scalar.
 
 *Effect:* The operation fails.
@@ -1832,9 +1820,8 @@ expression in the constructor, it must be scalar.
 == SQL 4126
 
 ```
-The row value constructors in a VALUES clause must be of equal
+The row value constructors in a VALUES clause must be of equal degree.
 ```
-degree.
 
 *Cause:* You specified a VALUES clause whose row value constructors are
 not of equal degree.
@@ -1861,13 +1848,13 @@ incompatible data types.
 == SQL 4128
 
 ```
-Default volume and subvolume information could not be retrieved fromc=_DEFAULTS define - DEFINEINFO error <number>.
+Default volume and sub volume information could not be retrieved from=_DEFAULTS define - DEFINEINFO error <number>.
 ```
 
 Where <number> is the error message.
 
 *Cause:* Trafodion was not able to retrieve
-default volume and subvolume information using the =_DEFAULTS define.
+default volume and sub volume information using the =_DEFAULTS define.
 
 *Effect:* The operation fails.
 
@@ -1878,8 +1865,8 @@ default volume and subvolume information using the =_DEFAULTS define.
 
 ```
 An IF statement should have the same set of output host variables on
-```
 both sides of IF THEN statement list and the ELSE statement list.
+```
 
 *Cause:* You specified an IF statement that does not have the same set
 of output host variables on both sides of its IF THEN statement list and
@@ -1936,8 +1923,8 @@ database software does not allow.
 
 ```
 In an INSERT-SELECT, each column in the ORDER BY clause must be one
-```
 of the columns in the selected list of the query. Column in error: B.
+```
 
 *Cause:* You tried to SQL-compile an INSERT-SELECT statement that
 specified an ORDER BY column that is not in the select list of the
@@ -1953,8 +1940,8 @@ is also in the select list of the INSERT-SELECT query and resubmit.
 
 ```
 An outer SELECT was used in a DELETE [FIRST N] statement without
-```
 using the [LAST 1] clause.
+```
 
 *Cause:* An outer SELECT was used in a Delete [FIRST N] statement
 without using the [LAST 1] clause.
@@ -1968,8 +1955,8 @@ without using the [LAST 1] clause.
 
 ```
 Primary key of table expression <name> must be used for join with
-```
 embedded <operation> expression. Tables in scope: <name>.
+```
 
 *Cause:* You performed an embedded DELETE or UPDATE and are now
 attempting to join the result set of whatever that operation was with
@@ -2017,9 +2004,8 @@ statement.
 == SQL 4153
 
 ```
-Statement may not compile due to an order requirement on stream
+Statement may not compile due to an order requirement on stream expression.
 ```
-expression.
 
 *Cause:* You attempted to compile a stream expression using an ORDER BY
 on columns that do not define the prefix of the clustering key of the
@@ -2036,8 +2022,8 @@ the order and resubmit.
 
 ```
 Statement may not compile due to an order requirement on embedded
-```
 <name> expression.
+```
 
 *Cause:* You attempted to compile an embedded DELETE or embedded UPDATE
 expression using an ORDER BY without using a clustering key or a
@@ -2082,9 +2068,8 @@ statement.
 == SQL 4158
 
 ```
-Join of stream expressions is not supported. Tables in scope:
+Join of stream expressions is not supported. Tables in scope: <name>.
 ```
-<name>.
 
 *Cause:* You attempted to perform a join of stream expressions.
 
@@ -2097,9 +2082,8 @@ statement.
 == SQL 4159
 
 ```
-Intersection of stream expressions is not supported. Tables in
+Intersection of stream expressions is not supported. Tables in scope: <name>.
 ```
-scope: <name>.
 
 *Cause:* You attempted to perform an intersection of stream expressions.
 
@@ -2113,9 +2097,8 @@ statement.
 
 ```
 Intersection between embedded <name-1> expression and embedded
+<name-2> expression is not supported. Tables in scope: <name-3>, <name-4>.
 ```
-<name-2> expression is not supported. Tables in scope: <name-3>,
-<name-4>.
 
 *Cause:* You attempted to perform an intersection between two embedded
 expressions.
@@ -2130,8 +2113,8 @@ statement.
 
 ```
 Union between embedded <name-1> expression and embedded <name-2>
-```
 expression not supported. Tables in scope: <name-3>, <name-4>.
+```
 
 *Cause:* You attempted to perform a union between two embedded
 expressions.
@@ -2145,9 +2128,8 @@ statement.
 == SQL 4162
 
 ```
-GROUP BY is not supported for stream expression. Tables in scope:
+GROUP BY is not supported for stream expression. Tables in scope: <name>.
 ```
-<name>.
 
 *Cause:* You attempted to perform a GROUP BY in conjunction with a
 stream expression.
@@ -2162,8 +2144,8 @@ statement.
 
 ```
 GROUP BY is not supported for embedded <name-1> expression. Tables in
-```
 scope: <name-2>.
+```
 
 *Cause:* You attempted to perform a GROUP BY in conjunction with an
 embedded expression.
@@ -2178,8 +2160,8 @@ statement.
 
 ```
 Outer relation of right join cannot be embedded <name> expression.
-```
 Tables in scope: <name>.
+```
 
 *Cause:* You attempted to perform a right join using an embedded
 expression as the outer relation.
@@ -2194,8 +2176,8 @@ statement.
 
 ```
 Outer relation of right join cannot be stream expression. Tables in
-```
 scope: <name>.
+```
 
 *Cause:* You attempted to perform a right join using a stream expression
 as the outer relation.
@@ -2210,8 +2192,8 @@ statement.
 
 ```
 ORDER BY clause is not supported in UNION of two streams. Tables in
-```
 scope: <name-1>, <name-2>.
+```
 
 *Cause:* You attempted to use an ORDER BY clause in the UNION of two
 streams.
@@ -2225,10 +2207,10 @@ statement.
 == SQL 4167
 
 ```
-Embedded <name> statements are not supported in subqueries.
+Embedded <name> statements are not supported in sub queries.
 ```
 
-*Cause:* You attempted to perform a subquery that included an embedded
+*Cause:* You attempted to perform a sub query that included an embedded
 statement.
 
 *Effect:* Trafodion is unable to compile the
@@ -2240,10 +2222,10 @@ statement.
 == SQL 4168
 
 ```
-Stream expressions are not supported in subqueries.
+Stream expressions are not supported in sub queries.
 ```
 
-*Cause:* You attempted to perform a subquery that included a stream
+*Cause:* You attempted to perform a sub query that included a stream
 expression.
 
 *Effect:* Trafodion is unable to compile the
@@ -2256,8 +2238,8 @@ statement.
 
 ```
 Embedded delete statements are not allowed when using DECLARE ...
-```
 FOR UPDATE clause.
+```
 
 *Cause:* You attempted to perform a DECLARE... FOR UPDATE clause that
 included an embedded DELETE statement.
@@ -2347,8 +2329,8 @@ statement.
 
 ```
 Join between stream expression and embedded <name-1> expression is
-```
 not supported. Tables in scope: <name-2>.
+```
 
 *Cause:* You attempted to perform a join between a stream expression and
 an embedded expression.
@@ -2377,9 +2359,8 @@ statement.
 == SQL 4178
 
 ```
-Update of variable length column <name> is not permitted on
+Update of variable length column <name> is not permitted on rollback.
 ```
-rollback.
 
 *Cause:* You attempted to perform a rollback that included an update of
 a variable length column.
@@ -2437,8 +2418,8 @@ table with a referential constraint.
 
 ```
 Columns that are part of a referential constraint cannot be updated
-```
 using embedded UPDATE statements.
+```
 
 *Cause:* You attempted to perform an embedded UPDATE statement on
 columns that are part of a referential constraint.
@@ -2450,8 +2431,10 @@ columns that are part of a referential constraint.
 [[SQL-4189]]
 == SQL 4189
 
-4189 ORDER BY clause in an embedded INSERT, UPDATE, or DELETE statement
+```
+ORDER BY clause in an embedded INSERT, UPDATE, or DELETE statement
 is not supported.
+```
 
 *Cause:* An embedded INSERT, UPDATE, or DELETE statement has an ORDER BY
 clause.
@@ -2511,19 +2494,19 @@ statement.
 
 ```
 Insert/Update/Delete operation on non-audited table <name> requires
-```
 index maintenance which may cause the index(es) to become corrupt.
 
-Performing INSERT, UPDATE, or DELETE operations on a nonaudited table
+Performing INSERT, UPDATE, or DELETE operations on a non-audited table
 could corrupt the index if the operation is interrupted. Use the
 
 IUD_NONAUDITED_INDEX_MAINT attribute value to control if these
 operations create an error condition, are allowed with a warning, or are
 allowed with no warning. This message appears as a warning or as an
 error, depending on how you have set this attribute value.
+```
 
 *Cause:* You attempted to perform an INSERT, UPDATE, or DELETE operation
-on a nonaudited table and IUD_NONAUDITED_INDEX_MAINT is set to OFF. This
+on a non-audited table and IUD_NONAUDITED_INDEX_MAINT is set to OFF. This
 message is displayed as an error.
 
 *Effect:* Trafodion is unable to compile the
@@ -2532,7 +2515,7 @@ statement.
 *Recovery:* Modify the statement and resubmit.
 
 *Cause:* You attempted to perform an INSERT, UPDATE, or DELETE operation
-on a nonaudited table and IUD_NONAUDITED_INDEX_MAINT is set to WARN.
+on a non-audited table and IUD_NONAUDITED_INDEX_MAINT is set to WARN.
 This message appears as an warning.
 
 *Effect:* Trafodion performs the INSERT, UPDATE,
@@ -2545,9 +2528,8 @@ other messages about that condition.
 == SQL 4204
 
 ```
-Stream access is supported for only key-sequenced tables. Table:
+Stream access is supported for only key-sequenced tables. Table: <name>.
 ```
-<name>.
 
 *Cause:* You attempted to use stream access on a table that is not
 key-sequenced, which is required.
@@ -2561,9 +2543,8 @@ statement.
 == SQL 4205
 
 ```
-Embedded <name-1> is supported for only key-sequenced tables. Table:
+Embedded <name-1> is supported for only key-sequenced tables. Table: <name-2>.
 ```
-<name-2>.
 
 *Cause:* You attempted to perform an embedded action that is supported
 only for key-sequenced tables.
@@ -2577,9 +2558,8 @@ statement.
 == SQL 4206
 
 ```
-Embedded <name> is supported only for updatable views. View:
+Embedded <name> is supported only for updatable views. View: <name-2>.
 ```
-<name-2>.
 
 *Cause:* You attempted to perform an embedded action that is supported
 only for updatable views.
@@ -2594,8 +2574,8 @@ statement.
 
 ```
 Index <name> and other indexes covering a subset of columns do not
-```
 cover all output values of stream.
+```
 
 *Cause:* You attempted to use an index for stream access that does not
 cover all output columns of the base table.
@@ -2611,8 +2591,8 @@ index.
 
 ```
 Index <name> and other indexes covering a subset of columns do not
-```
 cover all columns referenced in WHERE clause of stream.
+```
 
 *Cause:* You attempted to use an index for stream access that does not
 cover all base table columns referenced in the WHERE clause.
@@ -2641,9 +2621,8 @@ statement.
 == SQL 4210
 
 ```
-Embedded update/delete statements not supported within an IF
+Embedded update/delete statements not supported within an IF statement.
 ```
-statement.
 
 *Cause:* You attempted to embed UPDATE/DELETE statements within an IF
 statement.
@@ -2658,8 +2637,8 @@ statement.
 
 ```
 <table-name> cannot be used to satisfy order requirement on the
-```
 stream because it is partitioned.
+```
 
 *Cause:* You specified <table-name>, a partitioned table, as the order
 requirement on a stream.
@@ -2673,11 +2652,10 @@ statement.
 == SQL 4213
 
 ```
-Use of rowsets in a predicate with embedded update/delete is not
+Use of row sets in a predicate with embedded update/delete is not supported.
 ```
-supported.
 
-*Cause:* You attempted to use a rowset as a predicate with an embedded
+*Cause:* You attempted to use a row set as a predicate with an embedded
 update or embedded delete.
 
 *Effect:* Trafodion is unable to compile the
@@ -2689,12 +2667,11 @@ statement.
 == SQL 4214
 
 ```
-The SET ON ROLLBACK clause is not allowed on a nonaudited table.
+The SET ON ROLLBACK clause is not allowed on a non-audited table. Table: <name>.
 ```
-Table: <name>.
 
 *Cause:* You attempted to use a SET ON ROLLBACK clause to update a
-column in a nonaudited table.
+column in a non-audited table.
 
 *Effect:* The operation fails.
 
@@ -2704,11 +2681,10 @@ column in a nonaudited table.
 == SQL 4215
 
 ```
-Stream access is not allowed on a non-audited table. Table:
+Stream access is not allowed on a non-audited table. Table: <name>.
 ```
-<name>.
 
-*Cause:* You attempted to use stream access on a nonaudited table.
+*Cause:* You attempted to use stream access on a non-audited table.
 
 *Effect:* The operation fails.
 
@@ -2780,8 +2756,8 @@ parameters.
 
 ```
 Parameter <value> for user-defined routine <routine-name> is an OUT
-```
 or INOUT parameter and must be a host variable or a dynamic parameter.
+```
 
 *Cause:* In the Trafodion database software statement being compiled,
 you attempted to invoke a stored procedure that has an OUT or INOUT
@@ -2816,21 +2792,21 @@ Rowset parameters are not allowed in a CALL statement.
 ```
 
 *Cause:* In the Trafodion database software statement being compiled,
-you attempted to use a rowset as a parameter in a stored procedure
+you attempted to use a row set as a parameter in a stored procedure
 invocation.
 
 *Effect:* Trafodion statement is not compiled.
 
 *Recovery:* Alter the data type of the relevant variable, or use a
-different nonrowset host variable. Retry the compilation.
+different non-row-set host variable. Retry the compilation.
 
 [[SQL-4308]]
 == SQL 4308
 
 ```
 Internal error: Unsupported SQL data type <value> specified for a
-```
 CALL statement parameter.
+```
 
 *Cause:* In the Trafodion database software statement being compiled, a
 parameter in a stored procedure invocation had an unsupported SQL data
@@ -2847,8 +2823,8 @@ support.
 
 ```
 Procedure <procedure-name> is registered to return result sets and
-```
 stored procedure result sets are not yet supported.
+```
 
 Where <procedure-name> is the ANSI name of a stored procedure.
 
@@ -2868,8 +2844,8 @@ supports stored procedure result sets.
 
 ```
 USER(x) is currently supported only in the outermost SELECT list.
+For example, it cannot be part of the sub query.
 ```
-For example, it cannot be part of the subquery.
 
 *Cause:* You tried to use the USER(x) function somewhere other than the
 outermost SELECT clause. This function is not yet fully supported.
@@ -2881,7 +2857,9 @@ outermost SELECT clause. This function is not yet fully supported.
 [[SQL-4313]]
 == SQL 4313
 
-4313 Function rand()is not supported.
+```
+Function rand()is not supported.
+```
 
 *Cause:* You attempted to use the random function, which is not
 supported.
@@ -2893,9 +2871,11 @@ supported.
 [[SQL-4320]]
 == SQL 4320
 
-4320 Stream access not allowed on multi-partitioned table, when flag
+```
+Stream access not allowed on multi-partitioned table, when flag
 ATTEMPT_ASYNCHRONOUS_ACCESS is set to OFF. Table in scope:
-_$0~TableName_.
+<table-name>.
+```
 
 *Cause:* You attempted a stream access on a multi-partitioned table when
 the flag ATTEMPT_ASYNCHRONOUS_ACCESS was set to OFF.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/docs/messages_guide/src/asciidoc/_chapters/ddl_msgs.adoc
----------------------------------------------------------------------
diff --git a/docs/messages_guide/src/asciidoc/_chapters/ddl_msgs.adoc b/docs/messages_guide/src/asciidoc/_chapters/ddl_msgs.adoc
index e852937..777c6b2 100644
--- a/docs/messages_guide/src/asciidoc/_chapters/ddl_msgs.adoc
+++ b/docs/messages_guide/src/asciidoc/_chapters/ddl_msgs.adoc
@@ -1418,7 +1418,7 @@ and resubmit.
 == SQL 1112
 
 ```
-An index column list cannot consist only of the systemgenerated column SYSKEY.
+An index column list cannot consist only of the system-generated column SYSKEY.
 ```
 
 *Cause:* The column list specified in a CREATE INDEX statement consisted
@@ -1477,7 +1477,7 @@ statement. For information about file system errors, see <<file_system_errors,Fi
 == SQL 1116
 
 ```
-The current partitioning scheme requires a userspecified clustering key on object <table-name>.
+The current partitioning scheme requires a user-specified clustering key on object <table-name>.
 ```
 
 Where <table-name> is the name of the table.
@@ -1626,7 +1626,7 @@ not be correct.
 The float data value might not be evaluated consistently to the same
 value each time.
 
-*Recovery:* Do not use float datatypes in the partitioning key of a
+*Recovery:* Do not use float data types in the partitioning key of a
 partitionable table.
 
 [[SQL-1127]]
@@ -1755,13 +1755,13 @@ Where <column-name> is the name of a column of <table-name>.
 Where <table-name> is the name of the affected table.
 
 *Cause:* You attempted to create a check constraint that references a
-systemgenerated column. The column named SYSKEY is often
+system-generated column. The column named SYSKEY is often
 system-generated.
 
 *Effect:* The operation fails.
 
 *Recovery:* Modify the statement so that no check constraints reference
-any systemgenerated column and resubmit.
+any system-generated column and resubmit.
 
 [[SQL-1140]]
 == SQL 1140
@@ -1995,7 +1995,7 @@ the Partition Overlay Support feature was not enabled.
 *Effect:* The POS feature was not applied. A simple table without
 partitions was created.
 
-*Recovery:* None if a nonpartitioned table is requested. To request a
+*Recovery:* None if a non-partitioned table is requested. To request a
 partitioned table, delete the table, verify that disk volumes are
 available, and resubmit. You can also specify the volume names where the
 partitions need to be created for the given CREATE TABLE through
@@ -2505,9 +2505,8 @@ ISO88591 in a HEADING clause.
 The character set for string literals in CONSTRAINT must be ISO88591.
 ```
 
-```
-se.* You specified a literal with a character set other than
-```
+*Cause:* You specified a literal with a character set other than
+
 ISO88591 in the text of a constraint.
 
 *Effect:* The operation fails.
@@ -2922,7 +2921,7 @@ DDL or utility operation.
 == SQL 1301
 
 ```
-NO ACTION referential action for <referential-triggered-action> clause is not yet supported as specified by ANSI SQL99 standard. To alter the behavior, set an appropriate value for the REF_CONSTRAINT_NO_ACTION_LIKE_RESTRICT default.
+NO ACTION referential action for <referential-triggered-action> clause is not yet supported as specified by ANSI SQL-99 standard. To alter the behavior, set an appropriate value for the REF_CONSTRAINT_NO_ACTION_LIKE_RESTRICT default.
 ```
 
 Where <referential-triggered-action> can either be ON DELETE or ON
@@ -2989,7 +2988,7 @@ have the same subvolume names as their corresponding schemas on the
 other node. To create these, use the optional REUSE clause in the CREATE
 SCHEMA statement. All other schemas should have unique subvolume names.
 Schemas that are, or will be, related as RDF primary and backup schemas
-must have identical schema names and subvolumes on the primary and
+must have identical schema names and sub volumes on the primary and
 backup nodes.
 
 [[SQL-1307]]

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/docs/messages_guide/src/asciidoc/_chapters/executor_msgs.adoc
----------------------------------------------------------------------
diff --git a/docs/messages_guide/src/asciidoc/_chapters/executor_msgs.adoc b/docs/messages_guide/src/asciidoc/_chapters/executor_msgs.adoc
index 26fa1c4..aa07a1c 100644
--- a/docs/messages_guide/src/asciidoc/_chapters/executor_msgs.adoc
+++ b/docs/messages_guide/src/asciidoc/_chapters/executor_msgs.adoc
@@ -57,7 +57,7 @@ The operation has been canceled.
 == SQL 8012
 
 ```
-8012 Encoding of CONTROL QUERY DEFAULTs: <encoding>.
+Encoding of CONTROL QUERY DEFAULTs: <encoding>.
 ```
 
 *Cause:* Trafodion displays an internal CONTROL
@@ -673,7 +673,6 @@ rather than by Trafodion.
 *Effect:* The operation fails.
 
 *Recovery:* Commit or abort the transaction by calling SQL COMMIT or
-
 ROLLBACKWORK.
 
 [[SQL-8842]]
@@ -919,7 +918,7 @@ attempt was made to contact a nonexistent Trafodion UDR server.
 == SQL 8904
 
 ```
-SQL/MX did not receive a reply from MXUDR, possibly caused by internal errors while executing user-defined routines.
+Trafodion did not receive a reply from MXUDR, possibly caused by internal errors while executing user-defined routines.
 ```
 
 *Cause:* During execution of a Trafodion statement,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/docs/messages_guide/src/asciidoc/_chapters/file_system_errors.adoc
----------------------------------------------------------------------
diff --git a/docs/messages_guide/src/asciidoc/_chapters/file_system_errors.adoc b/docs/messages_guide/src/asciidoc/_chapters/file_system_errors.adoc
index 1d3f7d4..84e7a2b 100644
--- a/docs/messages_guide/src/asciidoc/_chapters/file_system_errors.adoc
+++ b/docs/messages_guide/src/asciidoc/_chapters/file_system_errors.adoc
@@ -132,7 +132,7 @@ contact the mailto:user@trafodion.incubator.apache.org[Trafodion User mailing li
 | 0087  | Waiting on a READ request and did not get it.
 | 0088  | A CONTROL READ is pending so a second READ is not valid. 
 | 0089  | A remote device cannot accept text because it has no buffer available.
-| 0090  | The transaction was aborted by the system because its parent process died, a server using the transaction failed, or a message to a server using the transaction was cancelled.
+| 0090  | The transaction was aborted by the system because its parent process died, a server using the transaction failed, or a message to a server using the transaction was canceled.
 | 0091  | A Transaction Services crash occurred during commitment of the transaction; the transaction may or may not have been committed.
 | 0092  | Distributed transaction aborted by system because the path to a remote segment that was part of the transaction was down.
 | 0093  | A transaction was aborted because it spanned too many transaction log files.
@@ -172,7 +172,7 @@ contact the mailto:user@trafodion.incubator.apache.org[Trafodion User mailing li
 | 0148  | Attempt to read unwritten data.
 | 0150  | End-of-tape marker detected.
 | 0151  | Runaway tape detected, or attempt to access a tape whose density is lower than the switch setting on the tape drive.
-| 0152  | Unusual end-tape unit went offline.
+| 0152  | Unusual end-tape unit went off-line.
 | 0153  | Tape drive power restored.
 | 0154  | BOT detected during backspace files or backspace records. 
 | 0155  | Only nine-track magnetic tape allowed on this system. 
@@ -262,7 +262,7 @@ contact the mailto:user@trafodion.incubator.apache.org[Trafodion User mailing li
 | 0530  | The program called WRITE^FILE for the receiving file before calling READ^FILE.
 | 0531  | A call to CHECK^BREAK could not open the receiving file the receiving file was opened without calling OPEN^FILE.
 | 0532  | A non-blocking I/O operation has been restarted.
-| 0533  | An internal sequential I/O error occured.
+| 0533  | An internal sequential I/O error occurred.
 | 0534  | A discrepancy was detected between the common file-control-block checksum and the previous checksum.
 | 0535  | A discrepancy was detected between the file file-control-block checksum and the previous checksum.
 | 0541  | A data structure version is incompatible with the requested operation.
@@ -290,7 +290,7 @@ contact the mailto:user@trafodion.incubator.apache.org[Trafodion User mailing li
 | 0588  | There was no kept transaction but the operation required one.
 | 0589  | The operation could not be performed because there was a kept transaction.
 | 0590  | The parameter value is invalid or inconsistent with another.
-| 0593  | The request was cancelled.
+| 0593  | The request was canceled.
 | 0594  | A tape-catalog error was returned to Tape Services. Refer to the event log for detailed information.
 | 0595  | An error was returned to Tape Services. Refer to the event log for detailed information.
 | 0597  | A required item is missing from an item list. 
@@ -467,7 +467,7 @@ contact the mailto:user@trafodion.incubator.apache.org[Trafodion User mailing li
 | 4101  | Operation would block.
 | 4102  | Operation now in progress.
 | 4103  | Operation already in progress.
-| 4104  | Socket operation on nonsocket.
+| 4104  | Socket operation on non socket.
 | 4105  | Destination address required.
 | 4106  | Message too long.
 | 4107  | Protocol wrong type for socket.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/docs/messages_guide/src/asciidoc/_chapters/optimizer_msgs.adoc
----------------------------------------------------------------------
diff --git a/docs/messages_guide/src/asciidoc/_chapters/optimizer_msgs.adoc b/docs/messages_guide/src/asciidoc/_chapters/optimizer_msgs.adoc
index 899eec4..802bce5 100644
--- a/docs/messages_guide/src/asciidoc/_chapters/optimizer_msgs.adoc
+++ b/docs/messages_guide/src/asciidoc/_chapters/optimizer_msgs.adoc
@@ -85,7 +85,7 @@ Multi-column statistics for columns <names> from table <name> were not available
 performing.
 
 This message appears when the user has not updated statistics for column
-<names> and when the rowcount in table <name> is more than the value of
+<names> and when the row count in table <name> is more than the value of
 the defaults table constant HIST_ROWCOUNT_REQUIRING_STATS. If you want
 to suppress this message, set that value to a very large number, and you
 will see this message only for tables with more rows than that, and for
@@ -106,7 +106,7 @@ Statistics for column <name> were not available. As a result, the access path ch
 *Cause:* Statistics are not available for the statement you specified.
 
 This message appears when the user has not updated statistics for column
-<name> and when the rowcount in the table is more than the value of the
+<name> and when the ROWCOUNT in the table is more than the value of the
 defaults table constant HIST_ROWCOUNT_REQUIRING_STATS. If you want to
 suppress this message, set that value to a very large number, and you
 will see this message only for tables with more rows than that, and for

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/docs/messages_guide/src/asciidoc/_chapters/parser_msgs.adoc
----------------------------------------------------------------------
diff --git a/docs/messages_guide/src/asciidoc/_chapters/parser_msgs.adoc b/docs/messages_guide/src/asciidoc/_chapters/parser_msgs.adoc
index 03d7695..7fae38b 100644
--- a/docs/messages_guide/src/asciidoc/_chapters/parser_msgs.adoc
+++ b/docs/messages_guide/src/asciidoc/_chapters/parser_msgs.adoc
@@ -73,15 +73,15 @@ greater than zero.
 == SQL 3004
 
 ```
-A delimited identifier must contain at least one nonblank character.
+A delimited identifier must contain at least one non-blank character.
 ```
 
 *Cause:* You defined a delimited identifier as blanks. You must enter at
-least one nonblank character.
+least one non-blank character.
 
 *Effect:* The operation fails.
 
-*Recovery:* Enter at least one nonblank character and resubmit.
+*Recovery:* Enter at least one non-blank character and resubmit.
 
 <<<
 [[SQL-3005]]
@@ -390,10 +390,10 @@ supported.
 == SQL 3025
 
 ```
-The format of the subvolume name part in the specified location name <name> is not valid. The subvolume name part must be eight characters long and begin with the letters ZSD.
+The format of the sub volume name part in the specified location name <name> is not valid. The sub volume name part must be eight characters long and begin with the letters ZSD.
 ```
 
-*Cause:* You used an invalid location <name> for a subvolume that must
+*Cause:* You used an invalid location <name> for a sub volume that must
 be eight characters long and begin with the letters <ZSD>.
 
 *Effect:* The operation fails.
@@ -1898,7 +1898,7 @@ which is not supported.
 == SQL 3136
 
 ```
-Only LEFT, RIGHT, and FULL OUTER JOIN are valid in \{oj . . .}
+Only LEFT, RIGHT, and FULL OUTER JOIN are valid in {oj . . .}
 ```
 
 *Cause:* You attempted to perform an invalid outer join. Only LEFT,
@@ -2407,7 +2407,7 @@ Trafodion statements.
 Subqueries are not allowed in the IF Condition.
 ```
 
-*Cause:* You specified an IF statement that contains a subquery.
+*Cause:* You specified an IF statement that contains a sub query.
 
 *Effect:* The operation fails.
 
@@ -3004,7 +3004,7 @@ operation as a table reference.
 == SQL 3220
 
 ```
-SHOWDDL failed for object <object-name> because an SQL/MP display option was used on a SQL/MX object.
+SHOWDDL failed for object <object-name> because an SQL/MP display option was used on a Trafodion object.
 ```
 
 Where <object-name> specifies the ANSI name of a table, view, or ALIAS.
@@ -3022,7 +3022,7 @@ object.
 == SQL 3225
 
 ```
-SHOWLABEL failed for object <object-name>. The object does not exist in the given namespace <name-space>, the object is not accessible, or the object type is not supported. SHOWLABEL supports only SQL/MX tables, views and indexes.
+SHOWLABEL failed for object <object-name>. The object does not exist in the given namespace <name-space>, the object is not accessible, or the object type is not supported. SHOWLABEL supports only Trafodion tables, views and indexes.
 ```
 
 Where <object-name> is the specified name of an object.
@@ -3043,7 +3043,7 @@ namespace of a valid, supported, and accessible object.
 == SQL 3226
 
 ```
-SHOWLABEL failed for physical location name <location-name>. Object does not exist or object type is not supported. SHOWLABEL supports only SQL/MX tables, views, and indexes.
+SHOWLABEL failed for physical location name <location-name>. Object does not exist or object type is not supported. SHOWLABEL supports only Trafodion tables, views, and indexes.
 ```
 
 Where <location-name> specifies the physical location name of a
@@ -3061,7 +3061,7 @@ argument.
 == SQL 3228
 
 ```
-SHOWLABEL failed for physical location name <location-name>. SHOWLABEL supports only the data forks of SQL/MX tables, views, and indexes.
+SHOWLABEL failed for physical location name <location-name>. SHOWLABEL supports only the data forks of Trafodion tables, views, and indexes.
 ```
 
 Where <location-name> specifies the physical location name of a

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/docs/messages_guide/src/asciidoc/_chapters/sort_msgs.adoc
----------------------------------------------------------------------
diff --git a/docs/messages_guide/src/asciidoc/_chapters/sort_msgs.adoc b/docs/messages_guide/src/asciidoc/_chapters/sort_msgs.adoc
index dc6d7fb..9cdf9fa 100644
--- a/docs/messages_guide/src/asciidoc/_chapters/sort_msgs.adoc
+++ b/docs/messages_guide/src/asciidoc/_chapters/sort_msgs.adoc
@@ -276,7 +276,7 @@ Sort could not find any appropriate disks for overflow.
 *Effect:* The operation fails.
 
 *Recovery:* Make sure there are appropriate disks with enough space for
-scratch file use. Disks such as optical disks, phantom disks, and SMS
+scratch file use. Disks such as optical disks, phantom disks, and 
 virtual disks are not considered suitable. See the
 http://trafodion.incubator.apache.org/docs/sql_reference/index.html[_Trafodion SQL Reference Manual_]
 for more information on how to influence the placement of scratch files.
@@ -354,7 +354,7 @@ Sort failed while calling FILENAME_FILESTART_ with error <number>.
 == SQL 10019 
 
 ```
-Sort failed while calling FILENAME_FILENEXT_ with error $0~int0.
+Sort failed while calling FILENAME_FILENEXT_ with error <number>.
 ```
 
 *Cause:* An error occurred while calling a system level call.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/docs/messages_guide/src/asciidoc/_chapters/sqlstate.adoc
----------------------------------------------------------------------
diff --git a/docs/messages_guide/src/asciidoc/_chapters/sqlstate.adoc b/docs/messages_guide/src/asciidoc/_chapters/sqlstate.adoc
index 1ad2e38..e4e730d 100644
--- a/docs/messages_guide/src/asciidoc/_chapters/sqlstate.adoc
+++ b/docs/messages_guide/src/asciidoc/_chapters/sqlstate.adoc
@@ -50,7 +50,7 @@ text or the SQLCODE value in addition to the SQLSTATE.
 ** In the future, Trafodion might return different SQLSTATE values for error conditions than it does now.
 
 ** In the future, the Trafodion error handling might use a different error path, and therefore return a 
-slightly different SQLCODE and implementationdefined SQLSTATE value for an error.
+slightly different SQLCODE and implementation defined SQLSTATE value for an error.
 
 [[sqlstate-values]]
 == SQLSTATE Values
@@ -185,7 +185,7 @@ numbers) and error messages (negative SQLCODE numbers).
 | 0153V    | 1139    | System-generated column <name> of base table <name> cannot appear in the search condition of a check constraint definition.
 | 0153W    | 1140    | Row-length <num> exceeds the maximum allowed row-length of <num> for table <name>.
 | 0153X    | 1141    | Could not obtain an up-and-audited DAM volume. Please check your system configuration.
-| 0153Y    | 1142    | Attempting to add a column with a NULL, UNIQUE, CHECK, PRIMARY KEY, or FOREIGN KEY constraint defined. This is not supported for a nonaudited table.
+| 0153Y    | 1142    | Attempting to add a column with a NULL, UNIQUE, CHECK, PRIMARY KEY, or FOREIGN KEY constraint defined. This is not supported for a non-audited table.
 | 0153Z    | 1143    | Validation for constraint <name> failed; incompatible data exists in referencing base table <name> and referenced base table <name>. To display the data violating the constraint, please use the following DML statement: <text>
 | 01540    | 1144    | Expected a quoted string in first key clause for column <name> on table <name>, value detected is (<num>).
 | 01541    | 1145    | The catalog name <name> is reserved for the Trafodion metadata.
@@ -229,7 +229,7 @@ numbers) and error messages (negative SQLCODE numbers).
 | 0160M    | 2022    | System error <num> in <name> from <name>, detail <num>.
 | 0160N    | 2023    | Unable to create server process <name>. <name>.
 | 0160P    | 2025    | Unable to create server process <name>. CPU is unavailable; <text>.
-| 0160R    | 2027    |  error <num> while sending a startup message to process <name>.
+| 0160R    | 2027    | Error <num> while sending a startup message to process <name>.
 | 0160S    | 2028    | Unable to create OSS server process <name>. Insufficient resources.
 | 0160T    | 2029    | Unable to create OSS server process <name>. OSS is not running.
 | 0160X    | 2033    | <text>:  error <num> while communicating with process <name>.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/docs/odb_user/src/asciidoc/_chapters/a_warnings.adoc
----------------------------------------------------------------------
diff --git a/docs/odb_user/src/asciidoc/_chapters/a_warnings.adoc b/docs/odb_user/src/asciidoc/_chapters/a_warnings.adoc
index 6c06c20..0bc5184 100644
--- a/docs/odb_user/src/asciidoc/_chapters/a_warnings.adoc
+++ b/docs/odb_user/src/asciidoc/_chapters/a_warnings.adoc
@@ -84,7 +84,7 @@ odb [2012-10-11 13:27:22]: starting ODBC connection(s)... 0
 [0] odb(5020) - [Oracle][ODBC]Optional feature not implemented. (State: HYC00 Native Err: 0)
 ```
 +
-Try adding `-nocatnull` to your command line. When the backend database doesn’t use catalogs, 
+Try adding `-nocatnull` to your command line. When the back-end database doesn't use catalogs, 
 then you should use an *empty string* as catalog name.
 +
 NOTE: Some flawed ODBC Drivers unfortunately want NULL here &#8212; instead of *empty strings* as it should be.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/docs/odb_user/src/asciidoc/_chapters/compare_tables.adoc
----------------------------------------------------------------------
diff --git a/docs/odb_user/src/asciidoc/_chapters/compare_tables.adoc b/docs/odb_user/src/asciidoc/_chapters/compare_tables.adoc
index 7e3e8c3..5d2e1b3 100644
--- a/docs/odb_user/src/asciidoc/_chapters/compare_tables.adoc
+++ b/docs/odb_user/src/asciidoc/_chapters/compare_tables.adoc
@@ -33,7 +33,7 @@ odb does the following to compare two tables:
 
 Each _comparison stream_ is made up of three threads:
 
-* One thred reading from the source table.
+* One thread reading from the source table.
 * One thread reading from the target table.
 * One thread comparing the source/target buffers.
 
@@ -120,7 +120,7 @@ Detailed Descriptions of the Copy Operators:
 [cols="30%,70%",options="header",]
 |===
 | Diff Operator              | Meaning
-| `src=<CAT.SCH.TAB>\|-file` | Definse the source table(s). You can use: +
+| `src=<CAT.SCH.TAB>\|-file` | Defines the source table(s). You can use: +
  +
 - A single table (for example: TRAFODION.MFTEST.LINEITEM) +
 - A file containing a list of tables to compare (`-` should precede the filename)
@@ -144,7 +144,7 @@ record separator the same way as the field separator. +
  +
 The default record separator is `\n` (new line).
 | `max=num`                  | The max number of records to compare. Default is to compare all records.
-| `rows=<num>\|k<num>\|m<num>` | Definess the size of the I/O buffer for each extraction thread. You
+| `rows=<num>\|k<num>\|m<num>` | Defines the size of the I/O buffer for each extraction thread. You
 can define the size of this buffer in two different ways: +
  +
 - number of rows (for example: `rows=100` means 100 rows as IO buffer) +
@@ -173,7 +173,7 @@ with `min(emp_id)=1` and `max(emp_id)=1000`, the four threads will extract the f
 `thread #3 emp_id >=751 and emp_id < 1001 (odb uses max(emp_id) + 1)` +
  +
 If the values are not equally distributed, then data extraction is deskewed.
-| `print=[I][C][D]`          | Specifie which rows are printed in the output file: +
+| `print=[I][C][D]`          | Specifies which rows are printed in the output file: +
  +
 `I` prints the new rows on target. (Based on *key*.) +
 `D` prints the missing rows on target. (Based on *key*.) +

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/docs/odb_user/src/asciidoc/_chapters/concepts.adoc
----------------------------------------------------------------------
diff --git a/docs/odb_user/src/asciidoc/_chapters/concepts.adoc b/docs/odb_user/src/asciidoc/_chapters/concepts.adoc
index 33e6ecd..8faff01 100644
--- a/docs/odb_user/src/asciidoc/_chapters/concepts.adoc
+++ b/docs/odb_user/src/asciidoc/_chapters/concepts.adoc
@@ -122,7 +122,7 @@ Data extraction options [connection required]:
       * rs: default '\n'. Also <ASCII_dec> 0<ASCII_OCT> X<ASCII_HEX>
       * ec: default '\'. Also <ASCII_dec> 0<ASCII_OCT> X<ASCII_HEX>
       * sq: no default. Also <ASCII_dec> 0<ASCII_OCT> X<ASCII_HEX>
-      * gzip compressione level between 0 and 9
+      * gzip compression level between 0 and 9
       * bpc: default 1,bpwc: default 4
 Data copy options [connection required]:
    -cp src={table|-file:tgt=schema[.table][pwhere=where_cond][:soe][:roe=#][:roedel=#ms]
@@ -636,7 +636,7 @@ This (standard) behavior can be modified using the following options:
 
 <<<
 [[concepts_load_balancing]]
-== Dynamic Load Balanacing
+== Dynamic Load Balancing
 As discussed in the previous section, executions are normally _pre-assigned_ to threads using a simple
 round-robin algorithm. This way, the total elapsed time for each thread depends on the complexity of
 *its own* _executions_.
@@ -858,7 +858,7 @@ CREATE TABLE TRAFODION.SEABASE."REGIONS" ( REGION_ID INTEGER NOT NULL
 );
 ```
 
-The `&` wildcard allows you to extract the DDL for multiple objects.
+The `&` wild card allows you to extract the DDL for multiple objects.
 
 *Example*
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3063990d/docs/odb_user/src/asciidoc/_chapters/install.adoc
----------------------------------------------------------------------
diff --git a/docs/odb_user/src/asciidoc/_chapters/install.adoc b/docs/odb_user/src/asciidoc/_chapters/install.adoc
index 4cfe1d1..b6df5b9 100644
Binary files a/docs/odb_user/src/asciidoc/_chapters/install.adoc and b/docs/odb_user/src/asciidoc/_chapters/install.adoc differ


Mime
View raw message