Repository: incubator-impala
Updated Branches:
  refs/heads/doc_prototype 11cca068f -> 0c0d34b86


Mark a bunch of "Cloudera recommends" statements for rewording as part of 
upstream work.


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

Branch: refs/heads/doc_prototype
Commit: 0c0d34b86ffe8fee76cd282eedea9c8eb5df3694
Parents: 11cca06
Author: John Russell <[email protected]>
Authored: Wed Nov 2 14:03:52 2016 -0700
Committer: John Russell <[email protected]>
Committed: Wed Nov 2 14:03:52 2016 -0700

----------------------------------------------------------------------
 docs/shared/impala_common.xml              | 16 ++++++++--------
 docs/topics/impala_admission.xml           |  4 ++--
 docs/topics/impala_authorization.xml       |  2 +-
 docs/topics/impala_config_options.xml      |  4 ++--
 docs/topics/impala_describe.xml            |  2 +-
 docs/topics/impala_hbase.xml               |  2 +-
 docs/topics/impala_howto_rm.xml            |  2 +-
 docs/topics/impala_jdbc.xml                |  2 +-
 docs/topics/impala_kerberos.xml            |  2 +-
 docs/topics/impala_logging.xml             |  4 ++--
 docs/topics/impala_noncm_installation.xml  |  4 ++--
 docs/topics/impala_perf_resources.xml      |  2 +-
 docs/topics/impala_perf_stats.xml          |  2 +-
 docs/topics/impala_proxy.xml               |  2 +-
 docs/topics/impala_resource_management.xml |  2 +-
 docs/topics/impala_tables.xml              |  2 +-
 docs/topics/impala_timestamp.xml           |  2 +-
 docs/topics/impala_txtfile.xml             |  2 +-
 docs/topics/impala_udf.xml                 |  2 +-
 19 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0c0d34b8/docs/shared/impala_common.xml
----------------------------------------------------------------------
diff --git a/docs/shared/impala_common.xml b/docs/shared/impala_common.xml
index 674fc9e..cfbad2a 100644
--- a/docs/shared/impala_common.xml
+++ b/docs/shared/impala_common.xml
@@ -2788,7 +2788,7 @@ select max(height), avg(height) from census_data where 
age &gt; 20;
         When Impala processes a cached data block, where the cache replication 
factor is greater than 1, Impala randomly
         selects a host that has a cached copy of that data block. This 
optimization avoids excessive CPU
         usage on a single host when the same cached data block is processed 
multiple times.
-        Cloudera recommends specifying a value greater than or equal to the 
HDFS block replication factor.
+        <ph rev="upstream">Cloudera</ph> recommends specifying a value greater 
than or equal to the HDFS block replication factor.
       </p>
 
 <!-- This same text is conref'ed in the #views and the #partition_pruning 
topics. -->
@@ -2898,7 +2898,7 @@ Query finished, fetching results ...
       </p>
 
       <p id="impala_overview_diagram">
-        The following graphic illustrates how Impala is positioned in the 
broader Cloudera environment:
+        The following graphic illustrates how Impala is positioned in the 
broader <ph rev="upstream">Cloudera</ph> environment:
         <image href="../images/impala_arch.jpeg" placement="break">
           <alt>Architecture diagram showing how Impala relates to other Hadoop 
components such as HDFS, the Hive metastore database, and client programs such 
as JDBC and ODBC applications and the Hue web UI.</alt>
         </image>
@@ -3267,7 +3267,7 @@ sudo pip-python install ssl</codeblock>
 
       <p id="hdfs_caching_encryption_caveat" rev="IMPALA-3679">
         Due to a limitation of HDFS, zero-copy reads are not supported with
-        encryption. Cloudera recommends not using HDFS caching for Impala data
+        encryption. <ph rev="upstream">Cloudera</ph> recommends not using HDFS 
caching for Impala data
         files in encryption zones. The queries fall back to the normal read
         path during query execution, which might cause some performance 
overhead.
       </p>
@@ -3387,7 +3387,7 @@ sudo pip-python install ssl</codeblock>
       <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, Cloudera recommends all 
