impala-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jruss...@apache.org
Subject [3/5] incubator-impala git commit: Bring in the latest updates to downstream docs.
Date Wed, 09 Nov 2016 00:14:31 GMT
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/shared/impala_common.xml
----------------------------------------------------------------------
diff --git a/docs/shared/impala_common.xml b/docs/shared/impala_common.xml
index e8b367f..b0c9ee5 100644
--- a/docs/shared/impala_common.xml
+++ b/docs/shared/impala_common.xml
@@ -33,12 +33,12 @@
 
         <ul>
           <li>
-            Impala integrates with the existing CDH ecosystem, meaning data can be stored, shared, and accessed using
-            the various solutions included with CDH. This also avoids data silos and minimizes expensive data movement.
+            Impala integrates with the existing <keyword keyref="hadoop_distro"/> ecosystem, meaning data can be stored, shared, and accessed using
+            the various solutions included with <keyword keyref="hadoop_distro"/>. This also avoids data silos and minimizes expensive data movement.
           </li>
 
           <li>
-            Impala provides access to data stored in CDH without requiring the Java skills required for MapReduce jobs.
+            Impala provides access to data stored in <keyword keyref="hadoop_distro"/> without requiring the Java skills required for MapReduce jobs.
             Impala can access data directly from the HDFS file system. Impala also provides a SQL front-end to access
             data in the HBase database system, <ph rev="2.2.0">or in the Amazon Simple Storage System (S3)</ph>.
           </li>
@@ -544,7 +544,7 @@
       </table>
 
     <p rev="IMPALA-2660 CDH-40241" id="auth_to_local_instructions">
-      In CDH 5.8 / Impala 2.6 and higher, Impala recognizes the <codeph>auth_to_local</codeph> setting,
+      In <keyword keyref="impala26_full"/> and higher, Impala recognizes the <codeph>auth_to_local</codeph> setting,
       specified through the HDFS configuration setting
       <codeph>hadoop.security.auth_to_local</codeph>
       or the Cloudera Manager setting
@@ -780,17 +780,6 @@ select concat('abc','mno','xyz');</codeblock>
 
   </section>
 
-  <section id="kudu">
-
-    <title>Kudu Snippets</title>
-
-    <p>
-      If any advice, background info, or warnings are needed in multiple
-      places for interaction of Impala with Kudu, put them under here.
-      </p>
-
-    </section>
-
     <section id="sql_ref">
 
       <title>SQL Language Reference Snippets</title>
@@ -873,7 +862,7 @@ select * from t2;
       <p rev="IMPALA-3732" id="avro_2gb_strings">
         The Avro specification allows string values up to 2**64 bytes in length. 
         Impala queries for Avro tables use 32-bit integers to hold string lengths.
-        In CDH 5.7 / Impala 2.5 and higher, Impala truncates <codeph>CHAR</codeph>
+        In <keyword keyref="impala25_full"/> and higher, Impala truncates <codeph>CHAR</codeph>
         and <codeph>VARCHAR</codeph> values in Avro tables to (2**31)-1 bytes.
         If a query encounters a <codeph>STRING</codeph> value longer than (2**31)-1
         bytes in an Avro table, the query fails. In earlier releases,
