http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_langref_unsupported.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_langref_unsupported.xml 
b/docs/topics/impala_langref_unsupported.xml
index 39043f3..82910d6 100644
--- a/docs/topics/impala_langref_unsupported.xml
+++ b/docs/topics/impala_langref_unsupported.xml
@@ -51,7 +51,7 @@
       -->
 
       <ul>
-<!-- Now supported in CDH 5.5 / Impala 2.3 and higher. Find places on this 
page (like already done under lateral views) to note the new data type support.
+<!-- Now supported in <keyword keyref="impala23_full"/> and higher. Find 
places on this page (like already done under lateral views) to note the new 
data type support.
         <li>
           Non-scalar data types such as maps, arrays, structs.
         </li>
@@ -82,7 +82,7 @@
         </li>
 
         <li>
-          Lateral views. In CDH 5.5 / Impala 2.3 and higher, Impala supports 
queries on complex types
+          Lateral views. In <keyword keyref="impala23_full"/> and higher, 
Impala supports queries on complex types
           (<codeph>STRUCT</codeph>, <codeph>ARRAY</codeph>, or 
<codeph>MAP</codeph>), using join notation
           rather than the <codeph>EXPLODE()</codeph> keyword.
           See <xref href="impala_complex_types.xml#complex_types"/> for 
details about Impala support for complex types.
@@ -192,7 +192,7 @@
       </p>
 
       <p>
-        The Hive component included in CDH 5.1 and higher now includes 
Sentry-enabled <codeph>GRANT</codeph>,
+        The Hive component included in <ph rev="upstream">CDH 5.1</ph> and 
higher now includes Sentry-enabled <codeph>GRANT</codeph>,
         <codeph>REVOKE</codeph>, and <codeph>CREATE/DROP ROLE</codeph> 
statements. Earlier Hive releases had a
         privilege system with <codeph>GRANT</codeph> and 
<codeph>REVOKE</codeph> statements that were primarily
         intended to prevent accidental deletion of data, rather than a 
security mechanism to protect against

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_lineage.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_lineage.xml b/docs/topics/impala_lineage.xml
index c05391c..677fc3d 100644
--- a/docs/topics/impala_lineage.xml
+++ b/docs/topics/impala_lineage.xml
@@ -29,7 +29,7 @@
       data propagates through the system through SQL statements such as
         <codeph>SELECT</codeph>, <codeph>INSERT</codeph>, and <codeph>CREATE
         TABLE AS SELECT</codeph>. Impala is covered by the Cloudera Navigator
-      lineage features in CDH 5.4.0 and higher. </p>
+      lineage features in <keyword keyref="impala22_full"/> and higher. </p>
 
     <p>
       This type of tracking is important in high-security configurations, 
especially in highly regulated industries

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_live_progress.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_live_progress.xml 
b/docs/topics/impala_live_progress.xml
index ef8e8c4..f99e4b1 100644
--- a/docs/topics/impala_live_progress.xml
+++ b/docs/topics/impala_live_progress.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept rev="2.3.0" id="live_progress">
 
-  <title>LIVE_PROGRESS Query Option (CDH 5.5 or higher only)</title>
+  <title>LIVE_PROGRESS Query Option (<keyword keyref="impala23"/> or higher 
only)</title>
   <titlealts audience="PDF"><navtitle>LIVE_PROGRESS</navtitle></titlealts>
   <prolog>
     <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_live_summary.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_live_summary.xml 
b/docs/topics/impala_live_summary.xml
index 42fe484..9c7329b 100644
--- a/docs/topics/impala_live_summary.xml
+++ b/docs/topics/impala_live_summary.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept rev="2.3.0" id="live_summary">
 
-  <title>LIVE_SUMMARY Query Option (CDH 5.5 or higher only)</title>
+  <title>LIVE_SUMMARY Query Option (<keyword keyref="impala23"/> or higher 
only)</title>
   <titlealts audience="PDF"><navtitle>LIVE_SUMMARY</navtitle></titlealts>
   <prolog>
     <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_load_data.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_load_data.xml b/docs/topics/impala_load_data.xml
index e9d94b5..0652914 100644
--- a/docs/topics/impala_load_data.xml
+++ b/docs/topics/impala_load_data.xml
@@ -77,9 +77,9 @@
 
       <li rev="2.5.0 IMPALA-2867">
         The operation fails if the source directory contains any non-hidden 
directories.
-        Prior to CDH 5.7 / Impala 2.5, if the source directory contained any 
subdirectory, even a hidden one such as
+        Prior to <keyword keyref="impala25_full"/> if the source directory 
contained any subdirectory, even a hidden one such as
         <filepath>_impala_insert_staging</filepath>, the <codeph>LOAD 
DATA</codeph> statement would fail.
-        In CDH 5.7 / Impala 2.5 and higher, <codeph>LOAD DATA</codeph> ignores 
hidden subdirectories in the
+        In <keyword keyref="impala25_full"/> and higher, <codeph>LOAD 
DATA</codeph> ignores hidden subdirectories in the
         source directory, and only fails if any of the subdirectories are 
non-hidden.
       </li>
 
@@ -231,6 +231,12 @@ Returned 1 row(s) in 0.62s</codeblock>
       permission for the destination directory.
     </p>
 
+    <p conref="../shared/impala_common.xml#common/kudu_blurb"/>
+    <p conref="../shared/impala_common.xml#common/kudu_no_load_data"/>
+
+    <p conref="../shared/impala_common.xml#common/hbase_blurb"/>
+    <p conref="../shared/impala_common.xml#common/hbase_no_load_data"/>
+
     <p conref="../shared/impala_common.xml#common/related_info"/>
     <p>
       The <codeph>LOAD DATA</codeph> statement is an alternative to the

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_logging.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_logging.xml b/docs/topics/impala_logging.xml
index 7eea4a8..960f1e6 100644
--- a/docs/topics/impala_logging.xml
+++ b/docs/topics/impala_logging.xml
@@ -176,14 +176,8 @@
         troubleshooting, Cloudera Manager collects front-end and back-end logs 
together into a single view, and let
         you do a search across log data for all the managed nodes rather than 
examining the logs on each node
         separately. If you installed Impala using Cloudera Manager, refer to 
the topics on Monitoring Services
-        (<xref 
href="http://www.cloudera.com/documentation/enterprise/latest/topics/cm_dg_service_monitoring.html";
 scope="external" format="html">CDH
-        5</xref>,
-        <xref 
href="http://www.cloudera.com/content/cloudera/en/documentation/cloudera-manager/v4-latest/Cloudera-Manager-Diagnostics-Guide/Cloudera-Manager-Diagnostics-Guide.html";
 scope="external" format="html">CDH
-        4</xref>) or Logs
-        (<xref 
href="http://www.cloudera.com/documentation/enterprise/latest/topics/cm_dg_logs.html";
 scope="external" format="html">CDH
-        5</xref>,
-        <xref 
href="http://www.cloudera.com/content/cloudera/en/documentation/cloudera-manager/v4-latest/Cloudera-Manager-Diagnostics-Guide/cmdg_logs.html";
 scope="external" format="html">CDH
-        4</xref>).
+        (<xref 
href="http://www.cloudera.com/documentation/enterprise/latest/topics/cm_dg_service_monitoring.html";
 scope="external" format="html">CDH 5</xref>)
+        or Logs (<xref 
href="http://www.cloudera.com/documentation/enterprise/latest/topics/cm_dg_logs.html";
 scope="external" format="html">CDH 5</xref>).
       </p>
 
       <p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_map.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_map.xml b/docs/topics/impala_map.xml
index 64851e9..a20c356 100644
--- a/docs/topics/impala_map.xml
+++ b/docs/topics/impala_map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE concept PUBLIC "-//OASIS//DTD 
DITA Concept//EN" "concept.dtd">
   <concept id="map">
 
-    <title>MAP Complex Type (CDH 5.5 or higher only)</title>
+    <title>MAP 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_max_num_runtime_filters.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_max_num_runtime_filters.xml 
b/docs/topics/impala_max_num_runtime_filters.xml
index 90e91dc..edf4058 100644
--- a/docs/topics/impala_max_num_runtime_filters.xml
+++ b/docs/topics/impala_max_num_runtime_filters.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="max_num_runtime_filters" rev="2.5.0">
 
-  <title>MAX_NUM_RUNTIME_FILTERS Query Option (CDH 5.7 or higher only)</title>
+  <title>MAX_NUM_RUNTIME_FILTERS Query Option (<keyword keyref="impala25"/> or 
higher only)</title>
   <titlealts 
audience="PDF"><navtitle>MAX_NUM_RUNTIME_FILTERS</navtitle></titlealts>
   <prolog>
     <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_max_scan_range_length.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_max_scan_range_length.xml 
b/docs/topics/impala_max_scan_range_length.xml
index 0a31317..a99b92b 100644
--- a/docs/topics/impala_max_scan_range_length.xml
+++ b/docs/topics/impala_max_scan_range_length.xml
@@ -43,7 +43,7 @@
     </p>
 
     <p rev="IMPALA-3799 CDH-43746">
