You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by jr...@apache.org on 2017/03/08 23:34:39 UTC

[1/3] incubator-impala git commit: [DOCS] Wide-ranging cleanup of CDH and Cloudera references

Repository: incubator-impala
Updated Branches:
  refs/heads/master 3b7ceceed -> 18927ac85


http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_new_features.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_new_features.xml b/docs/topics/impala_new_features.xml
index a403c27..91638a9 100644
--- a/docs/topics/impala_new_features.xml
+++ b/docs/topics/impala_new_features.xml
@@ -440,7 +440,7 @@ under the License.
           </p>
           <ul>
             <li>
-              <p rev="IMPALA-3206 CDH-43744">
+              <p rev="IMPALA-3206">
                 [<xref href="https://issues.cloudera.org/browse/IMPALA-3206" scope="external" format="html">IMPALA-3206</xref>]
                 Speedup for queries against <codeph>DECIMAL</codeph> columns in Avro tables.
                 The code that parses <codeph>DECIMAL</codeph> values from Avro now uses
@@ -456,7 +456,7 @@ under the License.
             </li>
             <!-- Not actually a new feature, it's more a tip about when to expect remote reads and how to minimize them. To go somewhere in the performance / best practices / Parquet info.
             <li>
-              <p rev="IMPALA-3885 CDH-43793">
+              <p rev="IMPALA-3885">
                 [<xref href="https://issues.cloudera.org/browse/IMPALA-3885" scope="external" format="html">IMPALA-3885</xref>]
                 Parquet files with multiple blocks can now be processed
                 without remote reads.
@@ -464,7 +464,7 @@ under the License.
             </li>
             -->
             <li>
-              <p rev="IMPALA-2979 CDH-43739"> [<xref
+              <p rev="IMPALA-2979"> [<xref
                   href="https://issues.cloudera.org/browse/IMPALA-2979" scope="external"
                   format="html">IMPALA-2979</xref>] Improvements to scheduling on worker nodes,
                 enabled by the <codeph>REPLICA_PREFERENCE</codeph> query option.
@@ -475,7 +475,7 @@ under the License.
           </ul>
         </li>
         <li audience="hidden">
-          <p rev="IMPALA-3210 CDH-43736"><!-- Patch didn't make it into in <keyword keyref="impala27_full"/> -->
+          <p rev="IMPALA-3210"><!-- 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>.
@@ -485,7 +485,7 @@ under the License.
           </p>
         </li>
         <li>
-          <p rev="IMPALA-1683 CDH-43732">
+          <p rev="IMPALA-1683">
             [<xref href="https://issues.cloudera.org/browse/IMPALA-1683" scope="external" format="html">IMPALA-1683</xref>]
             The <codeph>REFRESH</codeph> statement can be applied to a single partition,
             rather than the entire table. See <xref href="impala_refresh.xml#refresh"/>
@@ -498,21 +498,21 @@ under the License.
           </p>
           <ul>
             <li>
-              <p rev="IMPALA-2767 CDH-43748">
+              <p rev="IMPALA-2767">
                 [<xref href="https://issues.cloudera.org/browse/IMPALA-2767" scope="external" format="html">IMPALA-2767</xref>]
                 You can now force a session to expire by clicking a link in the web UI,
                 on the <uicontrol>/sessions</uicontrol> tab.
               </p>
             </li>
             <li>
-              <p rev="IMPALA-3715 CDH-43743">
+              <p rev="IMPALA-3715">
                 [<xref href="https://issues.cloudera.org/browse/IMPALA-3715" scope="external" format="html">IMPALA-3715</xref>]
                 The <uicontrol>/memz</uicontrol> tab includes more information about
                 Impala memory usage.
               </p>
             </li>
             <li>
-              <p rev="IMPALA-3716 CDH-43741">
+              <p rev="IMPALA-3716">
                 [<xref href="https://issues.cloudera.org/browse/IMPALA-3716" scope="external" format="html">IMPALA-3716</xref>]
                 The <uicontrol>Details</uicontrol> page for a query now includes
                 a <uicontrol>Memory</uicontrol> tab.
@@ -521,7 +521,7 @@ under the License.
           </ul>
         </li>
         <li>
-          <p rev="IMPALA-3499 CDH-43740">
+          <p rev="IMPALA-3499">
             [<xref href="https://issues.cloudera.org/browse/IMPALA-3499" scope="external" format="html">IMPALA-3499</xref>]
             Scalability improvements to the catalog server. Impala handles internal communication
             more efficiently for tables with large numbers of columns and partitions, where the
@@ -529,7 +529,7 @@ under the License.
           </p>
         </li>
         <li>
-          <p rev="IMPALA-3677 CDH-43745">
+          <p rev="IMPALA-3677">
             [<xref href="https://issues.cloudera.org/browse/IMPALA-3677" scope="external" format="html">IMPALA-3677</xref>]
             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
@@ -538,7 +538,7 @@ under the License.
           </p>
         </li>
         <li>
-          <p rev="IMPALA-3687 CDH-43731">
+          <p rev="IMPALA-3687">
             [<xref href="https://issues.cloudera.org/browse/IMPALA-3687" scope="external" format="html">IMPALA-3687</xref>]
             The schema reconciliation rules for Avro tables have changed slightly
             for <codeph>CHAR</codeph> and <codeph>VARCHAR</codeph> columns. Now, if
@@ -551,7 +551,7 @@ under the License.
           </p>
         </li>
         <li>
-          <p rev="IMPALA-3575 CDH-43742"> [<xref
+          <p rev="IMPALA-3575"> [<xref
               href="https://issues.cloudera.org/browse/IMPALA-3575"
               scope="external" format="html">IMPALA-3575</xref>] Some network
             operations now have additional timeout and retry settings. The extra
@@ -572,8 +572,6 @@ under the License.
 
     <conbody>
 
-      <!-- <note conref="../shared/impala_common.xml#common/only_cdh5_260" /> -->
-
       <ul>
         <li>
           <p>
@@ -581,7 +579,7 @@ under the License.
           </p>
           <ul>
             <li>
-              <p rev="IMPALA-1878 CDH-33310">
+              <p rev="IMPALA-1878">
                 Impala can now write to S3 tables through the <codeph>INSERT</codeph>
                 or <codeph>LOAD DATA</codeph> statements.
                 See <xref href="impala_s3.xml#s3"/> for general information about
@@ -589,7 +587,7 @@ under the License.
               </p>
             </li>
             <li>
-              <p rev="IMPALA-3452 CDH-39913">
+              <p rev="IMPALA-3452">
                 A new query option, <codeph>S3_SKIP_INSERT_STAGING</codeph>, lets you
                 trade off between fast <codeph>INSERT</codeph> performance and
                 slower <codeph>INSERT</codeph>s that are more consistent if a
@@ -601,19 +599,19 @@ under the License.
           </ul>
         </li>
         <li>
-          <p rev="CDH-41184">
+          <p rev="">
             Performance improvements for the runtime filtering feature:
           </p>
           <ul>
             <li>
-              <p rev="CDH-41184 IMPALA-3333">
+              <p rev="IMPALA-3333">
                 The default for the <codeph>RUNTIME_FILTER_MODE</codeph>
                 query option is changed to <codeph>GLOBAL</codeph> (the highest setting).
                 See <xref href="impala_runtime_filter_mode.xml#runtime_filter_mode"/> for
                 details about this option.
               </p>
             </li>
-            <li rev="CDH-41184 IMPALA-3007">
+            <li rev="IMPALA-3007">
               <p>
                 The <codeph>RUNTIME_BLOOM_FILTER_SIZE</codeph> setting is now only used
                 as a fallback if statistics are not available; otherwise, Impala
@@ -622,7 +620,7 @@ under the License.
                 details about this option.
               </p>
             </li>
-            <li rev="CDH-41184 IMPALA-3480">
+            <li rev="IMPALA-3480">
               <p>
                 New query options <codeph>RUNTIME_FILTER_MIN_SIZE</codeph> and
                 <codeph>RUNTIME_FILTER_MAX_SIZE</codeph> let you fine-tune
@@ -636,14 +634,14 @@ under the License.
                 for details about these options.
               </p>
             </li>
-            <li rev="CDH-41184 IMPALA-2956">
+            <li rev="IMPALA-2956">
               <p>
                 Runtime filter propagation now applies to all the
                 operands of <codeph>UNION</codeph> and <codeph>UNION ALL</codeph>
                 operators.
               </p>
             </li>
-            <li rev="CDH-41184 IMPALA-3077">
+            <li rev="IMPALA-3077">
               <p>
                 Runtime filters can now be produced during join queries even
                 when the join processing activates the spill-to-disk mechanism.
@@ -673,7 +671,7 @@ under the License.
           </p>
         </li>
         <li>
-          <p rev="CDH-40238 CDH-39818 IMPALA-3490 IMPALA-3581 IMPALA-2686">
+          <p rev="IMPALA-3490 IMPALA-3581 IMPALA-2686">
             Impala can now write lightweight <q>minidump</q> files, rather
             than large core files, to save diagnostic information when
             any of the Impala-related daemons crash. This feature uses the
@@ -686,7 +684,7 @@ under the License.
             New query options improve interoperability with Parquet files:
             <ul>
               <li>
-                <p rev="IMPALA-2835 CDH-33330">
+                <p rev="IMPALA-2835">
                   The <codeph>PARQUET_FALLBACK_SCHEMA_RESOLUTION</codeph> query option
                   lets Impala locate columns within Parquet files based on
                   column name rather than ordinal position.
@@ -727,7 +725,7 @@ under the License.
               </p>
             </li>
             <li>
-              <p rev="IMPALA-2660 CDH-40241">
+              <p rev="IMPALA-2660">
                 Impala now recognizes the <codeph>auth_to_local</codeph> setting,
                 specified through the HDFS configuration setting
                 <codeph>hadoop.security.auth_to_local</codeph>.
@@ -765,7 +763,7 @@ under the License.
           </p>
         </li>
         <li>
-          <p rev="IMPALA-3397 CDH-40097">
+          <p rev="IMPALA-3397">
             The <cmdname>impala-shell</cmdname> interpreter has a new command,
             <codeph>SOURCE</codeph>, that lets you run a set of SQL statements
             or other <cmdname>impala-shell</cmdname> commands stored in a file.
@@ -778,7 +776,7 @@ under the License.
           </p>
         </li>
         <li>
-          <p rev="IMPALA-1772 CDH-38381">
+          <p rev="IMPALA-1772">
             The <codeph>millisecond()</codeph> built-in function lets you extract
             the fractional seconds part of a <codeph>TIMESTAMP</codeph> value.
             See <xref href="impala_datetime_functions.xml#datetime_functions"/> for details.
@@ -905,11 +903,9 @@ under the License.
 
     <conbody>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_250" />
-
       <ul>
         <li><!-- Spec: https://docs.google.com/document/d/1ambtYJ1t05iITCVIrN6N1A-e7PZBSetBPgjy8SLzJrA/edit#heading=h.vcftzwlpn845 -->
-          <p rev="CDH-33292 IMPALA-2552 IMPALA-3054">
+          <p rev="IMPALA-2552 IMPALA-3054">
             Dynamic partition pruning. When a query refers to a partition key column in a <codeph>WHERE</codeph>
             clause, and the exact set of column values are not known until the query is executed,
             Impala evaluates the predicate and skips the I/O for entire partitions that are not needed.
@@ -1033,14 +1029,6 @@ under the License.
             <ph audience="PDF">See <xref href="impala_udf.xml#udfs_hive"/> for details.</ph>
           </p>
         </li>
-        <!-- CDH-33298 is for scoping internationalization / UTF-8 / Unicode support. That work is pushed out to 5.8.
-        <li>
-          <p rev="CDH-33298">
-            Improvements to internationalization support.
-            Now Impala can process data that uses the UTF-8 character encoding.
-          </p>
-        </li>
-        -->
         <li>
           <p rev="IMPALA-1588"><!-- This is from 2015, so perhaps it's really in an earlier release. -->
             Performance improvements for HDFS I/O. Impala now caches HDFS file handles to avoid the
@@ -1058,7 +1046,7 @@ under the License.
         </li>
         
         <li>
-          <p rev="IMPALA-3044 IMPALA-2538 IMPALA-1168 CDH-33289 CDH-34603">
+          <p rev="IMPALA-3044 IMPALA-2538 IMPALA-1168">
             Improvements to the memory reservation mechanism for the Impala
             admission control feature. You can specify more settings, such
             as the timeout period and maximum aggregate memory used, for each
@@ -1186,13 +1174,13 @@ under the License.
           </p>
         </li>
         <li>
-          <p rev="CDH-37009 CDH-30378">
+          <p rev="">
             Improvements to Impala integration and usability for Hue. (The code changes
             are actually on the Hue side.)
           </p>
           <ul>
           <li>
-            <p rev="CDH-37009">
+            <p rev="">
               The list of tables now refreshes dynamically.
             </p>
           </li>
@@ -1255,14 +1243,14 @@ under the License.
           </p>
         </li>
         <li>
-          <p rev="IMPALA-1748 CDH-38369">
+          <p rev="IMPALA-1748">
             User-defined functions (UDFs and UDAFs) written in C++ now persist automatically
             when the <cmdname>catalogd</cmdname> daemon is restarted. You no longer
             have to run the <codeph>CREATE FUNCTION</codeph> statements again after a restart.
           </p>
         </li>
         <li>
-          <p rev="IMPALA-2843 CDH-39148">
+          <p rev="IMPALA-2843">
             User-defined functions (UDFs) written in Java can now persist
             when the <cmdname>catalogd</cmdname> daemon is restarted, and can be shared
             transparently between Impala and Hive. You must do a one-time operation to recreate these
@@ -1352,13 +1340,11 @@ under the License.
 
     <conbody>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_240" />
-
       <ul>
         <li>
           <p>
             Impala can be used on the DSSD D5 Storage Appliance.
-            From a user perspective, the Impala features are the same as in CDH 5.5 / Impala 2.3.
+            From a user perspective, the Impala features are the same as in <keyword keyref="impala23_full"/>.
           </p>
         </li>
       </ul>
@@ -1378,11 +1364,9 @@ under the License.
 
     <conbody>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_23x" />
-
       <p>
-        The following are the major new features in Impala 2.3.x. This major release, available as part of CDH
-        5.5.x, contains improvements to SQL syntax (particularly new support for complex types), performance,
+        The following are the major new features in Impala 2.3.x. This major release
+        contains improvements to SQL syntax (particularly new support for complex types), performance,
         manageability, security.
       </p>
 
@@ -1425,14 +1409,14 @@ under the License.
           </p>
         </li>
 
-        <li id="CDH-28141">
+        <li>
           <p>
             Reduced memory usage and improved performance and robustness for spill-to-disk feature.
             <ph audience="PDF">See <xref href="impala_scalability.xml#spill_to_disk"/> for details about this feature.</ph>
           </p>
         </li>
 
-        <li rev="IMPALA-1881 CDH-34620">
+        <li rev="IMPALA-1881">
           <p>
             Performance improvements for querying Parquet data files containing multiple row groups
             and multiple data blocks:
@@ -1447,7 +1431,7 @@ under the License.
           <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 <ph rev="upstream">CDH 5.5</ph> and higher. (Impala itself never writes
+            files written by Hive, MapReduce, and other components. (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
@@ -1702,7 +1686,7 @@ under the License.
           </p>
         </li>
 
-        <li id="CDH-27547">
+        <li>
           <p>
             Impala can now run a specified command to obtain the password to decrypt a private-key PEM file,
             rather than having the private-key file be unencrypted on disk.
@@ -1735,7 +1719,7 @@ under the License.
       </ul>
 
       <p>
-        In CDH 5.5.2 / Impala 2.3.2, the bug fix for <xref href="https://issues.cloudera.org/browse/IMPALA-2598" scope="external" format="html">IMPALA-2598</xref>
+        In <keyword keyref="impala232"/>, the bug fix for <xref href="https://issues.cloudera.org/browse/IMPALA-2598" scope="external" format="html">IMPALA-2598</xref>
         removes the restriction on using both Kerberos and SSL for internal communication between Impala components.
       </p>
 
@@ -1747,35 +1731,12 @@ under the License.
 
 <!-- All 2.2.x subsections go under here -->
 
-  <concept rev="5.4.3" id="new_features_223">
-
-    <title>New Features in Impala 2.2.x for CDH 5.4.3 and 5.4.4</title>
-
-    <conbody>
-
-      <p>
-        No new features added to the Impala code. The certification of Impala with EMC Isilon under CDH 5.4.4 means
-        that now you can query data stored on Isilon storage devices through Impala. See
-        <xref audience="integrated" href="cm_mc_isilon_service.xml"/><xref audience="standalone" href="http://www.cloudera.com/documentation/enterprise/latest/topics/cm_mc_isilon_service.html" scope="external" format="html"/>
-        for details. The same level of Impala is included with both CDH
-        5.4.3 and 5.4.4.
-<!-- This point release is exclusively a bug fix release. -->
-      </p>
-
-      <note conref="../shared/impala_common.xml#common/only_cdh5_22x" />
-
-    </conbody>
-
-  </concept>
-
   <concept rev="2.2.0" id="new_features_220">
 
     <title>New Features in <keyword keyref="impala28_full"/></title>
 
     <conbody>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_220" />
-
       <p>
         The following are the major new features in <keyword keyref="impala22_full"/>. This release
         contains improvements to performance, manageability, security, and SQL syntax.
@@ -1968,7 +1929,7 @@ under the License.
           </p>
         </li>
 
-        <li rev="CDH-26073">
+        <li rev="">
           <p>
             The amount of memory required during setup for <q>spill to disk</q> operations is greatly reduced. This
             enhancement reduces the chance of a memory-intensive join or aggregation query failing with an
@@ -2414,7 +2375,7 @@ under the License.
 
         <li>
           <p>
-            On CDH 5, Impala can take advantage of the HDFS caching feature to <q>pin</q> entire tables or
+            Where the underlying HDFS support exists, Impala can take advantage of the HDFS caching feature to <q>pin</q> entire tables or
             individual partitions in memory, to speed up queries on frequently accessed data and reduce the CPU
             overhead of memory-to-memory copying. When HDFS files are cached in memory, Impala can read the cached
             data without any disk reads, and without making an additional copy of the data in memory. Other Hadoop
@@ -2422,8 +2383,7 @@ under the License.
           </p>
 
           <p audience="PDF">
-<!-- Original URL: http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH5/latest/CDH5-Installation-Guide/cdh_ig_hdfs_caching.html -->
-            For background information about HDFS caching in CDH, see
+            For background information about HDFS caching, see
             <xref href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_ig_hdfs_caching.html" scope="external" format="html">the
             CDH 5 Installation Guide</xref>. For performance information about using this feature with Impala, see
             <xref href="impala_perf_hdfs_caching.xml#hdfs_caching"/>. For the <codeph>SET CACHED</codeph> and
@@ -2654,7 +2614,7 @@ under the License.
 
   <concept rev="1.3.2" id="new_features_132">
 
-    <title>New Features in Impala 1.3.2 / CDH 5.0.4</title>
+    <title>New Features in <keyword keyref="impala132"/></title>
 
     <conbody>
 
@@ -2663,8 +2623,6 @@ under the License.
         HDFS caching.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_132" />
-
     </conbody>
 
   </concept>
@@ -2680,8 +2638,6 @@ under the License.
         resulting from fixes for performance, reliability, or usability issues.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/impala13_cdh" />
-
       <ul>
         <li>
           <p>
@@ -2723,8 +2679,6 @@ under the License.
 
     <conbody>
 
-      <note conref="../shared/impala_common.xml#common/impala13_cdh" />
-
       <ul>
         <li>
           <p>
@@ -2774,7 +2728,7 @@ under the License.
 
         <li>
           <p>
-            Integration with the YARN resource management framework. Only available in combination with CDH 5. This
+            Integration with the YARN resource management framework. This
             feature makes use of the underlying YARN service, plus an additional service (Llama) that coordinates
             requests to YARN for Impala resources, so that the Impala query only proceeds when all requested
             resources are available. See <xref href="impala_resource_management.xml#resource_management"/> for full
@@ -3204,79 +3158,6 @@ under the License.
           </p>
         </li>
 
-        <li audience="hidden">
-          <p>
-            Integration with the YARN resource management framework. Only available in combination with CDH 5. This
-            feature makes use of the underlying YARN service, plus an additional service (Llama) that coordinates
-            requests to YARN for Impala resources, so that the Impala query only proceeds when all requested
-            resources are available. See <xref href="impala_resource_management.xml#resource_management"/> for full
-            details.
-          </p>
-
-          <p>
-            On the Impala side, this feature involves some new startup options for the <cmdname>impalad</cmdname>
-            daemon:
-          </p>
-          <ul>
-            <li>
-              <codeph>-enable_rm</codeph>
-            </li>
-
-            <li>
-              <codeph>-llama_host</codeph>
-            </li>
-
-            <li>
-              <codeph>-llama_port</codeph>
-            </li>
-
-            <li>
-              <codeph>-llama_callback_port</codeph>
-            </li>
-
-            <li>
-              <codeph>-cgroup_hierarchy_path</codeph>
-            </li>
-          </ul>
-          <p>
-            For details of these startup options, see <xref href="impala_config_options.xml#config_options"/>.
-          </p>
-
-          <p>
-            This feature also involves several new or changed query options that you can set through the
-            <cmdname>impala-shell</cmdname> interpreter and apply within a specific session:
-          </p>
-          <ul>
-            <li>
-              <codeph>MEM_LIMIT</codeph>: the function of this existing option changes when Impala resource
-              management is enabled.
-            </li>
-
-            <li>
-              <codeph>YARN_POOL</codeph>: a new option. (Renamed to <codeph>RESOURCE_POOL</codeph> in Impala
-              1.3.0.)
-            </li>
-
-            <li>
-              <codeph>V_CPU_CORES</codeph>: a new option.
-            </li>
-
-            <li>
-              <codeph>RESERVATION_REQUEST_TIMEOUT</codeph>: a new option.
-            </li>
-          </ul>
-          <p>
-            For details of these query options, see <xref href="impala_resource_management.xml#rm_query_options"/>.
-          </p>
-        </li>
-
-        <li>
-          <p>
-            <codeph>CREATE TABLE ... AS SELECT</codeph> syntax, to create a table and copy data into it in a single
-            operation. See <xref href="impala_create_table.xml#create_table"/> for details.
-          </p>
-        </li>
-
         <li>
           <p>
             The <codeph>CREATE TABLE</codeph> and <codeph>ALTER TABLE</codeph> statements have new clauses
@@ -3293,8 +3174,8 @@ under the License.
         <li>
           <p>
             Delegation support lets you authorize certain OS users associated with applications (for example,
-            <codeph>hue</codeph>), to submit requests using the credentials of other users. Only available in
-            combination with CDH 5. See <xref href="impala_delegation.xml#delegation"/> for details.
+            <codeph>hue</codeph>), to submit requests using the credentials of other users.
+            See <xref href="impala_delegation.xml#delegation"/> for details.
           </p>
         </li>
 
@@ -3335,11 +3216,6 @@ under the License.
 
     <conbody>
 
-      <note>
-        The Impala 1.2.0 beta release only works in combination with the beta version of CDH 5. The Impala 1.2.0
-        software is bundled together with the CDH 5 beta 1 download.
-      </note>
-
       <p>
         The Impala 1.2.0 beta includes new features for security, performance, and flexibility.
       </p>
@@ -3395,7 +3271,7 @@ under the License.
 
         <li>
           <p>
-            Integration with the YARN resource management framework. Only available in combination with CDH 5. This
+            Integration with the YARN resource management framework. This
             feature makes use of the underlying YARN service, plus an additional service (Llama) that coordinates
             requests to YARN for Impala resources, so that the Impala query only proceeds when all requested
             resources are available. See <xref href="impala_resource_management.xml#resource_management"/> for full
@@ -3478,8 +3354,8 @@ under the License.
         <li>
           <p>
             Delegation support lets you authorize certain OS users associated with applications (for example,
-            <codeph>hue</codeph>), to submit requests using the credentials of other users. Only available in
-            combination with CDH 5. See <xref href="impala_delegation.xml#delegation"/> for details.
+            <codeph>hue</codeph>), to submit requests using the credentials of other users.
+            See <xref href="impala_delegation.xml#delegation"/> for details.
           </p>
         </li>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_perf_stats.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_perf_stats.xml b/docs/topics/impala_perf_stats.xml
index e08fd0b..54b7c72 100644
--- a/docs/topics/impala_perf_stats.xml
+++ b/docs/topics/impala_perf_stats.xml
@@ -204,7 +204,6 @@ show column stats parquet_snappy;
           the Impala <codeph>COMPUTE STATS</codeph> statement, both table and column statistics are automatically
           gathered at the same time, for all columns in the table.
         </p>
-        <p conref="../shared/impala_common.xml#common/decimal_no_stats"/>
       </note>
 
       <note conref="../shared/impala_common.xml#common/compute_stats_nulls"/>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_ports.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_ports.xml b/docs/topics/impala_ports.xml
index 11f8e1e..a9fcfed 100644
--- a/docs/topics/impala_ports.xml
+++ b/docs/topics/impala_ports.xml
@@ -365,7 +365,7 @@ under the License.
             </entry>
             <entry>
               <p>
-                Internal use only. Impala daemons use to communicate with Llama. New in <ph rev="upstream">CDH 5.0.0</ph> and higher.
+                Internal use only. Impala daemons use to communicate with Llama. New in <keyword keyref="impala13"/> and higher.
               </p>
             </entry>
           </row>
@@ -392,7 +392,7 @@ under the License.
             </entry>
             <entry>
               <p>
-                Internal use only. New in <ph rev="upstream">CDH 5.0.0</ph> and higher.
+                Internal use only. New in <keyword keyref="impala13"/> and higher.
               </p>
             </entry>
           </row>
@@ -419,7 +419,7 @@ under the License.
             </entry>
             <entry>
               <p>
-                Internal use only. New in <ph rev="upstream">CDH 5.0.0</ph> and higher.
+                Internal use only. New in <keyword keyref="impala13"/> and higher.
               </p>
             </entry>
           </row>
@@ -446,8 +446,8 @@ under the License.
             </entry>
             <entry>
               <p>
-                Llama service web interface for administrators to monitor and troubleshoot. New in CDH 5.0.0 and
-                higher.
+                Llama service web interface for administrators to monitor and troubleshoot.
+                New in <keyword keyref="impala13"/> and higher.
               </p>
             </entry>
           </row>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_prereqs.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_prereqs.xml b/docs/topics/impala_prereqs.xml
index 2ba5e13..50ac726 100644
--- a/docs/topics/impala_prereqs.xml
+++ b/docs/topics/impala_prereqs.xml
@@ -52,30 +52,6 @@ under the License.
     <p outputclass="toc inpage"/>
   </conbody>
 
-  <concept id="product_compatibility_matrix" audience="hidden">
-
-    <title>Product Compatibility Matrix</title>
-
-    <conbody>
-
-      <p> The ultimate source of truth about compatibility between various
-        versions of CDH, Cloudera Manager, and various CDH components is the <ph
-          audience="integrated"><xref
-            href="rn_consolidated_pcm.xml"
-            >Product Compatibility Matrix for CDH and Cloudera
-          Manager</xref></ph><ph audience="standalone">online <xref
-            href="http://www.cloudera.com/documentation/enterprise/latest/topics/rn_consolidated_pcm.html"
-            format="html" scope="external">Product Compatibility
-          Matrix</xref></ph>. </p>
-
-      <p>
-        For Impala, see the
-        <xref href="http://www.cloudera.com/documentation/enterprise/latest/topics/pcm_impala.html" scope="external" format="html">Impala
-        compatibility matrix page</xref>.
-      </p>
-    </conbody>
-  </concept>
-
   <concept id="prereqs_os">
 
     <title>Supported Operating Systems</title>
@@ -352,15 +328,6 @@ under the License.
         a white-list, add these accounts to the list of permitted accounts.
       </p>
 
-<!-- Taking out because no longer applicable in CDH 5.5 and up. -->
-      <p id="impala_hdfs_group" rev="1.2" audience="hidden">
-        For the resource management feature to work (in combination with CDH 5 and the YARN and Llama components),
-        the <codeph>impala</codeph> user must be a member of the <codeph>hdfs</codeph> group. This setup is
-        performed automatically during a new install, but not when upgrading from earlier Impala releases to Impala
-        1.2. If you are upgrading a node to CDH 5 that already had Impala 1.1 or 1.0 installed, manually add the
-        <codeph>impala</codeph> user to the <codeph>hdfs</codeph> group.
-      </p>
-
       <p>
         For correct file deletion during <codeph>DROP TABLE</codeph> operations, Impala must be able to move files
         to the HDFS trashcan. You might need to create an HDFS directory <filepath>/user/impala</filepath>,

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_revoke.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_revoke.xml b/docs/topics/impala_revoke.xml
index b7a0908..7299150 100644
--- a/docs/topics/impala_revoke.xml
+++ b/docs/topics/impala_revoke.xml
@@ -84,12 +84,12 @@ object_type ::= TABLE | DATABASE | SERVER | URI
     <p>
       <ul>
         <li>
-          The Impala <codeph>GRANT</codeph> and <codeph>REVOKE</codeph> statements are available in CDH 5.2 and
+          The Impala <codeph>GRANT</codeph> and <codeph>REVOKE</codeph> statements are available in <keyword keyref="impala20_full"/> and
           higher.
         </li>
 
         <li>
-          In <ph rev="upstream">CDH 5.1</ph> and higher, Impala makes use of any roles and privileges specified by the
+          In <keyword keyref="impala14_full"/> 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/18927ac8/docs/topics/impala_runtime_filtering.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_runtime_filtering.xml b/docs/topics/impala_runtime_filtering.xml
index aceecfc..418044f 100644
--- a/docs/topics/impala_runtime_filtering.xml
+++ b/docs/topics/impala_runtime_filtering.xml
@@ -59,9 +59,9 @@ under the License.
       <!-- and <xref href="impala_joins.xml#joins"/>. -->
     </p>
 
-    <note type="important" rev="2.6.0 CDH-41184">
-      <p rev="2.6.0 CDH-41184">
-        When this feature made its debut in CDH 5.7 / Impala 2.5,
+    <note type="important" rev="2.6.0">
+      <p rev="2.6.0">
+        When this feature made its debut in <keyword keyref="impala25"/>,
         the default setting was <codeph>RUNTIME_FILTER_MODE=LOCAL</codeph>.
         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
@@ -192,7 +192,7 @@ under the License.
         where filters are eligible to be transmitted across the network.
       </p>
 
-      <note rev="2.6.0 CDH-41184 IMPALA-3333">
+      <note rev="2.6.0 IMPALA-3333">
         In <keyword keyref="impala26_full"/> and higher, the default for runtime filtering is the <codeph>GLOBAL</codeph> setting.
       </note>
 
@@ -265,7 +265,7 @@ under the License.
         <li>
           <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>).
+            <ph rev="2.6.0 IMPALA-3333">By default, it is set to the highest level (<codeph>GLOBAL</codeph>).
             (This default applies to <keyword keyref="impala26_full"/> and higher.
             In previous releases, the default was <codeph>LOCAL</codeph>.)</ph>
           </p>
@@ -375,7 +375,7 @@ under the License.
         compare against the entries in the hash table.
       </p>
 
-<codeblock rev="2.6.0 CDH-41184">
+<codeblock rev="2.6.0">
 COMPUTE STATS huge_t1;
 COMPUTE STATS tiny_t2;
 SELECT c1, c2, c3 FROM huge_t1 JOIN tiny_t2 WHERE huge_t1.id = tiny_t2.id;
@@ -402,7 +402,7 @@ select c1 from t1 where year > (select min(year) from t2);
         are skipped.
       </p>
 
-<codeblock rev="2.6.0 CDH-41184">
+<codeblock rev="2.6.0">
 select c1 from t1 where year in (select distinct year from t2);
 </codeblock>
 
@@ -423,7 +423,7 @@ select c1 from t1 where year in (select distinct year from t2);
         back to the coordinator node, where they would be eliminated only at the very end of the query.
       </p>
 
-<codeblock rev="2.6.0 CDH-41184">
+<codeblock rev="2.6.0">
 select c1, c2, c3 from t1
   where year in (select distinct year from t2)
     and c2 in (select other_column from t3);
@@ -439,7 +439,7 @@ select c1, c2, c3 from t1
         in optimizing this query.
       </p>
 
-<codeblock rev="2.6.0 CDH-41184">
+<codeblock rev="2.6.0">
 select c1 from huge_t1 join [broadcast] tiny_t2
   on huge_t1.id = tiny_t2.id
   where huge_t1.year in (select distinct year from tiny_t2)
@@ -457,7 +457,7 @@ select c1 from huge_t1 join [broadcast] tiny_t2
         in optimizing this query.
       </p>
 
-<codeblock rev="2.6.0 CDH-41184">
+<codeblock rev="2.6.0">
 select c1 from huge_t1 join [shuffle] huge_t2
   on huge_t1.id = huge_t2.id
   where huge_t1.year in (select distinct year from huge_t2)

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_s3.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_s3.xml b/docs/topics/impala_s3.xml
index 617154c..dd29748 100644
--- a/docs/topics/impala_s3.xml
+++ b/docs/topics/impala_s3.xml
@@ -153,39 +153,11 @@ under the License.
         through the Hive metastore.)
       </p>
       