@@ -932,7 +921,7 @@ alter table partitioned_data set tblproperties ('numRows'='1030000', 'STATS_GENE
       <p rev="2.5.0" id="partition_key_optimization">
         If you frequently run aggregate functions such as <codeph>MIN()</codeph>, <codeph>MAX()</codeph>, and
         <codeph>COUNT(DISTINCT)</codeph> on partition key columns, consider enabling the <codeph>OPTIMIZE_PARTITION_KEY_SCANS</codeph>
-        query option, which optimizes such queries. This feature is available in CDH 5.7 / Impala 2.5 and higher.
+        query option, which optimizes such queries. This feature is available in <keyword keyref="impala25_full"/> and higher.
         See <xref href="../topics/impala_optimize_partition_key_scans.xml"/>
         for the kinds of queries that this option applies to, and slight differences in how partitions are
         evaluated when this query option is enabled.
@@ -996,7 +985,7 @@ alter table partitioned_data set tblproperties ('numRows'='1030000', 'STATS_GENE
           <li>
             <p>
               Likewise, the <cmdname>impala-shell</cmdname> command relies on
-              some information only available in Impala 2.3 / CDH 5.5 and higher
+              some information only available in <keyword keyref="impala23_full"/> and higher
               to prepare live progress reports and query summaries. The
               <codeph>LIVE_PROGRESS</codeph> and <codeph>LIVE_SUMMARY</codeph> 
               query options have no effect when <cmdname>impala-shell</cmdname> connects
@@ -1036,7 +1025,7 @@ drop database temp;
 use default;
 
 -- Before dropping a database, first drop all the tables inside it,
-<ph rev="2.3.0">-- or in CDH 5.5 and higher use the CASCADE clause.</ph>
+<ph rev="2.3.0">-- or in <keyword keyref="impala23_full"/> and higher use the CASCADE clause.</ph>
 drop database temp;
 ERROR: ImpalaRuntimeException: Error making 'dropDatabase' RPC to Hive Metastore: 
 CAUSED BY: InvalidOperationException: Database temp is not empty
@@ -1047,7 +1036,7 @@ show tables in temp;
 | t3   |
 +------+
 
-<ph rev="2.3.0">-- CDH 5.5 and higher:</ph>
+<ph rev="2.3.0">-- <keyword keyref="impala23_full"/> and higher:</ph>
 <ph rev="2.3.0">drop database temp cascade;</ph>
 
 -- CDH 5.4 and lower:
@@ -1115,7 +1104,7 @@ drop database temp;
       </p>
 
       <p rev="2.6.0 CDH-40329 IMPALA-3453" id="s3_block_splitting">
-        In CDH 5.8 / Impala 2.6 and higher, Impala queries are optimized for files stored in Amazon S3.
+        In <keyword keyref="impala26_full"/> and higher, Impala queries are optimized for files stored in Amazon S3.
         For Impala tables that use the file formats Parquet, RCFile, SequenceFile,
         Avro, and uncompressed text, the setting <codeph>fs.s3a.block.size</codeph>
         in the <filepath>core-site.xml</filepath> configuration file determines
@@ -1131,7 +1120,7 @@ drop database temp;
 
       <note rev="2.6.0 CDH-39913 IMPALA-1878" id="s3_production" type="important">
         <p>
-          In CDH 5.8 / Impala 2.6 and higher, Impala supports both queries (<codeph>SELECT</codeph>)
+          In <keyword keyref="impala26_full"/> and higher, Impala supports both queries (<codeph>SELECT</codeph>)
           and DML (<codeph>INSERT</codeph>, <codeph>LOAD DATA</codeph>, <codeph>CREATE TABLE AS SELECT</codeph>)
           for data residing on Amazon S3. With the inclusion of write support,
           <!-- and configuration settings for more secure S3 key management, -->
@@ -1148,7 +1137,7 @@ drop database temp;
       </note>
 
       <p rev="2.6.0 CDH-39913 IMPALA-1878" id="s3_ddl">
-        In CDH 5.8 / Impala 2.6 and higher, Impala DDL statements such as
+        In <keyword keyref="impala26_full"/> and higher, Impala DDL statements such as
         <codeph>CREATE DATABASE</codeph>, <codeph>CREATE TABLE</codeph>, <codeph>DROP DATABASE CASCADE</codeph>,
         <codeph>DROP TABLE</codeph>, and <codeph>ALTER TABLE [ADD|DROP] PARTITION</codeph> can create or remove folders
         as needed in the Amazon S3 system. Prior to CDH 5.8 / Impala 2.6, you had to create folders yourself and point
@@ -1157,7 +1146,7 @@ drop database temp;
       </p>
 
       <p rev="2.6.0 CDH-39913 IMPALA-1878" id="s3_dml">
-        In CDH 5.8 / Impala 2.6 and higher, the Impala DML statements (<codeph>INSERT</codeph>, <codeph>LOAD DATA</codeph>,
+        In <keyword keyref="impala26_full"/> and higher, the Impala DML statements (<codeph>INSERT</codeph>, <codeph>LOAD DATA</codeph>,
         and <codeph>CREATE TABLE AS SELECT</codeph>) can write data into a table or partition that resides in the
         Amazon Simple Storage Service (S3).
         The syntax of the DML statements is the same as for any other tables, because the S3 location for tables and
@@ -1227,7 +1216,7 @@ drop database temp;
       </p>
 
       <p id="udf_persistence_restriction" rev="2.5.0 IMPALA-1748">
-        In CDH 5.7 / Impala 2.5 and higher, Impala UDFs and UDAs written in C++ are persisted in the metastore database.
+        In <keyword keyref="impala25_full"/> and higher, Impala UDFs and UDAs written in C++ are persisted in the metastore database.
         Java UDFs are also persisted, if they were created with the new <codeph>CREATE FUNCTION</codeph> syntax for Java UDFs,
         where the Java function argument and return types are omitted.
         Java-based UDFs created with the old <codeph>CREATE FUNCTION</codeph> syntax do not persist across restarts
@@ -1235,7 +1224,7 @@ drop database temp;
         Until you re-create such Java UDFs using the new <codeph>CREATE FUNCTION</codeph> syntax,
         you must reload those Java-based UDFs by running the original <codeph>CREATE FUNCTION</codeph> statements again each time
         you restart the <cmdname>catalogd</cmdname> daemon.
-        Prior to CDH 5.7 / Impala 2.5, the requirement to reload functions after a restart applied to both C++ and Java functions.
+        Prior to <keyword keyref="impala25_full"/> the requirement to reload functions after a restart applied to both C++ and Java functions.
       </p>
 
       <p id="current_user_caveat" rev="CDH-36552">
@@ -1317,7 +1306,7 @@ select c_first_name, c_last_name from customer where lower(trim(c_last_name)) rl
 </codeblock>
 
       <p id="case_insensitive_comparisons_tip" rev="2.5.0 IMPALA-1787">
-        In CDH 5.7 / Impala 2.5 and higher, you can simplify queries that
+        In <keyword keyref="impala25_full"/> and higher, you can simplify queries that
         use many <codeph>UPPER()</codeph> and <codeph>LOWER()</codeph> calls
         to do case-insensitive comparisons, by using the <codeph>ILIKE</codeph>
         or <codeph>IREGEXP</codeph> operators instead. See
@@ -1857,11 +1846,11 @@ show functions in _impala_builtins like '*<varname>substring</varname>*';
         <b>Complex type considerations:</b>
         Although you can create tables in this file format using
         the complex types (<codeph>ARRAY</codeph>, <codeph>STRUCT</codeph>,
-        and <codeph>MAP</codeph>) available in CDH 5.5 / Impala 2.3 and higher,
+        and <codeph>MAP</codeph>) available in <keyword keyref="impala23_full"/> and higher,
         currently, Impala can query these types only in Parquet tables.
         <ph rev="IMPALA-2844">
         The one exception to the preceding rule is <codeph>COUNT(*)</codeph> queries on RCFile tables that include complex types.
-        Such queries are allowed in CDH 5.8 / Impala 2.6 and higher.
+        Such queries are allowed in <keyword keyref="impala26_full"/> and higher.
         </ph>
       </p>
 
@@ -1906,7 +1895,7 @@ show functions in _impala_builtins like '*<varname>substring</varname>*';
 
       <p rev="2.3.0" id="jdbc_odbc_complex_types">
         The Impala complex types (<codeph>STRUCT</codeph>, <codeph>ARRAY</codeph>, or <codeph>MAP</codeph>)
-        are available in CDH 5.5 / Impala 2.3 and higher.
+        are available in <keyword keyref="impala23_full"/> and higher.
         To use these types with JDBC requires version 2.5.28 or higher of the Cloudera JDBC Connector for Impala.
         To use these types with ODBC requires version 2.5.30 or higher of the Cloudera ODBC Connector for Impala.
         Consider upgrading all JDBC and ODBC drivers at the same time you upgrade from CDH 5.5 or higher.
@@ -2117,7 +2106,7 @@ order by r_name;
         The arguments to this command let you perform operations such as:
         <ul>
           <li>
-            <codeph>cat</codeph>: Print a file's contents to standard out. In CDH 5.5 and higher, you can use
+            <codeph>cat</codeph>: Print a file's contents to standard out. In <ph rev="upstream">CDH 5.5</ph> and higher, you can use
             the <codeph>-j</codeph> option to output JSON.
           </li>
           <li>
@@ -2430,6 +2419,10 @@ flight_num:           INT32 SNAPPY DO:83456393 FPO:83488603 SZ:10216514/11474301
         <b>HBase considerations:</b>
       </p>
 
+      <p id="hbase_no_load_data">
+        The <codeph>LOAD DATA</codeph> statement cannot be used with HBase tables.
+      </p>
+
       <p id="hbase_ok">
         <b>HBase considerations:</b> This data type is fully compatible with HBase tables.
       </p>
@@ -2782,7 +2775,7 @@ select max(height), avg(height) from census_data where age &gt; 20;
       </p>
 
       <p rev="2.2.0" id="impala_cache_replication_factor">
-        In Impala 2.2 / CDH 5.4 and higher, the optional <codeph>WITH REPLICATION</codeph> clause
+        In <keyword keyref="impala22_full"/> and higher, the optional <codeph>WITH REPLICATION</codeph> clause
         for <codeph>CREATE TABLE</codeph> and <codeph>ALTER TABLE</codeph> lets you specify
         a <term>replication factor</term>, the number of hosts on which to cache the same data blocks.
         When Impala processes a cached data block, where the cache replication factor is greater than 1, Impala randomly
@@ -2961,7 +2954,7 @@ Query finished, fetching results ...
       </p>
 
       <p id="skip_header_lines" rev="IMPALA-1740 2.6.0">
-        In CDH 5.8 / Impala 2.6 and higher, Impala can optionally
+        In <keyword keyref="impala26_full"/> and higher, Impala can optionally
         skip an arbitrary number of header lines from text input files on HDFS
         based on the <codeph>skip.header.line.count</codeph> value in the
         <codeph>TBLPROPERTIES</codeph> field of the table metadata. For example:
@@ -3198,7 +3191,7 @@ sudo pip-python install ssl</codeblock>
         Prior to CDH 5.5 / Impala 2.3, 
         the <codeph>impala</codeph> user was required to be a member of the <codeph>hdfs</codeph> group
         for the resource management feature to work (in combination with CDH 5 and the YARN and Llama components).
-        This requirement has been lifted in CDH 5.5 / Impala 2.3 and higher. The <codeph>impala</codeph>
+        This requirement has been lifted in <keyword keyref="impala23_full"/> and higher. The <codeph>impala</codeph>
         user remains in the <codeph>hdfs</codeph> group on upgraded systems if it was already there, but is
         no longer put into that group during new installs.
       </p>
@@ -3673,6 +3666,25 @@ sudo pip-python install ssl</codeblock>
       </p>
     </section>
 
+    <section id="kudu">
+
+      <title>Kudu</title>
+
+      <p>
+        Kudu-related content. This category gets its own special area because there could be considerations
+        around sharing content between the Impala documentation and the Kudu documentation.
+      </p>
+
+      <p id="kudu_blurb">
+        <b>Kudu considerations:</b>
+      </p>
+
+      <p id="kudu_no_load_data">
+        The <codeph>LOAD DATA</codeph> statement cannot be used with Kudu tables.
+      </p>
+
+    </section>
+
   </conbody>
 
 </concept>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_admission.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_admission.xml b/docs/topics/impala_admission.xml
index 41f5852..ad53823 100644
--- a/docs/topics/impala_admission.xml
+++ b/docs/topics/impala_admission.xml
@@ -82,7 +82,7 @@
       </p>
 
       <p rev="2.5.0">
-        In CDH 5.7 / Impala 2.5 and higher, you can specify these limits and thresholds for each
+        In <keyword keyref="impala25_full"/> and higher, you can specify these limits and thresholds for each
         pool rather than globally. That way, you can balance the resource usage and throughput
         between steady well-defined workloads, rare resource-intensive queries, and ad hoc
         exploratory queries.
@@ -388,9 +388,9 @@
       <note type="important">
         Although the following options are still present in the Cloudera Manager interface under the
         <uicontrol>Admission Control</uicontrol> configuration settings dialog,
-        <ph rev="upstream">Cloudera</ph> recommends you not use them in CDH 5.7 / Impala 2.5 and higher.
+        <ph rev="upstream">Cloudera</ph> recommends you not use them in <keyword keyref="impala25_full"/> and higher.
         These settings only apply if you enable admission control but leave dynamic resource pools disabled.
-        In CDH 5.7 / Impala 2.5 and higher, prefer to set up dynamic resource pools and
+        In <keyword keyref="impala25_full"/> and higher, prefer to set up dynamic resource pools and
         customize the settings for each pool, as described in
         <ph audience="integrated"><xref href="cm_mc_resource_pools.xml#concept_xkk_l1d_wr/section_p15_mhn_2v"/> and <xref href="cm_mc_resource_pools.xml#concept_xkk_l1d_wr/section_gph_tnk_lm"/></ph>
         <xref audience="standalone" href="http://www.cloudera.com/documentation/enterprise/latest/topics/cm_mc_resource_pools.html" scope="external" format="html"/>.
@@ -441,7 +441,7 @@
               </p>
               <p>
                 <b>Default:</b>
-                <ph rev="2.5.0">-1, meaning unlimited (prior to CDH 5.7 / Impala 2.5, the default was 200)</ph>
+                <ph rev="2.5.0">-1, meaning unlimited (prior to <keyword keyref="impala25_full"/> the default was 200)</ph>
               </p>
             </dd>
           </dlentry>
@@ -673,7 +673,7 @@ impala.admission-control.pool-queue-timeout-ms.<varname>queue_name</varname></ph
 
         <p rev="2.5.0 IMPALA-2538">
           The <codeph>impala.admission-control.*</codeph> configuration settings are available in
-          CDH 5.7 / Impala 2.5 and higher.
+          <keyword keyref="impala25_full"/> and higher.
         </p>
 
         <p audience="Cloudera"><!-- Hiding link because that subtopic is now hidden. -->
@@ -684,7 +684,7 @@ impala.admission-control.pool-queue-timeout-ms.<varname>queue_name</varname></ph
     </concept>
 
     <concept id="admission_examples">
-    <!-- Pruning the CM examples and screenshots because in CDH 5.7 / Impala 2.5, the defaults match up much better with our recommendations. -->
+    <!-- Pruning the CM examples and screenshots because in Impala 2.5 the defaults match up much better with our recommendations. -->
 
       <title>Examples of Admission Control Configurations</title>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_alter_table.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_alter_table.xml b/docs/topics/impala_alter_table.xml
index 5e6e7a0..61199cf 100644
--- a/docs/topics/impala_alter_table.xml
+++ b/docs/topics/impala_alter_table.xml
@@ -76,7 +76,7 @@ statsKey ::= numDVs | numNulls | avgSize | maxSize</ph>
     <p conref="../shared/impala_common.xml#common/complex_types_blurb"/>
 
     <p rev="2.3.0">
-      In CDH 5.5 / Impala 2.3 and higher, the <codeph>ALTER TABLE</codeph> statement can
+      In <keyword keyref="impala23_full"/> and higher, the <codeph>ALTER TABLE</codeph> statement can
       change the metadata for tables containing complex types (<codeph>ARRAY</codeph>,
       <codeph>STRUCT</codeph>, and <codeph>MAP</codeph>).
       For example, you can use an <codeph>ADD COLUMNS</codeph>, <codeph>DROP COLUMN</codeph>, or <codeph>CHANGE</codeph>
@@ -110,7 +110,7 @@ statsKey ::= numDVs | numNulls | avgSize | maxSize</ph>
 
     <p rev="2.6.0 CDH-39913 IMPALA-1878">
       You can specify an <codeph>s3a://</codeph> prefix on the <codeph>LOCATION</codeph> attribute of a table or partition
-      to make Impala query data from the Amazon S3 filesystem. In CDH 5.8 / Impala 2.6 and higher, Impala automatically
+      to make Impala query data from the Amazon S3 filesystem. In <keyword keyref="impala26_full"/> and higher, Impala automatically
       handles creating or removing the associated folders when you issue <codeph>ALTER TABLE</codeph> statements
       with the <codeph>ADD PARTITION</codeph> or <codeph>DROP PARTITION</codeph> clauses.
     </p>
@@ -209,7 +209,7 @@ alter table p1 partition (month=1, day=1) set location '/usr/external_data/new_y
     </p>
 
     <p rev="2.3.0 IMPALA-1568 CDH-36799">
-      In CDH 5.5 / Impala 2.3 and higher, the <codeph>RECOVER PARTITIONS</codeph> clause scans
+      In <keyword keyref="impala23_full"/> and higher, the <codeph>RECOVER PARTITIONS</codeph> clause scans
       a partitioned table to detect if any new partition directories were added outside of Impala,
       such as by Hive <codeph>ALTER TABLE</codeph> statements or by <cmdname>hdfs dfs</cmdname>
       or <cmdname>hadoop fs</cmdname> commands. The <codeph>RECOVER PARTITIONS</codeph> clause
@@ -378,7 +378,7 @@ yes,no</codeblock>
     </p>
 
     <p rev="2.6.0 IMPALA-3369">
-      In CDH 5.8 / Impala 2.6 and higher, you can use the <codeph>SET COLUMN STATS</codeph> clause
+      In <keyword keyref="impala26_full"/> and higher, you can use the <codeph>SET COLUMN STATS</codeph> clause
       to set a specific stats value for a particular column.
     </p>
 
@@ -566,7 +566,7 @@ optional int32 x [i:1 d:1 r:0]
 </codeblock>
 
     <p rev="IMPALA-3092">
-      In CDH 5.8 / Impala 2.6 and higher, if an Avro table is created without column definitions in the
+      In <keyword keyref="impala26_full"/> and higher, if an Avro table is created without column definitions in the
       <codeph>CREATE TABLE</codeph> statement, and columns are later
       added through <codeph>ALTER TABLE</codeph>, the resulting
       table is now queryable. Missing values from the newly added
@@ -705,7 +705,7 @@ show partitions partition_t;
 </codeblock>
 
     <p rev="2.3.0"> The optional <codeph>PURGE</codeph> keyword, available in
-      CDH 5.5 / Impala 2.3 and higher, is used with the <codeph>DROP
+      <keyword keyref="impala23_full"/> and higher, is used with the <codeph>DROP
         PARTITION</codeph> clause to remove associated HDFS data files
       immediately rather than going through the HDFS trashcan mechanism. Use
       this keyword when dropping a partition if it is crucial to remove the data

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_analytic_functions.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_analytic_functions.xml b/docs/topics/impala_analytic_functions.xml
index 7fc9b3c..0a31363 100644
--- a/docs/topics/impala_analytic_functions.xml
+++ b/docs/topics/impala_analytic_functions.xml
@@ -474,7 +474,7 @@ output as above. Because <codeph>RANGE</codeph> currently does not support numer
 
   <concept rev="2.3.0" id="cume_dist">
 
-    <title>CUME_DIST Function (CDH 5.5 or higher only)</title>
+    <title>CUME_DIST Function (<keyword keyref="impala23"/> or higher only)</title>
 
     <conbody>
 
@@ -1210,7 +1210,7 @@ from stock_ticker
 
   <concept rev="2.3.0" id="ntile">
 
-    <title>NTILE Function (CDH 5.5 or higher only)</title>
+    <title>NTILE Function (<keyword keyref="impala23"/> or higher only)</title>
 
     <conbody>
 
@@ -1345,7 +1345,7 @@ order by kilos desc;
 
   <concept rev="2.3.0" id="percent_rank">
 
-    <title>PERCENT_RANK Function (CDH 5.5 or higher only)</title>
+    <title>PERCENT_RANK Function (<keyword keyref="impala23"/> or higher only)</title>
 
     <conbody>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_appx_count_distinct.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_appx_count_distinct.xml b/docs/topics/impala_appx_count_distinct.xml
index 854bbd0..04078db 100644
--- a/docs/topics/impala_appx_count_distinct.xml
+++ b/docs/topics/impala_appx_count_distinct.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept rev="2.0.0" id="appx_count_distinct">
 
-  <title>APPX_COUNT_DISTINCT Query Option (CDH 5.2 or higher only)</title>
+  <title>APPX_COUNT_DISTINCT Query Option (<keyword keyref="impala20"/> or higher only)</title>
   <titlealts audience="PDF"><navtitle>APPX_COUNT_DISTINCT</navtitle></titlealts>
   <prolog>
     <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_array.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_array.xml b/docs/topics/impala_array.xml
index 4cab7f6..f9519c1 100644
--- a/docs/topics/impala_array.xml
+++ b/docs/topics/impala_array.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="array">
 
-  <title>ARRAY Complex Type (CDH 5.5 or higher only)</title>
+  <title>ARRAY Complex Type (<keyword keyref="impala23"/> or higher only)</title>
 
   <prolog>
     <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_authorization.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_authorization.xml b/docs/topics/impala_authorization.xml
index f12b6d1..5163b2f 100644
--- a/docs/topics/impala_authorization.xml
+++ b/docs/topics/impala_authorization.xml
@@ -56,7 +56,7 @@
       <p rev="2.3.0 collevelauth">
         The object hierarchy for Impala covers Server, URI, Database, Table, and Column. (The Table privileges apply to views as well;
         anywhere you specify a table name, you can specify a view name instead.)
-        Column-level authorization is available in CDH 5.5 / Impala 2.3 and higher, as described in
+        Column-level authorization is available in <keyword keyref="impala23_full"/> and higher, as described in
         <xref audience="integrated" href="sg_hive_sql.xml#concept_c2q_4qx_p4/col_level_auth_sentry"/><xref audience="standalone" href="https://www.cloudera.com/documentation/enterprise/latest/topics/sg_hive_sql.html" format="html" scope="external"/>.
         Previously, you constructed views to query specific columns and assigned privileges
         based on the views rather than the base tables.
@@ -253,7 +253,7 @@ report_generator = server=server1-&gt;db=reporting_db-&gt;table=*-&gt;action=SEL
 
   <concept id="sentry_service">
 
-    <title>Using Impala with the Sentry Service (CDH 5.1 or higher only)</title>
+    <title>Using Impala with the Sentry Service (<keyword keyref="impala14"/> or higher only)</title>
 
     <conbody>
 
@@ -261,7 +261,7 @@ report_generator = server=server1-&gt;db=reporting_db-&gt;table=*-&gt;action=SEL
         When you use the Sentry service rather than the policy file, you set up privileges through
         <codeph>GRANT</codeph> and <codeph>REVOKE</codeph> statement in either Impala or Hive, then both components
         use those same privileges automatically. (Impala added the <codeph>GRANT</codeph> and
-        <codeph>REVOKE</codeph> statements in Impala 2.0.0 / CDH 5.2.0.)
+        <codeph>REVOKE</codeph> statements in <keyword keyref="impala20_full"/>.)
       </p>
 
       <p>
@@ -298,7 +298,7 @@ report_generator = server=server1-&gt;db=reporting_db-&gt;table=*-&gt;action=SEL
 
       <note rev="1.4.0">
         <p rev="1.4.0">
-          In CDH 5 and higher, <ph rev="upstream">Cloudera</ph> recommends
+          In <ph rev="upstream">CDH 5</ph> and higher, <ph rev="upstream">Cloudera</ph> recommends
           managing privileges through SQL statements, as described in
           <xref href="impala_authorization.xml#sentry_service"/>. If you are still using policy files, plan to
           migrate to the new approach some time in the future.
@@ -913,7 +913,7 @@ Database
       </p>
 
       <p rev="2.3.0 collevelauth">
-        In CDH 5.5 / Impala 2.3 and higher, you can specify privileges for individual columns,
+        In <keyword keyref="impala23_full"/> and higher, you can specify privileges for individual columns,
         as described in
         <xref audience="integrated" href="sg_hive_sql.xml#concept_c2q_4qx_p4/col_level_auth_sentry"/><xref audience="standalone" href="https://www.cloudera.com/documentation/enterprise/latest/topics/sg_hive_sql.html" format="html" scope="external"/>.
         Formerly, to specify
@@ -1311,7 +1311,7 @@ it can be queried by a lower-privileged user who does not have full query privil
 for the underlying tables. See
 <xref audience="integrated" href="sg_hive_sql.xml#concept_c2q_4qx_p4/col_level_auth_sentry"/><xref audience="standalone" href="https://www.cloudera.com/documentation/enterprise/latest/topics/sg_hive_sql.html" format="html" scope="external"/>
 for details about column-level authorization.
-Before column-level authorization was added in CDH 5.5 / Impala 2.3, the way to implement
+Before column-level authorization was added in <keyword keyref="impala23_full"/> the way to implement
 column-level security was by creating views that referenced particular sets of columns.</entry>
 </row>
 <row>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_avro.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_avro.xml b/docs/topics/impala_avro.xml
index d89d782..04e84aa 100644
--- a/docs/topics/impala_avro.xml
+++ b/docs/topics/impala_avro.xml
@@ -75,7 +75,7 @@
       </p>
 
       <p rev="2.3.0">
-        In CDH 5.5 / Impala 2.3 and higher, the <codeph>CREATE TABLE</codeph> for Avro tables can include
+        In <keyword keyref="impala23_full"/> and higher, the <codeph>CREATE TABLE</codeph> for Avro tables can include
         SQL-style column definitions rather than specifying Avro notation through the <codeph>TBLPROPERTIES</codeph>
         clause. Impala issues warning messages if there are any mismatches between the types specified in the
         SQL column definitions and the underlying types; for example, any <codeph>TINYINT</codeph> or
@@ -215,7 +215,7 @@ for this information.
 
       <p rev="2.3.0">
         In rare instances, a mismatch could occur between the Avro schema and the column definitions in the
-        metastore database. In CDH 5.5 / Impala 2.3 and higher, Impala checks for such inconsistencies during
+        metastore database. In <keyword keyref="impala23_full"/> and higher, Impala checks for such inconsistencies during
         a <codeph>CREATE TABLE</codeph> statement and each time it loads the metadata for a table (for example,
         after <codeph>INVALIDATE METADATA</codeph>). Impala uses the following rules to determine how to treat
         mismatching columns, a process known as <term>schema reconciliation</term>:
@@ -228,9 +228,9 @@ for this information.
           If there is a mismatch in column name or type, Impala uses the column definition from the Avro schema.
           Because a <codeph>CHAR</codeph> or <codeph>VARCHAR</codeph> column in Impala maps to an Avro <codeph>STRING</codeph>,
           this case is not considered a mismatch and the column is preserved as <codeph>CHAR</codeph> or <codeph>VARCHAR</codeph>
-          in the reconciled schema. <ph rev="2.7.0 IMPALA-3687 CDH-43731">Prior to CDH 5.9 / Impala 2.7, the column
+          in the reconciled schema. <ph rev="2.7.0 IMPALA-3687 CDH-43731">Prior to <keyword keyref="impala27_full"/> the column
           name and comment for such <codeph>CHAR</codeph> and <codeph>VARCHAR</codeph> columns was also taken from the SQL column definition.
-          In CDH 5.9 / Impala 2.7 and higher, the column name and comment from the Avro schema file take precedence for such columns,
+          In <keyword keyref="impala27_full"/> and higher, the column name and comment from the Avro schema file take precedence for such columns,
           and only the <codeph>CHAR</codeph> or <codeph>VARCHAR</codeph> type is preserved from the SQL column definition.</ph>
         </li>
         <li>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_batch_size.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_batch_size.xml b/docs/topics/impala_batch_size.xml
index afd3c17..eb54b14 100644
--- a/docs/topics/impala_batch_size.xml
+++ b/docs/topics/impala_batch_size.xml
@@ -24,7 +24,7 @@
     </p>
 
     <p>
-      This option is primarily for Cloudera testing, or for use under the direction of Cloudera Support.
+      This option is primarily for testing during Impala development, or for use under the direction of <keyword keyref="support_org"/>.
     </p>
 
     <p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_breakpad.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_breakpad.xml b/docs/topics/impala_breakpad.xml
index 026fa1d..f764c2f 100644
--- a/docs/topics/impala_breakpad.xml
+++ b/docs/topics/impala_breakpad.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="breakpad" rev="2.6.0 IMPALA-2686 CDH-40238">
 
-  <title>Breakpad Minidumps for Impala (CDH 5.8 or higher only)</title>
+  <title>Breakpad Minidumps for Impala (<keyword keyref="impala26"/> or higher only)</title>
   <titlealts audience="PDF"><navtitle>Breakpad Minidumps</navtitle></titlealts>
   <prolog>
     <metadata>
@@ -18,7 +18,7 @@
     <p rev="2.6.0 IMPALA-2686 CDH-40238">
       The <xref href="https://chromium.googlesource.com/breakpad/breakpad/" scope="external" format="html">breakpad</xref>
       project is an open-source framework for crash reporting.
-      In CDH 5.8 / Impala 2.6 and higher, Impala can use <codeph>breakpad</codeph> to record stack information and
+      In <keyword keyref="impala26_full"/> and higher, Impala can use <codeph>breakpad</codeph> to record stack information and
       register values when any of the Impala-related daemons crash due to an error such as <codeph>SIGSEGV</codeph>
       or unhandled exceptions.
       The dump files are much smaller than traditional core dump files. The dump mechanism itself uses very little
@@ -50,7 +50,7 @@
       </p>
 
       <p rev="IMPALA-3677 CDH-43745">
-        In CDH 5.9 / Impala 2.7 and higher,
+        In <keyword keyref="impala27_full"/> and higher,
         you can send a <codeph>SIGUSR1</codeph> signal to any Impala-related daemon to write a
         Breakpad minidump. For advanced troubleshooting, you can now produce a minidump
         without triggering a crash.
@@ -134,7 +134,8 @@
     <title>Using the Minidump Files for Problem Resolution</title>
     <conbody>
       <p>
-        Typically, you provide minidump files to Cloudera Support as part of problem resolution, in the same way that you might provide a core dump. The <uicontrol>Send Diagnostic Data</uicontrol>
+        Typically, you provide minidump files to <keyword keyref="support_org"/> as part of problem resolution,
+        in the same way that you might provide a core dump. The <uicontrol>Send Diagnostic Data</uicontrol>
         under the <uicontrol>Support</uicontrol> menu in Cloudera Manager guides you through the
         process of selecting a time period and volume of diagnostic data, then collects the data
         from all hosts and transmits the relevant information for you.
@@ -144,10 +145,10 @@
         <image href="../images/support_send_diagnostic_data.png" scalefit="yes" placement="break"/>
       </fig>
       <p>
-        Cloudera Support might provide additional instructions about collecting minidumps to better isolate a specific problem.
+        You might get additional instructions from <keyword keyref="support_org"/> about collecting minidumps to better isolate a specific problem.
         Because the information in the minidump files is limited to stack traces and register contents,
         the possibility of including sensitive information is much lower than with core dump files.
-        If any sensitive information is included in the minidump, Cloudera Support preserves the confidentiality of that information.
+        If any sensitive information is included in the minidump, <keyword keyref="support_org"/> preserves the confidentiality of that information.
       </p>
     </conbody>
   </concept>
@@ -236,7 +237,7 @@ Wrote minidump to /var/log/impala-minidumps/impalad/0980da2d-a905-01e1-25ff883a-
 </codeblock>
       <p>
         The resulting minidump file is much smaller than the corresponding core file,
-        making it much easier to supply diagnostic information to Cloudera Support.
+        making it much easier to supply diagnostic information to <keyword keyref="support_org"/>.
         The transmission process for the minidump files is automated through Cloudera Manager.
       </p>
 <codeblock><![CDATA[

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_char.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_char.xml b/docs/topics/impala_char.xml
index 94b9401..0298d57 100644
--- a/docs/topics/impala_char.xml
+++ b/docs/topics/impala_char.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="char" rev="2.0.0">
 
-  <title>CHAR Data Type (CDH 5.2 or higher only)</title>
+  <title>CHAR Data Type (<keyword keyref="impala20"/> or higher only)</title>
   <titlealts audience="PDF"><navtitle>CHAR</navtitle></titlealts>
   <prolog>
     <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_complex_types.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_complex_types.xml b/docs/topics/impala_complex_types.xml
index 77e9707..105ecdd 100644
--- a/docs/topics/impala_complex_types.xml
+++ b/docs/topics/impala_complex_types.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept rev="2.3.0" id="complex_types">
 
-  <title id="nested_types">Complex Types (CDH 5.5 or higher only)</title>
+  <title id="nested_types">Complex Types (<keyword keyref="impala23"/> or higher only)</title>
 
   <prolog>
     <metadata>
@@ -351,7 +351,7 @@
         <note rev="2.6.0 IMPALA-2844">
           <p rev="2.6.0 IMPALA-2844">
             The one exception to the preceding rule is <codeph>COUNT(*)</codeph> queries on RCFile tables that include complex types.
-            Such queries are allowed in CDH 5.8 / Impala 2.6 and higher.
+            Such queries are allowed in <keyword keyref="impala26_full"/> and higher.
           </p>
         </note>
 
@@ -2615,7 +2615,7 @@ STORED AS PARQUET;
 
         <p>
           If you have a Hive-created Parquet table that includes <codeph>ARRAY</codeph>, <codeph>STRUCT</codeph>, or <codeph>MAP</codeph>
-          columns, Impala can query that same table in Impala 2.3 / CDH 5.5 and higher, subject to the usual restriction that all other
+          columns, Impala can query that same table in <keyword keyref="impala23_full"/> and higher, subject to the usual restriction that all other
           columns are of data types supported by Impala, and also that the file type of the table must be Parquet.
         </p>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_compression_codec.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_compression_codec.xml b/docs/topics/impala_compression_codec.xml
index b00089f..739c651 100644
--- a/docs/topics/impala_compression_codec.xml
+++ b/docs/topics/impala_compression_codec.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept rev="2.0.0" id="compression_codec">
 
-  <title>COMPRESSION_CODEC Query Option (CDH 5.2 or higher only)</title>
+  <title>COMPRESSION_CODEC Query Option (<keyword keyref="impala20"/> or higher only)</title>
   <titlealts audience="PDF"><navtitle>COMPRESSION_CODEC</navtitle></titlealts>
   <prolog>
     <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_config_options.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_config_options.xml b/docs/topics/impala_config_options.xml
index 686df87..a08aafa 100644
--- a/docs/topics/impala_config_options.xml
+++ b/docs/topics/impala_config_options.xml
@@ -301,7 +301,7 @@ Starting Impala Catalog Server:                            [  OK  ]</codeblock>
 
         <li>
           <p>
-            During troubleshooting, Cloudera Support might direct you to change other values,
+            During troubleshooting, <keyword keyref="support_org"/> might direct you to change other values,
             particularly for <codeph>IMPALA_SERVER_ARGS</codeph>, to work around issues or
             gather debugging information.
           </p>
@@ -469,7 +469,7 @@ Starting Impala Catalog Server:                            [  OK  ]</codeblock>
 -->
 
           <li>
-            During troubleshooting, Cloudera Support might direct you to change other values,
+            During troubleshooting, <keyword keyref="support_org"/> might direct you to change other values,
             particularly for <codeph>IMPALA_SERVER_ARGS</codeph>, to work around issues or
             gather debugging information.
           </li>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_create_database.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_create_database.xml b/docs/topics/impala_create_database.xml
index cb9dd84..de556bc 100644
--- a/docs/topics/impala_create_database.xml
+++ b/docs/topics/impala_create_database.xml
@@ -95,7 +95,7 @@
 
     <p>
       The <codeph>SHOW DATABASES</codeph> statement lists all databases, or the databases whose name
-      matches a wildcard pattern. <ph rev="2.5.0">In CDH 5.7 / Impala 2.5 and higher, the
+      matches a wildcard pattern. <ph rev="2.5.0">In <keyword keyref="impala25_full"/> and higher, the
       <codeph>SHOW DATABASES</codeph> output includes a second column that displays the associated
       comment, if any, for each database.</ph>
     </p>
@@ -105,7 +105,7 @@
     <p rev="2.6.0 CDH-39913 IMPALA-1878">
       To specify that any tables created within a database reside on the Amazon S3 system,
       you can include an <codeph>s3a://</codeph> prefix on the <codeph>LOCATION</codeph>
-      attribute. In CDH 5.8 / Impala 2.6 and higher, Impala automatically creates any
+      attribute. In <keyword keyref="impala26_full"/> and higher, Impala automatically creates any
       required folders as the databases, tables, and partitions are created, and removes
       them when they are dropped.
     </p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_create_function.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_create_function.xml b/docs/topics/impala_create_function.xml
index 77815f7..5b81f50 100644
--- a/docs/topics/impala_create_function.xml
+++ b/docs/topics/impala_create_function.xml
@@ -34,7 +34,7 @@
     </p>
 
     <p rev="2.5.0 IMPALA-2843 CDH-39148">
-      In CDH 5.7 / Impala 2.5 and higher, the syntax is also different for creating or dropping scalar Java-based UDFs.
+      In <keyword keyref="impala25_full"/> and higher, the syntax is also different for creating or dropping scalar Java-based UDFs.
       The statements for Java UDFs use a new syntax, without any argument types or return type specified. Java-based UDFs
       created using the new syntax persist across restarts of the Impala catalog server, and can be shared transparently
       between Impala and Hive.
@@ -227,7 +227,7 @@ DROP FUNCTION IF EXISTS bar;
       </li>
 
       <li rev="2.5.0 IMPALA-1748 CDH-38369 IMPALA-2843 CDH-39148">
-        CDH 5.7 / Impala 2.5 introduces UDF improvements to persistence for both C++ and Java UDFs,
+        <keyword keyref="impala25_full"/> introduces UDF improvements to persistence for both C++ and Java UDFs,
         and better compatibility between Impala and Hive for Java UDFs.
         See <xref href="impala_udf.xml#udfs"/> for details.
       </li>
@@ -330,7 +330,7 @@ DROP FUNCTION IF EXISTS bar;
       into UDFs under a single (overloaded) function name in Impala. Each <codeph>CREATE FUNCTION</codeph> or
       <codeph>DROP FUNCTION</codeph> statement applies to all the overloaded Java functions with the same name.
       This example uses the signatureless syntax for <codeph>CREATE FUNCTION</codeph> and <codeph>DROP FUNCTION</codeph>,
-      which is available in CDH 5.7 / Impala 2.5 and higher.
+      which is available in <keyword keyref="impala25_full"/> and higher.
     </p>
     <p rev="2.5.0 IMPALA-2843 CDH-39148">
       At the start, the jar file is in the local filesystem. Then it is copied into HDFS, so that it is

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_create_role.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_create_role.xml b/docs/topics/impala_create_role.xml
index 8258b1f..2308490 100644
--- a/docs/topics/impala_create_role.xml
+++ b/docs/topics/impala_create_role.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept rev="1.4.0" id="create_role">
 
-  <title>CREATE ROLE Statement (CDH 5.2 or higher only)</title>
+  <title>CREATE ROLE Statement (<keyword keyref="impala20"/> or higher only)</title>
   <titlealts audience="PDF"><navtitle>CREATE ROLE</navtitle></titlealts>
   <prolog>
     <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_create_table.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_create_table.xml b/docs/topics/impala_create_table.xml
index 1b5552f..ba83fc5 100644
--- a/docs/topics/impala_create_table.xml
+++ b/docs/topics/impala_create_table.xml
@@ -186,7 +186,7 @@ file_format:
 
     <p rev="2.3.0">
       The Impala complex types (<codeph>STRUCT</codeph>, <codeph>ARRAY</codeph>, or <codeph>MAP</codeph>)
-      are available in CDH 5.5 / Impala 2.3 and higher.
+      are available in <keyword keyref="impala23_full"/> and higher.
       Because you can nest these types (for example, to make an array of maps or a struct
       with an array field), these types are also sometimes referred to as nested types.
       See <xref href="impala_complex_types.xml#complex_types"/> for usage details.
@@ -252,9 +252,9 @@ file_format:
     </p>
 
     <p rev="2.5.0">
-      Prior to CDH 5.7 / Impala 2.5, you could use a partitioned table
+      Prior to <keyword keyref="impala25_full"/> you could use a partitioned table
       as the source and copy data from it, but could not specify any partitioning clauses for the new table.
-      In CDH 5.7 / Impala 2.5 and higher, you can now use the <codeph>PARTITIONED BY</codeph> clause with a
+      In <keyword keyref="impala25_full"/> and higher, you can now use the <codeph>PARTITIONED BY</codeph> clause with a
       <codeph>CREATE TABLE AS SELECT</codeph> statement. See the examples under the following discussion of
       the <codeph>CREATE TABLE AS SELECT</codeph> syntax variation.
     </p>
@@ -484,9 +484,9 @@ CREATE TABLE synthesized_columns AS SELECT upper(c1) AS all_caps, c2+c3 AS total
     </note>
 
     <p rev="2.5.0">
-      Prior to CDH 5.7 / Impala 2.5, you could use a partitioned table
+      Prior to <keyword keyref="impala25_full"/> you could use a partitioned table
       as the source and copy data from it, but could not specify any partitioning clauses for the new table.
-      In CDH 5.7 / Impala 2.5 and higher, you can now use the <codeph>PARTITIONED BY</codeph> clause with a
+      In <keyword keyref="impala25_full"/> and higher, you can now use the <codeph>PARTITIONED BY</codeph> clause with a
       <codeph>CREATE TABLE AS SELECT</codeph> statement. The following example demonstrates how you can copy
       data from an unpartitioned table in a <codeph>CREATE TABLE AS SELECT</codeph> operation, creating a new
       partitioned table in the process. The main syntax consideration is the column order in the <codeph>PARTITIONED BY</codeph>
@@ -779,7 +779,7 @@ ERROR: AnalysisException: Partition column name mismatch: year != month
     </p>
 
     <p rev="2.6.0 CDH-39913 IMPALA-1878">
-      In CDH 5.8 / Impala 2.6 and higher, you can
+      In <keyword keyref="impala26_full"/> and higher, you can
       use this special <codeph>LOCATION</codeph> syntax
       as part of a <codeph>CREATE TABLE AS SELECT</codeph> statement.
     </p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_date.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_date.xml b/docs/topics/impala_date.xml
index 7a63aad..ae17b9a 100644
--- a/docs/topics/impala_date.xml
+++ b/docs/topics/impala_date.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept audience="Cloudera" id="date" rev="2.0.0">
 
-  <title>DATE Data Type (CDH 5.3 or higher only)</title>
+  <title>DATE Data Type (<keyword keyref="impala21"/> or higher only)</title>
   <prolog>
     <metadata>
       <data name="Category" value="Impala"/>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_datetime_functions.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_datetime_functions.xml b/docs/topics/impala_datetime_functions.xml
index be6afa9..dddfee6 100644
--- a/docs/topics/impala_datetime_functions.xml
+++ b/docs/topics/impala_datetime_functions.xml
@@ -2203,11 +2203,11 @@ select now() + interval 2 weeks as 2_weeks_from_now,
             positions of elements and use different separator characters.
           </p>
           <p rev="2.2.3">
-            In CDH 5.4.3 and higher, you can include a trailing uppercase <codeph>Z</codeph> qualifier
+            In <ph rev="upstream">CDH 5.4.3</ph> and higher, you can include a trailing uppercase <codeph>Z</codeph> qualifier
             to indicate <q>Zulu</q> time, a synonym for UTC.
           </p>
           <p rev="2.3.0">
-            In CDH 5.5.0 and higher, you can include a timezone offset specified as minutes and hours,
+            In <keyword keyref="impala23_full"/> and higher, you can include a timezone offset specified as minutes and hours,
             provided you also specify the details in the format string argument. The offset is specified in the format
             string as a plus or minus sign followed by <codeph>hh:mm</codeph>, <codeph>hhmm</codeph>, or <codeph>hh</codeph>.
             The <codeph>hh</codeph> must be lowercase, to distinguish it from the <codeph>HH</codeph> represent

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_decimal.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_decimal.xml b/docs/topics/impala_decimal.xml
index b566860..58958ab 100644
--- a/docs/topics/impala_decimal.xml
+++ b/docs/topics/impala_decimal.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept rev="1.4.0" id="decimal">
 
-  <title>DECIMAL Data Type (CDH 5.1 or higher only)</title>
+  <title>DECIMAL Data Type (<keyword keyref="impala14"/> or higher only)</title>
   <titlealts audience="PDF"><navtitle>DECIMAL</navtitle></titlealts>
   <prolog>
     <metadata>
@@ -163,7 +163,7 @@
 
     <ul>
       <li>
-        Using the <codeph>DECIMAL</codeph> type is only supported under CDH 5.1.0 and higher.
+        Using the <codeph>DECIMAL</codeph> type is only supported under <keyword keyref="impala14_full"/> and higher.
       </li>
 
       <li>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_delete.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_delete.xml b/docs/topics/impala_delete.xml
index 997bd49..5715cc7 100644
--- a/docs/topics/impala_delete.xml
+++ b/docs/topics/impala_delete.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="delete">
 
-  <title>DELETE Statement (CDH 5.10 or higher only)</title>
+  <title>DELETE Statement (<keyword keyref="impala28"/> or higher only)</title>
   <titlealts audience="PDF"><navtitle>DELETE</navtitle></titlealts>
   <prolog>
     <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_describe.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_describe.xml b/docs/topics/impala_describe.xml
index c7a2088..c4070c3 100644
--- a/docs/topics/impala_describe.xml
+++ b/docs/topics/impala_describe.xml
@@ -23,9 +23,9 @@
       <indexterm audience="Cloudera">DESCRIBE statement</indexterm>
       The <codeph>DESCRIBE</codeph> statement displays metadata about a table, such as the column names and their
       data types.
-      <ph rev="2.3.0">In CDH 5.5 / Impala 2.3 and higher, you can specify the name of a complex type column, which takes
+      <ph rev="2.3.0">In <keyword keyref="impala23_full"/> and higher, you can specify the name of a complex type column, which takes
       the form of a dotted path. The path might include multiple components in the case of a nested type definition.</ph>
-      <ph rev="2.5.0">In CDH 5.7 / Impala 2.5 and higher, the <codeph>DESCRIBE DATABASE</codeph> form can display
+      <ph rev="2.5.0">In <keyword keyref="impala25_full"/> and higher, the <codeph>DESCRIBE DATABASE</codeph> form can display
       information about a database.</ph>
     </p>
 
@@ -75,7 +75,7 @@ object_name ::=
 
 <p rev="2.5.0">
 The following examples show the variations in syntax and output for
-describing databases. This feature is available in CDH 5.7 / Impala 2.5
+describing databases. This feature is available in <keyword keyref="impala25_full"/>
 and higher.
 </p>
 
@@ -178,7 +178,7 @@ describe formatted my_table;
 
     <p rev="2.3.0">
       For the <codeph>ARRAY</codeph>, <codeph>STRUCT</codeph>, and <codeph>MAP</codeph> types available in
-      CDH 5.5 / Impala 2.3 and higher, the <codeph>DESCRIBE</codeph> output is formatted to avoid
+      <keyword keyref="impala23_full"/> and higher, the <codeph>DESCRIBE</codeph> output is formatted to avoid
       excessively long lines for multiple fields within a <codeph>STRUCT</codeph>, or a nested sequence of
       complex types.
     </p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_disable_codegen.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_disable_codegen.xml b/docs/topics/impala_disable_codegen.xml
index bcc5787..ab306e8 100644
--- a/docs/topics/impala_disable_codegen.xml
+++ b/docs/topics/impala_disable_codegen.xml
@@ -20,7 +20,7 @@
       This is a debug option, intended for diagnosing and working around issues that cause crashes. If a query
       fails with an <q>illegal instruction</q> or other hardware-specific message, try setting
       <codeph>DISABLE_CODEGEN=true</codeph> and running the query again. If the query succeeds only when the
-      <codeph>DISABLE_CODEGEN</codeph> option is turned on, submit the problem to Cloudera support and include that
+      <codeph>DISABLE_CODEGEN</codeph> option is turned on, submit the problem to <keyword keyref="support_org"/> and include that
       detail in the problem report. Do not otherwise run with this setting turned on, because it results in lower
       overall performance.
     </p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_disable_row_runtime_filtering.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_disable_row_runtime_filtering.xml b/docs/topics/impala_disable_row_runtime_filtering.xml
index 4ba6e7a..a8c07cb 100644
--- a/docs/topics/impala_disable_row_runtime_filtering.xml
+++ b/docs/topics/impala_disable_row_runtime_filtering.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="disable_row_runtime_filtering" rev="2.5.0">
 
-  <title>DISABLE_ROW_RUNTIME_FILTERING Query Option (CDH 5.7 or higher only)</title>
+  <title>DISABLE_ROW_RUNTIME_FILTERING Query Option (<keyword keyref="impala25"/> or higher only)</title>
   <titlealts audience="PDF"><navtitle>DISABLE_ROW_RUNTIME_FILTERING</navtitle></titlealts>
   <prolog>
     <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_disable_streaming_preaggregations.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_disable_streaming_preaggregations.xml b/docs/topics/impala_disable_streaming_preaggregations.xml
index 683a16d..a3919af 100644
--- a/docs/topics/impala_disable_streaming_preaggregations.xml
+++ b/docs/topics/impala_disable_streaming_preaggregations.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="disable_streaming_preaggregations" rev="2.5.0 IMPALA-1305">
 
-  <title>DISABLE_STREAMING_PREAGGREGATIONS Query Option (CDH 5.7 or higher only)</title>
+  <title>DISABLE_STREAMING_PREAGGREGATIONS Query Option (<keyword keyref="impala25"/> or higher only)</title>
   <titlealts audience="PDF"><navtitle>DISABLE_STREAMING_PREAGGREGATIONS</navtitle></titlealts>
   <prolog>
     <metadata>
@@ -20,7 +20,7 @@
 
     <p rev="2.5.0 IMPALA-1305">
       <indexterm audience="Cloudera">DISABLE_STREAMING_PREAGGREGATIONS query option</indexterm>
-      Turns off the <q>streaming preaggregation</q> optimization that is available in CDH 5.7 / Impala 2.5
+      Turns off the <q>streaming preaggregation</q> optimization that is available in <keyword keyref="impala25_full"/>
       and higher. This optimization reduces unnecessary work performed by queries that perform aggregation
       operations on columns with few or no duplicate values, for example <codeph>DISTINCT <varname>id_column</varname></codeph>
       or <codeph>GROUP BY <varname>unique_column</varname></codeph>. If the optimization causes regressions in

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_disable_unsafe_spills.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_disable_unsafe_spills.xml b/docs/topics/impala_disable_unsafe_spills.xml
index 17ad2e1..14b687c 100644
--- a/docs/topics/impala_disable_unsafe_spills.xml
+++ b/docs/topics/impala_disable_unsafe_spills.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept rev="2.0.0" id="disable_unsafe_spills">
 
-  <title>DISABLE_UNSAFE_SPILLS Query Option (CDH 5.2 or higher only)</title>
+  <title>DISABLE_UNSAFE_SPILLS Query Option (<keyword keyref="impala20"/> or higher only)</title>
   <titlealts audience="PDF"><navtitle>DISABLE_UNSAFE_SPILLS</navtitle></titlealts>
   <prolog>
     <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_dml.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_dml.xml b/docs/topics/impala_dml.xml
index ecce473..b6c6399 100644
--- a/docs/topics/impala_dml.xml
+++ b/docs/topics/impala_dml.xml
@@ -25,20 +25,24 @@
     </p>
 
     <ul>
-      <li audience="Cloudera">
-        <xref href="impala_delete.xml#delete"/>; works for Kudu tables only
+      <li>
+        <xref keyref="delete"/>. Works for Kudu tables only.
       </li>
 
       <li>
-        <xref href="impala_insert.xml#insert"/>
+        <xref keyref="insert"/>.
       </li>
 
       <li>
-        <xref href="impala_load_data.xml#load_data"/>
+        <xref keyref="load_data"/>. Does not apply for HBase or Kudu tables.
       </li>
 
-      <li audience="Cloudera">
-        <xref href="impala_update.xml#update"/>; works for Kudu tables only
+      <li>
+        <xref keyref="update"/>. Works for Kudu tables only.
+      </li>
+
+      <li>
+        <xref keyref="upsert"/>. Works for Kudu tables only.
       </li>
     </ul>
 
@@ -58,21 +62,23 @@
     </p>
 
     <p>
-      To simulate the effects of an <codeph>UPDATE</codeph> or <codeph>DELETE</codeph> statement in other database
-      systems, typically you use <codeph>INSERT</codeph> or <codeph>CREATE TABLE AS SELECT</codeph> to copy data
+      In <keyword keyref="impala28_full"/> and higher, Impala does support the <codeph>UPDATE</codeph>, <codeph>DELETE</codeph>,
+      and <codeph>UPSERT</codeph> statements for Kudu tables.
+      For HDFS or S3 tables, to simulate the effects of an <codeph>UPDATE</codeph> or <codeph>DELETE</codeph> statement
+      in other database systems, typically you use <codeph>INSERT</codeph> or <codeph>CREATE TABLE AS SELECT</codeph> to copy data
       from one table to another, filtering out or changing the appropriate rows during the copy operation.
     </p>
 
     <p>
-      Although Impala currently does not have an <codeph>UPDATE</codeph> statement, you can achieve a similar
-      result by using Impala tables stored in HBase. When you insert a row into an HBase table, and the table
+      You can also achieve a result similar to <codeph>UPDATE</codeph> by using Impala tables stored in HBase.
+      When you insert a row into an HBase table, and the table
       already contains a row with the same value for the key column, the older row is hidden, effectively the same
       as a single-row <codeph>UPDATE</codeph>.
     </p>
 
-    <p rev="2.2.0">
-      Currently, Impala cannot perform DML operations for tables or partitions stored in the Amazon S3 filesystem.
-      See <xref href="impala_s3.xml#s3"/> for details.
+    <p rev="2.6.0">
+      Impala can perform DML operations for tables or partitions stored in the Amazon S3 filesystem
+      with <keyword keyref="impala26_full"/> and higher. See <xref href="impala_s3.xml#s3"/> for details.
     </p>
 
     <p conref="../shared/impala_common.xml#common/related_info"/>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_drop_database.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_drop_database.xml b/docs/topics/impala_drop_database.xml
index fca7a60..fb36dca 100644
--- a/docs/topics/impala_drop_database.xml
+++ b/docs/topics/impala_drop_database.xml
@@ -37,7 +37,7 @@
     </p>
 
     <p rev="2.3.0">
-      In CDH 5.5 / Impala 2.3 and higher, you can include the <codeph>CASCADE</codeph>
+      In <keyword keyref="impala23_full"/> and higher, you can include the <codeph>CASCADE</codeph>
       clause to make Impala drop all tables and other objects in the database before dropping the database itself.
       The <codeph>RESTRICT</codeph> clause enforces the original requirement that the database be empty
       before being dropped. Because the <codeph>RESTRICT</codeph> behavior is still the default, this

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_drop_function.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_drop_function.xml b/docs/topics/impala_drop_function.xml
index 0f6c33b..dfad51b 100644
--- a/docs/topics/impala_drop_function.xml
+++ b/docs/topics/impala_drop_function.xml
@@ -37,7 +37,7 @@
       <p rev="2.5.0 IMPALA-2843 CDH-39148">
         The preceding syntax, which includes the function signature, also applies to Java UDFs that were created
         using the corresponding <codeph>CREATE FUNCTION</codeph> syntax that includes the argument and return types.
-        After upgrading to CDH 5.7 / Impala 2.5 or higher, consider re-creating all Java UDFs with the
+        After upgrading to <keyword keyref="impala25_full"/> or higher, consider re-creating all Java UDFs with the
         <codeph>CREATE FUNCTION</codeph> syntax that does not include the function signature. Java UDFs created this
         way are now persisted in the metastore database and do not need to be re-created after an Impala restart.
       </p>
@@ -84,7 +84,7 @@ DROP FUNCTION IF EXISTS bar;
     <p conref="../shared/impala_common.xml#common/example_blurb"/>
     <p rev="2.5.0 IMPALA-2843 CDH-39148">
       The following example shows how to drop Java functions created with the signatureless
-      <codeph>CREATE FUNCTION</codeph> syntax in CDH 5.7 / Impala 2.5 and higher.
+      <codeph>CREATE FUNCTION</codeph> syntax in <keyword keyref="impala25_full"/> and higher.
       Issuing <codeph>DROP FUNCTION <varname>function_name</varname></codeph> removes all the
       overloaded functions under that name.
       (See <xref href="impala_create_function.xml#create_function"/> for a longer example

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_drop_role.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_drop_role.xml b/docs/topics/impala_drop_role.xml
index b60f465..7383b46 100644
--- a/docs/topics/impala_drop_role.xml
+++ b/docs/topics/impala_drop_role.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept rev="1.4.0" id="drop_role">
 
-  <title>DROP ROLE Statement (CDH 5.2 or higher only)</title>
+  <title>DROP ROLE Statement (<keyword keyref="impala20"/> or higher only)</title>
   <titlealts audience="PDF"><navtitle>DROP ROLE</navtitle></titlealts>
   <prolog>
     <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_drop_table.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_drop_table.xml b/docs/topics/impala_drop_table.xml
index 81ce8c6..8a75158 100644
--- a/docs/topics/impala_drop_table.xml
+++ b/docs/topics/impala_drop_table.xml
@@ -48,7 +48,7 @@
     </p>
 
     <p rev="2.3.0"> The optional <codeph>PURGE</codeph> keyword, available in
-      CDH 5.5 / Impala 2.3 and higher, causes Impala to remove the associated
+      <keyword keyref="impala23_full"/> and higher, causes Impala to remove the associated
       HDFS data files immediately, rather than going through the HDFS trashcan
       mechanism. Use this keyword when dropping a table if it is crucial to
       remove the data as quickly as possible to free up space, or if there is a
@@ -113,7 +113,7 @@ drop table temporary.trivial;</codeblock>
     <p rev="2.6.0 CDH-39913 IMPALA-1878">
       The <codeph>DROP TABLE</codeph> statement can remove data files from S3
       if the associated S3 table is an internal table.
-      In CDH 5.8 / Impala 2.6 and higher, as part of improved support for writing
+      In <keyword keyref="impala26_full"/> and higher, as part of improved support for writing
       to S3, Impala also removes the associated folder when dropping an internal table
       that resides on S3.
       See <xref href="impala_s3.xml#s3"/> for details about working with S3 tables.

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_exec_single_node_rows_threshold.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_exec_single_node_rows_threshold.xml b/docs/topics/impala_exec_single_node_rows_threshold.xml
index c677a64..a7cf102 100644
--- a/docs/topics/impala_exec_single_node_rows_threshold.xml
+++ b/docs/topics/impala_exec_single_node_rows_threshold.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept rev="2.0.0" id="exec_single_node_rows_threshold">
 
-  <title>EXEC_SINGLE_NODE_ROWS_THRESHOLD Query Option (CDH 5.3 or higher only)</title>
+  <title>EXEC_SINGLE_NODE_ROWS_THRESHOLD Query Option (<keyword keyref="impala21"/> or higher only)</title>
   <titlealts audience="PDF"><navtitle>EXEC_SINGLE_NODE_ROWS_THRESHOLD</navtitle></titlealts>
   <prolog>
     <metadata>
@@ -57,7 +57,7 @@
     </p>
 
     <p rev="2.3.0">
-      In CDH 5.5 / Impala 2.3 and higher, where Impala supports the complex data types <codeph>STRUCT</codeph>,
+      In <keyword keyref="impala23_full"/> and higher, where Impala supports the complex data types <codeph>STRUCT</codeph>,
       <codeph>ARRAY</codeph>, and <codeph>MAP</codeph>, if a query refers to any column of those types,
       the small-query optimization is turned off for that query regardless of the
       <codeph>EXEC_SINGLE_NODE_ROWS_THRESHOLD</codeph> setting.

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_faq.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_faq.xml b/docs/topics/impala_faq.xml
index 94b0b33..852beaf 100644
--- a/docs/topics/impala_faq.xml
+++ b/docs/topics/impala_faq.xml
@@ -672,7 +672,7 @@ through the <codeph>DEFAULT_ORDER_BY_LIMIT</codeph> query option.</ph>
         </p>
 
         <p rev="2.2.0">
-          In Impala 2.2 / CDH 5.4 and higher, you can use the log redaction feature
+          In <keyword keyref="impala22_full"/> and higher, you can use the log redaction feature
           to obfuscate sensitive information in Impala log files.
           See
           <xref audience="integrated" href="sg_redaction.xml#log_redact"/><xref audience="standalone" href="http://www.cloudera.com/documentation/enterprise/latest/topics/sg_redaction.html" scope="external" format="html"/>
@@ -1256,10 +1256,7 @@ Should consolidate since makes sense to have one faq_hive ID.
 
           <p>
             You can enable HDFS HA for the Hive metastore. See the
-<!-- Original URL: http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH5/latest/CDH5-High-Availability-Guide/cdh_hag_hdfs_ha_cdh_components_config.html -->
             <xref href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_hag_cdh_other_ha.html" scope="external" format="html">CDH5 High Availability Guide</xref>
-            or the
-            <xref href="http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH4-High-Availability-Guide/cdh4hag_topic_2_6.html" scope="external" format="html">CDH4 High Availability Guide</xref>
             for details.
           </p>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_fixed_issues.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_fixed_issues.xml b/docs/topics/impala_fixed_issues.xml
index efc7a6b..f55d95c 100644
--- a/docs/topics/impala_fixed_issues.xml
+++ b/docs/topics/impala_fixed_issues.xml
@@ -3011,7 +3011,7 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API - also in 5.2.4 /
           <xref href="https://issues.cloudera.org/browse/IMPALA-1674" scope="external" format="html"/> IMPALA-1674
         </p>
 
-<!--      <p><b>Resolution:</b> Contact Cloudera Support for a patch.</p> -->
+<!--      <p><b>Resolution:</b> Contact <keyword keyref="support_org"/> for a patch.</p> -->
       </conbody>
     </concept>
 
@@ -3032,7 +3032,7 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API - also in 5.2.4 /
           <xref href="https://issues.cloudera.org/browse/IMPALA-1668" scope="external" format="html">IMPALA-1668</xref>
         </p>
 
-<!--      <p><b>Resolution:</b> Contact Cloudera Support for a patch.</p> -->
+<!--      <p><b>Resolution:</b> Contact <keyword keyref="support_org"/> for a patch.</p> -->
       </conbody>
     </concept>
   </concept>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_grant.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_grant.xml b/docs/topics/impala_grant.xml
index 7204445..a14a717 100644
--- a/docs/topics/impala_grant.xml
+++ b/docs/topics/impala_grant.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept rev="2.0.0" id="grant">
 
-  <title>GRANT Statement (CDH 5.2 or higher only)</title>
+  <title>GRANT Statement (<keyword keyref="impala20"/> or higher only)</title>
   <titlealts audience="PDF"><navtitle>GRANT</navtitle></titlealts>
   <prolog>
     <metadata>
@@ -73,7 +73,7 @@ object_type ::= TABLE | DATABASE | SERVER | URI
 
     <p rev="2.3.0 collevelauth">
       The ability to grant or revoke <codeph>SELECT</codeph> privilege on specific columns is available
-      in CDH 5.5 / Impala 2.3 and higher. See
+      in <keyword keyref="impala23_full"/> and higher. See
       <xref audience="integrated" href="sg_hive_sql.xml#concept_c2q_4qx_p4/col_level_auth_sentry"/><xref audience="standalone" href="https://www.cloudera.com/documentation/enterprise/latest/topics/sg_hive_sql.html" format="html" scope="external"/>
       for details.
     </p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_group_by.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_group_by.xml b/docs/topics/impala_group_by.xml
index 055ae2a..2c6ade3 100644
--- a/docs/topics/impala_group_by.xml
+++ b/docs/topics/impala_group_by.xml
@@ -31,7 +31,7 @@
     <p conref="../shared/impala_common.xml#common/complex_types_blurb"/>
 
     <p rev="2.3.0">
-      In CDH 5.5 / Impala 2.3 and higher, the complex data types <codeph>STRUCT</codeph>,
+      In <keyword keyref="impala23_full"/> and higher, the complex data types <codeph>STRUCT</codeph>,
       <codeph>ARRAY</codeph>, and <codeph>MAP</codeph> are available. These columns cannot
       be referenced directly in the <codeph>ORDER BY</codeph> clause.
       When you query a complex type column, you use join notation to <q>unpack</q> the elements

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_hbase.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_hbase.xml b/docs/topics/impala_hbase.xml
index 0260545..8b8d013 100644
--- a/docs/topics/impala_hbase.xml
+++ b/docs/topics/impala_hbase.xml
@@ -35,14 +35,9 @@
     <p>
       For background information on HBase, see the snapshot of the Apache HBase site (including documentation) for
       the level of HBase that comes with
-      <xref href="https://archive.cloudera.com/cdh4/cdh/4/hbase/" scope="external" format="html">CDH 4</xref> or
       <xref href="https://archive.cloudera.com/cdh5/cdh/5/hbase/" scope="external" format="html">CDH 5</xref>. To
       install HBase on a CDH cluster, see the installation instructions for
-      <xref href="http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH4-Installation-Guide/cdh4ig_topic_20.html" scope="external" format="html">CDH
-      4</xref> or
-<!-- Original URL: http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH5/latest/CDH5-Installation-Guide/cdh_ig_hbase_installation.html -->
-      <xref href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_ig_hbase_installation.html" scope="external" format="html">CDH
-      5</xref>.
+      <xref href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_ig_hbase_installation.html" scope="external" format="html">CDH 5</xref>.
     </p>
 
     <p outputclass="toc inpage"/>
@@ -750,10 +745,13 @@ set hbase_caching=1000;
         <li rev="2.3.0">
           <p>
             Because the complex data types (<codeph>ARRAY</codeph>, <codeph>STRUCT</codeph>, and <codeph>MAP</codeph>)
-            available in CDH 5.5 / Impala 2.3 and higher are currently only supported in Parquet tables, you cannot
+            available in <keyword keyref="impala23_full"/> and higher are currently only supported in Parquet tables, you cannot
             use these types in HBase tables that are queried through Impala.
           </p>
         </li>
+        <li>
+          <p conref="../shared/impala_common.xml#common/hbase_no_load_data"/>
+        </li>
       </ul>
     </conbody>
   </concept>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_hints.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_hints.xml b/docs/topics/impala_hints.xml
index 3eef3d3..4c5145f 100644
--- a/docs/topics/impala_hints.xml
+++ b/docs/topics/impala_hints.xml
@@ -60,7 +60,7 @@ INSERT <varname>insert_clauses</varname>
 </codeblock>
 
     <p rev="2.0.0">
-      In Impala 2.0 and higher, or CDH 5.2 and higher, you can also specify the hints inside comments that use
+      In <keyword keyref="impala20_full"/> and higher, you can also specify the hints inside comments that use
       either the <codeph>/* */</codeph> or <codeph>--</codeph> notation. Specify a <codeph>+</codeph> symbol
       immediately before the hint name.
     </p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_impala_shell.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_impala_shell.xml b/docs/topics/impala_impala_shell.xml
index 58a96bc..afbfcaa 100644
--- a/docs/topics/impala_impala_shell.xml
+++ b/docs/topics/impala_impala_shell.xml
@@ -51,7 +51,7 @@
         on the command line using the notation
         <codeph>--var=<varname>variable_name</varname>=<varname>value</varname></codeph>.
         Within a SQL statement, you substitute the value by using the notation <codeph>${var:<varname>variable_name</varname>}</codeph>.
-        This feature is available in CDH 5.7 / Impala 2.5 and higher.
+        This feature is available in <keyword keyref="impala25_full"/> and higher.
       </li>
 
       <li>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_incompatible_changes.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_incompatible_changes.xml b/docs/topics/impala_incompatible_changes.xml
index a7bafcd..88a306f 100644
--- a/docs/topics/impala_incompatible_changes.xml
+++ b/docs/topics/impala_incompatible_changes.xml
@@ -243,7 +243,7 @@
             Formerly, all Impala UDFs and UDAs required running the
             <codeph>CREATE FUNCTION</codeph> statements to
             re-create them after each <cmdname>catalogd</cmdname> restart.
-            In CDH 5.7 / Impala 2.5 and higher, functions written in C++ are persisted across
+            In <keyword keyref="impala25_full"/> and higher, functions written in C++ are persisted across
             restarts, and the requirement to
             re-create functions only applies to functions written in Java. Adapt any
             function-reloading logic that you have added to your Impala environment.

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_jdbc.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_jdbc.xml b/docs/topics/impala_jdbc.xml
index 88b06aa..d667170 100644
--- a/docs/topics/impala_jdbc.xml
+++ b/docs/topics/impala_jdbc.xml
@@ -137,10 +137,7 @@
         <p>
           To get the JAR files, install the Hive JDBC driver on each CDH-enabled host in the cluster that will run
           JDBC applications. Follow the instructions for
-          <xref href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_ig_hive_jdbc_install.html" scope="external" format="html">CDH
-          5</xref> or
-          <xref href="http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH4-Installation-Guide/cdh4ig_Installing_hive_JDBC.html" scope="external" format="html">CDH
-          4</xref>.
+          <xref href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_ig_hive_jdbc_install.html" scope="external" format="html">CDH 5</xref>.
         </p>
 
         <note>
@@ -358,7 +355,7 @@
         </li>
         <li>
           <p>
-            The complex types available in CDH 5.5 / Impala 2.3 and higher are supported by the
+            The complex types available in <keyword keyref="impala23_full"/> and higher are supported by the
             JDBC <codeph>getColumns()</codeph> API.
             Both <codeph>MAP</codeph> and <codeph>ARRAY</codeph> are reported as the JDBC SQL Type <codeph>ARRAY</codeph>,
             because this is the closest matching Java SQL type. This behavior is consistent with Hive.

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_joins.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_joins.xml b/docs/topics/impala_joins.xml
index 0e807e8..ddd2f2b 100644
--- a/docs/topics/impala_joins.xml
+++ b/docs/topics/impala_joins.xml
@@ -177,7 +177,7 @@ SELECT * FROM t1 FULL OUTER JOIN t2 ON t1.id = t2.id;</codeblock>
 <codeblock>SELECT * FROM t1 CROSS JOIN t2 WHERE t1.total &gt; t2.maximum_price;</codeblock>
 
     <p rev="2.3.0">
-      In CDH 5.5 / Impala 2.3 and higher, additional non-equijoin queries are possible due to the addition
+      In <keyword keyref="impala23_full"/> and higher, additional non-equijoin queries are possible due to the addition
       of nested loop joins. These queries typically involve <codeph>SEMI JOIN</codeph>,
       <codeph>ANTI JOIN</codeph>, or <codeph>FULL OUTER JOIN</codeph> clauses.
       Impala sometimes also uses nested loop joins internally when evaluating <codeph>OUTER JOIN</codeph>
@@ -234,12 +234,12 @@ ERROR: NotImplementedException: Join with 't2' requires at least one conjunctive
 SELECT t1.c1, t2.c2 FROM t1 JOIN t2 USING (id, type_flag, name, address);</codeblock>
 
     <p rev="2.0.0">
-      <b>Anti-joins (Impala 2.0 / CDH 5.2 and higher only):</b>
+      <b>Anti-joins (<keyword keyref="impala20_full"/> and higher only):</b>
     </p>
 
     <p rev="2.0.0">
-      Impala supports the <codeph>LEFT ANTI JOIN</codeph> and <codeph>RIGHT ANTI JOIN</codeph> clauses in Impala
-      2.0 and higher on CDH 4, or CDH 5.2 and higher on CDH 5. The <codeph>LEFT</codeph> or <codeph>RIGHT</codeph>
+      Impala supports the <codeph>LEFT ANTI JOIN</codeph> and <codeph>RIGHT ANTI JOIN</codeph> clauses in
+      <keyword keyref="impala20"/> and higher. The <codeph>LEFT</codeph> or <codeph>RIGHT</codeph>
       keyword is required for this kind of join. For <codeph>LEFT ANTI JOIN</codeph>, this clause returns those
       values from the left-hand table that have no matching value in the right-hand table. <codeph>RIGHT ANTI
       JOIN</codeph> reverses the comparison and returns values from the right-hand table. You can express this
@@ -310,7 +310,7 @@ are returned only if no matching values are present in another table.
       </li>
 
       <li>
-        In CDH 5.5 / Impala 2.3 or higher, when referring to complex type columns in queries.
+        In <keyword keyref="impala23_full"/> or higher, when referring to complex type columns in queries.
         See <xref href="impala_complex_types.xml#complex_types"/> for details.
       </li>
     </ul>
@@ -481,7 +481,7 @@ Returned 1 row(s) in 1.00s</codeblock>
       By default, join key columns do not match if either one contains a <codeph>NULL</codeph> value.
       To treat such columns as equal if both contain <codeph>NULL</codeph>, you can use an expression
       such as <codeph>A = B OR (A IS NULL AND B IS NULL)</codeph>.
-      In CDH 5.7 / Impala 2.5 and higher, the <codeph>&lt;=&gt;</codeph> operator (shorthand for
+      In <keyword keyref="impala25_full"/> and higher, the <codeph>&lt;=&gt;</codeph> operator (shorthand for
       <codeph>IS NOT DISTINCT FROM</codeph>) performs the same comparison in a concise and efficient form.
       The <codeph>&lt;=&gt;</codeph> operator is more efficient in for comparing join keys in a <codeph>NULL</codeph>-safe
       manner, because the operator can use a hash join while the <codeph>OR</codeph> expression cannot.

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_kerberos.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_kerberos.xml b/docs/topics/impala_kerberos.xml
index d23186f..6393580 100644
--- a/docs/topics/impala_kerberos.xml
+++ b/docs/topics/impala_kerberos.xml
@@ -20,11 +20,7 @@
     <p>
       Impala supports Kerberos authentication. For more information on enabling Kerberos authentication, see the
       topic on Configuring Hadoop Security in the
-      <xref href="http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH4-Security-Guide/cdh4sg_topic_3.html" scope="external" format="html">CDH4
-      Security Guide</xref> or the
-<!-- Original URL: http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH5/latest/CDH5-Security-Guide/cdh_sg_cdh5_hadoop_security.html -->
-      <xref href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_sg_cdh5_hadoop_security.html" scope="external" format="html">CDH
-      5 Security Guide</xref>.
+      <xref href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_sg_cdh5_hadoop_security.html" scope="external" format="html">CDH 5 Security Guide</xref>.
     </p>
 
     <p>
@@ -116,10 +112,7 @@
       <p>
         To enable Impala to work with Kerberos security on your Hadoop cluster, make sure you perform the
         installation and configuration steps in
-<!-- Original URL: http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH5/latest/CDH5-Security-Guide/CDH5-Security-Guide.html -->
-        <xref href="http://www.cloudera.com/documentation/enterprise/latest/topics/sg_authentication.html" scope="external" format="html">Authentication in the CDH 5 Security Guide</xref>
-        or
-        the topic on Configuring Hadoop Security in the <xref href="http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH4-Security-Guide/CDH4-Security-Guide.html" scope="external" format="html">CDH4 Security Guide</xref>.
+        <xref href="http://www.cloudera.com/documentation/enterprise/latest/topics/sg_authentication.html" scope="external" format="html">Authentication in the CDH 5 Security Guide</xref>.
         Also note that when Kerberos security is enabled in Impala, a web browser that
         supports Kerberos HTTP SPNEGO is required to access the Impala web console (for example, Firefox, Internet
         Explorer, or Chrome).

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_known_issues.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_known_issues.xml b/docs/topics/impala_known_issues.xml
index 7b9ec2b..e57ec62 100644
--- a/docs/topics/impala_known_issues.xml
+++ b/docs/topics/impala_known_issues.xml
@@ -531,7 +531,7 @@ impala-shell -s impala --ssl --ca_cert /path_to_truststore/truststore.pem
       <conbody>
 
         <p>
-          The default heap size for Impala <cmdname>catalogd</cmdname> has changed in CDH 5.7 / Impala 2.5 and higher:
+          The default heap size for Impala <cmdname>catalogd</cmdname> has changed in <keyword keyref="impala25_full"/> and higher:
         </p>
 
         <ul>
@@ -613,12 +613,12 @@ impala-shell -s impala --ssl --ca_cert /path_to_truststore/truststore.pem
       <conbody>
 
         <p>
-          The initial release of CDH 5.8 / Impala 2.6 sometimes has a higher peak memory usage than in previous releases while reading
+          The initial release of <keyword keyref="impala26_full"/> sometimes has a higher peak memory usage than in previous releases while reading
           Parquet files.
         </p>
 
         <p>
-          CDH 5.8 / Impala 2.6 addresses the issue IMPALA-2736, which improves the efficiency of Parquet scans by up to 2x. The faster scans
+          <keyword keyref="impala26_full"/> addresses the issue IMPALA-2736, which improves the efficiency of Parquet scans by up to 2x. The faster scans
           may result in a higher peak memory consumption compared to earlier versions of Impala due to the new column-wise row
           materialization strategy. You are likely to experience higher memory consumption in any of the following scenarios:
           <ul>



Mime
View raw message