-      In CDH 5.9 / Impala 2.7 and higher, the argument value can include unit 
specifiers,
+      In <keyword keyref="impala27_full"/> and higher, the argument value can 
include unit specifiers,
       such as <codeph>100m</codeph> or <codeph>100mb</codeph>. In previous 
versions,
       Impala interpreted such formatted values as 0, leading to query failures.
     </p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_new_features.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_new_features.xml 
b/docs/topics/impala_new_features.xml
index 1e0754f..4da811f 100644
--- a/docs/topics/impala_new_features.xml
+++ b/docs/topics/impala_new_features.xml
@@ -78,7 +78,7 @@
           </ul>
         </li>
         <li audience="Cloudera">
-          <p rev="IMPALA-3210 CDH-43736"><!-- Patch didn't make it into in CDH 
5.9 / Impala 2.7 -->
+          <p rev="IMPALA-3210 CDH-43736"><!-- Patch didn't make it into in 
<keyword keyref="impala27_full"/> -->
             [<xref href="https://issues.cloudera.org/browse/IMPALA-3210"; 
scope="external" format="html">IMPALA-3210</xref>]
             The analytic functions <codeph>FIRST_VALUE()</codeph> and 
<codeph>LAST_VALUE()</codeph>
             accept a new clause, <codeph>IGNORE NULLS</codeph>.
@@ -153,7 +153,7 @@
             column definitions in Avro tables.
           </p>
         </li>
-        <li audience="Cloudera"><!-- Patch didn't make it into in CDH 5.9 / 
Impala 2.7 -->
+        <li audience="Cloudera"><!-- Patch didn't make it into in <keyword 
keyref="impala27_full"/> -->
           <p rev="IMPALA-1654 CDH-43747">
             [<xref href="https://issues.cloudera.org/browse/IMPALA-1654"; 
scope="external" format="html">IMPALA-1654</xref>]
             Several kinds of DDL operations
@@ -727,7 +727,7 @@
             <codeph>enable_partitioned_hash_join=false</codeph>.
             The latest improvements in the spill-to-disk mechanism, and 
related features that
             interact with it, make this feature robust enough that disabling 
it is now
-            no longer needed or supported. In particular, some new features in 
CDH 5.7 / Impala 2.5
+            no longer needed or supported. In particular, some new features in 
<keyword keyref="impala25_full"/>
             and higher do not work when the spill-to-disk feature is disabled.
           </p>
         </li>
@@ -1059,7 +1059,7 @@
           <li>
           <p>
             Impala queries benefit from the improved alignment of row groups 
with HDFS blocks for Parquet
-            files written by Hive, MapReduce, and other components in CDH 5.5 
and higher. (Impala itself never writes
+            files written by Hive, MapReduce, and other components in <ph 
rev="upstream">CDH 5.5</ph> and higher. (Impala itself never writes
             multiblock Parquet files, so the alignment change does not apply 
to Parquet files produced by Impala.)
             These Parquet writers now add padding to Parquet files that they 
write to align row groups with HDFS blocks.
             The <codeph>parquet.writer.max-padding</codeph> setting specifies 
the maximum number of bytes, by default
@@ -2579,16 +2579,6 @@
           </p>
         </li>
 
-<!-- This subtopic is being removed in CDH 5.7 / Impala 2.5. Getting rid of 
associated links.
-        <li>
-          <p>
-            Impala can take advantage of the Llama high availability feature 
in CDH 5.1, for improved reliability
-            of resource management through YARN. <ph audience="PDF">See
-            <xref href="impala_resource_management.xml#llama_ha"/> for 
details.</ph>
-          </p>
-        </li>
--->
-
         <li>
           The Impala <codeph>CREATE TABLE</codeph> statement now has a 
<codeph>STORED AS AVRO</codeph> clause,
           allowing you to create Avro tables through Impala. <ph 
audience="PDF">See

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_noncm_installation.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_noncm_installation.xml 
b/docs/topics/impala_noncm_installation.xml
index deaca5d..d9c1f1a 100644
--- a/docs/topics/impala_noncm_installation.xml
+++ b/docs/topics/impala_noncm_installation.xml
@@ -57,7 +57,7 @@
           described in the CDH Installation Guide).
         </p>
         <p>
-          Cloudera recommends setting up a Hive metastore service rather than 
connecting directly to the metastore
+          <ph rev="upstream">Cloudera</ph> recommends setting up a Hive 
metastore service rather than connecting directly to the metastore
           database; this configuration is required when running Impala under 
CDH 4.1. Make sure the
           <filepath>/etc/impala/conf/hive-site.xml</filepath> file contains 
the following setting, substituting the
           appropriate hostname for <varname>metastore_server_host</varname>:
@@ -119,7 +119,7 @@ $ sudo apt-get install impala-state-store # Service 
start/stop script
 $ sudo apt-get install impala-catalog     # Service start/stop script
 </codeblock>
         <note>
-          Cloudera recommends that you not install Impala on any HDFS 
NameNode. Installing Impala on NameNodes
+          <ph rev="upstream">Cloudera</ph> recommends that you not install 
Impala on any HDFS NameNode. Installing Impala on NameNodes
           provides no additional data locality, and executing queries with 
such a configuration might cause memory
           contention and negatively impact the HDFS NameNode.
         </note>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_operators.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_operators.xml b/docs/topics/impala_operators.xml
index 9923426..acd9297 100644
--- a/docs/topics/impala_operators.xml
+++ b/docs/topics/impala_operators.xml
@@ -445,9 +445,9 @@ NOT EXISTS (<varname>subquery</varname>)
       <p conref="../shared/impala_common.xml#common/subquery_no_limit"/>
 
       <p rev="IMPALA-3232">
-        Prior to CDH 5.8 / Impala 2.6,
+        Prior to <keyword keyref="impala26_full"/>,
         the <codeph>NOT EXISTS</codeph> operator required a correlated 
subquery.
-        In CDH 5.8 / Impala 2.6 and higher, <codeph>NOT EXISTS</codeph> works 
with
+        In <keyword keyref="impala26_full"/> and higher, <codeph>NOT 
EXISTS</codeph> works with
         uncorrelated queries also.
       </p>
 
@@ -640,7 +640,7 @@ ERROR: AnalysisException: couldn't resolve column 
reference: 'x'
       </p>
 
       <p>
-        This operator, available in CDH 5.7 / Impala 2.5 and higher, is the 
equivalent of the <codeph>LIKE</codeph> operator,
+        This operator, available in <keyword keyref="impala25_full"/> and 
higher, is the equivalent of the <codeph>LIKE</codeph> operator,
         but with case-insensitive comparisons.
       </p>
 