customers to migrate to a recent CDH 5 release.
+        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. -->
@@ -3395,19 +3395,19 @@ sudo pip-python install ssl</codeblock>
       <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, Cloudera recommends all 
customers to migrate to a recent CDH 5 release.
+        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, Cloudera recommends all 
customers to migrate to a recent CDH 5 release.
+        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, Cloudera recommends all 
customers to migrate to a recent CDH 5 release.
+        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.
@@ -3464,7 +3464,7 @@ sudo pip-python install ssl</codeblock>
       <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, Cloudera recommends all 
customers to migrate to a recent CDH 5 release.
+        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">

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0c0d34b8/docs/topics/impala_admission.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_admission.xml b/docs/topics/impala_admission.xml
index eb7563b..76e8040 100644
--- a/docs/topics/impala_admission.xml
+++ b/docs/topics/impala_admission.xml
@@ -375,7 +375,7 @@
       <p>
         The configuration options for admission control range from the simple 
(a single resource pool with a single
         set of options) to the complex (multiple resource pools with different 
options, each pool handling queries
-        for a different set of users and groups). Cloudera recommends 
configuring the settings through the Cloudera Manager user
+        for a different set of users and groups). <ph 
rev="upstream">Cloudera</ph> recommends configuring the settings through the 
Cloudera Manager user
         interface.
         <!--
         , or on a system without Cloudera Manager by editing configuration 
files or through startup
@@ -388,7 +388,7 @@
       <note type="important">
         Although the following options are still present in the Cloudera 
Manager interface under the
         <uicontrol>Admission Control</uicontrol> configuration settings dialog,
-        Cloudera recommends you not use them in CDH 5.7 / Impala 2.5 and 
higher.
+        <ph rev="upstream">Cloudera</ph> recommends you not use them in CDH 
5.7 / Impala 2.5 and higher.
         These settings only apply if you enable admission control but leave 
dynamic resource pools disabled.
         In CDH 5.7 / Impala 2.5 and higher, prefer to set up dynamic resource 
pools and
         customize the settings for each pool, as described in

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0c0d34b8/docs/topics/impala_authorization.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_authorization.xml 
b/docs/topics/impala_authorization.xml
index ab775a0..f12b6d1 100644
--- a/docs/topics/impala_authorization.xml
+++ b/docs/topics/impala_authorization.xml
@@ -298,7 +298,7 @@ report_generator = 
server=server1-&gt;db=reporting_db-&gt;table=*-&gt;action=SEL
 
       <note rev="1.4.0">
         <p rev="1.4.0">
-          In CDH 5 and higher, Cloudera recommends
+          In CDH 5 and higher, <ph rev="upstream">Cloudera</ph> recommends
           managing privileges through SQL statements, as described in
           <xref href="impala_authorization.xml#sentry_service"/>. If you are 
still using policy files, plan to
           migrate to the new approach some time in the future.

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0c0d34b8/docs/topics/impala_config_options.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_config_options.xml 
b/docs/topics/impala_config_options.xml
index 03f07d2..686df87 100644
--- a/docs/topics/impala_config_options.xml
+++ b/docs/topics/impala_config_options.xml
@@ -151,7 +151,7 @@ Starting Impala Catalog Server:                            
[  OK  ]</codeblock>
       <ul>
         <li>
           <p>
-            Statestore address. Cloudera recommends the statestore be on a 
separate host not
+            Statestore address. Where practical, put the statestore on a 
separate host not
             running the <cmdname>impalad</cmdname> daemon. In that recommended 
configuration,
             the <cmdname>impalad</cmdname> daemon cannot refer to the 
statestore server using
             the loopback address. If the statestore is hosted on a machine 
with an IP address of
@@ -338,7 +338,7 @@ Starting Impala Catalog Server:                            
[  OK  ]</codeblock>
         <ul>
           <li>
             <p>
-              Statestore address. Cloudera recommends the statestore be on a 
separate host not
+              Statestore address. Where practical, put the statestore on a 
separate host not
               running the <cmdname>impalad</cmdname> daemon. In that 
recommended configuration,
               the <cmdname>impalad</cmdname> daemon cannot refer to the 
