http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0467b0d5/docs/topics/impala_troubleshooting.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_troubleshooting.xml 
b/docs/topics/impala_troubleshooting.xml
index 3a9e2bb..304f770 100644
--- a/docs/topics/impala_troubleshooting.xml
+++ b/docs/topics/impala_troubleshooting.xml
@@ -412,8 +412,7 @@ MEM_LIMIT: 0
 
 <codeblock>
 <![CDATA[
-Useful test from beta at Visa.
-SME: Jayant@
+Useful test for I/O throughput of hardware.
 
 Symptoms:
 * Queries running slow

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0467b0d5/docs/topics/impala_txtfile.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_txtfile.xml b/docs/topics/impala_txtfile.xml
index ea1ada8..317bddc 100644
--- a/docs/topics/impala_txtfile.xml
+++ b/docs/topics/impala_txtfile.xml
@@ -442,8 +442,8 @@ INSERT INTO csv SELECT * FROM 
other_file_format_table;</codeblock>
         <indexterm audience="hidden">LZO support in Impala</indexterm>
 
         <indexterm audience="hidden">compression</indexterm>
-        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
+        Impala supports using text data files that employ LZO compression. 
Where practical, apply compression to
+        text data files. 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>
 
@@ -479,43 +479,15 @@ INSERT INTO csv SELECT * FROM 
other_file_format_table;</codeblock>
           you establish, or by using packages. You must do these steps 
manually, whether or not you
           are using cluster management software.
         </p>
-        
-        
-        <p audience="hidden">
-          Before using LZO-compressed tables in Impala, do the following 
one-time setup for each machine in the
-          cluster. Install the necessary packages using either the Cloudera 
public repository, a private repository
-          you establish, or by using packages. You must do these steps 
manually, whether or not the cluster is
-          managed by the Cloudera Manager product.
-        </p>
 
         <ol>
           <li>
             <b>Prepare your systems to work with LZO by downloading and 
installing the appropriate libraries:</b>
 
-            <p audience="hidden">
-              <b>On systems managed by Cloudera Manager using parcels:</b>
-            </p>
-
-            <p audience="hidden">
-              See the setup instructions for the LZO parcel in the Cloudera 
Manager documentation for
-              <xref 
href="http://www.cloudera.com/documentation/enterprise/latest/topics/cm_ig_install_gpl_extras.html";
 scope="external" format="html">Cloudera
-              Manager 5</xref>.
-            </p>
-            
-
-            <p>
-              <b>On systems using cluster management software or those not 
using cluster management
-                software:</b>
-            </p>
-
-            <p audience="hidden">
-              <b>On systems managed by Cloudera Manager using packages, or not 
managed by Cloudera Manager:</b>
-            </p>
-
             <p>
               Download and install the appropriate file to each machine on 
which you intend to use LZO with Impala.
-              These files all come from the Cloudera
-              <xref 
href="https://archive.cloudera.com/gplextras/redhat/5/x86_64/gplextras/"; 
scope="external" format="html">GPL
+              These files all come from
+              <xref 
href="https://archive.cloudera.com/gplextras/redhat/5/x86_64/gplextras/"; 
scope="external" format="html">this GPL
               extras</xref> download site. Install the:
             </p>
             <ul>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0467b0d5/docs/topics/impala_udf.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_udf.xml b/docs/topics/impala_udf.xml
index b55739c..a0ddd3e 100644
--- a/docs/topics/impala_udf.xml
+++ b/docs/topics/impala_udf.xml
@@ -161,7 +161,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.
-          <ph rev="upstream">Cloudera</ph> recommends using C++ UDFs because 
the compiled native code can yield higher performance, with
+          Where practical, use 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>
@@ -437,21 +437,13 @@ and other examples demonstrating this technique in
           (RHEL-based distributions) or <codeph>impala-udf-dev</codeph> 
(Ubuntu and Debian).
         </li>
       </ol>
-      
-      
+
+
       <note>
-        
+
         The UDF development code does not rely on Impala being installed on 
the same machine. You can write and
         compile UDFs on a minimal development system, then deploy them on a 
different one for use with Impala.
-        
-      </note>
 
-      <note audience="hidden">
-        The UDF development code does not rely on Impala being installed on 
the same machine. You can write and
-        compile UDFs on a minimal development system, then deploy them on a 
different one for use with Impala. If
-        you develop UDFs on a server managed by Cloudera Manager through the 
parcel mechanism, you still install
-        the UDF development kit through the package mechanism; this small 
standalone package does not interfere
-        with the parcels containing the main Impala code.
       </note>
 
       <p>
@@ -1012,7 +1004,7 @@ BigIntVal CountFinalize(FunctionContext* context, const 
BigIntVal&amp; val);
 // the StringVal intermediate type. When this UDA is registered, it would 
specify
 // 16 bytes (8 byte sum + 8 byte count) as the size for this buffer.
 //
-// Usage: &gt; create aggregate function my_avg(double) returns string 
+// Usage: &gt; create aggregate function my_avg(double) returns string
 //          location '/user/cloudera/libudasample.so' update_fn='AvgUpdate';
 //        &gt; select cast(my_avg(col) as double) from tbl;
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0467b0d5/docs/topics/impala_webui.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_webui.xml b/docs/topics/impala_webui.xml
index 60627e9..0e0493c 100644
--- a/docs/topics/impala_webui.xml
+++ b/docs/topics/impala_webui.xml
@@ -76,14 +76,14 @@ under the License.
       </li>
       </ul>
     </p>
- 
+
     <note>
       <p>
         The web user interface is primarily for problem diagnosis and 
troubleshooting. The items listed and their
         formats are subject to change.
       </p>
     </note>
-    
+
     <p outputclass="toc inpage"/>
   </conbody>
 
@@ -191,7 +191,7 @@ under the License.
           
<codeph>http://<varname>impala-server-hostname</varname>:25000/logs</codeph> 
(non-secure cluster) or
           
<codeph>https://<varname>impala-server-hostname</varname>:25000/logs</codeph> 
(secure cluster).
         </p>
-        
+
         <p>
           This page shows the last portion of the 
<filepath>impalad.INFO</filepath> log file, the most detailed of
           the info, warning, and error logs for the <cmdname>impalad</cmdname> 
daemon. You can refer here to see
@@ -199,7 +199,7 @@ under the License.
           central page can be more convenient than looking around the 
filesystem for the log files, which could be
           in different locations on clusters that use cluster management 
software.
         </p>
-        
+
       </conbody>
     </concept>
 
@@ -234,19 +234,12 @@ under the License.
           
<codeph>http://<varname>impala-server-hostname</varname>:25000/metrics</codeph> 
(non-secure cluster) or
           
<codeph>https://<varname>impala-server-hostname</varname>:25000/metrics</codeph>
 (secure cluster).
         </p>
-        
+
         <p>
           This page displays the current set of metrics: counters and flags 
representing various aspects of
           <cmdname>impalad</cmdname> internal operation.
         </p>
-        
 
-        <p audience="hidden">
-          This page displays the current set of metrics: counters and flags 
representing various aspects of
-          <cmdname>impalad</cmdname> internal operation. For the meanings of 
these metrics, see
-          <xref 
href="http://www.cloudera.com/documentation/enterprise/latest/topics/cm_metrics_impala.html";
 scope="external" format="html">Impala
-          Metrics</xref> in the Cloudera Manager documentation.
-        </p>
       </conbody>
     </concept>
 
@@ -406,7 +399,7 @@ under the License.
           the info, warning, and error logs for the <cmdname>impalad</cmdname> 
daemon. You can refer here to see
           the details of the most recent operations, whether the operations 
succeeded or encountered errors. This
           central page can be more convenient than looking around the 
filesystem for the log files, which could be
-          in different locations on clusters that use Cloudera Manager or not.
+          in different locations on different hosts.
         </p>
       </conbody>
     </concept>
@@ -445,9 +438,7 @@ under the License.
 
         <p>
           This page displays the current set of metrics: counters and flags 
representing various aspects of
-          <cmdname>impalad</cmdname> internal operation. For the meanings of 
these metrics, see
-          <xref 
href="http://www.cloudera.com/documentation/enterprise/latest/topics/cm_metrics_impala.html";
 scope="external" format="html">Impala
-          Metrics</xref> in the Cloudera Manager documentation.
+          <cmdname>impalad</cmdname> internal operation.
         </p>
       </conbody>
     </concept>
@@ -612,7 +603,7 @@ under the License.
           the info, warning, and error logs for the <cmdname>impalad</cmdname> 
daemon. You can refer here to see
           the details of the most recent operations, whether the operations 
succeeded or encountered errors. This
           central page can be more convenient than looking around the 
filesystem for the log files, which could be
-          in different locations on clusters that use Cloudera Manager or not.
+          in different locations on different hosts.
         </p>
       </conbody>
     </concept>
@@ -631,9 +622,7 @@ under the License.
 
         <p>
           This page displays the current set of metrics: counters and flags 
representing various aspects of
-          <cmdname>impalad</cmdname> internal operation. For the meanings of 
these metrics, see
-          <xref 
href="http://www.cloudera.com/documentation/enterprise/latest/topics/cm_metrics_impala.html";
 scope="external" format="html">Impala
-          Metrics</xref> in the Cloudera Manager documentation.
+          <cmdname>impalad</cmdname> internal operation.
         </p>
       </conbody>
     </concept>

Reply via email to