-         
-      <p audience="hidden">
-        As of CDH 5.8, these settings do not have corresponding controls in the Cloudera Manager user interface.
-        Specify them in the <uicontrol>HDFS Client Advanced Configuration Snippet (Safety Valve) for
-        core-site.xml</uicontrol> field. After specifying the credentials, restart both the Impala and Hive
-        services. (Restarting Hive is required because Impala queries, <codeph>CREATE TABLE</codeph> statements,
-        and so on go through the Hive metastore.)
-      </p>
-
-<!--
-      <p rev="CDH-39914 IMPALA-3306">
-        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>
-        startup options. For clusters not managed by Cloudera Manager, use the
-        <codeph>-
-        -s3a_access_key_cmd</codeph> and <codeph>-
-        -s3a_secret_key_cmd</codeph>
-        startup options for the <cmdname>impalad</cmdname> daemon.
-        For clusters managed by Cloudera Manager, set the
-        <codeph>s3a_access_key_cmd</codeph> and <codeph>s3a_secret_key_cmd</codeph>
-        configuration settings and restart the Impala and Hive services.
-        (Restarting Hive is required because Impala queries, <codeph>CREATE TABLE</codeph> statements,
-        and so on go through the Hive metastore.)
-      </p>
--->
-
       <note type="important">
 <!--
       <ul>
         <li>
-          <p rev="CDH-39914 IMPALA-3306">
+          <p rev="IMPALA-3306">
             The <codeph>s3a_access_key_cmd</codeph> and <codeph>s3a_secret_key_cmd</codeph> settings
             for <cmdname>impalad</cmdname> only allow Impala to access S3. You must still include the credentials in the
             client <filepath>hdfs-site.xml</filepath> configuration file to allow S3 access for the Hive metastore,
@@ -206,7 +178,7 @@ under the License.
 -->
         <!-- Overriding with a new first list bullet following clarification by Sailesh.
         <li>
-          <p rev="CDH-39914 IMPALA-3306">
+          <p rev="IMPALA-3306">
             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>.
@@ -244,7 +216,7 @@ under the License.
 
     </conbody>
 
-    <concept id="s3_dml" rev="2.6.0 CDH-39913 IMPALA-1878">
+    <concept id="s3_dml" rev="2.6.0 IMPALA-1878">
       <title>Using Impala DML Statements for S3 Data</title>
       <conbody>
         <p conref="../shared/impala_common.xml#common/s3_dml"/>
@@ -707,7 +679,7 @@ under the License.
         filesystem in the cluster.
       </p>
 
-      <p rev="2.6.0 CDH-39913 IMPALA-1878">
+      <p rev="2.6.0 IMPALA-1878">
         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 <keyword keyref="impala26_full"/> and higher.
@@ -734,7 +706,7 @@ under the License.
 
   </concept>
 
-  <concept id="s3_best_practices" rev="2.6.0 CDH-33310 CDH-39913 IMPALA-1878">
+  <concept id="s3_best_practices" rev="2.6.0 IMPALA-1878">
     <title>Best Practices for Using Impala with S3</title>
     <prolog>
       <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_show.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_show.xml b/docs/topics/impala_show.xml
index 4e9e7fc..3f99981 100644
--- a/docs/topics/impala_show.xml
+++ b/docs/topics/impala_show.xml
@@ -162,7 +162,7 @@ show files in sample_table partition (month like 'J%');
 
 <!-- Extensive round of testing makes me pretty confident of these findings. -->
       <p conref="../shared/impala_common.xml#common/permissions_blurb"/>
-      <p rev="CDH-19187">
+      <p rev="">
         The user ID that the <cmdname>impalad</cmdname> daemon runs under,
         typically the <codeph>impala</codeph> user, must have read
         permission for all the table files, read and execute permission for all the directories that make up the table,
@@ -336,7 +336,7 @@ where id between 1 and 1000000;
     <conbody>
 
       <p>
-        The <codeph>SHOW ROLES</codeph> statement displays roles. This syntax is available in CDH 5.2 and later
+        The <codeph>SHOW ROLES</codeph> statement displays roles. This syntax is available in <keyword keyref="impala20_full"/> and later
         only, when you are using the Sentry authorization framework along with the Sentry service, as described in
         <xref href="impala_authorization.xml#sentry_service"/>. It does not apply when you use the Sentry framework
         with privileges defined in a policy file.
@@ -389,7 +389,7 @@ where id between 1 and 1000000;
 
       <p rev="2.0.0">
         The <codeph>SHOW CURRENT ROLE</codeph> statement displays roles assigned to the current user. This syntax
-        is available in CDH 5.2 and later only, when you are using the Sentry authorization framework along with
+        is available in <keyword keyref="impala20_full"/> and later only, when you are using the Sentry authorization framework along with
         the Sentry service, as described in <xref href="impala_authorization.xml#sentry_service"/>. It does not
         apply when you use the Sentry framework with privileges defined in a policy file.
       </p>
@@ -441,7 +441,7 @@ where id between 1 and 1000000;
 <!-- Copied from Sentry docs. Turn into conref. I did some rewording for clarity. -->
         The <codeph>SHOW ROLE GRANT</codeph> statement lists all the roles assigned to the specified group. This
         statement is only allowed for Sentry administrative users and others users that are part of the specified
-        group. This syntax is available in CDH 5.2 and later only, when you are using the Sentry authorization
+        group. This syntax is available in <keyword keyref="impala20_full"/> and later only, when you are using the Sentry authorization
         framework along with the Sentry service, as described in
         <xref href="impala_authorization.xml#sentry_service"/>. It does not apply when you use the Sentry framework
         with privileges defined in a policy file.
@@ -483,7 +483,7 @@ where id between 1 and 1000000;
 <!-- Copied from Sentry docs. Turn into conref. I did some rewording for clarity. -->
         The <codeph>SHOW GRANT ROLE</codeph> statement list all the grants for the given role name. This statement
         is only allowed for Sentry administrative users and other users that have been granted the specified role.
-        This syntax is available in CDH 5.2 and later only, when you are using the Sentry authorization framework
+        This syntax is available in <keyword keyref="impala20_full"/> and later only, when you are using the Sentry authorization framework
         along with the Sentry service, as described in <xref href="impala_authorization.xml#sentry_service"/>. It
         does not apply when you use the Sentry framework with privileges defined in a policy file.
       </p>
@@ -614,7 +614,7 @@ Returned 1 row(s) in 0.01s</codeblock>
 
       <p conref="../shared/impala_common.xml#common/show_security"/>
 
-      <p rev="CDH-19187">
+      <p rev="">
         The user ID that the <cmdname>impalad</cmdname> daemon runs under,
         typically the <codeph>impala</codeph> user, must have read and execute
         permissions for all directories that are part of the table.
@@ -1006,7 +1006,7 @@ show table stats store_sales;
 </codeblock>
 
       <p conref="../shared/impala_common.xml#common/permissions_blurb"/>
-      <p rev="CDH-19187">
+      <p rev="">
         The user ID that the <cmdname>impalad</cmdname> daemon runs under,
         typically the <codeph>impala</codeph> user, must have read and execute
         permissions for all directories that are part of the table.
@@ -1196,7 +1196,7 @@ show column stats store_sales;
 </codeblock>
 
       <p conref="../shared/impala_common.xml#common/permissions_blurb"/>
-      <p rev="CDH-19187">
+      <p rev="">
         The user ID that the <cmdname>impalad</cmdname> daemon runs under,
         typically the <codeph>impala</codeph> user, must have read and execute
         permissions for all directories that are part of the table.
@@ -1332,7 +1332,7 @@ show range partitions million_rows_range;
 </codeblock>
 
       <p conref="../shared/impala_common.xml#common/permissions_blurb"/>
-      <p rev="CDH-19187">
+      <p rev="">
         The user ID that the <cmdname>impalad</cmdname> daemon runs under,
         typically the <codeph>impala</codeph> user, must have read and execute
         permissions for all directories that are part of the table.
@@ -1439,7 +1439,7 @@ show functions in _impala_builtins like '*week*';
 
   <concept rev="someday" audience="hidden" id="show_data_sources">
 
-    <title>SHOW DATA SOURCES Statement (CDH x.y and later only)</title>
+    <title>SHOW DATA SOURCES Statement (Impala x.y and later only)</title>
 
     <conbody>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_tables.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_tables.xml b/docs/topics/impala_tables.xml
index ae65045..c731cc2 100644
--- a/docs/topics/impala_tables.xml
+++ b/docs/topics/impala_tables.xml
@@ -267,7 +267,7 @@ under the License.
       <p>
         The default file format, text, is the most flexible and easy to produce when you are just getting started with
         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.
+        requirements; therefore, where practical, use 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 <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
@@ -324,7 +324,7 @@ describe formatted old_name;
 | Table Type:        | MANAGED_TABLE         | NULL
 | Table Parameters:  | NULL                  | NULL
 |                    | DO_NOT_UPDATE_STATS   | true
-|                    | kudu.master_addresses | vd0342.halxg.cloudera.com
+|                    | kudu.master_addresses | vd0342.example.com
 |                    | kudu.table_name       | impala::user.old_name
 
 -- ALTER TABLE RENAME TO changes the Impala name but not the underlying Kudu name.
@@ -335,7 +335,7 @@ describe formatted new_name;
 | Table Type:        | MANAGED_TABLE         | NULL
 | Table Parameters:  | NULL                  | NULL
 |                    | DO_NOT_UPDATE_STATS   | true
-|                    | kudu.master_addresses | vd0342.halxg.cloudera.com
+|                    | kudu.master_addresses | vd0342.example.com
 |                    | kudu.table_name       | impala::user.old_name
 
 -- Setting TBLPROPERTIES changes the underlying Kudu name.
@@ -347,7 +347,7 @@ describe formatted new_name;
 | Table Type:        | MANAGED_TABLE         | NULL
 | Table Parameters:  | NULL                  | NULL
 |                    | DO_NOT_UPDATE_STATS   | true
-|                    | kudu.master_addresses | vd0342.halxg.cloudera.com
+|                    | kudu.master_addresses | vd0342.example.com
 |                    | kudu.table_name       | impala::user.new_name
 
 -- Put some data in the table to demonstrate how external tables can map to

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_timestamp.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_timestamp.xml b/docs/topics/impala_timestamp.xml
index 2e807b0..1f37f30 100644
--- a/docs/topics/impala_timestamp.xml
+++ b/docs/topics/impala_timestamp.xml
@@ -165,8 +165,8 @@ insert into auction_details
       To avoid compatibility problems or having to code workarounds, you can specify one or both of these
       <cmdname>impalad</cmdname> startup flags: <codeph>-use_local_tz_for_unix_timestamp_conversions=true</codeph>
       <codeph>-convert_legacy_hive_parquet_utc_timestamps=true</codeph>. Although
-      <codeph>-convert_legacy_hive_parquet_utc_timestamps</codeph> is turned off by default to avoid performance overhead, <ph rev="upstream">Cloudera</ph> recommends
-      turning it on when processing <codeph>TIMESTAMP</codeph> columns in Parquet files written by Hive, to avoid unexpected behavior.
+      <codeph>-convert_legacy_hive_parquet_utc_timestamps</codeph> is turned off by default to avoid performance overhead, where practical
+      turn it on when processing <codeph>TIMESTAMP</codeph> columns in Parquet files written by Hive, to avoid unexpected behavior.
     </p>
 
     <p rev="2.2.0">

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_tutorial.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_tutorial.xml b/docs/topics/impala_tutorial.xml
index 43eef0d..e99abea 100644
--- a/docs/topics/impala_tutorial.xml
+++ b/docs/topics/impala_tutorial.xml
@@ -62,14 +62,6 @@ under the License.
         metastore service if you do not already have Hive configured.
       </li>
 
-      <li audience="hidden">
-        To set up Impala and all its prerequisites at once, in a minimal configuration that you can use for
-        small-scale experiments, set up the Cloudera QuickStart VM, which includes CDH and Impala on CentOS.
-        Use this single-node VM to try out basic SQL functionality, not anything related to
-        performance and scalability. For more information, see
-        <xref href="http://www.cloudera.com/content/support/en/downloads/quickstart_vms.html" scope="external" format="html">the
-        Cloudera QuickStart VM</xref>.
-      </li>
     </ul>
 
     <p outputclass="toc inpage"/>
@@ -460,19 +452,6 @@ Welcome to the Impala shell. Press TAB twice to see a list of available commands
       </conbody>
     </concept>
 