statestore server using
               the loopback address. If the statestore is hosted on a machine 
with an IP address

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0c0d34b8/docs/topics/impala_describe.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_describe.xml b/docs/topics/impala_describe.xml
index adff870..c7a2088 100644
--- a/docs/topics/impala_describe.xml
+++ b/docs/topics/impala_describe.xml
@@ -325,7 +325,7 @@ describe region.r_nations.item;
           elements are anonymous. The fields of the <codeph>STRUCT</codeph> 
give names to any other complex types
           nested inside the <codeph>STRUCT</codeph>. Therefore, the 
<codeph>DESCRIBE</codeph> parameters
           <codeph>CUSTOMER.C_ORDERS.ITEM.O_LINEITEMS</codeph> and 
<codeph>CUSTOMER.C_ORDERS.O_LINEITEMS</codeph>
-          are equivalent. (For brevity, Cloudera recommends leaving out the 
<codeph>ITEM</codeph> portion of
+          are equivalent. (For brevity, leave out the <codeph>ITEM</codeph> 
portion of
           a qualified name when it is not required.)
         </p>
       </li>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0c0d34b8/docs/topics/impala_hbase.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_hbase.xml b/docs/topics/impala_hbase.xml
index 5ce47e4..0260545 100644
--- a/docs/topics/impala_hbase.xml
+++ b/docs/topics/impala_hbase.xml
@@ -135,7 +135,7 @@
 
       <p>
         To avoid delays if HBase is unavailable during Impala startup or after 
an <codeph>INVALIDATE
-        METADATA</codeph> statement, Cloudera recommends setting timeout 
values as follows in
+        METADATA</codeph> statement, <ph rev="upstream">Cloudera</ph> 
recommends setting timeout values as follows in
         <filepath>/etc/impala/conf/hbase-site.xml</filepath> (for environments 
not managed by Cloudera Manager):
       </p>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0c0d34b8/docs/topics/impala_howto_rm.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_howto_rm.xml b/docs/topics/impala_howto_rm.xml
index 4c3facc..2a7494b 100644
--- a/docs/topics/impala_howto_rm.xml
+++ b/docs/topics/impala_howto_rm.xml
@@ -101,7 +101,7 @@
   <title>Setting Per-query Memory Limits</title>
   <conbody>
    <p>Use per-query memory limits to prevent queries from consuming excessive 
memory resources that
-    impact other queries. Cloudera recommends that you set the query memory 
limits whenever
+    impact other queries. <ph rev="upstream">Cloudera</ph> recommends that you 
set the query memory limits whenever
     possible.</p>
    <p>If you set the <b>Pool Max Mem Resources</b> for a resource pool, Impala 
attempts to throttle
     queries if there is not enough memory to run them within the specified 
resources.</p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0c0d34b8/docs/topics/impala_jdbc.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_jdbc.xml b/docs/topics/impala_jdbc.xml
index ef5e9db..88b06aa 100644
--- a/docs/topics/impala_jdbc.xml
+++ b/docs/topics/impala_jdbc.xml
@@ -80,7 +80,7 @@
 
       <p>
         In Impala 2.0 and later, you have the choice between the Cloudera JDBC 
Connector and the Hive 0.13 JDBC driver.
-        Cloudera recommends using the Cloudera JDBC Connector where practical.
+        <ph rev="upstream">Cloudera</ph> recommends using the Cloudera JDBC 
Connector where practical.
       </p>
 
       <p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0c0d34b8/docs/topics/impala_kerberos.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_kerberos.xml b/docs/topics/impala_kerberos.xml
index 7c59185..d23186f 100644
--- a/docs/topics/impala_kerberos.xml
+++ b/docs/topics/impala_kerberos.xml
@@ -30,7 +30,7 @@
     <p>
       When using Impala in a managed environment, Cloudera Manager 
automatically completes Kerberos configuration.
       In an unmanaged environment, create a Kerberos principal for each host 
running <cmdname>impalad</cmdname> or
-      <cmdname>statestored</cmdname>. Cloudera recommends using a consistent 
format, such as
+      <cmdname>statestored</cmdname>. <ph rev="upstream">Cloudera</ph> 
recommends using a consistent format, such as
       <codeph>impala/_HOST@Your-Realm</codeph>, but you can use any three-part 
Kerberos server principal.
     </p>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0c0d34b8/docs/topics/impala_logging.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_logging.xml b/docs/topics/impala_logging.xml
index 0767818..7eea4a8 100644
--- a/docs/topics/impala_logging.xml
+++ b/docs/topics/impala_logging.xml
@@ -172,7 +172,7 @@
     <conbody>
 
       <p>
-        Cloudera recommends installing Impala through the Cloudera Manager 
administration interface. To assist with
+        <ph rev="upstream">Cloudera</ph> recommends installing Impala through 
the Cloudera Manager administration interface. To assist with
         troubleshooting, Cloudera Manager collects front-end and back-end logs 
together into a single view, and let
         you do a search across log data for all the managed nodes rather than 
examining the logs on each node
         separately. If you installed Impala using Cloudera Manager, refer to 
the topics on Monitoring Services
@@ -401,7 +401,7 @@ I0107 08:42:12.292706 14876 logging.cc:76] Flags (see also 
/varz are on debug we
         </p>
 
         <p>
-          Increasing logging levels imposes performance overhead and increases 
log size. Cloudera recommends using
+          Increasing logging levels imposes performance overhead and increases 
log size. <ph rev="upstream">Cloudera</ph> recommends using
           GLOG_v=1 for most cases: this level has minimal performance impact 
but still captures useful
           troubleshooting information.
         </p>

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

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0c0d34b8/docs/topics/impala_perf_resources.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_perf_resources.xml 
b/docs/topics/impala_perf_resources.xml
index e00c6de..c538893 100644
--- a/docs/topics/impala_perf_resources.xml
+++ b/docs/topics/impala_perf_resources.xml
@@ -49,7 +49,7 @@
 
       <li>
         <p>
-          For production deployment, Cloudera recommends that you implement 
resource isolation using mechanisms
+          For production deployment, <ph rev="upstream">Cloudera</ph> 
recommends that you implement resource isolation using mechanisms
           such as cgroups, which you can configure using Cloudera Manager. For 
details, see the
           <xref 
href="http://www.cloudera.com/documentation/enterprise/latest/topics/cm_mc_service_pools.html";
 scope="external" format="html">Static
           Resource Pools</xref> in the Cloudera Manager documentation.

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0c0d34b8/docs/topics/impala_perf_stats.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_perf_stats.xml 
b/docs/topics/impala_perf_stats.xml
index 5e12881..e6b4c14 100644
--- a/docs/topics/impala_perf_stats.xml
+++ b/docs/topics/impala_perf_stats.xml
@@ -108,7 +108,7 @@ show table stats parquet_snappy;
       <p>
         If you use the Hive-based methods of gathering statistics, see
         <xref href="https://cwiki.apache.org/confluence/display/Hive/StatsDev"; 
scope="external" format="html">the
-        Hive wiki</xref> for information about the required configuration on 
the Hive side. Cloudera recommends
+        Hive wiki</xref> for information about the required configuration on 
the Hive side. <ph rev="upstream">Cloudera</ph> recommends
         using the Impala <codeph>COMPUTE STATS</codeph> statement to avoid 
potential configuration and scalability
         issues with the statistics-gathering process.
       </p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0c0d34b8/docs/topics/impala_proxy.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_proxy.xml b/docs/topics/impala_proxy.xml
index 84511c7..fc2e27c 100644
--- a/docs/topics/impala_proxy.xml
+++ b/docs/topics/impala_proxy.xml
@@ -93,7 +93,7 @@
             </li>
             <li>
               <p rev="DOCS-690">
-                Consider enabling <q>sticky sessions</q>. Cloudera recommends 
enabling this setting
+                Consider enabling <q>sticky sessions</q>. <ph 
rev="upstream">Cloudera</ph> recommends enabling this setting
                 so that stateless client applications such as 
<cmdname>impalad</cmdname> and Hue
                 are not disconnected from long-running queries. Evaluate 
whether this setting is
                 appropriate for your combination of workload and client 
applications.

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0c0d34b8/docs/topics/impala_resource_management.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_resource_management.xml 
b/docs/topics/impala_resource_management.xml
index baadee1..d8f7cb0 100644
--- a/docs/topics/impala_resource_management.xml
+++ b/docs/topics/impala_resource_management.xml
@@ -225,7 +225,7 @@
               <codeph>-rm_always_use_defaults</codeph>: If this Boolean option 
is enabled, Impala ignores computed
               estimates and always obtains the default memory and CPU 
allocation settings at the start of the
               query. These default estimates are approximately 2 CPUs and 4 GB 
of memory, possibly varying slightly
-              depending on cluster size, workload, and so on. Cloudera 
recommends enabling
+              depending on cluster size, workload, and so on. <ph 
rev="upstream">Cloudera</ph> recommends enabling
               <codeph>-rm_always_use_defaults</codeph> whenever resource 
management is used, and relying on these
               default values (that is, leaving out the two following options).
             </li>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0c0d34b8/docs/topics/impala_tables.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_tables.xml b/docs/topics/impala_tables.xml
index dfd3199..e2354e3 100644
--- a/docs/topics/impala_tables.xml
+++ b/docs/topics/impala_tables.xml
@@ -246,7 +246,7 @@
       <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, Cloudera recommends using Parquet for Impala 
tables with substantial amounts of data.
+        requirements; therefore, <ph rev="upstream">Cloudera</ph> recommends 
using Parquet for Impala tables with substantial amounts of data.
         <ph rev="2.3.0">Also, the complex types (<codeph>ARRAY</codeph>, 
<codeph>STRUCT</codeph>, and <codeph>MAP</codeph>)
         available in CDH 5.5 / Impala 2.3 and higher are currently only 
supported with the Parquet file type.</ph>
         Based on your existing ETL workflow, you might use other file formats 
such as Avro, possibly doing a final

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0c0d34b8/docs/topics/impala_timestamp.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_timestamp.xml b/docs/topics/impala_timestamp.xml
index 4b6e16e..46db308 100644
--- a/docs/topics/impala_timestamp.xml
+++ b/docs/topics/impala_timestamp.xml
@@ -147,7 +147,7 @@ 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, Cloudera recommends
+      <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.
     </p>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0c0d34b8/docs/topics/impala_txtfile.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_txtfile.xml b/docs/topics/impala_txtfile.xml
index 543e2ff..8418eca 100644
--- a/docs/topics/impala_txtfile.xml
+++ b/docs/topics/impala_txtfile.xml
@@ -424,7 +424,7 @@ INSERT INTO csv SELECT * FROM 
other_file_format_table;</codeblock>
         <indexterm audience="Cloudera">LZO support in Impala</indexterm>
 
         <indexterm audience="Cloudera">compression</indexterm>
-        Impala supports using text data files that employ LZO compression. 
Cloudera recommends compressing
+        Impala supports using text data files that employ LZO compression. <ph 
rev="upstream">Cloudera</ph> recommends compressing
         text data files when practical. Impala queries are usually I/O-bound; 
reducing the amount of data read from
         disk typically speeds up a query, despite the extra CPU work to 
uncompress the data in memory.
       </p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0c0d34b8/docs/topics/impala_udf.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_udf.xml b/docs/topics/impala_udf.xml
index 2d2f3b5..52c9a41 100644
--- a/docs/topics/impala_udf.xml
+++ b/docs/topics/impala_udf.xml
@@ -143,7 +143,7 @@ select real_words(letters) from word_games;</codeblock>
 
         <p>
           Impala supports UDFs written in C++, in addition to supporting 
existing Hive UDFs written in Java.
-          Cloudera recommends using C++ UDFs because the compiled native code 
can yield higher performance, with
+          <ph rev="upstream">Cloudera</ph> recommends using C++ UDFs because 
the compiled native code can yield higher performance, with
           UDF execution time often 10x faster for a C++ UDF than the 
equivalent Java UDF.
         </p>
       </conbody>

Reply via email to