@@ -952,7 +952,7 @@ SELECT COUNT(DISTINCT(visitor_id)) FROM web_traffic WHERE 
month IN ('January','J
       </p>
 
       <p>
-        This operator, available in CDH 5.7 / Impala 2.5 and higher, is the 
equivalent of the <codeph>REGEXP</codeph> operator,
+        This operator, available in <keyword keyref="impala25_full"/> and 
higher, is the equivalent of the <codeph>REGEXP</codeph> operator,
         but with case-insensitive comparisons.
       </p>
 

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

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_order_by.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_order_by.xml b/docs/topics/impala_order_by.xml
index 0ef49f1..2db141d 100644
--- a/docs/topics/impala_order_by.xml
+++ b/docs/topics/impala_order_by.xml
@@ -91,7 +91,7 @@ col_ref ::= <varname>column_name</varname> | 
<varname>integer_literal</varname>
     <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_parquet.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_parquet.xml b/docs/topics/impala_parquet.xml
index bcc95b4..b22fa84 100644
--- a/docs/topics/impala_parquet.xml
+++ b/docs/topics/impala_parquet.xml
@@ -337,7 +337,7 @@ Add an example here.
       </p>
 
       <p rev="2.5.0">
-        The runtime filtering feature, available in CDH 5.7 / Impala 2.5 and 
higher, works best with Parquet tables.
+        The runtime filtering feature, available in <keyword 
keyref="impala25_full"/> and higher, works best with Parquet tables.
         The per-row filtering aspect only applies to Parquet tables.
         See <xref href="impala_runtime_filtering.xml#runtime_filtering"/> for 
details.
       </p>
@@ -672,7 +672,7 @@ Returned 1 row(s) in 13.35s
     <conbody>
 
     <p>
-      In CDH 5.5 / Impala 2.3 and higher, Impala supports the complex types
+      In <keyword keyref="impala23_full"/> and higher, Impala supports the 
complex types
       <codeph>ARRAY</codeph>, <codeph>STRUCT</codeph>, and <codeph>MAP</codeph>
       See <xref href="impala_complex_types.xml#complex_types"/> for details.
       Because these data types are currently supported only for the Parquet 
file format,
@@ -736,7 +736,7 @@ ALTER TABLE <varname>table_name</varname> SET FILEFORMAT
 
       <p rev="2.2.0">
         Impala supports the scalar data types that you can encode in a Parquet 
data file, but not composite or
-        nested types such as maps or arrays. In Impala 2.2.0 / CDH 5.4.0 and 
higher, Impala can query Parquet data
+        nested types such as maps or arrays. In <keyword 
keyref="impala22_full"/> and higher, Impala can query Parquet data
         files that include composite or nested types, as long as the query 
only refers to columns with scalar
         types.
 <!-- TK: could include an example here, but would require setup in Hive or Pig 
or something. -->
@@ -1094,7 +1094,7 @@ select * from production_table where c1 = 100 and c2 &lt; 
50 and ...;
         a table with columns <codeph>C1,C2,C3,C4</codeph>, and now you want to 
reuse the same
         Parquet file in a table with columns <codeph>C4,C2</codeph>. By 
default, Impala expects the
         columns in the data file to appear in the same order as the columns 
defined for the table,
-        making it impractical to do some kinds of file reuse or schema 
evolution. In CDH 5.8 / Impala 2.6
+        making it impractical to do some kinds of file reuse or schema 
evolution. In <keyword keyref="impala26_full"/>
         and higher, the query option 
<codeph>PARQUET_FALLBACK_SCHEMA_RESOLUTION=name</codeph> lets Impala
         resolve columns by name, and therefore handle out-of-order or extra 
columns in the data file.
         For example:
@@ -1149,7 +1149,7 @@ BINARY + OriginalType DECIMAL -&gt; DECIMAL
 
       <p rev="2.3.0">
         For the complex types (<codeph>ARRAY</codeph>, <codeph>MAP</codeph>, 
and <codeph>STRUCT</codeph>)
-        available in CDH 5.5 / Impala 2.3 and higher, Impala only supports 
queries
+        available in <keyword keyref="impala23_full"/> and higher, Impala only 
supports queries
         against those types in Parquet tables.
       </p>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_parquet_annotate_strings_utf8.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_parquet_annotate_strings_utf8.xml 
b/docs/topics/impala_parquet_annotate_strings_utf8.xml
index cd5b578..b603b2c 100644
--- a/docs/topics/impala_parquet_annotate_strings_utf8.xml
+++ b/docs/topics/impala_parquet_annotate_strings_utf8.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="parquet_annotate_strings_utf8" rev="2.6.0 IMPALA-2069">
 
-  <title>PARQUET_ANNOTATE_STRINGS_UTF8 Query Option (CDH 5.8 or higher 
only)</title>
+  <title>PARQUET_ANNOTATE_STRINGS_UTF8 Query Option (<keyword 
keyref="impala26"/> 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_parquet_fallback_schema_resolution.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_parquet_fallback_schema_resolution.xml 
b/docs/topics/impala_parquet_fallback_schema_resolution.xml
index 06b1a28..e9c9327 100644
--- a/docs/topics/impala_parquet_fallback_schema_resolution.xml
+++ b/docs/topics/impala_parquet_fallback_schema_resolution.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="parquet_fallback_schema_resolution" rev="2.6.0 IMPALA-2835 
CDH-33330">
 
-  <title>PARQUET_FALLBACK_SCHEMA_RESOLUTION Query Option (CDH 5.8 or higher 
only)</title>
+  <title>PARQUET_FALLBACK_SCHEMA_RESOLUTION Query Option (<keyword 
keyref="impala26"/> or higher only)</title>
   <titlealts 
audience="PDF"><navtitle>PARQUET_FALLBACK_SCHEMA_RESOLUTION</navtitle></titlealts>
   <prolog>
     <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_partitioning.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_partitioning.xml 
b/docs/topics/impala_partitioning.xml
index d9cb31a..1aedfa1 100644
--- a/docs/topics/impala_partitioning.xml
+++ b/docs/topics/impala_partitioning.xml
@@ -119,7 +119,7 @@
         </li>
 
         <li rev="2.5.0">
-          In CDH 5.7 / Impala 2.5 and higher, you can also use the 
<codeph>PARTITIONED BY</codeph> clause in a <codeph>CREATE TABLE AS
+          In <keyword keyref="impala25_full"/> and higher, you can also use 
the <codeph>PARTITIONED BY</codeph> clause in a <codeph>CREATE TABLE AS
           SELECT</codeph> statement. This syntax lets you use a single 
statement to create a partitioned table, copy data into it, and
           create new partitions based on the values in the inserted data.
         </li>
@@ -208,7 +208,7 @@ insert into weather <b>partition (year=2014, month=04, 
day)</b> select 'sunny',2
       </p>
 
       <p>
-        In CDH 5.9 / Impala 2.7 and higher, you can include a 
<codeph>PARTITION (<varname>partition_spec</varname>)</codeph> clause in the
+        In <keyword keyref="impala27_full"/> and higher, you can include a 
<codeph>PARTITION (<varname>partition_spec</varname>)</codeph> clause in the
         <codeph>REFRESH</codeph> statement so that only a single partition is 
refreshed. For example, <codeph>REFRESH big_table PARTITION
         (year=2017, month=9, day=30)</codeph>. The partition spec must include 
all the partition key columns. See
         <xref href="impala_refresh.xml#refresh"/> for more details and 
examples of <codeph>REFRESH</codeph> syntax and usage.
@@ -453,7 +453,7 @@ SELECT COUNT(*) FROM sales_table WHERE year IN (2005, 2010, 
2015);
 
         <li rev="IMPALA-2499">
           <p>
-            In CDH 5.7 / Impala 2.5 and higher, you can enable the 
<codeph>OPTIMIZE_PARTITION_KEY_SCANS</codeph> query option to speed up
+            In <keyword keyref="impala25_full"/> and higher, you can enable 
the <codeph>OPTIMIZE_PARTITION_KEY_SCANS</codeph> query option to speed up
             queries that only refer to partition key columns, such as 
<codeph>SELECT MAX(year)</codeph>. This setting is not enabled by
             default because the query behavior is slightly different if the 
table contains partition directories without actual data inside.
             See <xref 
href="impala_optimize_partition_key_scans.xml#optimize_partition_key_scans"/> 
for details.

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_perf_hdfs_caching.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_perf_hdfs_caching.xml 
b/docs/topics/impala_perf_hdfs_caching.xml
index e7ffeec..883bc8d 100644
--- a/docs/topics/impala_perf_hdfs_caching.xml
+++ b/docs/topics/impala_perf_hdfs_caching.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept rev="1.4" id="hdfs_caching">
 
-  <title>Using HDFS Caching with Impala (CDH 5.1 or higher only)</title>
+  <title>Using HDFS Caching with Impala (<keyword keyref="impala21"/> or 
higher only)</title>
   <titlealts audience="PDF"><navtitle>HDFS Caching</navtitle></titlealts>
   <prolog>
     <metadata>
@@ -37,7 +37,7 @@
         Therefore, always compare performance with and without this feature 
enabled, using a realistic workload.
       </p>
       <p rev="2.2.0">
-        In CDH 5.4 / Impala 2.2 and higher, you can spread the CPU load more 
evenly by specifying the <codeph>WITH REPLICATION</codeph>
+        In <keyword keyref="impala22_full"/> and higher, you can spread the 
CPU load more evenly by specifying the <codeph>WITH REPLICATION</codeph>
         clause of the <codeph>CREATE TABLE</codeph> and <codeph>ALTER 
TABLE</codeph> statements.
         This clause lets you control the replication factor for
         HDFS caching for a specific table or partition. By default, each 
cached block is
@@ -48,7 +48,7 @@
         if necessary to match the replication factor for the underlying HDFS 
data files.
       </p>
       <p rev="2.5.0">
-        In CDH 5.7 / Impala 2.5 and higher, Impala automatically randomizes 
which host processes
+        In <keyword keyref="impala25_full"/> and higher, Impala automatically 
randomizes which host processes
         a cached HDFS block, to avoid CPU hotspots. For tables where HDFS 
caching is not applied,
         Impala designates which host to process a data block using an 
algorithm that estimates
         the load on each host. If CPU hotspots still arise during queries,
@@ -81,7 +81,7 @@
     <conbody>
 
       <p>
-        On CDH 5.1 and higher, Impala can use the HDFS caching feature to make 
more effective use of RAM, so that
+        On <ph rev="upstream">CDH 5.1</ph> and higher, Impala can use the HDFS 
caching feature to make more effective use of RAM, so that
         repeated queries can take advantage of data <q>pinned</q> in memory 
regardless of how much data is
         processed overall. The HDFS caching feature lets you designate a 
subset of frequently accessed data to be
         pinned permanently in memory, remaining in the cache across multiple 
queries and never being evicted. This

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_perf_stats.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_perf_stats.xml 
b/docs/topics/impala_perf_stats.xml
index e6b4c14..33d394d 100644
--- a/docs/topics/impala_perf_stats.xml
+++ b/docs/topics/impala_perf_stats.xml
@@ -343,7 +343,7 @@ show column stats year_month_day;
         Partitioned tables can grow so large that scanning the entire table, 
as the <codeph>COMPUTE STATS</codeph>
         statement does, is impractical just to update the statistics for a new 
partition. The standard
         <codeph>COMPUTE STATS</codeph> statement might take hours, or even 
days. That situation is where you switch
-        to using incremental statistics, a feature available in CDH 5.3 / 
Impala 2.1 and higher.
+        to using incremental statistics, a feature available in <keyword 
keyref="impala21_full"/> and higher.
         See <xref href="impala_perf_stats.xml#perf_stats_incremental"/> for 
details about this feature
         and the <codeph>COMPUTE INCREMENTAL STATS</codeph> syntax.
       </note>
@@ -495,7 +495,7 @@ show column stats year_month_day;
         It gathers both table statistics and column statistics for all columns 
in a single operation.
         For large partitioned tables, where you frequently need to update 
statistics and it is impractical
         to scan the entire table each time, use the syntax <codeph>COMPUTE 
INCREMENTAL STATS</codeph>,
-        which is available in CDH 5.3 / Impala 2.1 and higher.
+        which is available in <keyword keyref="impala21_full"/> and higher.
       </p>
 
       <p>
@@ -808,7 +808,7 @@ alter table <varname>table_name</varname> partition 
(<varname>keycol1</varname>=
     <title>Setting Column Stats Manually through ALTER TABLE</title>
     <conbody>
       <p>
-        In CDH 5.8 / Impala 2.6 and higher, you can also use the <codeph>SET 
COLUMN STATS</codeph>
+        In <keyword keyref="impala26_full"/> and higher, you can also use the 
<codeph>SET COLUMN STATS</codeph>
         clause of <codeph>ALTER TABLE</codeph> to manually set or change 
column statistics.
         Only use this technique in cases where it is impractical to run
         <codeph>COMPUTE STATS</codeph> or <codeph>COMPUTE INCREMENTAL 
STATS</codeph>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_ports.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_ports.xml b/docs/topics/impala_ports.xml
index ba57ede..80f217f 100644
--- a/docs/topics/impala_ports.xml
+++ b/docs/topics/impala_ports.xml
@@ -347,7 +347,7 @@
             </entry>
             <entry>
               <p>
-                Internal use only. Impala daemons use to communicate with 
Llama. New in CDH 5.0.0 and higher.
+                Internal use only. Impala daemons use to communicate with 
Llama. New in <ph rev="upstream">CDH 5.0.0</ph> and higher.
               </p>
             </entry>
           </row>
@@ -374,7 +374,7 @@
             </entry>
             <entry>
               <p>
-                Internal use only. New in CDH 5.0.0 and higher.
+                Internal use only. New in <ph rev="upstream">CDH 5.0.0</ph> 
and higher.
               </p>
             </entry>
           </row>
@@ -401,7 +401,7 @@
             </entry>
             <entry>
               <p>
-                Internal use only. New in CDH 5.0.0 and higher.
+                Internal use only. New in <ph rev="upstream">CDH 5.0.0</ph> 
and higher.
               </p>
             </entry>
           </row>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_prefetch_mode.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_prefetch_mode.xml 
b/docs/topics/impala_prefetch_mode.xml
index 30dd116..fc85c11 100644
--- a/docs/topics/impala_prefetch_mode.xml
+++ b/docs/topics/impala_prefetch_mode.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="prefetch_mode" rev="2.6.0 IMPALA-3286">
 
-  <title>PREFETCH_MODE Query Option (CDH 5.8 or higher only)</title>
+  <title>PREFETCH_MODE Query Option (<keyword keyref="impala26"/> or higher 
only)</title>
   <titlealts audience="PDF"><navtitle>PREFETCH_MODE</navtitle></titlealts>
   <prolog>
     <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_prereqs.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_prereqs.xml b/docs/topics/impala_prereqs.xml
index 88b7265..8572738 100644
--- a/docs/topics/impala_prereqs.xml
+++ b/docs/topics/impala_prereqs.xml
@@ -73,11 +73,8 @@
         <indexterm audience="Cloudera">Ubuntu</indexterm>
         <indexterm audience="Cloudera">SUSE</indexterm>
         <indexterm audience="Cloudera">Debian</indexterm> The relevant 
supported operating systems
-        and versions for Impala are the same as for the corresponding CDH 4 
and CDH 5 platforms. For
-        details, see the <cite>Supported Operating Systems</cite> page for 
<xref
-          
href="http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH4-Requirements-and-Supported-Versions/cdhrsv_topic_1.html";
-          scope="external" format="html">CDH 4</xref> or <!-- Original URL: 
http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH5/latest/CDH5-Requirements-and-Supported-Versions/cdh_rsv_os.html
 -->
-        <!-- Expected post-reorg URL, doesn't work: <xref 
href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rsv_os.html";
 scope="external" format="html">CDH 5</xref>. -->
+        and versions for Impala are the same as for the corresponding CDH 5 
platforms. For
+        details, see the <cite>Supported Operating Systems</cite> page for
         <ph audience="integrated"><xref 
href="rn_consolidated_pcm.xml#cdh_cm_supported_os">CDH
             5</xref></ph><ph audience="standalone"><xref
             
href="http://www.cloudera.com/documentation/enterprise/latest/topics/rn_consolidated_pcm.html#cdh_cm_supported_os";

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

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_refresh.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_refresh.xml b/docs/topics/impala_refresh.xml
index 9c790f0..4b038ff 100644
--- a/docs/topics/impala_refresh.xml
+++ b/docs/topics/impala_refresh.xml
@@ -56,7 +56,7 @@
 
     <note rev="2.3.0">
       <p rev="2.3.0">
-        In CDH 5.5 / Impala 2.3 and higher, the syntax <codeph>ALTER TABLE 
<varname>table_name</varname> RECOVER PARTITIONS</codeph>
+        In <keyword keyref="impala23_full"/> and higher, the syntax 
<codeph>ALTER TABLE <varname>table_name</varname> RECOVER PARTITIONS</codeph>
         is a faster alternative to <codeph>REFRESH</codeph> when the only 
change to the table data is the addition of
         new partition directories through Hive or manual HDFS operations.
         See <xref href="impala_alter_table.xml#alter_table"/> for details.
@@ -158,7 +158,7 @@
     </p>
 
     <p rev="IMPALA-1683 CDH-43732">
-      In CDH 5.9 / Impala 2.7 and higher, the <codeph>REFRESH</codeph> 
statement can apply to a single partition at a time,
+      In <keyword keyref="impala27_full"/> and higher, the 
<codeph>REFRESH</codeph> statement can apply to a single partition at a time,
       rather than the whole table. Include the optional <codeph>PARTITION 
(<varname>partition_spec</varname>)</codeph>
       clause and specify values for each of the partition key columns.
     </p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_replica_preference.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_replica_preference.xml 
b/docs/topics/impala_replica_preference.xml
index fcf93cc..6cf73da 100644
--- a/docs/topics/impala_replica_preference.xml
+++ b/docs/topics/impala_replica_preference.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="replica_preference" rev="2.7.0">
 
-  <title>REPLICA_PREFERENCE Query Option (CDH 5.9 or higher only)</title>
+  <title>REPLICA_PREFERENCE Query Option (<keyword keyref="impala27"/> or 
higher only)</title>
   <titlealts audience="PDF"><navtitle>REPLICA_PREFERENCE</navtitle></titlealts>
   <prolog>
     <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_resource_management.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_resource_management.xml 
b/docs/topics/impala_resource_management.xml
index d8f7cb0..abc2e3d 100644
--- a/docs/topics/impala_resource_management.xml
+++ b/docs/topics/impala_resource_management.xml
@@ -91,7 +91,7 @@
       </p>
 
       <p>
-        In CDH 5.7 / Impala 2.5 and higher, the preferred way to avoid 
overcommitting memory in a high-concurrency
+        In <keyword keyref="impala25_full"/> and higher, the preferred way to 
avoid overcommitting memory in a high-concurrency
         or multitenant scenario is to use Impala admission control together 
with dynamic resource pools.
         You can specify a <uicontrol>Default Query Memory Limit</uicontrol> 
setting, with a different value for each
         pool, and Impala uses that value to calculate how many queries can 
safely run within a specified

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_revoke.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_revoke.xml b/docs/topics/impala_revoke.xml
index 694d343..9ab81fe 100644
--- a/docs/topics/impala_revoke.xml
+++ b/docs/topics/impala_revoke.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept rev="2.0.0" id="revoke">
 
-  <title>REVOKE Statement (CDH 5.2 or higher only)</title>
+  <title>REVOKE Statement (<keyword keyref="impala20"/> or higher only)</title>
   <titlealts audience="PDF"><navtitle>REVOKE</navtitle></titlealts>
   <prolog>
     <metadata>
@@ -47,7 +47,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>
@@ -71,7 +71,7 @@ object_type ::= TABLE | DATABASE | SERVER | URI
         </li>
 
         <li>
-          In CDH 5.1 and higher, Impala makes use of any roles and privileges 
specified by the
+          In <ph rev="upstream">CDH 5.1</ph> and higher, Impala makes use of 
any roles and privileges specified by the
           <codeph>GRANT</codeph> and <codeph>REVOKE</codeph> statements in 
Hive, when your system is configured to
           use the Sentry service instead of the file-based policy mechanism.
         </li>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_runtime_bloom_filter_size.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_runtime_bloom_filter_size.xml 
b/docs/topics/impala_runtime_bloom_filter_size.xml
index e372d4f..8fdc0c3 100644
--- a/docs/topics/impala_runtime_bloom_filter_size.xml
+++ b/docs/topics/impala_runtime_bloom_filter_size.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="runtime_bloom_filter_size" rev="2.5.0">
 
-  <title>RUNTIME_BLOOM_FILTER_SIZE Query Option (CDH 5.7 or higher 
only)</title>
+  <title>RUNTIME_BLOOM_FILTER_SIZE Query Option (<keyword keyref="impala25"/> 
or higher only)</title>
   <titlealts 
audience="PDF"><navtitle>RUNTIME_BLOOM_FILTER_SIZE</navtitle></titlealts>
   <prolog>
     <metadata>
@@ -24,13 +24,13 @@
 
     <note type="important">
       <p rev="2.6.0 CDH-41184 IMPALA-3007">
-        In CDH 5.8 / Impala 2.6 and higher, this query option only applies as 
a fallback, when statistics
+        In <keyword keyref="impala26_full"/> and higher, this query option 
only applies as a fallback, when statistics
         are not available. By default, Impala estimates the optimal size of 
the Bloom filter structure
         regardless of the setting for this option. (This is a change from the 
original behavior in
-        CDH 5.7 / Impala 2.5.)
+        <keyword keyref="impala25_full"/>.)
       </p>
       <p rev="2.6.0 CDH-41184 IMPALA-3007">
-        In CDH 5.8 / Impala 2.6 and higher, when the value of this query 
option is used for query planning,
+        In <keyword keyref="impala26_full"/> and higher, when the value of 
this query option is used for query planning,
         it is constrained by the minimum and maximum sizes specified by the
         <codeph>RUNTIME_FILTER_MIN_SIZE</codeph> and 
<codeph>RUNTIME_FILTER_MAX_SIZE</codeph> query options.
         The filter size is adjusted upward or downward if necessary to fit 
within the minimum/maximum range.

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_runtime_filter_max_size.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_runtime_filter_max_size.xml 
b/docs/topics/impala_runtime_filter_max_size.xml
index 9f729b1..1591d3f 100644
--- a/docs/topics/impala_runtime_filter_max_size.xml
+++ b/docs/topics/impala_runtime_filter_max_size.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="runtime_filter_max_size" rev="2.6.0 IMPALA-3480 CDH-41184">
 
-  <title>RUNTIME_FILTER_MAX_SIZE Query Option (CDH 5.8 or higher only)</title>
+  <title>RUNTIME_FILTER_MAX_SIZE Query Option (<keyword keyref="impala26"/> or 
higher only)</title>
   <titlealts 
audience="PDF"><navtitle>RUNTIME_FILTER_MAX_SIZE</navtitle></titlealts>
   <prolog>
     <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_runtime_filter_min_size.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_runtime_filter_min_size.xml 
b/docs/topics/impala_runtime_filter_min_size.xml
index ec152f6..75944e3 100644
--- a/docs/topics/impala_runtime_filter_min_size.xml
+++ b/docs/topics/impala_runtime_filter_min_size.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="runtime_filter_min_size" rev="2.6.0 IMPALA-3480 CDH-41184">
 
-  <title>RUNTIME_FILTER_MIN_SIZE Query Option (CDH 5.8 or higher only)</title>
+  <title>RUNTIME_FILTER_MIN_SIZE Query Option (<keyword keyref="impala26"/> or 
higher only)</title>
   <titlealts 
audience="PDF"><navtitle>RUNTIME_FILTER_MIN_SIZE</navtitle></titlealts>
   <prolog>
     <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_runtime_filter_mode.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_runtime_filter_mode.xml 
b/docs/topics/impala_runtime_filter_mode.xml
index 2494621..fa75bdf 100644
--- a/docs/topics/impala_runtime_filter_mode.xml
+++ b/docs/topics/impala_runtime_filter_mode.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="runtime_filter_mode" rev="2.5.0">
 
-  <title>RUNTIME_FILTER_MODE Query Option (CDH 5.7 or higher only)</title>
+  <title>RUNTIME_FILTER_MODE Query Option (<keyword keyref="impala25"/> or 
higher only)</title>
   <titlealts 
audience="PDF"><navtitle>RUNTIME_FILTER_MODE</navtitle></titlealts>
   <prolog>
     <metadata>
@@ -33,7 +33,7 @@
     </p>
 
     <p rev="2.6.0 CDH-41184">
-      <b>Default:</b> 2 (equivalent to <codeph>GLOBAL</codeph>); formerly was 
1 / <codeph>LOCAL</codeph>, in CDH 5.7 / Impala 2.5
+      <b>Default:</b> 2 (equivalent to <codeph>GLOBAL</codeph>); formerly was 
1 / <codeph>LOCAL</codeph>, in <keyword keyref="impala25_full"/>
     </p>
 
     <p conref="../shared/impala_common.xml#common/added_in_250"/>
@@ -41,7 +41,7 @@
     <p conref="../shared/impala_common.xml#common/usage_notes_blurb"/>
 
     <p rev="2.6.0 CDH-41184">
-      In CDH 5.8 / Impala 2.6 and higher, the default is 
<codeph>GLOBAL</codeph>.
+      In <keyword keyref="impala26_full"/> and higher, the default is 
<codeph>GLOBAL</codeph>.
       This setting is recommended for a wide variety of workloads, to provide 
best
       performance with <q>out of the box</q> settings.
     </p>
@@ -49,7 +49,7 @@
     <p rev="2.6.0 CDH-41184">
       The lowest setting of <codeph>LOCAL</codeph> does a similar level of 
optimization
       (such as partition pruning) as in earlier Impala releases.
-      This setting was the default in CDH 5.7 / Impala 2.5,
+      This setting was the default in <keyword keyref="impala25_full"/>,
       to allow for a period of post-upgrade testing for existing workloads.
       This setting is suitable for workloads with non-performance-critical 
queries,
       or if the coordinator node is under heavy CPU or memory pressure.

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

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_runtime_filtering.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_runtime_filtering.xml 
b/docs/topics/impala_runtime_filtering.xml
index 4c69e0c..b5c1fcb 100644
--- a/docs/topics/impala_runtime_filtering.xml
+++ b/docs/topics/impala_runtime_filtering.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="runtime_filtering" rev="2.5.0">
 
-  <title id="runtime_filters">Runtime Filtering for Impala Queries</title>
+  <title id="runtime_filters">Runtime Filtering for Impala Queries (<keyword 
keyref="impala25"/> or higher only)</title>
   <titlealts audience="PDF"><navtitle>Runtime Filtering</navtitle></titlealts>
   <prolog>
     <metadata>
@@ -20,7 +20,7 @@
     <p rev="2.5.0">
       <indexterm audience="Cloudera">runtime filtering</indexterm>
       <term>Runtime filtering</term> is a wide-ranging optimization feature 
available in
-      CDH 5.7 / Impala 2.5 and higher. When only a fraction of the data in a 
table is
+      <keyword keyref="impala25_full"/> and higher. When only a fraction of 
the data in a table is
       needed for a query against a partitioned table or to evaluate a join 
condition,
       Impala determines the appropriate conditions while the query is running, 
and
       broadcasts that information to all the <cmdname>impalad</cmdname> nodes 
that are reading the table
@@ -45,7 +45,7 @@
       <p rev="2.6.0 CDH-41184">
         When this feature made its debut in CDH 5.7 / Impala 2.5,
         the default setting was <codeph>RUNTIME_FILTER_MODE=LOCAL</codeph>.
-        Now the default is <codeph>RUNTIME_FILTER_MODE=GLOBAL</codeph> in CDH 
5.8 / Impala 2.6 and higher,
+        Now the default is <codeph>RUNTIME_FILTER_MODE=GLOBAL</codeph> in 
<keyword keyref="impala26_full"/> and higher,
         which enables more wide-ranging and ambitious query optimization 
without requiring you to
         explicitly set any query options.
       </p>
@@ -175,7 +175,7 @@
       </p>
 
       <note rev="2.6.0 CDH-41184 IMPALA-3333">
-        In CDH 5.8 / Impala 2.6 and higher, the default for runtime filtering 
is the <codeph>GLOBAL</codeph> setting.
+        In <keyword keyref="impala26_full"/> and higher, the default for 
runtime filtering is the <codeph>GLOBAL</codeph> setting.
       </note>
 
     </conbody>
@@ -248,7 +248,7 @@
           <p>
             The first query option adjusts the <q>sensitivity</q> of this 
feature.
             <ph rev="2.6.0 CDH-41184 IMPALA-3333">By default, it is set to the 
highest level (<codeph>GLOBAL</codeph>).
-            (This default applies to CDH 5.8 / Impala 2.6 and higher.
+            (This default applies to <keyword keyref="impala26_full"/> and 
higher.
             In previous releases, the default was <codeph>LOCAL</codeph>.)</ph>
           </p>
           <ul>
@@ -289,7 +289,7 @@
             <li>
               <p rev="2.6.0 IMPALA-3007">
                 <xref 
href="impala_runtime_bloom_filter_size.xml#runtime_bloom_filter_size"/>;
-                in CDH 5.8 / Impala 2.6 and higher, this setting acts as a 
fallback when
+                in <keyword keyref="impala26_full"/> and higher, this setting 
acts as a fallback when
                 statistics are not available, rather than as a directive.
               </p>
             </li>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_s3.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_s3.xml b/docs/topics/impala_s3.xml
index 04788eb..e61bb7c 100644
--- a/docs/topics/impala_s3.xml
+++ b/docs/topics/impala_s3.xml
@@ -139,7 +139,7 @@
 
 <!--
       <p rev="CDH-39914 IMPALA-3306">
-        In CDH 5.8 / Impala 2.6 and higher, you can specify the S3 access key 
and secret key through
+        In <keyword keyref="impala26_full"/> and higher, you can specify the 
S3 access key and secret key through
         configuration settings for the <cmdname>impalad</cmdname> daemon.
         Rather than specifying the keys themselves on the command line or in 
startup scripts,
         you specify the commands to retrieve the keys as 
<cmdname>impalad</cmdname>
@@ -182,10 +182,10 @@
         <!-- Overriding with a new first list bullet following clarification 
by Sailesh.
         <li>
           <p rev="CDH-39914 IMPALA-3306">
-            Prior to CDH 5.8 / Impala 2.6, an alternative way to specify the 
keys was by
+            Prior to <keyword keyref="impala26_full"/> an alternative way to 
specify the keys was by
             including the fields <codeph>fs.s3a.access.key</codeph> and 
<codeph>fs.s3a.secret.key</codeph>
             in a configuration file such as <filepath>core-site.xml</filepath> 
or <filepath>hdfs-site.xml</filepath>.
-            With the enhanced S3 key management in CDH 5.8 / Impala 2.6 and 
higher, if you are upgrading from
+            With the enhanced S3 key management in <keyword 
keyref="impala26_full"/> and higher, if you are upgrading from
             an earlier release where you used Impala with S3, remove the S3 
keys from any copies of those files.
           </p>
         </li>
@@ -683,9 +683,9 @@
       </p>
 
       <p rev="2.6.0 CDH-39913 IMPALA-1878">
-        Prior to CDH 5.8 / Impala 2.6, Impala could not perform DML operations 
(<codeph>INSERT</codeph>,
+        Prior to <keyword keyref="impala26_full"/> Impala could not perform 
DML operations (<codeph>INSERT</codeph>,
         <codeph>LOAD DATA</codeph>, or <codeph>CREATE TABLE AS 
SELECT</codeph>) where the destination is a table
-        or partition located on an S3 filesystem. This restriction is lifted 
in CDH 5.8 / Impala 2.6 and higher.
+        or partition located on an S3 filesystem. This restriction is lifted 
in <keyword keyref="impala26_full"/> and higher.
       </p>
 
       <p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_s3_skip_insert_staging.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_s3_skip_insert_staging.xml 
b/docs/topics/impala_s3_skip_insert_staging.xml
index a9cceb5..f9035a2 100644
--- a/docs/topics/impala_s3_skip_insert_staging.xml
+++ b/docs/topics/impala_s3_skip_insert_staging.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="s3_skip_insert_staging" rev="2.6.0 IMPALA-3452 CDH-39913">
 
-  <title>S3_SKIP_INSERT_STAGING Query Option (CDH 5.8 or higher only)</title>
+  <title>S3_SKIP_INSERT_STAGING Query Option (<keyword keyref="impala26"/> or 
higher only)</title>
   <titlealts 
audience="PDF"><navtitle>S3_SKIP_INSERT_STAGING</navtitle></titlealts>
   <prolog>
     <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_scalability.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_scalability.xml 
b/docs/topics/impala_scalability.xml
index ab4ef36..ea0d0a4 100644
--- a/docs/topics/impala_scalability.xml
+++ b/docs/topics/impala_scalability.xml
@@ -164,8 +164,8 @@ Memory Usage: Additional Notes
       <note type="important" rev="TSB-168">
       <p>
         Because of a change in the default heap size for the 
<cmdname>catalogd</cmdname> daemon in
-        CDH 5.7 / Impala 2.5 and higher, the following procedure to increase 
the <cmdname>catalogd</cmdname>
-        memory limit might be required following an upgrade to CDH 5.7 / 
Impala 2.5, even if not
+        <keyword keyref="impala25_full"/> and higher, the following procedure 
to increase the <cmdname>catalogd</cmdname>
+        memory limit might be required following an upgrade to <keyword 
keyref="impala25_full"/> even if not
         needed previously.
       </p>
       </note>
@@ -370,7 +370,7 @@ Memory Usage: Additional Notes
         <!-- JIRA still in open state as of 5.8 / 2.6, commenting out.
         <li>
           <p rev="IMPALA-3471">
-            In CDH 5.8 / Impala 2.6 and higher, <term>top-N</term> queries 
(those with
+            In <keyword keyref="impala26_full"/> and higher, 
<term>top-N</term> queries (those with
             <codeph>ORDER BY</codeph> and <codeph>LIMIT</codeph> clauses) can 
also spill.
             Impala allocates enough memory to hold as many rows as specified 
by the <codeph>LIMIT</codeph>
             clause, plus enough memory to hold as many rows as specified by 
any <codeph>OFFSET</codeph> clause.
@@ -409,7 +409,7 @@ Memory Usage: Additional Notes
         Prior to Impala 2.2 (CDH 5.4), the extra memory buffer for an operator 
that might spill to disk
         was allocated when the data structure used by the applicable SQL 
operator reaches 16 MB in size,
         and the memory buffer itself was 512 MB. In Impala 2.2, these values 
are halved: the threshold value
-        is 8 MB and the memory buffer is 256 MB. <ph rev="2.3.0">In Impala 2.3 
/ CDH 5.5 and higher, the memory for the buffer
+        is 8 MB and the memory buffer is 256 MB. <ph rev="2.3.0">In <keyword 
keyref="impala23_full"/> and higher, the memory for the buffer
         is allocated in pieces, only as needed, to avoid sudden large jumps in 
memory usage.</ph> A query that uses
         multiple such operators might allocate multiple such memory buffers, 
as the size of the data structure
         for each operator crosses the threshold on a particular host.
@@ -671,11 +671,11 @@ these tables, hint the plan or disable this behavior via 
query options to enable
 
 <!--
       <p>
-        <b>Turning off the spill-to-disk feature: (CDH 5.6 / Impala 2.4 and 
lower only)</b>
+        <b>Turning off the spill-to-disk feature: (<keyword 
keyref="impala24_full"/> and lower only)</b>
       </p>
 
       <p>
-        Prior to CDH 5.7 / Impala 2.5, certain conditions...
+        Prior to <keyword keyref="impala25_full"/> certain conditions...
       </p>
 
       <p>
@@ -817,7 +817,7 @@ Consider using a higher value such as 360 (6 hours).
       <p>
         Hotspots with high CPU load for HDFS cached data could still arise in 
some cases, due to
         the way that Impala schedules the work of processing data blocks on 
different hosts.
-        In CDH 5.7 / Impala 2.5 and higher, scheduling improvements mean that 
the work for
+        In <keyword keyref="impala25_full"/> and higher, scheduling 
improvements mean that the work for
         HDFS cached data is divided better among all the hosts that have 
cached replicas
         for a particular data block. When more than one host has a cached 
replica for a data block,
         Impala assigns the work of processing that block to whichever host has 
done the least work

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

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_schedule_random_replica.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_schedule_random_replica.xml 
b/docs/topics/impala_schedule_random_replica.xml
index bf8e667..39092e8 100644
--- a/docs/topics/impala_schedule_random_replica.xml
+++ b/docs/topics/impala_schedule_random_replica.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="schedule_random_replica" rev="2.5.0">
 
-  <title>SCHEDULE_RANDOM_REPLICA Query Option (CDH 5.7 or higher only)</title>
+  <title>SCHEDULE_RANDOM_REPLICA Query Option (<keyword keyref="impala25"/> or 
higher only)</title>
   <titlealts 
audience="PDF"><navtitle>SCHEDULE_RANDOM_REPLICA</navtitle></titlealts>
   <prolog>
     <metadata>
@@ -59,7 +59,7 @@
 
     <p rev="CDH-43739 IMPALA-2979">
       This query option works in conjunction with the work scheduling 
improvements
-      in CDH 5.7 / Impala 2.5 and higher. The scheduling improvements
+      in <keyword keyref="impala25_full"/> and higher. The scheduling 
improvements
       distribute the processing for cached HDFS data blocks to minimize 
hotspots:
       if a data block is cached on more than one host, Impala chooses which 
host
       to process each block based on which host has read the fewest bytes 
during

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_select.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_select.xml b/docs/topics/impala_select.xml
index 24ed896..321c371 100644
--- a/docs/topics/impala_select.xml
+++ b/docs/topics/impala_select.xml
@@ -72,7 +72,7 @@ LIMIT <i>expression</i> [OFFSET <i>expression</i>]
 <!-- To do: Consider promoting 'querying complex types' to its own subtopic or 
pseudo-heading. -->
       <li rev="2.3.0">
         The complex data types <codeph>ARRAY</codeph>, 
<codeph>STRUCT</codeph>, and <codeph>MAP</codeph>,
-        are available in CDH 5.5 / Impala 2.3 and higher.
+        are available in <keyword keyref="impala23_full"/> and higher.
         Queries involving these types typically involve special qualified names
         using dot notation for referring to the complex column fields,
         and join clauses for bringing the complex columns into the result set.
@@ -93,7 +93,7 @@ LIMIT <i>expression</i> [OFFSET <i>expression</i>]
       </li>
 
       <li>
-        Subqueries in a <codeph>FROM</codeph> clause. In CDH 5.2 / Impala 2.0 
and higher,
+        Subqueries in a <codeph>FROM</codeph> clause. In <keyword 
keyref="impala20_full"/> and higher,
         subqueries can also go in the <codeph>WHERE</codeph> clause, for 
example with the
         <codeph>IN()</codeph>, <codeph>EXISTS</codeph>, and <codeph>NOT 
EXISTS</codeph> operators.
       </li>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_set.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_set.xml b/docs/topics/impala_set.xml
index 2594af9..f477269 100644
--- a/docs/topics/impala_set.xml
+++ b/docs/topics/impala_set.xml
@@ -24,7 +24,7 @@
     </p>
 
     <p rev="2.5.0 IMPALA-2180">
-      In CDH 5.7 / Impala 2.5 and higher, <codeph>SET</codeph> also defines 
user-specified substitution variables for
+      In <keyword keyref="impala25_full"/> and higher, <codeph>SET</codeph> 
also defines user-specified substitution variables for
       the <cmdname>impala-shell</cmdname> interpreter. This feature uses the 
<codeph>SET</codeph> command
       built into <cmdname>impala-shell</cmdname> instead of the SQL 
<codeph>SET</codeph> statement.
       Therefore the substitution mechanism only works with queries processed 
by <cmdname>impala-shell</cmdname>,
@@ -58,7 +58,7 @@
     </p>
 
     <p rev="2.5.0 IMPALA-2180">
-      In CDH 5.7 / Impala 2.5 and higher, you can specify your own names and 
string substitution values
+      In <keyword keyref="impala25_full"/> and higher, you can specify your 
own names and string substitution values
       within the <cmdname>impala-shell</cmdname> interpreter. Once a 
substitution variable is set up,
       its value is inserted into any SQL statement in that same 
<cmdname>impala-shell</cmdname> session
       that contains the notation 
<codeph>${var:<varname>varname</varname>}</codeph>.

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_shell_commands.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_shell_commands.xml 
b/docs/topics/impala_shell_commands.xml
index 6d6f720..885fd16 100644
--- a/docs/topics/impala_shell_commands.xml
+++ b/docs/topics/impala_shell_commands.xml
@@ -342,7 +342,7 @@
                 and how to interpret it.
               </p>
               <p rev="2.3.0">
-                In CDH 5.5 / Impala 2.3 and higher, you can see a continuously 
updated report of
+                In <keyword keyref="impala23_full"/> and higher, you can see a 
continuously updated report of
                 the summary information while a query is in progress.
                 See <xref href="impala_live_summary.xml#live_summary"/> for 
details.
               </p>
@@ -360,7 +360,7 @@
                 See <xref href="impala_query_options.xml#query_options"/> for 
the available query options.
               </p>
               <p rev="2.5.0 IMPALA-2180">
-                In CDH 5.7 / Impala 2.5 and higher, it can also remove 
user-specified substitution variables
+                In <keyword keyref="impala25_full"/> and higher, it can also 
remove user-specified substitution variables
                 using the notation <codeph>UNSET 
VAR:<varname>variable_name</varname></codeph>.
               </p>
             </entry>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_shell_options.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_shell_options.xml 
b/docs/topics/impala_shell_options.xml
index 26f7364..7da27af 100644
--- a/docs/topics/impala_shell_options.xml
+++ b/docs/topics/impala_shell_options.xml
@@ -237,7 +237,7 @@
               <entry>
                 <p>
                   Passes a SQL query from a file. Multiple statements must be 
semicolon (;) delimited.
-                  <ph rev="2.3.0">In CDH 5.5 / Impala 2.3 and higher, you can 
specify a filename of <codeph>-</codeph>
+                  <ph rev="2.3.0">In <keyword keyref="impala23_full"/> and 
higher, you can specify a filename of <codeph>-</codeph>
                   to represent standard input. This feature makes it 
convenient to use <cmdname>impala-shell</cmdname>
                   as part of a Unix pipeline where SQL statements are 
generated dynamically by other tools.</ph>
                 </p>
@@ -490,7 +490,7 @@
                 The variable can be substituted into statements processed by 
the <codeph>-q</codeph> or <codeph>-f</codeph> options,
                 or in an interactive shell session.
                 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.
               </entry>
             </row>
           </tbody>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_shell_running_commands.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_shell_running_commands.xml 
b/docs/topics/impala_shell_running_commands.xml
index 013b23d..70b4593 100644
--- a/docs/topics/impala_shell_running_commands.xml
+++ b/docs/topics/impala_shell_running_commands.xml
@@ -73,7 +73,7 @@ connect   describe  explain   help      history   insert    
quit      refresh
     </p>
 
     <p rev="2.5.0 IMPALA-2179 IMPALA-2180">
-      In CDH 5.7 / Impala 2.5 and higher, you can define substitution 
variables to be used within SQL statements
+      In <keyword keyref="impala25_full"/> and higher, you can define 
substitution variables to be used within SQL statements
       processed by <cmdname>impala-shell</cmdname>. On the command line, you 
specify the option
       
<codeph>--var=<varname>variable_name</varname>=<varname>value</varname></codeph>.
       Within an interactive session or a script file processed by the 
<codeph>-f</codeph> option, you specify

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_show.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_show.xml b/docs/topics/impala_show.xml
index dd60d82..fbee88a 100644
--- a/docs/topics/impala_show.xml
+++ b/docs/topics/impala_show.xml
@@ -89,7 +89,7 @@ show tables '*dim*|*fact*';</codeblock>
 
       <p>
         The <codeph>SHOW FILES</codeph> statement displays the files that 
constitute a specified table,
-        or a partition within a partitioned table. This syntax is available in 
CDH 5.4 and higher
+        or a partition within a partitioned table. This syntax is available in 
<keyword keyref="impala22_full"/> and higher
         only. The output includes the names of the files, the size of each 
file, and the applicable partition
         for a partitioned table. The size includes a suffix of 
<codeph>B</codeph> for bytes,
         <codeph>MB</codeph> for megabytes, and <codeph>GB</codeph> for 
gigabytes.
@@ -494,7 +494,7 @@ where id between 1 and 1000000;
       </p>
 
       <p rev="2.5.0 IMPALA-2070">
-        In CDH 5.7 / Impala 2.5 and higher, the output includes a second 
column showing any associated comment
+        In <keyword keyref="impala25_full"/> and higher, the output includes a 
second column showing any associated comment
         for each database.
       </p>
 
@@ -1178,7 +1178,7 @@ show column stats store_sales;
       <p conref="../shared/impala_common.xml#common/usage_notes_blurb"/>
 
       <p rev="2.5.0">
-        In CDH 5.7 / Impala 2.5 and higher, the <codeph>SHOW 
FUNCTIONS</codeph> output includes
+        In <keyword keyref="impala25_full"/> and higher, the <codeph>SHOW 
FUNCTIONS</codeph> output includes
         a new column, labelled <codeph>is persistent</codeph>. This property 
is <codeph>true</codeph> for
         Impala built-in functions, C++ UDFs, and Java UDFs created using the 
new <codeph>CREATE FUNCTION</codeph>
         syntax with no signature. It is <codeph>false</codeph> for Java UDFs 
created using the old

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_ssl.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_ssl.xml b/docs/topics/impala_ssl.xml
index c736693..1e0f2da 100644
--- a/docs/topics/impala_ssl.xml
+++ b/docs/topics/impala_ssl.xml
@@ -196,7 +196,7 @@ Info from Henry, from 
https://docs.google.com/a/cloudera.com/document/d/1u00CJ8W
       </ul>
 
       <p rev="2.3.0">
-        In CDH 5.5 / Impala 2.3 and higher, Impala can also use SSL for its 
own internal communication between the
+        In <keyword keyref="impala23_full"/> and higher, Impala can also use 
SSL for its own internal communication between the
         <cmdname>impalad</cmdname>, <codeph>statestored</codeph>, and 
<codeph>catalogd</codeph> daemons.
         To enable this additional SSL encryption, set the 
<codeph>--ssl_server_certificate</codeph>
         and <codeph>--ssl_private_key</codeph> flags in the startup options for

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_struct.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_struct.xml b/docs/topics/impala_struct.xml
index 769ff49..bddb1bb 100644
--- a/docs/topics/impala_struct.xml
+++ b/docs/topics/impala_struct.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept id="struct">
 
-  <title>STRUCT Complex Type (CDH 5.5 or higher only)</title>
+  <title>STRUCT 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_subqueries.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_subqueries.xml 
b/docs/topics/impala_subqueries.xml
index d1c4d79..880f15c 100644
--- a/docs/topics/impala_subqueries.xml
+++ b/docs/topics/impala_subqueries.xml
@@ -301,7 +301,7 @@ Therefore, this is not an efficient construct to use with 
Impala queries for HBa
 
     <p rev="2.3.0">
       For the complex types (<codeph>ARRAY</codeph>, <codeph>STRUCT</codeph>, 
and <codeph>MAP</codeph>)
-      available in CDH 5.5 / Impala 2.3 and higher, the join queries that 
<q>unpack</q> complex type
+      available in <keyword keyref="impala23_full"/> and higher, the join 
queries that <q>unpack</q> complex type
       columns often use correlated subqueries in the <codeph>FROM</codeph> 
clause.
       For example, if the first table in the join clause is 
<codeph>CUSTOMER</codeph>, the second
       join clause might have a subquery that selects from the column 
<codeph>CUSTOMER.C_ORDERS</codeph>,

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_tables.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_tables.xml b/docs/topics/impala_tables.xml
index e2354e3..80b4000 100644
--- a/docs/topics/impala_tables.xml
+++ b/docs/topics/impala_tables.xml
@@ -248,7 +248,7 @@
         Impala. The Parquet file format offers the highest query performance 
and uses compression to reduce storage
         requirements; therefore, <ph rev="upstream">Cloudera</ph> recommends 
using Parquet for Impala tables with substantial amounts of data.
         <ph rev="2.3.0">Also, the complex 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 with the Parquet file type.</ph>
+        available in <keyword keyref="impala23_full"/> and higher are 
currently only supported with the Parquet file type.</ph>
         Based on your existing ETL workflow, you might use other file formats 
such as Avro, possibly doing a final
         conversion step to Parquet to take advantage of its performance for 
analytic queries.
       </p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_timestamp.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_timestamp.xml b/docs/topics/impala_timestamp.xml
index 46db308..2f4fa40 100644
--- a/docs/topics/impala_timestamp.xml
+++ b/docs/topics/impala_timestamp.xml
@@ -86,7 +86,7 @@ insert into auction_details
       function represents the local time in the system time zone, rather than 
in UTC. To store values relative to
       the current time in a portable way, convert any <codeph>now()</codeph> 
return values using the
       <codeph>to_utc_timestamp()</codeph> function first. For example, the 
following example shows that the current
-      time in California (where Cloudera HQ is located) is shortly after 2 PM. 
If that value was written to a data
+      time in California (where this Impala cluster is located) is shortly 
after 2 PM. If that value was written to a data
       file, and shipped off to a distant server to be analyzed alongside other 
data from far-flung locations, the
       dates and times would not match up precisely because of time zone 
differences. Therefore, the
       <codeph>to_utc_timestamp()</codeph> function converts it using a common 
reference point, the UTC time zone
@@ -342,7 +342,7 @@ Fetched 2 row(s) in 0.22s
     <p>
       In Impala 1.3 and higher, the <codeph>FROM_UNIXTIME()</codeph> and 
<codeph>UNIX_TIMESTAMP()</codeph>
       functions allow a wider range of format strings, with more flexibility 
in element order, repetition of letter
-      placeholders, and separator characters. In CDH 5.5 / Impala 2.3 and 
higher, the <codeph>UNIX_TIMESTAMP()</codeph>
+      placeholders, and separator characters. In <keyword 
keyref="impala23_full"/> and higher, the <codeph>UNIX_TIMESTAMP()</codeph>
       function also allows a numeric timezone offset to be specified as part 
of the input string.
       See <xref href="impala_datetime_functions.xml#datetime_functions"/> for 
details.
     </p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_truncate_table.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_truncate_table.xml 
b/docs/topics/impala_truncate_table.xml
index 220354b..72f072f 100644
--- a/docs/topics/impala_truncate_table.xml
+++ b/docs/topics/impala_truncate_table.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE concept PUBLIC "-//OASIS//DTD 
DITA Concept//EN" "concept.dtd">
 <concept rev="2.3.0" id="truncate_table">
 
-  <title>TRUNCATE TABLE Statement (CDH 5.5 or higher only)</title>
+  <title>TRUNCATE TABLE Statement (<keyword keyref="impala23"/> or higher 
only)</title>
   <titlealts audience="PDF"><navtitle>TRUNCATE TABLE</navtitle></titlealts>
   <prolog>
     <metadata>
@@ -58,7 +58,7 @@
       The optional <codeph>IF EXISTS</codeph> clause makes the statement 
succeed whether or not the table exists.
       If the table does exist, it is truncated; if it does not exist, the 
statement has no effect. This capability is
       useful in standardized setup scripts that are might be run both before 
and after some of the tables exist.
-      This clause is available in CDH 5.7 / Impala 2.5 and higher.
+      This clause is available in <keyword keyref="impala25_full"/> and higher.
     </p>
 
     <p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_txtfile.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_txtfile.xml b/docs/topics/impala_txtfile.xml
index 8418eca..fc8f846 100644
--- a/docs/topics/impala_txtfile.xml
+++ b/docs/topics/impala_txtfile.xml
@@ -464,7 +464,7 @@ INSERT INTO csv SELECT * FROM 
other_file_format_table;</codeblock>
 
         <ol>
           <li>
-            <b>Prepare your systems to work with LZO using Cloudera 
repositories:</b>
+            <b>Prepare your systems to work with LZO by downloading and 
installing the appropriate libraries:</b>
             <p>
               <b>On systems managed by Cloudera Manager using parcels:</b>
             </p>
@@ -528,8 +528,8 @@ INSERT INTO csv SELECT * FROM 
other_file_format_table;</codeblock>
 
             <note rev="1.2.0">
               <p rev="1.2.0">
-                The name of the Hadoop LZO package changed between CDH 4 and 
CDH 5. In CDH 4, the package name was
-                <codeph>hadoop-lzo-cdh4</codeph>. In CDH 5 and higher, the 
package name is <codeph>hadoop-lzo</codeph>.
+                <ph rev="upstream">The name of the Hadoop LZO package changed 
between CDH 4 and CDH 5. In CDH 4, the package name was
+                <codeph>hadoop-lzo-cdh4</codeph>. In CDH 5 and higher, the 
package name is <codeph>hadoop-lzo</codeph>.</ph>
               </p>
             </note>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_udf.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_udf.xml b/docs/topics/impala_udf.xml
index 52c9a41..1c0f159 100644
--- a/docs/topics/impala_udf.xml
+++ b/docs/topics/impala_udf.xml
@@ -171,10 +171,10 @@ select real_words(letters) from word_games;</codeblock>
           </li>
 
           <li>
-            Prior to CDH 5.7 / Impala 2.5, the return type must be a 
<q>Writable</q> type such as <codeph>Text</codeph> or
+            Prior to <keyword keyref="impala25_full"/> the return type must be 
a <q>Writable</q> type such as <codeph>Text</codeph> or
             <codeph>IntWritable</codeph>, rather than a Java primitive type 
such as <codeph>String</codeph> or
             <codeph>int</codeph>. Otherwise, the UDF returns 
<codeph>NULL</codeph>.
-            <ph rev="2.5.0">In CDH 5.7 / Impala 2.5 and higher, this 
restriction is lifted, and both
+            <ph rev="2.5.0">In <keyword keyref="impala25_full"/> and higher, 
this restriction is lifted, and both
             UDF arguments and return values can be Java primitive types.</ph>
           </li>
 
@@ -187,7 +187,7 @@ select real_words(letters) from word_games;</codeblock>
             written in C++.
           </li>
           <li rev="2.5.0 IMPALA-2843 CDH-39148">
-            In CDH 5.7 / Impala 2.5 and higher, you can transparently call 
Hive Java UDFs through Impala,
+            In <keyword keyref="impala25_full"/> and higher, you can 
transparently call Hive Java UDFs through Impala,
             or call Impala Java UDFs through Hive. This feature does not apply 
to built-in Hive functions.
             Any Impala Java UDFs created with older versions must be 
re-created using new <codeph>CREATE FUNCTION</codeph>
             syntax, without any signature for arguments or the return value.
@@ -1912,8 +1912,8 @@ Returned 2 row(s) in 0.43s</codeblock>
         </li>
 
         <li rev="2.5.0 IMPALA-2843">
-          Prior to CDH 5.7 / Impala 2.5, when the <cmdname>catalogd</cmdname> 
process is restarted,
-          all UDFs become undefined and must be reloaded. In CDH 5.7 / Impala 
2.5 and higher, this
+          Prior to <keyword keyref="impala25_full"/> when the 
<cmdname>catalogd</cmdname> process is restarted,
+          all UDFs become undefined and must be reloaded. In <keyword 
keyref="impala25_full"/> and higher, this
           limitation only applies to older Java UDFs. Re-create those UDFs 
using the new
           <codeph>CREATE FUNCTION</codeph> syntax for Java UDFs, which 
excludes the function signature,
           to remove the limitation entirely.

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

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

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/04cd1c16/docs/topics/impala_views.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_views.xml b/docs/topics/impala_views.xml
index 939f564..afe9948 100644
--- a/docs/topics/impala_views.xml
+++ b/docs/topics/impala_views.xml
@@ -93,7 +93,7 @@ select * from report;</codeblock>
 
       <li rev="2.3.0 collevelauth">
         Set up fine-grained security where a user can query some columns from 
a table but not other columns.
-        Because CDH 5.5 / Impala 2.3 and higher support column-level 
authorization, this technique is no longer
+        Because <keyword keyref="impala23_full"/> and higher support 
column-level authorization, this technique is no longer
         required. If you formerly implemented column-level security through 
views, 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 the

Reply via email to