-    <concept audience="hidden" id="tutorial_quickstart_vm">
-
-      <title>Setting Up Impala with the QuickStart VM</title>
-
-      <conbody>
-
-        <p>
-          This tutorial scenario shows how to set up the Cloudera QuickStart VM, load some sample data, and begin
-          experimenting with Impala inside this virtualized environment.
-        </p>
-      </conbody>
-    </concept>
-
     <concept audience="hidden" id="tutorial_hdfs">
 
       <title>Exploring the HDFS Directory Structure</title>
@@ -664,15 +643,6 @@ ROW FORMAT DELIMITED FIELDS TERMINATED BY ',';
               Impala can write to. The ownership should be <codeph>hive:hive</codeph>, and the
               <codeph>impala</codeph> user should also be a member of the <codeph>hive</codeph> group.
             </li>
-
-            <li audience="hidden">
-              If the value of <codeph>hive.metastore.warehouse.dir</codeph> is different in the Cloudera Manager
-              dialogs and in the Hive shell, you might need to
-              <xref href="http://www.cloudera.com/documentation/enterprise/latest/topics/cm_mc_managing_roles.html" scope="external" format="html">designate
-              the hosts running <cmdname>impalad</cmdname> with the <q>gateway</q> role for Hive</xref>, and
-              <xref href="http://www.cloudera.com/documentation/enterprise/latest/topics/cm_mc_client_config.html" scope="external" format="html">deploy
-              the client configuration files</xref> to those hosts.
-            </li>
           </ul>
         </note>
       </conbody>
@@ -2329,7 +2299,7 @@ It's even possible that by chance (depending on HDFS replication factor and the
 across the cluster), that multiple year partitions selected by a filter such as
 <codeph>WHERE year BETWEEN 1999 AND 2001</codeph> could all be read and processed by the same data node.
 The more data files each partition has, the more parallelism you can get and the less probability of <q>hotspots</q> occurring
-on particular nodes, therefore a bigger performance boost by having a big CDH cluster.
+on particular nodes, therefore a bigger performance boost by having a big cluster.
 </p>
 
 <p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_v_cpu_cores.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_v_cpu_cores.xml b/docs/topics/impala_v_cpu_cores.xml
index 5d1661a..aad2f38 100644
--- a/docs/topics/impala_v_cpu_cores.xml
+++ b/docs/topics/impala_v_cpu_cores.xml
@@ -20,7 +20,7 @@ under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
 <concept rev="1.2" id="v_cpu_cores">
 
-  <title>V_CPU_CORES Query Option (CDH 5 only)</title>
+  <title>V_CPU_CORES Query Option</title>
   <titlealts audience="PDF"><navtitle>V_CPU_CORES</navtitle></titlealts>
   <prolog>
     <metadata>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_varchar.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_varchar.xml b/docs/topics/impala_varchar.xml
index 5917724..a0cb16c 100644
--- a/docs/topics/impala_varchar.xml
+++ b/docs/topics/impala_varchar.xml
@@ -119,7 +119,7 @@ prefer to use an integer data type with sufficient range (<codeph>INT</codeph>,
     <p conref="../shared/impala_common.xml#common/compatibility_blurb"/>
 
     <p>
-      This type is available on CDH 5.2 or higher.
+      This type is available in <keyword keyref="impala20_full"/> or higher.
     </p>
 
     <p conref="../shared/impala_common.xml#common/internals_min_bytes"/>


[3/3] incubator-impala git commit: [DOCS] Wide-ranging cleanup of CDH and Cloudera references

Posted by jr...@apache.org.
[DOCS] Wide-ranging cleanup of CDH and Cloudera references

Genericize 3-part version numbers in "known issues".

Genericize CDH version numbers in 'ports' topic.

Genericize 'Cloudera' and hostnames in 'Tables' topic.

Genericize the version numbers in 'added in' blurbs.

Remove lots of CDH / Impala notices from release notes.

Remove obsolete conref'able elements that weren't
actually being called from anywhere, that contained
CDH version number wording.

Reword 'Cloudera recommends'.

Remove more hidden or commented material with
Cloudera-specific wording.

Remove obsolete CDH references from 'incompatible changes'.

Change 'cloudera' HDFS username for LOAD DATA examples.

Remove material related to big lists of CDH fixed JIRAs.
Genericize some CDH-related language.

Change-Id: Iaa5db6c20f4d010972ade4945a3ea59b32ef95de
Reviewed-on: http://gerrit.cloudera.org:8080/6267
Reviewed-by: Ambreen Kazi <am...@cloudera.com>
Reviewed-by: John Russell <jr...@cloudera.com>
Tested-by: Impala Public Jenkins


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

Branch: refs/heads/master
Commit: 18927ac852303288d3ada15ffd3f6b87b43b389e
Parents: 3b7cece
Author: John Russell <jr...@cloudera.com>
Authored: Fri Mar 3 11:47:08 2017 -0800
Committer: Impala Public Jenkins <im...@gerrit.cloudera.org>
Committed: Wed Mar 8 22:40:19 2017 +0000

----------------------------------------------------------------------
 docs/impala_keydefs.ditamap                 |  32 +-
 docs/shared/impala_common.xml               | 351 +++------------
 docs/topics/impala.xml                      |  49 ---
 docs/topics/impala_compute_stats.xml        |   4 +-
 docs/topics/impala_create_function.xml      |  42 +-
 docs/topics/impala_decimal.xml              |   4 -
 docs/topics/impala_describe.xml             |  16 +-
 docs/topics/impala_drop_function.xml        |  16 +-
 docs/topics/impala_fixed_issues.xml         | 515 +++--------------------
 docs/topics/impala_incompatible_changes.xml |  79 +---
 docs/topics/impala_known_issues.xml         | 121 ++----
 docs/topics/impala_load_data.xml            |  22 +-
 docs/topics/impala_misc_functions.xml       |   2 +-
 docs/topics/impala_new_features.xml         | 222 +++-------
 docs/topics/impala_perf_stats.xml           |   1 -
 docs/topics/impala_ports.xml                |  10 +-
 docs/topics/impala_prereqs.xml              |  33 --
 docs/topics/impala_revoke.xml               |   4 +-
 docs/topics/impala_runtime_filtering.xml    |  20 +-
 docs/topics/impala_s3.xml                   |  38 +-
 docs/topics/impala_show.xml                 |  20 +-
 docs/topics/impala_tables.xml               |   8 +-
 docs/topics/impala_timestamp.xml            |   4 +-
 docs/topics/impala_tutorial.xml             |  32 +-
 docs/topics/impala_v_cpu_cores.xml          |   2 +-
 docs/topics/impala_varchar.xml              |   2 +-
 26 files changed, 344 insertions(+), 1305 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/impala_keydefs.ditamap
----------------------------------------------------------------------
diff --git a/docs/impala_keydefs.ditamap b/docs/impala_keydefs.ditamap
index 1d35640..424beb8 100644
--- a/docs/impala_keydefs.ditamap
+++ b/docs/impala_keydefs.ditamap
@@ -10291,20 +10291,50 @@ https://issues.cloudera.org/secure/IssueNavigator.jspa?reset=true&amp;jqlQuery=p
 
 
 <!-- Short form of mapping from Impala release to vendor-specific releases, for use in headings. -->
+  <keydef keys="impala29"><topicmeta><keywords><keyword>Impala 2.9</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala28"><topicmeta><keywords><keyword>Impala 2.8</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala27"><topicmeta><keywords><keyword>Impala 2.7</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala26"><topicmeta><keywords><keyword>Impala 2.6</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala25"><topicmeta><keywords><keyword>Impala 2.5</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala24"><topicmeta><keywords><keyword>Impala 2.4</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala23"><topicmeta><keywords><keyword>Impala 2.3</keyword></keywords></topicmeta></keydef>
-  <keydef keys="impala223"><topicmeta><keywords><keyword>Impala 2.2.3</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala22"><topicmeta><keywords><keyword>Impala 2.2</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala21"><topicmeta><keywords><keyword>Impala 2.1</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala20"><topicmeta><keywords><keyword>Impala 2.0</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala14"><topicmeta><keywords><keyword>Impala 1.4</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala13"><topicmeta><keywords><keyword>Impala 1.3</keyword></keywords></topicmeta></keydef>
 
+<!-- 3-part forms of version numbers, for use in release notes. -->
+  <keydef keys="impala290"><topicmeta><keywords><keyword>Impala 2.9.0</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala280"><topicmeta><keywords><keyword>Impala 2.8.0</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala270"><topicmeta><keywords><keyword>Impala 2.7.0</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala263"><topicmeta><keywords><keyword>Impala 2.6.3</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala262"><topicmeta><keywords><keyword>Impala 2.6.2</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala260"><topicmeta><keywords><keyword>Impala 2.6.0</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala254"><topicmeta><keywords><keyword>Impala 2.5.4</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala253"><topicmeta><keywords><keyword>Impala 2.5.3</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala252"><topicmeta><keywords><keyword>Impala 2.5.2</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala251"><topicmeta><keywords><keyword>Impala 2.5.1</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala250"><topicmeta><keywords><keyword>Impala 2.5.0</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala241"><topicmeta><keywords><keyword>Impala 2.4.1</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala240"><topicmeta><keywords><keyword>Impala 2.4.0</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala234"><topicmeta><keywords><keyword>Impala 2.3.4</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala232"><topicmeta><keywords><keyword>Impala 2.3.2</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala231"><topicmeta><keywords><keyword>Impala 2.3.1</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala230"><topicmeta><keywords><keyword>Impala 2.3.0</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala223"><topicmeta><keywords><keyword>Impala 2.2.3</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala2210"><topicmeta><keywords><keyword>Impala 2.2.10</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala229"><topicmeta><keywords><keyword>Impala 2.2.9</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala225"><topicmeta><keywords><keyword>Impala 2.2.5</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala220"><topicmeta><keywords><keyword>Impala 2.2.0</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala210"><topicmeta><keywords><keyword>Impala 2.1.0</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala200"><topicmeta><keywords><keyword>Impala 2.0.0</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala140"><topicmeta><keywords><keyword>Impala 1.4.0</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala132"><topicmeta><keywords><keyword>Impala 1.3.2</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala130"><topicmeta><keywords><keyword>Impala 1.3.0</keyword></keywords></topicmeta></keydef>
+
 <!-- Long form of mapping from Impala release to vendor-specific releases, for use in running text. -->
+  <keydef keys="impala29_full"><topicmeta><keywords><keyword>Impala 2.9</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala28_full"><topicmeta><keywords><keyword>Impala 2.8</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala27_full"><topicmeta><keywords><keyword>Impala 2.7</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala26_full"><topicmeta><keywords><keyword>Impala 2.6</keyword></keywords></topicmeta></keydef>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/shared/impala_common.xml
----------------------------------------------------------------------
diff --git a/docs/shared/impala_common.xml b/docs/shared/impala_common.xml
index 17c0026..af62603 100644
--- a/docs/shared/impala_common.xml
+++ b/docs/shared/impala_common.xml
@@ -561,7 +561,7 @@ under the License.
         </tgroup>
       </table>
 
-    <p rev="IMPALA-2660 CDH-40241" id="auth_to_local_instructions">
+    <p rev="IMPALA-2660" id="auth_to_local_instructions">
       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>.
@@ -860,7 +860,7 @@ select * from t2;
 </codeblock>
 
       <note rev="IMPALA-3334" id="one_but_not_true">
-        In CDH 5.7.0 / Impala 2.5.0, only the value 1 enables the option, and the value
+        In <keyword keyref="impala250"/>, only the value 1 enables the option, and the value
         <codeph>true</codeph> is not recognized. This limitation is
         tracked by the issue
         <xref href="https://issues.cloudera.org/browse/IMPALA-3334" scope="external" format="html">IMPALA-3334</xref>,
@@ -983,8 +983,8 @@ alter table partitioned_data set tblproperties ('numRows'='1030000', 'STATS_GENE
           </li>
           <li>
             <p>
-              Be careful when using <cmdname>impala-shell</cmdname> on a pre-CDH 5.5
-              system to connect to Impala running on a CDH 5.5 or higher system.
+              Be careful when using <cmdname>impala-shell</cmdname> on a pre-<keyword keyref="impala23"/>
+              system to connect to a system running <keyword keyref="impala23"/> or higher.
               The older <cmdname>impala-shell</cmdname> does not recognize these
               query option names. Upgrade <cmdname>impala-shell</cmdname> on the
               systems where you intend to use these query options.
@@ -1047,7 +1047,7 @@ show tables in temp;
 <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:
+-- Earlier releases:
 drop table temp.t3;
 drop database temp;
 </codeblock>
@@ -1063,7 +1063,7 @@ drop database temp;
       </p>
 
       <p rev="2.3.0" id="current_timezone_tip">
-        To determine the time zone of the server you are connected to, in CDH 5.5 / Impala 2.3 and
+        To determine the time zone of the server you are connected to, in <keyword keyref="impala23_full"/> and
         higher you can call the <codeph>timeofday()</codeph> function, which includes the time zone
         specifier in its return value. Remember that with cloud computing, the server you interact
         with might be in a different time zone than you are, or different sessions might connect to
@@ -1077,8 +1077,8 @@ drop database temp;
         how Impala handles time zone considerations for the <codeph>TIMESTAMP</codeph> data type.
       </p>
 
-      <p rev="2.6.0 CDH-39913 IMPALA-3558" id="s3_drop_table_purge">
-        For best compatibility with the S3 write support in CDH 5.8 / Impala 2.6
+      <p rev="2.6.0 IMPALA-3558" id="s3_drop_table_purge">
+        For best compatibility with the S3 write support in <keyword keyref="impala26_full"/>
         and higher:
         <ul>
         <li>Use native Hadoop techniques to create data files in S3 for querying through Impala.</li>
@@ -1095,7 +1095,7 @@ drop database temp;
         <codeph>hadoop fs -cp</codeph>, or <codeph>INSERT</codeph> in Impala or Hive.
       </p>
 
-      <p rev="2.6.0 CDH-39913 IMPALA-1878" id="s3_dml_performance">
+      <p rev="2.6.0 IMPALA-1878" id="s3_dml_performance">
         Because of differences between S3 and traditional filesystems, DML operations
         for S3 tables can take longer than for tables on HDFS. For example, both the
         <codeph>LOAD DATA</codeph> statement and the final stage of the <codeph>INSERT</codeph>
@@ -1104,14 +1104,14 @@ drop database temp;
         the files are moved from a temporary staging directory to the final destination directory.)
         Because S3 does not support a <q>rename</q> operation for existing objects, in these cases Impala
         actually copies the data files from one location to another and then removes the original files.
-        In CDH 5.8 / Impala 2.6, the <codeph>S3_SKIP_INSERT_STAGING</codeph> query option provides a way
+        In <keyword keyref="impala26_full"/>, the <codeph>S3_SKIP_INSERT_STAGING</codeph> query option provides a way
         to speed up <codeph>INSERT</codeph> statements for S3 tables and partitions, with the tradeoff
         that a problem during statement execution could leave data in an inconsistent state.
         It does not apply to <codeph>INSERT OVERWRITE</codeph> or <codeph>LOAD DATA</codeph> statements.
         See <xref href="../topics/impala_s3_skip_insert_staging.xml#s3_skip_insert_staging"/> for details.
       </p>
 
-      <p rev="2.6.0 CDH-40329 IMPALA-3453" id="s3_block_splitting">
+      <p rev="2.6.0 IMPALA-3453" id="s3_block_splitting">
         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>
@@ -1126,7 +1126,7 @@ drop database temp;
         to 268435456 (256 MB) to match the row group size produced by Impala.
       </p>
 
-      <note rev="2.6.0 CDH-39913 IMPALA-1878" id="s3_production" type="important">
+      <note rev="2.6.0 IMPALA-1878" id="s3_production" type="important">
         <p>
           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>)
@@ -1137,23 +1137,22 @@ drop database temp;
       </note>
 
       <note rev="2.2.0" id="s3_caveat" type="important">
-        <p> Impala query support for Amazon S3 is included in CDH 5.4.0, but is
-          not currently supported or recommended for production use. To try this
-          feature, use it in a test environment until Cloudera resolves
-          currently existing issues and limitations to make it ready for
-          production use. </p>
+        <p>
+          Impala query support for Amazon S3 is included in <keyword keyref="impala22_full"/>, but is
+          not supported or recommended for production use in this version.
+        </p>
       </note>
 
-      <p rev="2.6.0 CDH-39913 IMPALA-1878" id="s3_ddl">
+      <p rev="2.6.0 IMPALA-1878" id="s3_ddl">
         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
+        as needed in the Amazon S3 system. Prior to <keyword keyref="impala26_full"/>, you had to create folders yourself and point
         Impala database, tables, or partitions at them, and manually remove folders when no longer needed.
         See <xref href="../topics/impala_s3.xml#s3"/> for details about reading and writing S3 data with Impala.
       </p>
 
-      <p rev="2.6.0 CDH-39913 IMPALA-1878" id="s3_dml">
+      <p rev="2.6.0 IMPALA-1878" id="s3_dml">
         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).
@@ -1235,7 +1234,7 @@ drop database temp;
         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">
+      <p id="current_user_caveat" rev="">
         The Hive <codeph>current_user()</codeph> function cannot be
         called from a Java UDF through Impala.
       </p>
