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"/>

Reply via email to