@@ -1466,7 +1465,8 @@ explain select s from yy2 where year in (select year from yy where year between
         <codeph>--scratch_dirs="<varname>path_to_directory</varname>"</codeph> configuration option. 
         You can specify a single directory, or a comma-separated list of directories. The scratch directories must 
         be on the local filesystem, not in HDFS. You might specify different directory paths for different hosts, 
-        depending on the capacity and speed of the available storage devices. In CDH 5.5 / Impala 2.3 or higher, 
+        depending on the capacity and speed
+        of the available storage devices. In <keyword keyref="impala23_full"/> or higher, Impala successfully starts (with a warning
         Impala successfully starts (with a warning written to the log) if it cannot create or read and write files 
         in one of the scratch directories. If there is less than 1 GB free on the filesystem where that directory resides, 
         Impala still runs, but writes a warning message to its log.  If Impala encounters an error reading or writing 
@@ -1641,14 +1641,7 @@ show functions in _impala_builtins like '*<varname>substring</varname>*';
         or file formats.
       </p>
 
-      <p rev="1.4.0" id="decimal_no_stats">
-        Currently, the <codeph>COMPUTE STATS</codeph> statement under CDH 4 does not store any statistics for
-        <codeph>DECIMAL</codeph> columns. When Impala runs under CDH 5, which has better support for
-        <codeph>DECIMAL</codeph> in the metastore database, <codeph>COMPUTE STATS</codeph> does collect statistics
-        for <codeph>DECIMAL</codeph> columns and Impala uses the statistics to optimize query performance.
-      </p>
-
-      <p rev="CDH-35866" id="hive_column_stats_caveat">
+      <p rev="" id="hive_column_stats_caveat">
         If you run the Hive statement <codeph>ANALYZE TABLE COMPUTE STATISTICS FOR COLUMNS</codeph>, 
         Impala can only use the resulting column statistics if the table is unpartitioned.
         Impala cannot use Hive-generated column statistics for a partitioned table.
@@ -1765,7 +1758,7 @@ show functions in _impala_builtins like '*<varname>substring</varname>*';
         <b>Sqoop considerations:</b>
       </p>
 
-      <p id="sqoop_timestamp_caveat" rev="IMPALA-2111 CDH-37399"> If you use Sqoop to
+      <p id="sqoop_timestamp_caveat" rev="IMPALA-2111"> If you use Sqoop to
         convert RDBMS data to Parquet, be careful with interpreting any
         resulting values from <codeph>DATE</codeph>, <codeph>DATETIME</codeph>,
         or <codeph>TIMESTAMP</codeph> columns. The underlying values are
@@ -1809,7 +1802,7 @@ show functions in _impala_builtins like '*<varname>substring</varname>*';
             The <codeph>COMPUTE STATS</codeph> statement does not produce any statistics for columns of this data type.
           </p>
         </li>
-        <li rev="CDH-35868">
+        <li rev="">
           <p id="complex_types_max_length">
             The maximum length of the column definition for any complex type, including declarations for any nested types,
             is 4000 characters.
@@ -1909,7 +1902,7 @@ show functions in _impala_builtins like '*<varname>substring</varname>*';
         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.
+        Consider upgrading all JDBC and ODBC drivers at the same time you upgrade from <keyword keyref="impala23_full"/> or higher.
       </p>
 
       <p rev="2.3.0" id="jdbc_odbc_complex_types_views">
@@ -2015,11 +2008,11 @@ order by r_name;
         <b>Hive considerations:</b>
       </p>
 
-      <p rev="CDH-19187" id="permissions_blurb">
+      <p rev="" id="permissions_blurb">
         <b>HDFS permissions:</b>
       </p>
 
-      <p rev="CDH-19187" id="permissions_blurb_no">
+      <p rev="" id="permissions_blurb_no">
         <b>HDFS permissions:</b> This statement does not touch any HDFS files or directories,
         therefore no HDFS permissions are required.
       </p>
@@ -2108,16 +2101,17 @@ order by r_name;
         <b>Parquet considerations:</b>
       </p>
 
+<!-- Github project for parquet-tools: https://github.com/Parquet/parquet-mr/tree/master/parquet-tools -->
       <p id="parquet_tools_blurb">
         To examine the internal structure and data of Parquet files, you can use the
-        <cmdname>parquet-tools</cmdname> command that comes with CDH. Make sure this
+        <cmdname>parquet-tools</cmdname> command. Make sure this
         command is in your <codeph>$PATH</codeph>. (Typically, it is symlinked from
         <filepath>/usr/bin</filepath>; sometimes, depending on your installation setup, you
-        might need to locate it under a CDH-specific <codeph>bin</codeph> directory.)
+        might need to locate it under an alternative  <codeph>bin</codeph> directory.)
         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 <ph rev="upstream">CDH 5.5</ph> and higher, you can use
+            <codeph>cat</codeph>: Print a file's contents to standard out. In <keyword keyref="impala23_full"/> and higher, you can use
             the <codeph>-j</codeph> option to output JSON.
           </li>
           <li>
@@ -2215,7 +2209,7 @@ message schema {
 
 <codeblock><![CDATA[
 $ parquet-tools meta sample.parq
-creator:             impala version 2.2.0-cdh5.4.3 (build 517bb0f71cd604a00369254ac6d88394df83e0f6) 
+creator:             impala version 2.2.0-...
 
 file schema:         schema 
 -------------------------------------------------------------------
@@ -2256,7 +2250,7 @@ flight_num:           INT32 SNAPPY DO:83456393 FPO:83488603 SZ:10216514/11474301
         This function cannot be used in an analytic context. That is, the <codeph>OVER()</codeph> clause is not allowed at all with this function.
       </p>
 
-      <p rev="CDH-40418" id="analytic_partition_pruning_caveat">
+      <p rev="" id="analytic_partition_pruning_caveat">
         In queries involving both analytic functions and partitioned tables, partition pruning only occurs for columns named in the <codeph>PARTITION BY</codeph>
         clause of the analytic function call. For example, if an analytic function query has a clause such as <codeph>WHERE year=2016</codeph>,
         the way to make the query prune all other <codeph>YEAR</codeph> partitions is to include <codeph>PARTITION BY year</codeph>in the analytic function call;
@@ -2476,26 +2470,26 @@ flight_num:           INT32 SNAPPY DO:83456393 FPO:83488603 SZ:10216514/11474301
       </p>
 
       <p rev="2.7.0" id="added_in_270">
-        <b>Added in:</b> CDH 5.9.0 (Impala 2.7.0)
+        <b>Added in:</b> <keyword keyref="impala270"/>
       </p>
       <p rev="2.6.0" id="added_in_260">
-        <b>Added in:</b> CDH 5.8.0 (Impala 2.6.0)
+        <b>Added in:</b> <keyword keyref="impala260"/>
       </p>
       <p rev="2.5.0" id="added_in_250">
-        <b>Added in:</b> CDH 5.7.0 (Impala 2.5.0)
+        <b>Added in:</b> <keyword keyref="impala250"/>
       </p>
 
       <p rev="2.3.0" id="added_in_230">
-        <b>Added in:</b> CDH 5.5.0 (Impala 2.3.0)
+        <b>Added in:</b> <keyword keyref="impala230"/>
       </p>
 
       <p rev="2.0.0" id="added_in_20">
-        <b>Added in:</b> CDH 5.2.0 (Impala 2.0.0)
+        <b>Added in:</b> <keyword keyref="impala200"/>
       </p>
 
       <p rev="2.0.0" id="enhanced_in_20">
         <b>Added in:</b> Available in earlier Impala releases, but new capabilities were added in
-        CDH 5.2.0 / Impala 2.0.0
+        <keyword keyref="impala200"/>
       </p>
 
       <p id="added_forever">
@@ -2519,11 +2513,11 @@ flight_num:           INT32 SNAPPY DO:83456393 FPO:83488603 SZ:10216514/11474301
       </p>
 
       <p id="added_in_210" rev="2.1.0">
-        <b>Added in:</b> CDH 5.3.0 (Impala 2.1.0)
+        <b>Added in:</b> <keyword keyref="impala210"/>
       </p>
 
       <p id="added_in_220" rev="2.2.0">
-        <b>Added in:</b> CDH 5.4.0 (Impala 2.2.0)
+        <b>Added in:</b> <keyword keyref="impala220"/>
       </p>
 
       <p id="syntax_blurb">
@@ -2799,7 +2793,7 @@ select max(height), avg(height) from census_data where age &gt; 20;
 
 <!-- This same text is conref'ed in the #views and the #partition_pruning topics. -->
 
-      <p id="partitions_and_views" rev="CDH-36224">
+      <p id="partitions_and_views" rev="">
         If a view applies to a partitioned table, any partition pruning considers the clauses on both
         the original query and any additional <codeph>WHERE</codeph> predicates in the query that refers to the view.
         Prior to Impala 1.4, only the <codeph>WHERE</codeph> clauses on the original query from the
@@ -2823,7 +2817,7 @@ Query finished, fetching results ...
 |                              | NULL                         | NULL       |
 | # Detailed Table Information | NULL                         | NULL       |
 | Database:                    | views                        | NULL       |
-| Owner:                       | cloudera                     | NULL       |
+| Owner:                       | doc_demo                     | NULL       |
 | CreateTime:                  | Mon Jul 08 15:56:27 EDT 2013 | NULL       |
 | LastAccessTime:              | UNKNOWN                      | NULL       |
 | Protect Mode:                | None                         | NULL       |
@@ -3121,16 +3115,6 @@ select * from header_line limit 10;
             Other security settings may prevent Impala from writing core dumps even when this option is enabled.
           </p>
         </li>
-        <li rev="CDH-34070" audience="hidden">
-          <p>
-            On systems managed by Cloudera Manager, the default location for core dumps is on a temporary
-            filesystem, which can lead to out-of-space issues if the core dumps are large, frequent, or
-            not removed promptly. To specify an alternative location for the core dumps, filter the
-            Impala configuration settings to find the <codeph>core_dump_dir</codeph> option, which is
-            available in Cloudera Manager 5.4.3 and higher. This option lets you specify a different directory
-            for core dumps for each of the Impala-related daemons.
-          </p>
-        </li>
       </ul>
       </note>
       <p id="cpu_prereq" rev="2.2.0">
@@ -3157,67 +3141,21 @@ sudo pip-python install ssl</codeblock>
       </p>
 
       <note type="warning" id="impala_kerberos_ssl_caveat">
-        Prior to CDH 5.5.2 / Impala 2.3.2, you could enable Kerberos authentication between Impala internal components,
+        Prior to <keyword keyref="impala232"/>, you could enable Kerberos authentication between Impala internal components,
         or SSL encryption between Impala internal components, but not both at the same time.
         This restriction has now been lifted.
-        See <xref href="https://issues.cloudera.org/browse/IMPALA-2598" scope="external" format="html">IMPALA-2598</xref>
-        to see the maintenance releases for different levels of CDH where the fix has been published.
+        See <xref keyref="IMPALA-2598">IMPALA-2598</xref>
+        to see the maintenance releases for different levels of Impala where the fix has been published.
       </note>
 
       <p id="hive_jdbc_ssl_kerberos_caveat">
-        Prior to CDH 5.7 / Impala 2.5, the Hive JDBC driver did not support connections that use both Kerberos authentication
+        Prior to <keyword keyref="impala25_full"/>, the Hive JDBC driver did not support connections that use both Kerberos authentication
         and SSL encryption. If your cluster is running an older release that has this restriction,
         to use both of these security features with Impala through a JDBC application,
         use the <xref href="http://www.cloudera.com/content/www/en-us/downloads.html.html" scope="external" format="html">Cloudera JDBC Connector</xref>
         as the JDBC driver.
       </p>
 
-      <note rev="1.2" id="cdh4_cdh5_upgrade">
-        Because Impala 1.2.2 works with CDH 4, while the Impala that comes with the CDH 5 beta is version 1.2.0,
-        upgrading from CDH 4 to the CDH 5 beta actually reverts to an earlier Impala version. The beta release of
-        Impala that comes with the CDH 5 beta includes the resource management feature that relies on the CDH 5
-        infrastructure, as well as the much-requested user-defined function feature and the catalog service.
-        However, it does not include new features in Impala 1.2.3 such as join order optimizations, <codeph>COMPUTE
-        STATS</codeph> statement, <codeph>CROSS JOIN</codeph> operator, <codeph>SHOW CREATE TABLE</codeph>
-        statement, <codeph>SHOW TABLE STATS</codeph> and <codeph>SHOW COLUMN STATS</codeph> statements,
-        <codeph>OFFSET</codeph> and <codeph>NULLS FIRST/LAST</codeph> clauses for queries, and the
-        <codeph>SYNC_DDL</codeph> query option.
-      </note>
-
-      <p rev="1.2" id="cm48_upgrade" audience="hidden"><!-- conref'ed in 2 places under 'incompatible changes' -->
-        In a Cloudera Manager environment, the catalog service is not recognized or managed by Cloudera Manager
-        versions prior to 4.8. Cloudera Manager 4.8 and higher require the catalog service to be present for
-        Impala. Therefore, if you upgrade to Cloudera Manager 4.8 or higher, you must also upgrade Impala to 1.2.1
-        or higher. Likewise, if you upgrade Impala to 1.2.1 or higher, you must also upgrade Cloudera Manager to
-        4.8 or higher.
-      </p>
-
-      <p id="impala_hdfs_group_obsolete" rev="1.2">
-        For the resource management feature to work (in combination with CDH 5 and the YARN and Llama components),
-        the <codeph>impala</codeph> user must be a member of the <codeph>hdfs</codeph> group. This setup is
-        performed automatically during a new install, but not when upgrading from earlier Impala releases to Impala
-        1.2. If you are upgrading a node that already had Impala 1.1 or 1.0 installed, manually add the
-        <codeph>impala</codeph> user to the <codeph>hdfs</codeph> group.
-      </p>
-
-      <p id="impala_hdfs_group" rev="1.2">
-        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 <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>
-
-      <note id="impala13_cdh">
-        <ul>
-          <li>
-            The Impala 1.3.1 release is available for both CDH 4 and CDH 5. This is the first release in the 1.3.x
-            series for CDH 4.
-          </li>
-        </ul>
-      </note>
-
     </section>
 
     <section id="performance_conrefs">
@@ -3261,7 +3199,7 @@ sudo pip-python install ssl</codeblock>
 
       <title>Administration</title>
  
-      <p id="statestored_catalogd_ha_blurb" rev="CDH-39624">
+      <p id="statestored_catalogd_ha_blurb" rev="">
         Most considerations for load balancing and high availability apply to the <cmdname>impalad</cmdname> daemon.
         The <cmdname>statestored</cmdname> and <cmdname>catalogd</cmdname> daemons do not have special
         requirements for high availability, because problems with those daemons do not result in data loss.
@@ -3354,203 +3292,26 @@ sudo pip-python install ssl</codeblock>
         the connection has been closed.
       </note>
 
-      <p id="impala_mr">
-        For a detailed information about configuring a cluster to share resources between Impala queries and MapReduce jobs, see
-        <xref audience="integrated" href="../topics/admin_howto_multitenancy.xml#howto_multitenancy"/><xref audience="standalone" href="https://www.cloudera.com/documentation/enterprise/latest/topics/admin_howto_multitenancy.html" format="html" scope="external"/>
-        <!--and <xref href="../topics/impala_howto_rm.xml#howto_impala_rm"/>-->.
-      </p>
-      
-      <note id="llama_beta" type="warning">
-        In CDH 5.0.0, the Llama component is in beta. It is intended for evaluation of resource management in test
-        environments, in combination with Impala and YARN. It is currently not recommended for production
-        deployment.
-      </note>
-
     </section>
 
-    <section id="cdh5_conrefs">
+    <section id="upstream_conrefs">
 
-      <title>CDH5 Integration</title>
+      <title>Upstream Cleanup</title>
 
       <p>
-        Snippets related to CDH 5 integration, for example phrase tags that are conditionalized in or out of
+        Snippets related to upstream cleanup work, for example phrase tags that are conditionalized in or out of
         'integrated' and 'standalone' conditions to provide extra context for links that don't work in certain PDF
         contexts.
       </p>
 
-      <p id="cdh551_noop">
-        The version of Impala that is included with CDH 5.5.1 is identical to the Impala for CDH 5.5.0.
+      <p id="impala231_noop">
+        The version of Impala that is included with <keyword keyref="impala231"/> is identical to <keyword keyref="impala230"/>.
         There are no new bug fixes, new features, or incompatible changes.
       </p>
 
-<!-- This next one is not actually used. -->
-      <note id="only_cdh5_260">
-        Impala 2.6.x is available as part of CDH 5.8.x.
-      </note>
-
-      <note id="only_cdh5_250">
-        Impala 2.5.x is available as part of CDH 5.7.x and is not available for CDH 4.
-        Cloudera does not intend to release future versions of Impala for CDH 4 outside patch and maintenance releases if required.
-        Given the end-of-maintenance status for CDH 4, <ph rev="upstream">Cloudera</ph> recommends all customers to migrate to a recent CDH 5 release.
-      </note>
-
-<!-- These next 2 for Impala 2.4 / CDH 5.6 are not actually used. Trying to move away from the repetitive "don't use CDH 4" notes. -->
-
-      <note id="only_cdh5_24x">
-        Impala 2.4.x is available as part of CDH 5.6.x and is not available for CDH 4.
-        Cloudera does not intend to release future versions of Impala for CDH 4 outside patch and maintenance releases if required.
-        Given the end-of-maintenance status for CDH 4, <ph rev="upstream">Cloudera</ph> recommends all customers to migrate to a recent CDH 5 release.
-      </note>
-
-      <note id="only_cdh5_240">
-        Impala 2.4.0 is available as part of CDH 5.6.0 and is not available for CDH 4.
-        Cloudera does not intend to release future versions of Impala for CDH 4 outside patch and maintenance releases if required.
-        Given the end-of-maintenance status for CDH 4, <ph rev="upstream">Cloudera</ph> recommends all customers to migrate to a recent CDH 5 release.
-      </note>
-
-      <note id="only_cdh5_23x">
-        Impala 2.3.x is available as part of CDH 5.5.x and is not available for CDH 4.
-        Cloudera does not intend to release future versions of Impala for CDH 4 outside patch and maintenance releases if required.
-        Given the end-of-maintenance status for CDH 4, <ph rev="upstream">Cloudera</ph> recommends all customers to migrate to a recent CDH 5 release.
-      </note>
-
-<!-- My original suggested wording. Using Justin E's suggestion instead, below.
-      <note id="only_cdh5_220">
-        Impala 2.2.0 is available as part of CDH 5.4.0, not under CDH 4.
-        With the Impala 2.2.x series, Cloudera intends all future
-        Impala feature work to be released only with CDH 5, rather than
-        having an equivalent CDH 4 release.
-      </note>
--->
-
-      <note id="only_cdh5_229">
-        Impala 2.2.9 is available as part of CDH 5.4.9, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_228">
-        Impala 2.2.8 is available as part of CDH 5.4.8, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_227">
-        Impala 2.2.7 is available as part of CDH 5.4.7, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_226">
-        Impala 2.2.6 is available as part of CDH 5.4.6, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_225">
-        Impala 2.2.5 is available as part of CDH 5.4.5, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_224">
-        Impala 2.2.4 is available as part of CDH 5.4.4, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_223">
-        Impala 2.2.3 is available as part of CDH 5.4.3, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_222">
-        Impala 2.2.2 is available as part of CDH 5.4.2, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_221">
-        Impala 2.2.1 is available as part of CDH 5.4.1, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_22x">
-        The Impala 2.2.x maintenance releases now use the CDH 5.4.x numbering system
-        rather than increasing the Impala version numbers.
-        Impala 2.2 and higher are not available under CDH 4.
-      </note>
-
-      <note id="only_cdh5_220">
-        Impala 2.2.0 is available as part of CDH 5.4.0 and is not available for CDH 4.
-        Cloudera does not intend to release future versions of Impala for CDH 4 outside patch and maintenance releases if required.
-        Given the end-of-maintenance status for CDH 4, <ph rev="upstream">Cloudera</ph> recommends all customers to migrate to a recent CDH 5 release.
-      </note>
-
-      <note id="only_cdh5_21x">
-        This Impala maintenance release is only available as part of CDH 5, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_213">
-        Impala 2.1.3 is available as part of CDH 5.3.3, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_212">
-        Impala 2.1.2 is available as part of CDH 5.3.2, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_205">
-        Impala 2.0.5 is available as part of CDH 5.2.6, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_204">
-        Impala 2.0.4 is available as part of CDH 5.2.5, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_203">
-        Impala 2.0.3 is available as part of CDH 5.2.4, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_202">
-        Impala 2.0.2 is available as part of CDH 5.2.3, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_144">
-        Impala 1.4.4 is available as part of CDH 5.1.5, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_143">
-        Impala 1.4.3 is available as part of CDH 5.1.4, and under CDH 4.
-      </note>
-
-      <note id="only_cdh5_142">
-        Impala 1.4.2 is only available as part of CDH 5.1.3, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_133">
-        Impala 1.3.3 is only available as part of CDH 5.0.5, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_132">
-        Impala 1.3.2 is only available as part of CDH 5.0.4, not under CDH 4.
-      </note>
-
-      <note id="only_cdh5_141">
-<!--  Impala 1.4.1 is only available as part of CDH 5.1.2; this bug-fix release is not available for CDH 4. -->
-        Impala 1.4.1 is only available as part of CDH 5.1.2, not under CDH 4.
-      </note>
-
-      <note id="standalone_release_notes_blurb">
-        Starting in April 2016, future release note updates are being consolidated
-        in a single location to avoid duplication of stale or incomplete information.
-        You can view online the Impala
-        <xref href="http://www.cloudera.com/documentation/enterprise/release-notes/topics/impala_new_features.html" scope="external" format="html">New Features</xref>,
-        <xref href="http://www.cloudera.com/documentation/enterprise/release-notes/topics/impala_incompatible_changes.html" scope="external" format="html">Incompatible Changes</xref>,
-        <xref href="http://www.cloudera.com/documentation/enterprise/release-notes/topics/impala_known_issues.html" scope="external" format="html">Known Issues</xref>, and
-        <xref href="http://www.cloudera.com/documentation/enterprise/release-notes/topics/impala_fixed_issues.html" scope="external" format="html">Fixed Issues</xref>.
-        You can view or print all of these by downloading <xref href="http://www.cloudera.com/documentation/enterprise/latest/topics/impala.html" scope="external" format="html">the latest Impala PDF</xref>.
-      </note>
-
 <!-- The only significant text in this paragraph is inside the <ph> tags. Those are conref'ed into sentences
      similar in form to the ones below. -->
 
-      <p>
-        <ph id="impala_214_redux">Because CDH 5.3.5 does not include any code changes for Impala, Impala 2.1.4
-        is included with both CDH 5.3.4 and 5.3.5.</ph>
-        See such-and-such a topic <ph id="cdh5ig" audience="integrated">in the <cite>CDH 5 Installation
-        Guide</cite></ph>. See such-and-such a topic <ph id="cdh5sg" audience="integrated">in the <cite>CDH 5
-        Security Guide</cite></ph>. See such-and-such a topic <ph id="cdh5rn" audience="integrated">in the
-        <cite>CDH 5 Release Notes</cite></ph>. See such-and-such a topic <ph id="ciiu" audience="integrated">in the
-        <cite>Impala User Guide</cite></ph>. See such-and-such a topic
-        <ph id="cirn" audience="integrated">in the <cite>Impala Release Notes</cite></ph>. See
-        such-and-such a topic <ph id="cifaq" audience="integrated">in the <cite>Impala Frequently Asked
-        Questions</cite></ph>.
-      </p>
-
       <note id="admission_compute_stats">
         Impala relies on the statistics produced by the <codeph>COMPUTE STATS</codeph> statement to estimate memory
         usage for each query. See <xref href="../topics/impala_compute_stats.xml#compute_stats"/> for guidelines
@@ -3608,7 +3369,7 @@ sudo pip-python install ssl</codeblock>
       </p>
 
       <p id="IMPALA-3662" rev="IMPALA-3662">
-        The initial release of CDH 5.7 / Impala 2.5 sometimes has a higher peak memory usage than in previous releases
+        The initial release of <keyword keyref="impala25_full"/> sometimes has a higher peak memory usage than in previous releases
         while reading Parquet files.
         The following query options might help to reduce memory consumption in the Parquet scanner:
         <ul>
@@ -3626,7 +3387,7 @@ sudo pip-python install ssl</codeblock>
         <xref href="https://issues.cloudera.org/browse/IMPALA-3662" scope="external" format="html">IMPALA-3662</xref>.
       </p>
 
-      <p id="increase_catalogd_heap_size" rev="CDH-40801 TSB-168">
+      <p id="increase_catalogd_heap_size" rev="">
         For schemas with large numbers of tables, partitions, and data files, the <cmdname>catalogd</cmdname>
         daemon might encounter an out-of-memory error. To increase the memory limit for the
         <cmdname>catalogd</cmdname> daemon:

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala.xml b/docs/topics/impala.xml
index 922a830..ba6884d 100644
--- a/docs/topics/impala.xml
+++ b/docs/topics/impala.xml
@@ -42,54 +42,5 @@ under the License.
 
     <p outputclass="toc"/>
 
-    <p audience="integrated">
-      <b>Related information throughout the CDH 5 library:</b>
-    </p>
-
-    <p audience="integrated">
-      In CDH 5, the Impala documentation for Release Notes, Installation, Upgrading, and Security has been
-      integrated alongside the corresponding information for other Hadoop components:
-    </p>
-
-<!-- Same list is in impala.xml and Impala FAQs. Conref in both places. -->
-
-    <ul>
-      <li>
-        <xref href="impala_new_features.xml#new_features">New features</xref>
-      </li>
-
-      <li>
-        <xref href="impala_known_issues.xml#known_issues">Known and fixed issues</xref>
-      </li>
-
-      <li>
-        <xref href="impala_incompatible_changes.xml#incompatible_changes">Incompatible changes</xref>
-      </li>
-
-      <li>
-        <xref href="impala_install.xml#install">Installing Impala</xref>
-      </li>
-
-      <li>
-        <xref href="impala_upgrading.xml#upgrading">Upgrading Impala</xref>
-      </li>
-
-      <li>
-        <xref href="impala_config.xml#config">Configuring Impala</xref>
-      </li>
-
-      <li>
-        <xref href="impala_processes.xml#processes">Starting Impala</xref>
-      </li>
-
-      <li>
-        <xref href="impala_security.xml#security">Security for Impala</xref>
-      </li>
-
-      <li>
-        <xref href="http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH5/latest/CDH-Version-and-Packaging-Information/CDH-Version-and-Packaging-Information.html" scope="external" format="html">CDH
-        Version and Packaging Information</xref>
-      </li>
-    </ul>
   </conbody>
 </concept>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_compute_stats.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_compute_stats.xml b/docs/topics/impala_compute_stats.xml
index bd21dae..dc14f1e 100644
--- a/docs/topics/impala_compute_stats.xml
+++ b/docs/topics/impala_compute_stats.xml
@@ -487,8 +487,6 @@ show table stats item_partitioned;
 
     <p conref="../shared/impala_common.xml#common/restrictions_blurb"/>
 
-    <p conref="../shared/impala_common.xml#common/decimal_no_stats"/>
-
     <note conref="../shared/impala_common.xml#common/compute_stats_nulls"/>
 
     <p conref="../shared/impala_common.xml#common/internals_blurb"/>
@@ -507,7 +505,7 @@ show table stats item_partitioned;
     </p>
 
     <p conref="../shared/impala_common.xml#common/permissions_blurb"/>
-    <p rev="CDH-19187">
+    <p rev="">
       The user ID that the <cmdname>impalad</cmdname> daemon runs under,
       typically the <codeph>impala</codeph> user, must have read
       permission for all affected files in the source directory:

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_create_function.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_create_function.xml b/docs/topics/impala_create_function.xml
index 15f8eb2..4afa237 100644
--- a/docs/topics/impala_create_function.xml
+++ b/docs/topics/impala_create_function.xml
@@ -51,7 +51,7 @@ under the License.
       multiple functions that compute intermediate results across sets of rows.
     </p>
 
-    <p rev="2.5.0 IMPALA-2843 CDH-39148">
+    <p rev="2.5.0 IMPALA-2843">
       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
@@ -67,7 +67,7 @@ under the License.
   LOCATION '<varname>hdfs_path_to_dot_so</varname>'
   SYMBOL='<varname>symbol_name</varname>'</codeblock>
 
-    <p rev="2.5.0 IMPALA-2843 CDH-39148">
+    <p rev="2.5.0 IMPALA-2843">
       To create a persistent Java UDF with <codeph>CREATE FUNCTION</codeph>:
 <codeblock>CREATE FUNCTION [IF NOT EXISTS] [<varname>db_name</varname>.]<varname>function_name</varname>
   LOCATION '<varname>hdfs_path_to_jar</varname>'
@@ -96,7 +96,7 @@ DROP FUNCTION IF EXISTS bar;
   [CLOSEFN='<varname>function</varname>]
   <ph rev="2.0.0">[SERIALIZE_FN='<varname>function</varname>]</ph>
   [FINALIZE_FN='<varname>function</varname>]
-  <ph rev="2.3.0 IMPALA-1829 CDH-30572">[INTERMEDIATE <varname>type_spec</varname>]</ph></codeblock>
+  <ph rev="2.3.0 IMPALA-1829">[INTERMEDIATE <varname>type_spec</varname>]</ph></codeblock>
 
     <p conref="../shared/impala_common.xml#common/ddl_blurb"/>
 
@@ -104,8 +104,8 @@ DROP FUNCTION IF EXISTS bar;
       <b>Varargs notation:</b>
     </p>
 
-    <note rev="CDH-39271 CDH-38572">
-      <p rev="CDH-39271 CDH-38572">
+    <note rev="">
+      <p rev="">
         Variable-length argument lists are supported for C++ UDFs, but currently not for Java UDFs.
       </p>
     </note>
@@ -139,7 +139,7 @@ DROP FUNCTION IF EXISTS bar;
       </li>
     </ul>
 
-    <p rev="CDH-39271 CDH-38572">
+    <p rev="">
       See <xref href="impala_udf.xml#udf_varargs"/> for how to code a C++ UDF to accept
       variable-length argument lists.
     </p>
@@ -244,7 +244,7 @@ DROP FUNCTION IF EXISTS bar;
         most suited to reusing existing Hive UDFs. (Impala can run Java-based Hive UDFs but not Hive UDAs.)
       </li>
 
-      <li rev="2.5.0 IMPALA-1748 CDH-38369 IMPALA-2843 CDH-39148">
+      <li rev="2.5.0 IMPALA-1748 IMPALA-2843">
         <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.
@@ -343,19 +343,19 @@ DROP FUNCTION IF EXISTS bar;
       For additional examples of all kinds of user-defined functions, see <xref href="impala_udf.xml#udfs"/>.
     </p>
 
-    <p rev="2.5.0 IMPALA-2843 CDH-39148">
+    <p rev="2.5.0 IMPALA-2843">
       The following example shows how to take a Java jar file and make all the functions inside one of its classes
       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 <keyword keyref="impala25_full"/> and higher.
     </p>
-    <p rev="2.5.0 IMPALA-2843 CDH-39148">
+    <p rev="2.5.0 IMPALA-2843">
       At the start, the jar file is in the local filesystem. Then it is copied into HDFS, so that it is
       available for Impala to reference through the <codeph>CREATE FUNCTION</codeph> statement and
       queries that refer to the Impala function name.
     </p>
-<codeblock rev="2.5.0 IMPALA-2843 CDH-39148">
+<codeblock rev="2.5.0 IMPALA-2843">
 $ jar -tvf udf-examples-cdh570.jar
      0 Mon Feb 22 04:06:50 PST 2016 META-INF/
    122 Mon Feb 22 04:06:48 PST 2016 META-INF/MANIFEST.MF
@@ -373,13 +373,13 @@ Found 2 items
 -rw-r--r--   3 jrussell supergroup        853 2015-10-09 14:05 /user/impala/udfs/hello_world.jar
 -rw-r--r--   3 jrussell supergroup       7366 2016-06-08 14:25 /user/impala/udfs/udf-examples-cdh570.jar
 </codeblock>
-    <p rev="2.5.0 IMPALA-2843 CDH-39148">
+    <p rev="2.5.0 IMPALA-2843">
       In <cmdname>impala-shell</cmdname>, the <codeph>CREATE FUNCTION</codeph> refers to the HDFS path of the jar file
       and the fully qualified class name inside the jar. Each of the functions inside the class becomes an
       Impala function, each one overloaded under the specified Impala function name.
     </p>
-<codeblock rev="2.5.0 IMPALA-2843 CDH-39148">
-[localhost:21000] > create function testudf location '/user/impala/udfs/udf-examples-cdh570.jar' symbol='com.cloudera.impala.TestUdf';
+<codeblock rev="2.5.0 IMPALA-2843">
+[localhost:21000] > create function testudf location '/user/impala/udfs/udf-examples-cdh570.jar' symbol='org.apache.impala.TestUdf';
 [localhost:21000] > show functions;
 +-------------+---------------------------------------+-------------+---------------+
 | return type | signature                             | binary type | is persistent |
@@ -407,12 +407,12 @@ Found 2 items
 | TINYINT     | testudf(TINYINT)                      | JAVA        | true          |
 +-------------+---------------------------------------+-------------+---------------+
 </codeblock>
-    <p rev="2.5.0 IMPALA-2843 CDH-39148">
+    <p rev="2.5.0 IMPALA-2843">
       These are all simple functions that return their single arguments, or
       sum, concatenate, and so on their multiple arguments. Impala determines which
       overloaded function to use based on the number and types of the arguments.
     </p>
-<codeblock rev="2.5.0 IMPALA-2843 CDH-39148">
+<codeblock rev="2.5.0 IMPALA-2843">
 insert into bigint_x values (1), (2), (4), (3);
 select testudf(x) from bigint_x;
 +-----------------+
@@ -455,16 +455,16 @@ select testudf(x,x) from string_x;
 +--------------------+
 </codeblock>
 
-    <p rev="2.5.0 IMPALA-2843 CDH-39148">
+    <p rev="2.5.0 IMPALA-2843">
       The previous example used the same Impala function name as the name of the class.
       This example shows how the Impala function name is independent of the underlying
       Java class or function names. A second <codeph>CREATE FUNCTION</codeph> statement
       results in a set of overloaded functions all named <codeph>my_func</codeph>,
       to go along with the overloaded functions all named <codeph>testudf</codeph>.
     </p>
-<codeblock rev="2.5.0 IMPALA-2843 CDH-39148">
+<codeblock rev="2.5.0 IMPALA-2843">
 create function my_func location '/user/impala/udfs/udf-examples-cdh570.jar'
-  symbol='com.cloudera.impala.TestUdf';
+  symbol='org.apache.impala.TestUdf';
 
 show functions;
 +-------------+---------------------------------------+-------------+---------------+
@@ -479,11 +479,11 @@ show functions;
 | BOOLEAN     | testudf(BOOLEAN, BOOLEAN)             | JAVA        | true          |
 ...
 </codeblock>
-    <p rev="2.5.0 IMPALA-2843 CDH-39148">
+    <p rev="2.5.0 IMPALA-2843">
       The corresponding <codeph>DROP FUNCTION</codeph> statement with no signature
       drops all the overloaded functions with that name.
     </p>
-<codeblock rev="2.5.0 IMPALA-2843 CDH-39148">
+<codeblock rev="2.5.0 IMPALA-2843">
 drop function my_func;
 show functions;
 +-------------+---------------------------------------+-------------+---------------+
@@ -494,7 +494,7 @@ show functions;
 | BOOLEAN     | testudf(BOOLEAN, BOOLEAN)             | JAVA        | true          |
 ...
 </codeblock>
-    <p rev="2.5.0 IMPALA-2843 CDH-39148">
+    <p rev="2.5.0 IMPALA-2843">
       The signatureless <codeph>CREATE FUNCTION</codeph> syntax for Java UDFs ensures that
       the functions shown in this example remain available after the Impala service
       (specifically, the Catalog Server) are restarted.

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_decimal.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_decimal.xml b/docs/topics/impala_decimal.xml
index 80e8130..d5c9d70 100644
--- a/docs/topics/impala_decimal.xml
+++ b/docs/topics/impala_decimal.xml
@@ -798,10 +798,6 @@ SELECT x+y, ROUND(y,1), z/98.6 FROM t1;
 SELECT CAST(1000.5 AS DECIMAL);
 </codeblock>
 
-    <p conref="../shared/impala_common.xml#common/restrictions_blurb"/>
-
-    <p conref="../shared/impala_common.xml#common/decimal_no_stats"/>
-
 <!-- <p conref="../shared/impala_common.xml#common/partitioning_good"/> -->
 
     <p conref="../shared/impala_common.xml#common/hbase_ok"/>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_describe.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_describe.xml b/docs/topics/impala_describe.xml
index 1f7ce9b..67af443 100644
--- a/docs/topics/impala_describe.xml
+++ b/docs/topics/impala_describe.xml
@@ -577,7 +577,7 @@ Query finished, fetching results ...
 |                              | NULL                                       | NULL       |
 | # Detailed Table Information | NULL                                       | NULL       |
 | Database:                    | describe_formatted                         | NULL       |
-| Owner:                       | cloudera                                   | NULL       |
+| Owner:                       | doc_demo                                   | NULL       |
 | CreateTime:                  | Mon Jul 22 17:03:16 EDT 2013               | NULL       |
 | LastAccessTime:              | UNKNOWN                                    | NULL       |
 | Protect Mode:                | None                                       | NULL       |
@@ -625,7 +625,7 @@ Query finished, fetching results ...
 |                              | NULL                         | NULL                 |
 | # Detailed Table Information | NULL                         | NULL                 |
 | Database:                    | describe_formatted           | NULL                 |
-| Owner:                       | cloudera                     | NULL                 |
+| Owner:                       | doc_demo                     | NULL                 |
 | CreateTime:                  | Mon Jul 22 16:56:38 EDT 2013 | NULL                 |
 | LastAccessTime:              | UNKNOWN                      | NULL                 |
 | Protect Mode:                | None                         | NULL                 |
@@ -648,7 +648,7 @@ Query finished, fetching results ...
 | View Expanded Text:          | SELECT x, upper(s) FROM t1   | NULL                 |
 +------------------------------+------------------------------+----------------------+
 Returned 28 row(s) in 0.03s
-[localhost:21000] &gt; create external table t2 (x int, y int, s string) stored as parquet location '/user/cloudera/sample_data';
+[localhost:21000] &gt; create external table t2 (x int, y int, s string) stored as parquet location '/user/doc_demo/sample_data';
 [localhost:21000] &gt; describe formatted t2;
 Query: describe formatted t2
 Query finished, fetching results ...
@@ -663,12 +663,12 @@ Query finished, fetching results ...
 |                              | NULL                                               | NULL       |
 | # Detailed Table Information | NULL                                               | NULL       |
 | Database:                    | describe_formatted                                 | NULL       |
-| Owner:                       | cloudera                                           | NULL       |
+| Owner:                       | doc_demo                                           | NULL       |
 | CreateTime:                  | Mon Jul 22 17:01:47 EDT 2013                       | NULL       |
 | LastAccessTime:              | UNKNOWN                                            | NULL       |
 | Protect Mode:                | None                                               | NULL       |
 | Retention:                   | 0                                                  | NULL       |
-| Location:                    | hdfs://127.0.0.1:8020/user/cloudera/sample_data    | NULL       |
+| Location:                    | hdfs://127.0.0.1:8020/user/doc_demo/sample_data    | NULL       |
 | Table Type:                  | EXTERNAL_TABLE                                     | NULL       |
 | Table Parameters:            | NULL                                               | NULL       |
 |                              | EXTERNAL                                           | TRUE       |
@@ -676,8 +676,8 @@ Query finished, fetching results ...
 |                              | NULL                                               | NULL       |
 | # Storage Information        | NULL                                               | NULL       |
 | SerDe Library:               | org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe | NULL       |
-| InputFormat:                 | com.cloudera.impala.hive.serde.ParquetInputFormat  | NULL       |
-| OutputFormat:                | com.cloudera.impala.hive.serde.ParquetOutputFormat | NULL       |
+| InputFormat:                 | org.apache.impala.hive.serde.ParquetInputFormat    | NULL       |
+| OutputFormat:                | org.apache.impala.hive.serde.ParquetOutputFormat   | NULL       |
 | Compressed:                  | No                                                 | NULL       |
 | Num Buckets:                 | 0                                                  | NULL       |
 | Bucket Columns:              | []                                                 | NULL       |
@@ -688,7 +688,7 @@ Returned 27 row(s) in 0.17s</codeblock>
     <p conref="../shared/impala_common.xml#common/cancel_blurb_no"/>
 
     <p conref="../shared/impala_common.xml#common/permissions_blurb"/>
-    <p rev="CDH-19187">
+    <p rev="">
       The user ID that the <cmdname>impalad</cmdname> daemon runs under,
       typically the <codeph>impala</codeph> user, must have read and execute
       permissions for all directories that are part of the table.

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_drop_function.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_drop_function.xml b/docs/topics/impala_drop_function.xml
index 6627211..71f3a32 100644
--- a/docs/topics/impala_drop_function.xml
+++ b/docs/topics/impala_drop_function.xml
@@ -51,8 +51,8 @@ under the License.
 
 <codeblock>DROP [AGGREGATE] FUNCTION [IF EXISTS] [<varname>db_name</varname>.]<varname>function_name</varname>(<varname>type</varname>[, <varname>type</varname>...])</codeblock>
 
-    <note rev="2.5.0 IMPALA-2843 CDH-39148">
-      <p rev="2.5.0 IMPALA-2843 CDH-39148">
+    <note rev="2.5.0 IMPALA-2843">
+      <p rev="2.5.0 IMPALA-2843">
         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 <keyword keyref="impala25_full"/> or higher, consider re-creating all Java UDFs with the
@@ -61,7 +61,7 @@ under the License.
       </p>
     </note>
 
-    <p rev="2.5.0 IMPALA-2843 CDH-39148">
+    <p rev="2.5.0 IMPALA-2843">
       To drop Java UDFs (created using the <codeph>CREATE FUNCTION</codeph> syntax with no function signature):
     </p>
 
@@ -91,7 +91,7 @@ DROP FUNCTION IF EXISTS bar;
     <p conref="../shared/impala_common.xml#common/cancel_blurb_no"/>
 
     <p conref="../shared/impala_common.xml#common/permissions_blurb"/>
-    <p rev="CDH-19187">
+    <p rev="">
       The user ID that the <cmdname>impalad</cmdname> daemon runs under,
       typically the <codeph>impala</codeph> user, does not need any
       particular HDFS permissions to perform this statement.
@@ -100,7 +100,7 @@ DROP FUNCTION IF EXISTS bar;
     </p>
 
     <p conref="../shared/impala_common.xml#common/example_blurb"/>
-    <p rev="2.5.0 IMPALA-2843 CDH-39148">
+    <p rev="2.5.0 IMPALA-2843">
       The following example shows how to drop Java functions created with the signatureless
       <codeph>CREATE FUNCTION</codeph> syntax in <keyword keyref="impala25_full"/> and higher.
       Issuing <codeph>DROP FUNCTION <varname>function_name</varname></codeph> removes all the
@@ -108,9 +108,9 @@ DROP FUNCTION IF EXISTS bar;
       (See <xref href="impala_create_function.xml#create_function"/> for a longer example
       showing how to set up such functions in the first place.)
     </p>
-<codeblock rev="2.5.0 IMPALA-2843 CDH-39148">
-create function my_func location '/user/impala/udfs/udf-examples-cdh570.jar'
-  symbol='com.cloudera.impala.TestUdf';
+<codeblock rev="2.5.0 IMPALA-2843">
+create function my_func location '/user/impala/udfs/udf-examples.jar'
+  symbol='org.apache.impala.TestUdf';
 
 show functions;
 +-------------+---------------------------------------+-------------+---------------+


[2/3] incubator-impala git commit: [DOCS] Wide-ranging cleanup of CDH and Cloudera references

Posted by jr...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_fixed_issues.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_fixed_issues.xml b/docs/topics/impala_fixed_issues.xml
index ef56d4c..d0af303 100644
--- a/docs/topics/impala_fixed_issues.xml
+++ b/docs/topics/impala_fixed_issues.xml
@@ -50,7 +50,7 @@ under the License.
 
   <concept rev="2.8.0" id="fixed_issues_280">
 
-    <title>Issues Fixed in <keyword keyref="impala28_full"/></title>
+    <title>Issues Fixed in <keyword keyref="impala280"/></title>
 
     <conbody>
 
@@ -66,7 +66,7 @@ under the License.
 
   <concept rev="2.7.0" id="fixed_issues_270">
 
-    <title>Issues Fixed in Impala for CDH 5.9.0</title>
+    <title>Issues Fixed in <keyword keyref="impala270"/></title>
 
     <conbody>
 
@@ -79,64 +79,35 @@ under the License.
         <xref href="https://issues.cloudera.org/issues/?jql=%20type%20%3D%20bug%20and%20project%20%3D%20IMPALA%20AND%20resolution%20%3D%20fixed%20AND%20affectedVersion%20!%3D%20%22Impala%202.7.0%22%20AND%20fixVersion%20%3D%20%22Impala%202.7.0%22%20and%20not%20labels%20%3D%20broken-build%20order%20by%20priority%20desc" scope="external" format="html">this report in the Impala JIRA tracker</xref>.
       </p>
 
-      <p> For the full list of fixed issues for all CDH components in CDH 5.9.0, see <xref
-          audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_59.html"
-          format="html" scope="external">the CDH 5.9.x release notes</xref><xref
-          audience="integrated" href="cdh_rn_fixed_in_59.xml"
-         />. </p>
-      <ul audience="integrated">
-        <li conref="cdh_rn_fixed_in_59.xml#ui_fixed_in_59/impala_start"
-          conrefend="cdh_rn_fixed_in_59.xml#ui_fixed_in_59/impala_end" />
-      </ul>
-
     </conbody>
   </concept>
 
 <!-- All 2.6.x subsections go under here -->
 
   <concept rev="2.6.3" id="fixed_issues_263">
-    <title>Issues Fixed in Impala for CDH 5.8.3</title>
+    <title>Issues Fixed in <keyword keyref="impala263"/></title>
     <conbody>
-      <p> For the full list of fixed issues for all CDH components, see <xref
-          audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_58.html"
-          format="html" scope="external">the CDH 5.8.x release notes</xref><xref
-          audience="integrated" href="cdh_rn_fixed_in_58.xml#ui_fixed_in_583"
-         />. </p>
-      <ul audience="integrated">
-        <li conref="cdh_rn_fixed_in_58.xml#ui_fixed_in_583/impala_start"
-          conrefend="cdh_rn_fixed_in_58.xml#ui_fixed_in_583/impala_end" />
-      </ul>
+      <p></p>
     </conbody>
   </concept>
 
   <concept rev="2.6.2" id="fixed_issues_262">
-    <title>Issues Fixed in Impala for CDH 5.8.2</title>
+    <title>Issues Fixed in <keyword keyref="impala262"/></title>
     <conbody>
-      <p> For the full list of fixed issues for all CDH components, see <xref
-          audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_58.html"
-          format="html" scope="external">the CDH 5.8.x release notes</xref><xref
-          audience="integrated" href="cdh_rn_fixed_in_58.xml#upstream582"
-         />. </p>
-      <ul audience="integrated">
-        <li conref="cdh_rn_fixed_in_58.xml#upstream582/impala_start"
-          conrefend="cdh_rn_fixed_in_58.xml#upstream582/impala_end" />
-      </ul>
+      <p></p>
     </conbody>
   </concept>
 
   <concept rev="2.6.0" id="fixed_issues_260">
 
-    <title>Issues Fixed in Impala for CDH 5.8.0</title>
+    <title>Issues Fixed in <keyword keyref="impala260"/></title>
 
     <conbody>
 
       <p>
         The following list contains the most critical fixed issues
         (<codeph>priority='Blocker'</codeph>) from the JIRA system.
-        For the full list of fixed issues in CDH 5.8.0 / Impala 2.6.0, see
+        For the full list of fixed issues in <keyword keyref="impala260"/>, see
         <xref href="https://issues.cloudera.org/issues/?jql=%20type%20%3D%20bug%20and%20project%20%3D%20IMPALA%20AND%20resolution%20%3D%20fixed%20AND%20affectedVersion%20!%3D%20%22Impala%202.6.0%22%20AND%20fixVersion%20%3D%20%22Impala%202.6.0%22%20and%20not%20labels%20%3D%20broken-build%20order%20by%20priority%20desc" scope="external" format="html">this report in the Impala JIRA tracker</xref>.
       </p>
 
@@ -277,92 +248,38 @@ under the License.
 <!-- All 2.5.x subsections go under here -->
 
   <concept rev="2.5.4" id="fixed_issues_254">
-    <title>Issues Fixed in Impala for CDH 5.7.4</title>
+    <title>Issues Fixed in <keyword keyref="impala254"/></title>
     <conbody>
-      <p> For the full list of fixed issues for all CDH components, see <xref
-          audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_57.html"
-          format="html" scope="external">the CDH 5.7.x release notes</xref><xref
-          audience="integrated" href="cdh_rn_fixed_in_57.xml#ui_fixed_in_574"
-         />. </p>
-      <ul audience="integrated">
-        <li conref="cdh_rn_fixed_in_57.xml#ui_fixed_in_574/impala_start"
-          conrefend="cdh_rn_fixed_in_57.xml#ui_fixed_in_574/impala_end" />
-      </ul>
-    </conbody>
-  </concept>
-
-<!--
-  <concept rev="2.5.3" id="fixed_issues_253" audience="pre-release">
-
-    <title>Issues Fixed in Impala for CDH 5.7.3</title>
-
-    <conbody>
-
-      <p>
-        For the full list of fixed issues for all CDH components, see
-        <xref audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_57.html#ui_fixed_in_573"
-          format="html" scope="external">the CDH 5.7.x release notes</xref><xref
-            audience="integrated" href="cdh_rn_fixed_in_57.xml#ui_fixed_in_573"/>.
-      </p>
-
-      <ul audience="integrated">
-        <li conref="cdh_rn_fixed_in_57.xml#ui_fixed_in_573/impala_start" conrefend="cdh_rn_fixed_in_57.xml#ui_fixed_in_573/impala_end"/>
-      </ul>
-
+      <p></p>
     </conbody>
-
   </concept>
--->
 
   <concept rev="2.5.2" id="fixed_issues_252">
-    <title>Issues Fixed in Impala for CDH 5.7.2</title>
+    <title>Issues Fixed in <keyword keyref="impala252"/></title>
     <conbody>
-      <p> For the full list of fixed issues for all CDH components, see <xref
-          audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_57.html#ui_fixed_in_572"
-          format="html" scope="external">the CDH 5.7.x release notes</xref><xref
-          audience="integrated" href="cdh_rn_fixed_in_57.xml#ui_fixed_in_572"
-         />. </p>
-      <ul audience="integrated">
-        <li conref="cdh_rn_fixed_in_57.xml#ui_fixed_in_572/impala_start"
-          conrefend="cdh_rn_fixed_in_57.xml#ui_fixed_in_572/impala_end" />
-      </ul>
+      <p></p>
     </conbody>
   </concept>
 
   <concept rev="2.5.1" id="fixed_issues_251">
 
-    <title>Issues Fixed in Impala for CDH 5.7.1</title>
+    <title>Issues Fixed in <keyword keyref="impala251"/></title>
 
     <conbody>
-
-      <p>
-        For the full list of fixed issues for all CDH components, see
-        <xref audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_57.html#ui_fixed_in_571"
-          format="html" scope="external">the CDH 5.7.x release notes</xref><xref
-            audience="integrated" href="cdh_rn_fixed_in_57.xml#ui_fixed_in_571"/>.
-      </p>
-
-      <ul audience="integrated">
-        <li conref="cdh_rn_fixed_in_57.xml#ui_fixed_in_571/impala_start" conrefend="cdh_rn_fixed_in_57.xml#ui_fixed_in_571/impala_end"/>
-      </ul>
-
+      <p></p>
     </conbody>
 
   </concept>
 
   <concept rev="2.5.0" id="fixed_issues_250">
 
-    <title>Issues Fixed in Impala for CDH 5.7.0</title>
+    <title>Issues Fixed in <keyword keyref="impala250"/></title>
 
     <conbody>
 
       <p>
         The following list contains the most critical issues (<codeph>priority='Blocker'</codeph>) from the JIRA system.
-        For the full list of fixed issues in CDH 5.7.0 / Impala 2.5.0, see
+        For the full list of fixed issues in <keyword keyref="impala25_full"/>, see
         <xref href="https://issues.cloudera.org/issues/?jql=%20type%20%3D%20bug%20and%20project%20%3D%20IMPALA%20AND%20resolution%20%3D%20fixed%20AND%20affectedVersion%20!%3D%20%22Impala%202.5.0%22%20AND%20fixVersion%20%3D%20%22Impala%202.5.0%22%20and%20not%20labels%20%3D%20broken-build%20order%20by%20priority%20desc" scope="external" format="html">this report in the Impala JIRA tracker</xref>.
       </p>
 
@@ -635,47 +552,25 @@ select 2061013007, conv(cast(cast(2061013007 as decimal(20,0)) as bigint), 16, 1
 
   <concept rev="2.4.1" id="fixed_issues_241">
 
-    <title>Issues Fixed in Impala for CDH 5.6.1</title>
+    <title>Issues Fixed in <keyword keyref="impala241"/></title>
 
     <conbody>
-
       <p>
-        For the full list of fixed issues for all CDH components, see
-        <xref audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_56.html#ui_fixed_in_561"
-          format="html" scope="external">the CDH 5.6.x release notes</xref><xref
-            audience="integrated" href="cdh_rn_fixed_in_56.xml#ui_fixed_in_561"/>.
       </p>
-
-      <!-- Maybe time to start dropping the 'CDH 5 only' notes... wasn't included for 5.6.0, so why start for 5.6.1...
-           <note conref="../shared/impala_common.xml#common/only_cdh5_24x"/> -->
-
-      <ul audience="integrated">
-        <li conref="cdh_rn_fixed_in_56.xml#ui_fixed_in_561/impala_start" conrefend="cdh_rn_fixed_in_56.xml#ui_fixed_in_561/impala_end"/>
-      </ul>
-
     </conbody>
 
   </concept>
 
   <concept rev="2.4.0" id="fixed_issues_240">
 
-    <title>Issues Fixed in Impala for CDH 5.6.0</title>
+    <title>Issues Fixed in <keyword keyref="impala240"/></title>
 
     <conbody>
 
-      <p> The set of fixes for Impala in CDH 5.6.0 is the same as in CDH 5.5.2.
+      <p> The set of fixes for Impala in <keyword keyref="impala240"/> is the same as in <keyword keyref="impala232"/>.
         See <xref href="impala_fixed_issues.xml#fixed_issues_232"
           audience="integrated"/> for details. </p>
 
-<!--
-      <p>
-        This section lists the most serious or frequently encountered customer issues fixed in CDH 5.6.0 / Impala 2.4.0.
-        For the full list of fixed Impala issues, see
-        <xref audience="standalone" href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_560.html" format="html" scope="external">the CDH 5.6.x release notes</xref><xref audience="integrated" href="cdh_rn_fixed_in_560.xml"/>.
-      </p>
--->
-
     </conbody>
 
   </concept>
@@ -684,73 +579,28 @@ select 2061013007, conv(cast(cast(2061013007 as decimal(20,0)) as bigint), 16, 1
 
   <concept rev="2.3.4" id="fixed_issues_234">
 
-    <title>Issues Fixed in Impala for CDH 5.5.4</title>
+    <title>Issues Fixed in <keyword keyref="impala234"/></title>
 
     <conbody>
-
-      <p>
-        For the full list of fixed issues for all CDH components, see
-        <xref audience="standalone" href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_55.html#fixed_issues_554" format="html" scope="external">the CDH 5.5.x release notes</xref><xref audience="integrated" href="cdh_rn_fixed_in_55.xml#fixed_issues_554"/>.
-      </p>
-
-      <note conref="../shared/impala_common.xml#common/only_cdh5_23x"/>
-
-      <ul audience="integrated">
-        <li conref="cdh_rn_fixed_in_55.xml#ui_fixed_in_554/impala_start" conrefend="cdh_rn_fixed_in_55.xml#ui_fixed_in_554/impala_end"/>
-      </ul>
-
+      <p></p>
     </conbody>
 
   </concept>
 
   <concept rev="2.3.2" id="fixed_issues_232">
 
-    <title>Issues Fixed in Impala for CDH 5.5.2</title>
+    <title>Issues Fixed in <keyword keyref="impala232"/></title>
 
     <conbody>
 
       <p>
         This section lists the most serious or frequently encountered customer
-        issues fixed in CDH 5.5.2 / Impala 2.3.2. For the full list of fixed Impala issues,
+        issues fixed in <keyword keyref="impala232"/>. For the full list of fixed Impala issues,
         see <xref audience="standalone" href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_552.html" format="html" scope="external">the CDH 5.5.x release notes</xref><xref href="cdh_rn_fixed_in_55.xml#fixed_issues_552" audience="integrated"/>.
       </p>
 
     </conbody>
 
-<!--
-Fixed issues in 5.5.2 from Juan Yu spreadsheet (https://docs.google.com/spreadsheets/d/1Ia06xOLKQInKfsJzQfQ6Sf1fO3nYLOpZ-0OWfFNgNSc/edit#gid=2094272728):
-
-IMPALA-2747: Thrift-client cleans openSSL state before using it in the case of the catalog
-IMPALA-2829: SEGV in AnalyticEvalNode touching NULL input_stream_
-IMPALA-2722: Free local allocations per row batch in non-partitioned AGG and HJ
-IMPALA-2612: Free local allocations once for every row batch when building hash tables
-IMPALA-2643: Prevent migrating incorrectly inferred identity predicates into inline views
-IMPALA-2695: Fix GRANTs on URIs with uppercase letters
-IMPALA-2664: Avoid sending large partition stats objects over thrift
-IMPALA-2648: Ditto
-IMPALA-2226: Throw AnalysisError if table properties are too large (for the Hive metastore)
-IMPALA-2273: Make MAX_PAGE_HEADER_SIZE configurable
-IMPALA-2473: reduce scanner memory usage
-IMPALA-2113: Handle error when distinct and aggregates are used with a having clause
-IMPALA-2225: Handle error when star based select item and aggregate are incorrectly used
-IMPALA-2731: Refactor MemPool usage in HBase scan node
-IMPALA-1459: Fix migration/assignment of On-clause predicates inside inline views
-IMPALA-2558: DCHECK in parquet scanner after block read error
-IMPALA-2535: PAGG hits mem_limit when switching to I/O buffers
-IMPALA-2559: Fix check failed: sorter_runs_.back()->is_pinned_
-IMPALA-2614: Don't ignore Status returned by DataStreamRecvr::CreateMerger()
-IMPALA-2591: DataStreamSender::Send() does not return an error status if SendBatch() failed
-IMPALA-2598: Re-enable SSL and Kerberos on server-server
-
-These are changes to test cases and so ignored for release note purposes:
-
-IMPALA-2103: Fix flaky test_impersonation test
-IMPALA-2776: Remove escapechartesttable and associated tests.
-IMPALA-2812: Remove additional test referencing escapecharstesttable.
-IMPALA-2630: skip TestParquet.test_continue_on_error when using old aggs/joins
-IMPALA-2624: Increase fs.trash.interval to 24 hours for test suite
--->
-
     <concept id="IMPALA-2829">
       <title>SEGV in AnalyticEvalNode touching NULL input_stream_</title>
       <conbody>
@@ -1017,11 +867,11 @@ IMPALA-2624: Increase fs.trash.interval to 24 hours for test suite
 
   <concept rev="2.3.1" id="fixed_issues_231">
 
-    <title>Issues Fixed in Impala for CDH 5.5.1</title>
+    <title>Issues Fixed in <keyword keyref="impala231"/></title>
 
     <conbody>
 
-      <p conref="../shared/impala_common.xml#common/cdh551_noop"/>
+      <p conref="../shared/impala_common.xml#common/impala231_noop"/>
 
     </conbody>
 
@@ -1029,13 +879,13 @@ IMPALA-2624: Increase fs.trash.interval to 24 hours for test suite
 
   <concept rev="2.3.0" id="fixed_issues_230">
 
-    <title>Issues Fixed in Impala for CDH 5.5.0</title>
+    <title>Issues Fixed in <keyword keyref="impala230"/></title>
 
     <conbody>
       <p> This section lists the most serious or frequently encountered customer
-        issues fixed in CDH 5.5.0 / Impala 2.3.0. Any issues already fixed in
-        CDH 5.4 maintenance releases (up through CDH 5.4.8) are also included.
-        Those issues are listed under the respective CDH 5.4 sections and are
+        issues fixed in <keyword keyref="impala23_full"/>. Any issues already fixed in
+        <keyword keyref="impala22"/> maintenance releases (up through <keyword keyref="impala228"/>) are also included.
+        Those issues are listed under the respective <keyword keyref="impala22"/> sections and are
         not repeated here. For the full list of fixed Impala issues, see <xref
           audience="standalone"
           href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_550.html"
@@ -1282,46 +1132,24 @@ IMPALA-1917
 
   <concept rev="2.2.10" id="fixed_issues_2210">
 
-    <title>Issues Fixed in Impala for CDH 5.4.10</title>
+    <title>Issues Fixed in <keyword keyref="impala2210"/></title>
 
     <conbody>
-
-<!--
-      <p>
-        This section lists the most frequently encountered customer issues fixed in Impala for CDH 5.4.10.
-      </p>
--->
-
-      <p>
-        For the full list of fixed issues for all CDH components, see
-        <xref audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_54.html#fixed_issues_5410"
-          format="html" scope="external">the CDH 5.4.x release notes</xref><xref
-            audience="integrated" href="cdh_rn_fixed_in_54.xml#fixed_issues_5410"/>.
-      </p>
-
-      <note conref="../shared/impala_common.xml#common/only_cdh5_22x"/>
-
-      <ul audience="integrated">
-        <li conref="cdh_rn_fixed_in_54.xml#ui_fixed_in_5410/impala_start" conrefend="cdh_rn_fixed_in_54.xml#ui_fixed_in_5410/impala_end"/>
-      </ul>
-
+      <p></p>
     </conbody>
 
   </concept>
 
   <concept rev="2.2.9" id="fixed_issues_229">
 
-    <title>Issues Fixed in Impala for CDH 5.4.9</title>
+    <title>Issues Fixed in <keyword keyref="impala229"/></title>
 
     <conbody>
 
       <p>
-        This section lists the most frequently encountered customer issues fixed in Impala for CDH 5.4.9.
+        This section lists the most frequently encountered customer issues fixed in <keyword keyref="impala229"/>.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_22x"/>
-
       <p>
         For the full list of fixed issues, see
         <xref audience="standalone"
@@ -1528,16 +1356,14 @@ d9d2a10 IMPALA-0000: Log backtrace on all MEM_LIMIT_EXCEEDED errors
 
   <concept rev="2.2.8" id="fixed_issues_228">
 
-    <title>Issues Fixed in Impala for CDH 5.4.8</title>
+    <title>Issues Fixed in <keyword keyref="impala228"/></title>
 
     <conbody>
 
       <p>
-        This section lists the most frequently encountered customer issues fixed in Impala for CDH 5.4.8.
+        This section lists the most frequently encountered customer issues fixed in <keyword keyref="impala228"/>.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_22x"/>
-
       <p>
         For the full list of fixed issues, see
         <xref audience="standalone"
@@ -1650,16 +1476,14 @@ d93fb5a IMPALA-1899: Cleanup handling of Hive's field schema
 
   <concept rev="2.2.7" id="fixed_issues_227">
 
-    <title>Issues Fixed in Impala for CDH 5.4.7</title>
+    <title>Issues Fixed in <keyword keyref="impala227"/></title>
 
     <conbody>
 
       <p>
-        This section lists the most frequently encountered customer issues fixed in Impala for CDH 5.4.7.
+        This section lists the most frequently encountered customer issues fixed in <keyword keyref="impala227"/>.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_22x"/>
-
       <p>
         For the full list of fixed issues, see
         <xref audience="standalone"
@@ -1845,16 +1669,14 @@ ce9fa25 IMPALA-2201: Unconditionally update the partition stats and row count.
 
   <concept rev="2.2.5" id="fixed_issues_225">
 
-    <title>Issues Fixed in Impala for CDH 5.4.5</title>
+    <title>Issues Fixed in Impala <keyword keyref="impala225"/></title>
 
     <conbody>
 
       <p>
-        This section lists the most frequently encountered customer issues fixed in Impala for CDH 5.4.5.
+        This section lists the most frequently encountered customer issues fixed in <keyword keyref="impala225"/>.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_22x"/>
-
       <p>
         For the full list of fixed issues, see
         <xref audience="standalone"
@@ -1881,13 +1703,12 @@ c2b8852 IMPALA-2018: Where clause does not propagate to joins inside nested view
 
     <concept id="IMPALA-2048">
       <title>Impala DML/DDL operations corrupt table metadata leading to Hive query failures</title>
-      <!-- Real JIRA title: Class not found: com.cloudera.impala.hive.serde.ParquetInputFormat error -->
       <conbody>
       <p>
         When the Impala <codeph>COMPUTE STATS</codeph> statement was run on a partitioned Parquet table that was created in Hive, the table subsequently became inaccessible in Hive.
         The table was still accessible to Impala. Regaining access in Hive required a workaround of creating a new table. The error displayed in Hive was:
       </p>
-<codeblock>Error: Error while compiling statement: FAILED: SemanticException Class not found: com.cloudera.impala.hive.serde.ParquetInputFormat (state=42000,code=40000)</codeblock>
+<codeblock>Error: Error while compiling statement: FAILED: SemanticException Class not found: org.apache.impala.hive.serde.ParquetInputFormat (state=42000,code=40000)</codeblock>
       <p><b>Bug:</b> <xref href="https://issues.cloudera.org/browse/IMPALA-2048" scope="external" format="html">IMPALA-2048</xref></p>
       </conbody>
     </concept>
@@ -1976,16 +1797,14 @@ c2b8852 IMPALA-2018: Where clause does not propagate to joins inside nested view
 
   <concept rev="2.2.3" id="fixed_issues_223">
 
-    <title>Issues Fixed in Impala for CDH 5.4.3</title>
+    <title>Issues Fixed in <keyword keyref="impala223"/></title>
 
     <conbody>
 
       <p>
-        This section lists the most frequently encountered customer issues fixed in Impala for CDH 5.4.3.
+        This section lists the most frequently encountered customer issues fixed in <keyword keyref="impala223"/>.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_22x"/>
-
       <p>
         For the full list of fixed issues, see
         <xref audience="standalone"
@@ -2015,11 +1834,10 @@ ce601ec : Enable using isilon as the underlying filesystem.
       <title>Enable using Isilon as the underlying filesystem.</title>
       <conbody>
       <p>
-        The certification of CDH and Impala with the Isilon filesystem involves a number of
+        Enabling Impala to work with the Isilon filesystem involves a number of
         fixes to performance and flexibility for dealing with I/O using remote reads.
         See <xref href="impala_isilon.xml#impala_isilon"/> for details on using Impala and Isilon together.
       </p>
-      <p audience="hidden"><b>Bug:</b> <xref href="https://jira.cloudera.com/browse/CDH-24040" scope="external" format="html">CDH-24040</xref></p>
       <p><b>Bug:</b> <xref href="https://issues.cloudera.org/browse/IMPALA-1968" scope="external" format="html">IMPALA-1968</xref>,
       <xref href="https://issues.cloudera.org/browse/IMPALA-1730" scope="external" format="html">IMPALA-1730</xref></p>
       </conbody>
@@ -2084,7 +1902,7 @@ ce601ec : Enable using isilon as the underlying filesystem.
     </concept>
 
     <concept id="IMPALA-1952">
-    <!-- Fixed in first in earlier release and 'frontported' to 5.4.3. -->
+    <!-- Fixed in first in earlier release and 'frontported' to this one. -->
     <!-- Identical issue farther down in this page, just with a slightly mangled ID. -->
       <title>Expand parsing of decimals to include scientific notation</title>
       <conbody>
@@ -2098,97 +1916,18 @@ ce601ec : Enable using isilon as the underlying filesystem.
       </conbody>
     </concept>
 
-<!-- Not significant.
-    <concept id="IMPALA-2043">
-      <title>skip metadata/testddl.py#test_create_alter_bulk_parition on S3</title>
-      <conbody>
-      <p></p>
-      <p><b>Bug:</b> <xref href="https://issues.cloudera.org/browse/" scope="external" format="html"></xref></p>
-      <p><b>Severity:</b> High</p>
-      </conbody>
-    </concept>
--->
-
-<!-- Not significant.
-    <concept id="CDH-27688">
-      <title>Isilon: fix custom_cluster/test_insert_inherit_permission.py</title>
-      <conbody>
-      <p></p>
-      <p audience="hidden"><b>Bug:</b> <xref href="https://issues.cloudera.org/browse/" scope="external" format="html"></xref></p>
-      <p><b>Severity:</b> High</p>
-      </conbody>
-    </concept>
--->
-
-<!-- Not significant.
-    <concept id="CDH-26785">
-      <title>Isilon: add remote HDFS disk queue</title>
-      <conbody>
-      <p></p>
-      <p audience="hidden"><b>Bug:</b> <xref href="https://issues.cloudera.org/browse/" scope="external" format="html"></xref></p>
-      <p><b>Severity:</b> High</p>
-      </conbody>
-    </concept>
--->
-
-<!-- Not significant.
-    <concept id="IMPALA-2002">
-      <title>Provide way to cache ext data source classes</title>
-      <conbody>
-      <p></p>
-      <p><b>Bug:</b> <xref href="https://issues.cloudera.org/browse/" scope="external" format="html"></xref></p>
-      <p><b>Severity:</b> High</p>
-      </conbody>
-    </concept>
--->
-
-<!-- Not significant.
-    <concept id="isilon_warn_multiple_blocks">
-      <title>Isilon: don't warn for multiple remote parquet blocks</title>
-      <conbody>
-      <p></p>
-      <p audience="hidden"><b>Bug:</b> <xref href="https://issues.cloudera.org/browse/" scope="external" format="html"></xref></p>
-      <p><b>Severity:</b> High</p>
-      </conbody>
-    </concept>
--->
-
-<!-- Not significant.
-    <concept id="isilon_tests">
-      <title>Enable isilon end to end tests for Impala.</title>
-      <conbody>
-      <p></p>
-      <p><b>Bug:</b> <xref href="https://issues.cloudera.org/browse/" scope="external" format="html"></xref></p>
-      <p><b>Severity:</b> High</p>
-      </conbody>
-    </concept>
--->
-
-<!-- Not significant.
-    <concept id="skip_hbase_pytests">
-      <title>Add flag to skip HBase pytests</title>
-      <conbody>
-      <p></p>
-      <p><b>Bug:</b> <xref href="https://issues.cloudera.org/browse/" scope="external" format="html"></xref></p>
-      <p><b>Severity:</b> High</p>
-      </conbody>
-    </concept>
--->
-
   </concept>
 
   <concept rev="2.2.1" id="fixed_issues_221">
 
-    <title>Issues Fixed in Impala for CDH 5.4.1</title>
+    <title>Issues Fixed in <keyword keyref="impala221"/></title>
 
     <conbody>
 
       <p>
-        This section lists the most frequently encountered customer issues fixed in Impala for CDH 5.4.1.
+        This section lists the most frequently encountered customer issues fixed in <keyword keyref="impala221"/>.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_22x"/>
-
       <p>
         For the full list of fixed issues, see
         <xref audience="standalone"
@@ -2200,22 +1939,20 @@ ce601ec : Enable using isilon as the underlying filesystem.
 
   <concept rev="2.2.0" id="fixed_issues_220">
 
-    <title>Issues Fixed in <keyword keyref="impala22_full"/></title>
+    <title>Issues Fixed in <keyword keyref="impala220"/></title>
 
     <conbody>
 
       <p>
-        This section lists the most frequently encountered customer issues fixed in Impala 2.2.0.
+        This section lists the most frequently encountered customer issues fixed in <keyword keyref="impala220"/>.
       </p>
 
       <p>
-        For the full list of fixed issues in Impala 2.2.0, including over 40 critical issues, see
+        For the full list of fixed issues in <keyword keyref="impala220"/>, including over 40 critical issues, see
         <xref href="https://issues.cloudera.org/secure/IssueNavigator.jspa?reset=true&amp;jqlQuery=project%3Dimpala+and+fixVersion%3D%22Impala+2.2%22+and+resolution%3D%22Fixed%22" format="html" scope="external">
         this report in the JIRA system</xref>.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_220"/>
-
       <p outputclass="toc inpage"/>
     </conbody>
 <!--
@@ -2391,36 +2128,22 @@ IMPALA-1607
 
   <concept rev="2.3.10" id="fixed_issues_2310">
 
-    <title>Issues Fixed in Impala for CDH 5.3.10</title>
+    <title>Issues Fixed in <keyword keyref="impala2310"/></title>
 
     <conbody>
-
-      <p>
-        For the full list of fixed issues for all CDH components, see
-        <xref audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_53.html#fixed_issues_5310"
-          format="html" scope="external">the CDH 5.3.x release notes</xref><xref
-            audience="integrated" href="cdh_rn_fixed_in_53.xml#fixed_issues_5310"/>.
-      </p>
-
-      <note conref="../shared/impala_common.xml#common/only_cdh5_21x"/>
-
-      <ul audience="integrated">
-        <li conref="cdh_rn_fixed_in_53.xml#ui_fixed_in_5310/impala_start" conrefend="cdh_rn_fixed_in_53.xml#ui_fixed_in_5310/impala_end"/>
-      </ul>
-
+      <p></p>
     </conbody>
 
   </concept>
 
   <concept rev="2.1.7" id="fixed_issues_217">
 
-    <title>Issues Fixed in Impala 2.1.7</title>
+    <title>Issues Fixed in <keyword keyref="impala217"/></title>
 
     <conbody>
 
       <p>
-        This section lists the most significant Impala issues fixed in Impala 2.1.7.
+        This section lists the most significant Impala issues fixed in <keyword keyref="impala217"/>.
       </p>
 
       <p> For the full list of Impala fixed issues in this release, see <xref
@@ -2430,8 +2153,6 @@ IMPALA-1607
           href="cdh_rn_fixed_in_53.xml#fixed_issues_539" audience="integrated"
         />. </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_21x"/>
-
     </conbody>
 <!--
 5e7e50d IMPALA-1917: Do not register aux equivalence predicates with NULL on either side.
@@ -2528,8 +2249,6 @@ e591cf4 IMPALA-2141: UnionNode::GetNext() doesn't check for query errors
           href="cdh_rn_fixed_in_53.xml#fixed_issues_538" audience="integrated"
         />. </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_21x"/>
-
     </conbody>
 
 <!--
@@ -2616,8 +2335,6 @@ e591cf4 IMPALA-2141: UnionNode::GetNext() doesn't check for query errors
           href="cdh_rn_fixed_in_53.xml#fixed_issues_536" audience="integrated"
         />. </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_21x"/>
-
     </conbody>
 
 <!--
@@ -2649,7 +2366,6 @@ e591cf4 IMPALA-2141: UnionNode::GetNext() doesn't check for query errors
 
       <p>
         This section lists the most significant Impala issues fixed in Impala 2.1.4.
-        <ph conref="../shared/impala_common.xml#common/impala_214_redux"/>
       </p>
 
       <p> For the full list of Impala fixed issues in Impala 2.1.4,
@@ -2659,8 +2375,6 @@ e591cf4 IMPALA-2141: UnionNode::GetNext() doesn't check for query errors
           href="cdh_rn_fixed_in_53.xml#fixed_issues_534" audience="integrated"
         />. </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_21x"/>
-
       <p outputclass="toc inpage"/>
     </conbody>
 
@@ -2807,34 +2521,9 @@ c132c75 IMPALA-1808: AnalyticEvalNode cannot handle partition/order by exprs wit
         this report in the JIRA system</xref>. -->
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_213"/>
-
       <p outputclass="toc inpage"/>
     </conbody>
 
-<!--
-! = identified by Juan as a critical fix, so listing here.
-? = not identified by Juan as a critical fix, so leaving in the big list under CDH fixed issues
-    but removing from the long descriptions here.
-
-! IMPALA-1658 - Add compatibility flag for Hive-Parquet-Timestamps
-! IMPALA-1738 - Use snprintf() instead of lexical_cast() in float-to-string casts
-! IMPALA-1865 - Fix partition spilling cleanup when new stream OOMs
-! IMPALA-1805 - Impala's ACLs check do not consider all group ACLs, only checked first one.
-! IMPALA-1794 - Fix infinite loop opening or closing file with invalid metadata
-! IMPALA-1801 - external-data-source-executor leaking global jni refs
-! IMPALA-1712 - Unexpected remote bytes read counter was not being reset properly
-
-? IMPALA-1820 - Start with small pages for hash tables during repartitioning
-? IMPALA-1897 - Fixes for old hash join and agg
-? IMPALA-1894 - Fix old aggregation node hash table cleanup
-? IMPALA-1863 - Avoid deadlock across fragment instances
-? IMPALA-1915 - Fix query hang in BufferedBlockMgr:FindBlock()
-? IMPALA-1890 - Fixing a race between ~BufferedBlockMgr() and the WriteComplete() call
-? IMPALA-1835 - Keep the fragment alive for TransmitData()
-? IMPALA-1636 - Generalize index-based partition pruning to allow constant expressions
--->
-
     <concept id="IMPALA-1658">
       <title>Add compatibility flag for Hive-Parquet-Timestamps</title>
       <conbody>
@@ -2947,8 +2636,6 @@ c132c75 IMPALA-1808: AnalyticEvalNode cannot handle partition/order by exprs wit
         this report in the JIRA system</xref>.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_212"/>
-
       <p outputclass="toc inpage"/>
     </conbody>
 <!--
@@ -3196,8 +2883,6 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API - also in 5.2.4 /
         this report in the JIRA system</xref>.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_205"/>
-
     </conbody>
   </concept>
 
@@ -3217,8 +2902,6 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API - also in 5.2.4 /
         this report in the JIRA system</xref>.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_204"/>
-
       <p outputclass="toc inpage"/>
     </conbody>
 
@@ -3286,17 +2969,9 @@ db3362f IMPALA-1801: external-data-source-executor leaking global jni refs
         this report in the JIRA system</xref>.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_203"/>
-
       <p outputclass="toc inpage"/>
     </conbody>
 
-<!--
-IMPALA-1471: Bug in spilling of PHJ that was affecting left anti and outer joins.
-IMPALA-1535: Partition pruning with NULL
-IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API    this one fix the customer issue in this JIRA https://jira.cloudera.com/browse/CDH-24919  Stats on Avro column names using uppercase letters don't get persisted
--->
-
     <concept id="IMPALA-1471">
       <title>Anti join could produce incorrect results when spilling</title>
       <conbody>
@@ -3345,8 +3020,6 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API    this one fix th
         this report in the JIRA system</xref>.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_202"/>
-
       <p outputclass="toc inpage"/>
     </conbody>
 
@@ -3493,9 +3166,9 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API    this one fix th
         </p>
 
         <p>
-          <b>Workaround:</b> Upgrading to CDH 5.2.1, or another level of CDH that includes the fix for HIVE-8627,
+          <b>Workaround:</b> Upgrading to a level of <keyword keyref="distro"/> that includes the fix for HIVE-8627,
           prevents the problem from affecting future <codeph>COMPUTE STATS</codeph> statements. On affected levels
-          of CDH, or for Impala tables that have become inaccessible, the workaround is to disable the
+          of <keyword keyref="distro"/>, or for Impala tables that have become inaccessible, the workaround is to disable the
           <codeph>hive.metastore.try.direct.sql</codeph> setting in the Hive metastore
           <filepath>hive-site.xml</filepath> file and issue the <codeph>INVALIDATE METADATA</codeph> statement for
           the affected table. You do not need to rerun the <codeph>COMPUTE STATS</codeph> statement for the table.
@@ -3843,8 +3516,6 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API    this one fix th
         <xref href="http://www.cloudera.com/documentation/enterprise/release-notes/topics/cdh_rn_fixed_in_51.html" scope="external" format="html">Issues Fixed in CDH 5.1.5</xref>.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_144"/>
-
     </conbody>
   </concept>
 
@@ -3859,8 +3530,6 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API    this one fix th
         disabled in the Impala debug web UI.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_143"/>
-
     </conbody>
   </concept>
 
@@ -3880,8 +3549,6 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API    this one fix th
         this report in the JIRA system</xref>.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_143"/>
-
       <p outputclass="toc inpage"/>
     </conbody>
   </concept>
@@ -3902,12 +3569,10 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API    this one fix th
         this report in the JIRA system</xref>.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_141"/>
-
       <p outputclass="toc inpage"/>
     </conbody>
 
-    <concept id="CDH-20513">
+    <concept id="impalad_boost_exception">
 
       <title>impalad terminating with Boost exception</title>
 
@@ -3922,15 +3587,13 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API    this one fix th
   &lt;boost::exception_detail::error_info_injector&lt;boost::lock_error&gt; &gt;
 </codeblock>
 
-<!--      <p><b>Bug:</b> <xref href="https://issues.cloudera.org/browse/CDH-20513" scope="external" format="html">CDH-20513</xref></p> -->
-
         <p>
           <b>Severity:</b> High
         </p>
       </conbody>
     </concept>
 
-    <concept id="CDH-20478">
+    <concept id="string_format_logs">
 
       <title>Impalad uses wrong string format when writing logs</title>
 
@@ -3944,7 +3607,6 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API    this one fix th
 <codeblock>jni-util.cc:177] java.util.MissingFormatArgumentException: Format specifier 's'
 </codeblock>
 
-<!--      <p><b>Bug:</b> <xref href="https://jira.cloudera.com/browse/CDH-20478" scope="external" format="html">CDH-20478</xref></p> -->
       </conbody>
     </concept>
 
@@ -3968,7 +3630,7 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API    this one fix th
 
     <concept id="IMPALA-1093">
 
-      <title>Impalad catalog updates can fail with error: "IllegalArgumentException: fromKey out of range" at com.cloudera.impala.catalog.CatalogDeltaLog</title>
+      <title>Impalad catalog updates can fail with error: "IllegalArgumentException: fromKey out of range"</title>
 
       <conbody>
 
@@ -4114,8 +3776,8 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API    this one fix th
 
         <p>
           The issue was due to the use of HDFS caching with data files accessed by Impala. Support for HDFS caching
-          in Impala was introduced in Impala 1.4.0 for CDH 5.1.0. The fix for this issue was backported to Impala
-          1.3.x, and is the only change in Impala 1.3.2 for CDH 5.0.4.
+          in Impala was introduced in <keyword keyref="impala140"/>. The fix for this issue was backported to Impala
+          1.3.x, and is the only change in Impala 1.3.2.
         </p>
 
         <p>
@@ -4124,30 +3786,8 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API    this one fix th
         </p>
         
         <p>
-          <b>Workaround:</b> On CDH 5.0.x, upgrade to CDH 5.0.4 with Impala 1.3.2, where this issue is fixed. In
-          Impala 1.3.0 or 1.3.1 on CDH 5.0.x, do not use HDFS caching for Impala data files in Impala internal or
-          external tables. If some of these data files are cached (for example because they are used by other
-          components that take advantage of HDFS caching), set the query option
-          <codeph>DISABLE_CACHED_READS=true</codeph>. To set that option for all Impala queries across all
-          sessions, start <cmdname>impalad</cmdname> with the <codeph>-default_query_options</codeph> option and
-          include this setting in the option argument.
-        </p>
-        
-
-        <p audience="hidden">
-          <b>Workaround:</b> On CDH 5.0.x, upgrade to CDH 5.0.4 with Impala 1.3.2, where this issue is fixed. In
-          Impala 1.3.0 or 1.3.1 on CDH 5.0.x, do not use HDFS caching for Impala data files in Impala internal or
-          external tables. If some of these data files are cached (for example because they are used by other
-          components that take advantage of HDFS caching), set the query option
-          <codeph>DISABLE_CACHED_READS=true</codeph>. To set that option for all Impala queries across all
-          sessions, start <cmdname>impalad</cmdname> with the <codeph>-default_query_options</codeph> option and
-          include this setting in the option argument, or on a cluster managed by Cloudera Manager, fill in this
-          option setting on the <uicontrol>Impala Daemon</uicontrol> options page.
-        </p>
-
-        <p>
-          <b>Resolution:</b> This issue is fixed in Impala 1.3.2 for CDH 5.0.4. The addition of HDFS caching
-          support in Impala 1.4 means that this issue does not apply to any new level of Impala on CDH 5.
+          <b>Resolution:</b> This issue is fixed in Impala 1.3.2. The addition of HDFS caching
+          support in Impala 1.4 means that this issue does not apply to any new level of Impala.
         </p>
       </conbody>
     </concept>
@@ -4338,8 +3978,6 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API    this one fix th
         disabled in the Impala debug web UI.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_133"/>
-
       <p outputclass="toc inpage"/>
     </conbody>
   </concept>
@@ -4354,8 +3992,6 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API    this one fix th
         This backported bug fix is the only change between Impala 1.3.1 and Impala 1.3.2.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_133"/>
-
     </conbody>
 
     <concept id="IMPALA-1019-132">
@@ -4374,8 +4010,8 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API    this one fix th
 
         <p>
           The issue was due to the use of HDFS caching with data files accessed by Impala. Support for HDFS caching
-          in Impala was introduced in Impala 1.4.0 for CDH 5.1.0. The fix for this issue was backported to Impala
-          1.3.x, and is the only change in Impala 1.3.2 for CDH 5.0.4.
+          in Impala was introduced in <keyword keyref="impala140"/>. The fix for this issue was backported to Impala
+          1.3.x, and is the only change in Impala 1.3.2.
         </p>
 
         <p>
@@ -4384,27 +4020,6 @@ IMPALA-1120: Fetch column statistics using Hive 0.13 bulk API    this one fix th
         </p>
         
         <p>
-          <b>Workaround:</b> Upgrade to CDH 5.0.4 with Impala 1.3.2, where this issue is fixed. In
-          Impala 1.3.0 or 1.3.1, do not use HDFS caching for Impala data files in Impala internal or
-          external tables. If some of these data files are cached (for example because they are used by other
-          components that take advantage of HDFS caching), set the query option
-          <codeph>DISABLE_CACHED_READS=true</codeph>. To set that option for all Impala queries across all
-          sessions, start <cmdname>impalad</cmdname> with the <codeph>-default_query_options</codeph> option and
-          include this setting in the option argument.
-        </p>
-
-        <p audience="hidden">
-          <b>Workaround:</b> On CDH 5.0.x, upgrade to CDH 5.0.4 with Impala 1.3.2, where this issue is fixed. In
-          Impala 1.3.0 or 1.3.1 on CDH 5.0.x, do not use HDFS caching for Impala data files in Impala internal or
-          external tables. If some of these data files are cached (for example because they are used by other
-          components that take advantage of HDFS caching), set the query option
-          <codeph>DISABLE_CACHED_READS=true</codeph>. To set that option for all Impala queries across all
-          sessions, start <cmdname>impalad</cmdname> with the <codeph>-default_query_options</codeph> option and
-          include this setting in the option argument, or on a cluster managed by Cloudera Manager, fill in this
-          option setting on the <uicontrol>Impala Daemon</uicontrol> options page.
-        </p>
-
-        <p>
           <b>Resolution:</b> This issue is fixed in Impala 1.3.2. The addition of HDFS caching
           support in Impala 1.4 means that this issue does not apply to any new level of Impala.
         </p>
@@ -5200,7 +4815,7 @@ Bad stats:
       <conbody>
 
         <p>
-          The <codeph>parquet-mr</codeph> library included with CDH4.5 writes files that are not readable by
+          An early version of the <codeph>parquet-mr</codeph> library writes files that are not readable by
           Impala, due to the presence of multiple row groups. Queries involving these data files might result in a
           crash or a failure with an error such as <q>Column chunk should not contain two dictionary pages</q>.
         </p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_incompatible_changes.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_incompatible_changes.xml b/docs/topics/impala_incompatible_changes.xml
index 4d790c2..af47094 100644
--- a/docs/topics/impala_incompatible_changes.xml
+++ b/docs/topics/impala_incompatible_changes.xml
@@ -141,7 +141,7 @@ under the License.
     <conbody>
       <ul>
         <li>
-          <p rev="IMPALA-1731 IMPALA-3868 CDH-43734">
+          <p rev="IMPALA-1731 IMPALA-3868">
             Bug fixes related to parsing of floating-point values (IMPALA-1731 and IMPALA-3868) can change
             the results of casting strings that represent invalid floating-point values.
             For example, formerly a string value beginning or ending with <codeph>inf</codeph>,
@@ -165,12 +165,12 @@ under the License.
     <conbody>
       <ul>
         <li>
-          <p rev="CDH-41184">
+          <p rev="">
             The default for the <codeph>RUNTIME_FILTER_MODE</codeph>
             query option is changed to <codeph>GLOBAL</codeph> (the highest setting).
           </p>
         </li>
-        <li rev="CDH-41184 IMPALA-3007">
+        <li rev="IMPALA-3007">
           <p>
             The <codeph>RUNTIME_BLOOM_FILTER_SIZE</codeph> setting is now only used
             as a fallback if statistics are not available; otherwise, Impala
@@ -238,7 +238,7 @@ under the License.
         <li>
           <p conref="../shared/impala_common.xml#common/IMPALA-3662"/>
         </li>
-        <li rev="IMPALA-3452 CDH-39913">
+        <li rev="IMPALA-3452">
           <p>
             The <codeph>S3_SKIP_INSERT_STAGING</codeph> query option, which is enabled by
             default, increases the speed of <codeph>INSERT</codeph> operations for S3 tables.
@@ -255,7 +255,7 @@ under the License.
       </p>
       <ul>
         <li>
-          <p rev="IMPALA-2660 CDH-40241">
+          <p rev="IMPALA-2660">
             Impala now recognizes the <codeph>auth_to_local</codeph> setting,
             specified through the HDFS configuration setting
             <codeph>hadoop.security.auth_to_local</codeph>.
@@ -275,7 +275,7 @@ under the License.
           </p>
         </li>
         <li>
-          <p rev="IMPALA-2835 CDH-33330">
+          <p rev="IMPALA-2835">
             A new query option,
             <codeph>PARQUET_FALLBACK_SCHEMA_RESOLUTION</codeph>,
             lets Impala locate columns within Parquet files based on
@@ -318,7 +318,7 @@ under the License.
             reason about.
           </p>
         </li>
-        <li rev="IMPALA-2204 CDH-33139">
+        <li rev="IMPALA-2204">
           <p>
             Previously, the <codeph>_</codeph> and <codeph>%</codeph> wildcard
             characters for the <codeph>LIKE</codeph> operator would not match
@@ -330,7 +330,7 @@ under the License.
             queries on identical data.
           </p>
         </li>
-        <li rev="IMPALA-1748 CDH-38369">
+        <li rev="IMPALA-1748">
           <p>
             Formerly, all Impala UDFs and UDAs required running the
             <codeph>CREATE FUNCTION</codeph> statements to
@@ -384,8 +384,8 @@ under the License.
 
     <conbody>
       <p>
-        Other than support for DSSD storage, the Impala feature set for CDH 5.6 is the same as for CDH 5.5.
-        Therefore, there are no incompatible changes for Impala introduced in CDH 5.6.
+        Other than support for DSSD storage, the Impala feature set for <keyword keyref="impala24"/> is the same as for <keyword keyref="impala23"/>.
+        Therefore, there are no incompatible changes for Impala introduced in <keyword keyref="impala24"/>.
       </p>
     </conbody>
 
@@ -419,7 +419,7 @@ under the License.
             Previously, Impala would attempt to read the file despite the possibility that the file was corrupted.
           </p>
         </li>
-        <li rev="IMPALA-2233 CDH-33145">
+        <li rev="IMPALA-2233">
           <p>
             Previously, calls to overloaded built-in functions could treat parameters as <codeph>DOUBLE</codeph>
             or <codeph>FLOAT</codeph> when no overload had a signature that matched the exact argument types.
@@ -445,7 +445,7 @@ under the License.
             but displays a warning message.
           </p>
         </li>
-        <li rev="CDH-28071">
+        <li rev="">
           <p>
             Formerly, Impala could include snippets of table data in log files by default, for example
             when reporting conversion errors for data values. Now any such log messages are only produced
@@ -466,8 +466,6 @@ under the License.
 
     <conbody>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_220"/>
-
       <section id="files_220">
       <title>
         Changes to File Handling
@@ -507,10 +505,10 @@ under the License.
       <title>
         Changes to Prerequisites
       </title>
-        <p rev="CDH-24874">
+        <p rev="">
           Currently, Impala 2.1.x does not function on CPUs without the SSE4.1 instruction set. This minimum CPU
           requirement is higher than in previous versions, which relied on the older SSSE3 instruction set. Check
-          the CPU level of the hosts in your cluster before upgrading to Impala 2.1.x or CDH 5.3.x.
+          the CPU level of the hosts in your cluster before upgrading to <keyword keyref="impala21_full"/>.
         </p>
       </section>
 
@@ -552,8 +550,6 @@ under the License.
         No incompatible changes.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_205"/>
-
     </conbody>
   </concept>
 
@@ -567,8 +563,6 @@ under the License.
         No incompatible changes.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_204"/>
-
     </conbody>
   </concept>
 
@@ -578,8 +572,6 @@ under the License.
 
     <conbody>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_203"/>
-
     </conbody>
   </concept>
 
@@ -593,8 +585,6 @@ under the License.
         No incompatible changes.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_202"/>
-
     </conbody>
   </concept>
 
@@ -639,10 +629,10 @@ under the License.
       <title>
         Changes to Prerequisites
       </title>
-        <p rev="CDH-24874">
+        <p rev="">
           Currently, Impala 2.0.x does not function on CPUs without the SSE4.1 instruction set. This minimum CPU
           requirement is higher than in previous versions, which relied on the older SSSE3 instruction set. Check
-          the CPU level of the hosts in your cluster before upgrading to Impala 2.0.x or CDH 5.2.x.
+          the CPU level of the hosts in your cluster before upgrading to <keyword keyref="impala20_full"/>.
         </p>
       </section>
 
@@ -829,8 +819,6 @@ under the License.
         No incompatible changes.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_144"/>
-
     </conbody>
   </concept>
 
@@ -845,8 +833,6 @@ under the License.
         Impala.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_143"/>
-
     </conbody>
   </concept>
 
@@ -860,8 +846,6 @@ under the License.
         None. Impala 1.4.2 is purely a bug-fix release. It does not include any incompatible changes.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_142"/>
-
     </conbody>
   </concept>
 
@@ -996,8 +980,6 @@ under the License.
         Impala.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_133"/>
-
     </conbody>
   </concept>
 
@@ -1011,8 +993,6 @@ under the License.
         With the fix for IMPALA-1019, you can use HDFS caching for files that are accessed by Impala.
       </p>
 
-      <note conref="../shared/impala_common.xml#common/only_cdh5_132"/>
-
     </conbody>
   </concept>
 
@@ -1071,7 +1051,7 @@ under the License.
 
         <li>
           <p>
-            The query option named <codeph>YARN_POOL</codeph> during the CDH 5 beta period is now named
+            The query option formerly named <codeph>YARN_POOL</codeph> is now named
             <codeph>REQUEST_POOL</codeph> to reflect its broader use with the Impala admission control feature.
             <ph audience="PDF">See <xref href="impala_request_pool.xml#request_pool"/> for information about the
             option, and <xref href="impala_admission.xml#admission_control"/> for details about its use with the
@@ -1279,11 +1259,6 @@ select * from `cross`;</codeblock>
       </p>
 
       <p>
-        Because Impala 1.2.0 is bundled with the CDH 5 beta download and depends on specific levels of Apache
-        Hadoop components supplied with CDH 5, you can only install it in combination with the CDH 5 beta.
-      </p>
-
-      <p>
         The new <cmdname>catalogd</cmdname> service might require changes to any user-written scripts that stop,
         start, or restart Impala services, install or upgrade Impala packages, or issue <codeph>REFRESH</codeph> or
         <codeph>INVALIDATE METADATA</codeph> statements:
@@ -1294,22 +1269,8 @@ select * from `cross`;</codeblock>
       </ul>
       
       <p>
-        The new resource management feature interacts with both YARN and Llama services. <ph audience="PDF">See
-          <xref href="impala_resource_management.xml#resource_management"/> for usage information for Impala resource
-          management.</ph>
-      </p>
-
-      <p audience="hidden">
-        The new resource management feature interacts with both YARN and Llama services, which are available in CDH
-        5. These services are set up for you automatically in a Cloudera Manager (CM) environment. For information
-        about setting up the YARN and Llama services, see the instructions for
-<!-- Original URL: http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH5/latest/CDH5-Installation-Guide/cdh_ig_yarn_cluster_deploy.html -->
-        <xref href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_ig_yarn_cluster_deploy.html" scope="external" format="html">YARN</xref>
-        and
-<!-- Original URL: http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH5/latest/CDH5-Installation-Guide/cdh_ig_llama_installation.html -->
-<!-- Then this, which was removed: http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_ig_llama_installation.html -->
-        <xref href="http://www.cloudera.com/documentation/enterprise/latest/topics/admin_llama.html" scope="external" format="html">Llama</xref>
-        in the <cite>CDH 5 Documentation</cite>. <ph audience="PDF">See
+        The new resource management feature interacts with both YARN and Llama services.
+        <ph audience="PDF">See
         <xref href="impala_resource_management.xml#resource_management"/> for usage information for Impala resource
         management.</ph>
       </p>
@@ -1360,7 +1321,7 @@ ALTER TABLE <varname>table_name</varname> SET FILEFORMAT
       </p>
 
       <p>
-        As usual, make sure to upgrade the <codeph>impala-lzo-cdh4</codeph> package to the latest level at the same
+        As usual, make sure to upgrade the Impala LZO package to the latest level at the same
         time as you upgrade the Impala server.
       </p>
     </conbody>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_known_issues.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_known_issues.xml b/docs/topics/impala_known_issues.xml
index 99c670d..748b933 100644
--- a/docs/topics/impala_known_issues.xml
+++ b/docs/topics/impala_known_issues.xml
@@ -73,7 +73,7 @@ under the License.
 
   </conbody>
 
-<!-- New known issues for CDH 5.5 / Impala 2.3.
+<!-- New known issues for Impala 2.3.
 
 Title: Server-to-server SSL and Kerberos do not work together
 Description: If server<->server SSL is enabled (with ssl_client_ca_certificate), and Kerberos auth is used between servers, the cluster will fail to start.
@@ -204,7 +204,7 @@ https://issues.cloudera.org/browse/IMPALA-2144 - Don't have
           <b>Severity:</b> High
         </p>
 
-        <p><b>Resolution:</b> Fixed in CDH 5.9.0 / Impala 2.7.0.</p>
+        <p><b>Resolution:</b> Fixed in <keyword keyref="impala270"/>.</p>
 
       </conbody>
 
@@ -228,7 +228,7 @@ https://issues.cloudera.org/browse/IMPALA-2144 - Don't have
           <b>Severity:</b> High
         </p>
 
-        <p><b>Resolution:</b> Fixed in CDH 5.9.0 / Impala 2.7.0 and CDH 5.8.2 / Impala 2.6.2.</p>
+        <p><b>Resolution:</b> Fixed in <keyword keyref="impala270"/> and <keyword keyref="impala262"/>.</p>
 
       </conbody>
 
@@ -250,7 +250,7 @@ https://issues.cloudera.org/browse/IMPALA-2144 - Don't have
         </p>
 
         <p>
-          <b>Resolution:</b> Fixed in CDH 5.7.0 / Impala 2.5.0.
+          <b>Resolution:</b> Fixed in <keyword keyref="impala250"/>.
         </p>
 
       </conbody>
@@ -272,7 +272,7 @@ https://issues.cloudera.org/browse/IMPALA-2144 - Don't have
           <b>Bug:</b> <xref href="https://issues.cloudera.org/browse/IMPALA-2365" scope="external" format="html">IMPALA-2365</xref>
         </p>
 
-        <p><b>Resolution:</b> Fixed in CDH 5.7.0 / Impala 2.5.0.</p>
+        <p><b>Resolution:</b> Fixed in <keyword keyref="impala250"/>.</p>
 
       </conbody>
 
@@ -312,7 +312,7 @@ https://issues.cloudera.org/browse/IMPALA-2144 - Don't have
           <b>Workaround:</b> Run the DDL statement in Hive if the slowness is an issue.
         </p>
 
-        <p><b>Resolution:</b> Fixed in CDH 5.7.0 / Impala 2.5.0.</p>
+        <p><b>Resolution:</b> Fixed in <keyword keyref="impala250"/>.</p>
 
       </conbody>
 
@@ -353,10 +353,10 @@ https://issues.cloudera.org/browse/IMPALA-2144 - Don't have
         </p>
 
         <p>
-          <b>Resolution:</b> Fixes have been issued for some but not all CDH / Impala releases. Check the JIRA for details of fix releases.
+          <b>Resolution:</b> Fixes have been issued for some but not all Impala releases. Check the JIRA for details of fix releases.
         </p>
 
-        <p><b>Resolution:</b> Fixed in CDH 5.8.0 / Impala 2.6.0 and CDH 5.7.1 / Impala 2.5.1.</p>
+        <p><b>Resolution:</b> Fixed in <keyword keyref="impala260"/> and <keyword keyref="impala251"/>.</p>
 
       </conbody>
 
@@ -454,55 +454,6 @@ https://issues.cloudera.org/browse/IMPALA-2144 - Don't have
 
     </conbody>
 
-<!-- To do: Hiding for the moment. https://jira.cloudera.com/browse/CDH-38736 reports the issue is fixed. -->
-
-    <concept id="impala-shell_ssl_dependency" audience="hidden" rev="impala-shell_ssl_dependency">
-
-      <title>impala-shell requires Python with ssl module</title>
-
-      <conbody>
-
-        <p>
-          On CentOS 5.10 and Oracle Linux 5.11 using the built-in Python 2.4, invoking the <cmdname>impala-shell</cmdname> with the
-          <codeph>--ssl</codeph> option might fail with the following error:
-        </p>
-
-<codeblock>
-Unable to import the python 'ssl' module. It is required for an SSL-secured connection.
-</codeblock>
-
-<!-- No associated IMPALA-* JIRA... It is the internal JIRA CDH-38736. -->
-
-        <p>
-          <b>Severity:</b> Low, workaround available
-        </p>
-
-        <p>
-          <b>Resolution:</b> Customers are less likely to experience this issue over time, because <codeph>ssl</codeph> module is included
-          in newer Python releases packaged with recent Linux releases.
-        </p>
-
-        <p>
-          <b>Workaround:</b> To use SSL with <cmdname>impala-shell</cmdname> on these platform versions, install the <codeph>ssh</codeph>
-          Python module:
-        </p>
-
-<codeblock>
-yum install python-ssl
-</codeblock>
-
-        <p>
-          Then <cmdname>impala-shell</cmdname> can run when using SSL. For example:
-        </p>
-
-<codeblock>
-impala-shell -s impala --ssl --ca_cert /path_to_truststore/truststore.pem
-</codeblock>
-
-      </conbody>
-
-    </concept>
-
     <concept id="renewable_kerberos_tickets">
 
 <!-- Not part of Alex's spreadsheet. Not associated with a JIRA number AFAIK. -->
@@ -547,7 +498,7 @@ impala-shell -s impala --ssl --ca_cert /path_to_truststore/truststore.pem
           issue is resolved.
         </p>
 
-        <p><b>Resolution:</b> Fixed in CDH 5.7.0 / Impala 2.5.0 and CDH 5.5.2 / Impala 2.3.2.</p>
+        <p><b>Resolution:</b> Fixed in <keyword keyref="impala250"/> and <keyword keyref="impala232"/>.</p>
 
       </conbody>
 
@@ -586,9 +537,9 @@ impala-shell -s impala --ssl --ca_cert /path_to_truststore/truststore.pem
 
     </conbody>
 
-    <concept id="TSB-168">
+    <concept id="catalogd_heap">
 
-      <title>Impala catalogd heap issues when upgrading to 5.7</title>
+      <title>Impala catalogd heap issues when upgrading to <keyword keyref="impala25"/></title>
 
       <conbody>
 
@@ -599,14 +550,14 @@ impala-shell -s impala --ssl --ca_cert /path_to_truststore/truststore.pem
         <ul>
           <li>
             <p>
-              Before 5.7, by default <cmdname>catalogd</cmdname> was using the JVM's default heap size, which is the smaller of 1/4th of the
+              Previously, by default <cmdname>catalogd</cmdname> was using the JVM's default heap size, which is the smaller of 1/4th of the
               physical memory or 32 GB.
             </p>
           </li>
 
           <li>
             <p>
-              Starting with CDH 5.7.0, the default <cmdname>catalogd</cmdname> heap size is 4 GB.
+              Starting with <keyword keyref="impala250"/>, the default <cmdname>catalogd</cmdname> heap size is 4 GB.
             </p>
           </li>
         </ul>
@@ -616,10 +567,6 @@ impala-shell -s impala --ssl --ca_cert /path_to_truststore/truststore.pem
           in out-of-memory errors in catalogd and leading to query failures.
         </p>
 
-        <p audience="hidden">
-          <b>Bug:</b> <xref href="https://jira.cloudera.com/browse/TSB-168" scope="external" format="html">TSB-168</xref>
-        </p>
-
         <p>
           <b>Severity:</b> High
         </p>
@@ -778,7 +725,7 @@ impala-shell -s impala --ssl --ca_cert /path_to_truststore/truststore.pem
           <b>Workaround:</b> Transition away from the <q>old-style</q> join and aggregation mechanism if practical.
         </p>
 
-        <p><b>Resolution:</b> Fixed in CDH 5.7.0 / Impala 2.5.0.</p>
+        <p><b>Resolution:</b> Fixed in <keyword keyref="impala250"/>.</p>
 
       </conbody>
 
@@ -818,7 +765,7 @@ impala-shell -s impala --ssl --ca_cert /path_to_truststore/truststore.pem
           <b>Severity:</b> High
         </p>
 
-        <p><b>Resolution:</b> Fixed in CDH 5.9.0 / Impala 2.7.0.</p>
+        <p><b>Resolution:</b> Fixed in <keyword keyref="impala270"/>.</p>
 
       </conbody>
 
@@ -1116,7 +1063,7 @@ select
           <b>Bug:</b> <xref href="https://issues.cloudera.org/browse/IMPALA-1170" scope="external" format="html"></xref>IMPALA-1170
         </p>
 
-        <p><b>Resolution:</b> Fixed in CDH 5.7.0 / Impala 2.5.0 and CDH 5.5.4 / Impala 2.3.4.</p>
+        <p><b>Resolution:</b> Fixed in <keyword keyref="impala250"/> and <keyword keyref="impala234"/>.</p>
 
       </conbody>
 
@@ -1179,7 +1126,7 @@ select
           <b>Workaround:</b> Avoid selecting the same column twice within an inline view.
         </p>
 
-        <p><b>Resolution:</b> Fixed in CDH 5.7.0 / Impala 2.5.0, CDH 5.5.2 / Impala 2.3.2, and CDH 5.4.10 / Impala 2.2.10.</p>
+        <p><b>Resolution:</b> Fixed in <keyword keyref="impala250"/>, <keyword keyref="impala232"/>, and <keyword keyref="impala2210"/>.</p>
 
       </conbody>
 
@@ -1202,7 +1149,7 @@ select
           <b>Bug:</b> <xref href="https://issues.cloudera.org/browse/IMPALA-1459" scope="external" format="html">IMPALA-1459</xref>
         </p>
 
-        <p><b>Resolution:</b> Fixed in CDH 5.7.0 / Impala 2.5.0, CDH 5.5.2 / Impala 2.3.2, and CDH 5.4.9 / Impala 2.2.9.</p>
+        <p><b>Resolution:</b> Fixed in <keyword keyref="impala250"/>, <keyword keyref="impala232"/>, and <keyword keyref="impala229"/>.</p>
 
       </conbody>
 
@@ -1256,7 +1203,7 @@ select
           <b>Bug:</b> <xref href="https://issues.cloudera.org/browse/IMPALA-2665" scope="external" format="html">IMPALA-2665</xref>
         </p>
 
-        <p><b>Resolution:</b> Fixed in CDH 5.7.0 / Impala 2.5.0, CDH 5.5.2 / Impala 2.3.2, and CDH 5.4.9 / Impala 2.2.9.</p>
+        <p><b>Resolution:</b> Fixed in <keyword keyref="impala250"/>, <keyword keyref="impala232"/>, and <keyword keyref="impala229"/>.</p>
 
       </conbody>
 
@@ -1277,7 +1224,7 @@ select
           <b>Bug:</b> <xref href="https://issues.cloudera.org/browse/IMPALA-2144" scope="external" format="html">IMPALA-2144</xref>
         </p>
 
-        <p><b>Resolution:</b> Fixed in CDH 5.7.0 / Impala 2.5.0.</p>
+        <p><b>Resolution:</b> Fixed in <keyword keyref="impala250"/>.</p>
 
       </conbody>
 
@@ -1298,7 +1245,7 @@ select
           <b>Bug:</b> <xref href="https://issues.cloudera.org/browse/IMPALA-2093" scope="external" format="html">IMPALA-2093</xref>
         </p>
 
-        <p><b>Resolution:</b> Fixed in CDH 5.7.0 / Impala 2.5.0 and CDH 5.5.4 / Impala 2.3.4.</p>
+        <p><b>Resolution:</b> Fixed in <keyword keyref="impala250"/> and <keyword keyref="impala234"/>.</p>
 
       </conbody>
 
@@ -1350,7 +1297,7 @@ select
 
 <!-- Not part of Alex's spreadsheet -->
 
-      <title>Can't update stats manually via alter table after upgrading to CDH 5.2</title>
+      <title>Can't update stats manually via alter table after upgrading to <keyword keyref="impala20"/></title>
 
       <conbody>
 
@@ -1361,7 +1308,7 @@ select
         </p>
 
         <p>
-          <b>Workaround:</b> On CDH 5.2, when adjusting table statistics manually by setting the <codeph>numRows</codeph>, you must also
+          <b>Workaround:</b> On <keyword keyref="impala20"/>, when adjusting table statistics manually by setting the <codeph>numRows</codeph>, you must also
           enable the Boolean property <codeph>STATS_GENERATED_VIA_STATS_TASK</codeph>. For example, use a statement like the following to
           set both properties with a single <codeph>ALTER TABLE</codeph> statement:
         </p>
@@ -1371,7 +1318,7 @@ select
         <p>
           <b>Resolution:</b> The underlying cause is the issue
           <xref href="https://issues.apache.org/jira/browse/HIVE-8648" scope="external" format="html">HIVE-8648</xref> that affects the
-          metastore in Hive 0.13. The workaround is only needed until the fix for this issue is incorporated into a CDH release.
+          metastore in Hive 0.13. The workaround is only needed until the fix for this issue is incorporated into release of <keyword keyref="distro"/>.
         </p>
 
       </conbody>
@@ -1393,16 +1340,16 @@ select
 
     </conbody>
 
-<!-- Opened based on CDH-41605. Not part of Alex's spreadsheet AFAIK. -->
+<!-- Opened based on internal JIRA. Not part of Alex's spreadsheet AFAIK. -->
 
-    <concept id="CDH-41605">
+    <concept id="describe_formatted_avro">
 
       <title>DESCRIBE FORMATTED gives error on Avro table</title>
 
       <conbody>
 
         <p>
-          This issue can occur either on old Avro tables (created prior to Hive 1.1 / CDH 5.4) or when changing the Avro schema file by
+          This issue can occur either on old Avro tables (created prior to Hive 1.1) or when changing the Avro schema file by
           adding or removing columns. Columns added to the schema file will not show up in the output of the <codeph>DESCRIBE
           FORMATTED</codeph> command. Removing columns from the schema file will trigger a <codeph>NullPointerException</codeph>.
         </p>
@@ -1421,10 +1368,6 @@ ALTER TABLE table_name SET TBLPROPERTIES('EXTERNAL'='TRUE');
           table. See <xref href="impala_tables.xml#tables"/> for the differences between internal and external tables.
         </note>
 
-        <p audience="hidden">
-          <b>Bug:</b> <xref href="https://issues.cloudera.org/browse/CDH-41605" scope="external" format="html">CDH-41605</xref>
-        </p>
-
         <p>
           <b>Severity:</b> High
         </p>
@@ -1484,9 +1427,9 @@ ALTER TABLE table_name SET TBLPROPERTIES('EXTERNAL'='TRUE');
 
     </concept>
 
-    <concept id="CDH-13199">
+    <concept id="flume_writeformat_text">
 
-<!-- Not part of Alex's spreadsheet. The CDH- prefix makes it an oddball. -->
+<!-- Not part of Alex's spreadsheet. From a non-public JIRA. -->
 
       <title>Configuration needed for Flume to be compatible with Impala</title>
 
@@ -1582,7 +1525,7 @@ ALTER TABLE table_name SET TBLPROPERTIES('EXTERNAL'='TRUE');
           <b>Workaround:</b> Use a different gzip tool to compress file to a single stream file.
         </p>
 
-        <p><b>Resolution:</b> Fixed in CDH 5.7.0 / Impala 2.5.0.</p>
+        <p><b>Resolution:</b> Fixed in <keyword keyref="impala250"/>.</p>
 
       </conbody>
 
@@ -1609,7 +1552,7 @@ ALTER TABLE table_name SET TBLPROPERTIES('EXTERNAL'='TRUE');
           <b>Workaround:</b> Use the Parquet format for large volumes of data where practical.
         </p>
 
-        <p><b>Resolution:</b> Fixed in CDH 5.8.0 / Impala 2.6.0.</p>
+        <p><b>Resolution:</b> Fixed in <keyword keyref="impala260"/>.</p>
 
       </conbody>
 
@@ -1788,7 +1731,7 @@ ALTER TABLE table_name SET TBLPROPERTIES('EXTERNAL'='TRUE');
           <b>Bug:</b> <xref href="https://issues.cloudera.org/browse/IMPALA-1619" scope="external" format="html">IMPALA-1619</xref>
         </p>
 
-        <p><b>Resolution:</b> Fixed in CDH 5.9.0 / Impala 2.7.0 and CDH 5.8.3 / Impala 2.6.3.</p>
+        <p><b>Resolution:</b> Fixed in <keyword keyref="impala2?0"/> and <keyword keyref="impala263"/>.</p>
 
       </conbody>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_load_data.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_load_data.xml b/docs/topics/impala_load_data.xml
index 8d027f3..a092276 100644
--- a/docs/topics/impala_load_data.xml
+++ b/docs/topics/impala_load_data.xml
@@ -146,13 +146,13 @@ under the License.
 
     <p>
       First, we use a trivial Python script to write different numbers of strings (one per line) into files stored
-      in the <codeph>cloudera</codeph> HDFS user account. (Substitute the path for your own HDFS user account when
+      in the <codeph>doc_demo</codeph> HDFS user account. (Substitute the path for your own HDFS user account when
       doing <cmdname>hdfs dfs</cmdname> operations like these.)
     </p>
 
-<codeblock>$ random_strings.py 1000 | hdfs dfs -put - /user/cloudera/thousand_strings.txt
-$ random_strings.py 100 | hdfs dfs -put - /user/cloudera/hundred_strings.txt
-$ random_strings.py 10 | hdfs dfs -put - /user/cloudera/ten_strings.txt</codeblock>
+<codeblock>$ random_strings.py 1000 | hdfs dfs -put - /user/doc_demo/thousand_strings.txt
+$ random_strings.py 100 | hdfs dfs -put - /user/doc_demo/hundred_strings.txt
+$ random_strings.py 10 | hdfs dfs -put - /user/doc_demo/ten_strings.txt</codeblock>
 
     <p>
       Next, we create a table and load an initial set of data into it. Remember, unless you specify a
@@ -163,7 +163,7 @@ $ random_strings.py 10 | hdfs dfs -put - /user/cloudera/ten_strings.txt</codeblo
     </p>
 
 <codeblock>[localhost:21000] &gt; create table t1 (s string);
-[localhost:21000] &gt; load data inpath '/user/cloudera/thousand_strings.txt' into table t1;
+[localhost:21000] &gt; load data inpath '/user/doc_demo/thousand_strings.txt' into table t1;
 Query finished, fetching results ...
 +----------------------------------------------------------+
 | summary                                                  |
@@ -179,8 +179,8 @@ Query finished, fetching results ...
 | 1000 |
 +------+
 Returned 1 row(s) in 0.67s
-[localhost:21000] &gt; load data inpath '/user/cloudera/thousand_strings.txt' into table t1;
-ERROR: AnalysisException: INPATH location '/user/cloudera/thousand_strings.txt' does not exist. </codeblock>
+[localhost:21000] &gt; load data inpath '/user/doc_demo/thousand_strings.txt' into table t1;
+ERROR: AnalysisException: INPATH location '/user/doc_demo/thousand_strings.txt' does not exist. </codeblock>
 
     <p>
       As indicated by the message at the end of the previous example, the data file was moved from its original
@@ -190,7 +190,7 @@ ERROR: AnalysisException: INPATH location '/user/cloudera/thousand_strings.txt'
 
 <codeblock>$ hdfs dfs -ls /user/hive/warehouse/load_data_testing.db/t1
 Found 1 items
--rw-r--r--   1 cloudera cloudera      13926 2013-06-26 15:40 /user/hive/warehouse/load_data_testing.db/t1/thousand_strings.txt</codeblock>
+-rw-r--r--   1 doc_demo doc_demo      13926 2013-06-26 15:40 /user/hive/warehouse/load_data_testing.db/t1/thousand_strings.txt</codeblock>
 
     <p>
       The following example demonstrates the difference between the <codeph>INTO TABLE</codeph> and
@@ -201,7 +201,7 @@ Found 1 items
       the just-loaded data file.
     </p>
 
-<codeblock>[localhost:21000] &gt; load data inpath '/user/cloudera/hundred_strings.txt' into table t1;
+<codeblock>[localhost:21000] &gt; load data inpath '/user/doc_demo/hundred_strings.txt' into table t1;
 Query finished, fetching results ...
 +----------------------------------------------------------+
 | summary                                                  |
@@ -217,7 +217,7 @@ Query finished, fetching results ...
 | 1100 |
 +------+
 Returned 1 row(s) in 0.55s
-[localhost:21000] &gt; load data inpath '/user/cloudera/ten_strings.txt' overwrite into table t1;
+[localhost:21000] &gt; load data inpath '/user/doc_demo/ten_strings.txt' overwrite into table t1;
 Query finished, fetching results ...
 +----------------------------------------------------------+
 | summary                                                  |
@@ -242,7 +242,7 @@ Returned 1 row(s) in 0.62s</codeblock>
     <p conref="../shared/impala_common.xml#common/cancel_blurb_no"/>
 
     <p conref="../shared/impala_common.xml#common/permissions_blurb"/>
-    <p rev="CDH-19187">
+    <p rev="">
       The user ID that the <cmdname>impalad</cmdname> daemon runs under,
       typically the <codeph>impala</codeph> user, must have read and write
       permissions for the files in the source directory, and write

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/18927ac8/docs/topics/impala_misc_functions.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_misc_functions.xml b/docs/topics/impala_misc_functions.xml
index c5ca9eb..7bd57d3 100644
--- a/docs/topics/impala_misc_functions.xml
+++ b/docs/topics/impala_misc_functions.xml
@@ -72,7 +72,7 @@ under the License.
             <b>Return type:</b> <codeph>string</codeph>
           </p>
           <p>
-            <b>Added in:</b> CDH 5.4.5
+            <b>Added in:</b> <keyword keyref="impala225"/>
           </p>
         </dd>