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

incubator-impala git commit: IMPALA-4643: [DOCS] Phase 2 of genericizing cloudera.com links

Repository: incubator-impala
Updated Branches:
  refs/heads/master 4fa9ebbc3 -> d9602df71


IMPALA-4643: [DOCS] Phase 2 of genericizing cloudera.com links

Get rid of cloudera.com URLs within the topics/*.xml source files.

Abstract any that need to remain (e.g. blog posts) into impala_keydefs
file for easy examining and editing.

After this change, the number of source/artifact references to CDH and
Cloudera is small enough that we can enumerate exceptions and start the endgame:

Cleanup items remaining in XML source files:
grep -EiI "[^a-zA-Z]cm[^a-zA-Z]|cdh|cloudera" *.xml |
  grep -v issues.cloudera.org | wc -l
282
Cleanup items remaining in HTML output files:
grep -EiI "[^a-zA-Z]cm[^a-zA-Z]|cdh|cloudera" ../build/html/topics/*.html |
  grep -v issues.cloudera.org | wc -l
148

(These numbers will go down further when the 'installing' and 'updating'
edits land in master.)

Change-Id: I9e29c0feec7bd8e974d8a3d1eb84abe757514be7
Reviewed-on: http://gerrit.cloudera.org:8080/6345
Reviewed-by: John Russell <jr...@cloudera.com>
Tested-by: Impala Public Jenkins


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

Branch: refs/heads/master
Commit: d9602df71b6d686a8e8268d0e18e99f2a51d4e78
Parents: 4fa9ebb
Author: John Russell <jr...@cloudera.com>
Authored: Fri Mar 10 11:44:45 2017 -0800
Committer: Impala Public Jenkins <im...@gerrit.cloudera.org>
Committed: Mon Mar 13 23:49:56 2017 +0000

----------------------------------------------------------------------
 docs/impala_keydefs.ditamap                     |  66 ++--
 docs/shared/impala_common.xml                   |  15 +-
 docs/topics/impala_admission.xml                |  17 +-
 .../topics/impala_allow_unsupported_formats.xml |   6 -
 docs/topics/impala_authorization.xml            | 349 -------------------
 docs/topics/impala_complex_types.xml            |   3 +-
 docs/topics/impala_create_table.xml             |   4 -
 docs/topics/impala_delegation.xml               |   5 +-
 docs/topics/impala_fixed_issues.xml             |  91 +----
 docs/topics/impala_grant.xml                    |   4 +-
 docs/topics/impala_hbase.xml                    |   1 -
 docs/topics/impala_incompatible_changes.xml     |  10 +-
 docs/topics/impala_jdbc.xml                     |   8 +-
 docs/topics/impala_kerberos.xml                 |   3 -
 docs/topics/impala_known_issues.xml             |  10 -
 docs/topics/impala_logging.xml                  |   4 +-
 docs/topics/impala_mem_limit.xml                |   2 +-
 docs/topics/impala_new_features.xml             |  31 +-
 docs/topics/impala_odbc.xml                     |  18 +-
 docs/topics/impala_parquet.xml                  |   5 +-
 docs/topics/impala_perf_cookbook.xml            |   3 +-
 docs/topics/impala_perf_stats.xml               |   6 +-
 docs/topics/impala_prereqs.xml                  |  11 +-
 docs/topics/impala_proxy.xml                    |   7 +-
 docs/topics/impala_relnotes.xml                 |   2 +-
 docs/topics/impala_revoke.xml                   |   3 +-
 docs/topics/impala_security_metastore.xml       |   5 +-
 docs/topics/impala_txtfile.xml                  |  21 +-
 docs/topics/impala_udf.xml                      |  14 +-
 docs/topics/impala_views.xml                    |   5 +-
 30 files changed, 97 insertions(+), 632 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/impala_keydefs.ditamap
----------------------------------------------------------------------
diff --git a/docs/impala_keydefs.ditamap b/docs/impala_keydefs.ditamap
index 9db36f1..7a85fd7 100644
--- a/docs/impala_keydefs.ditamap
+++ b/docs/impala_keydefs.ditamap
@@ -78,34 +78,33 @@ under the License.
     <topicmeta><linktext>test-udas.cc</linktext></topicmeta>
   </keydef>
   <keydef href="https://github.com/cloudera/impala/tree/master/be/src/udf_samples" scope="external" format="html" keys="udf_samples">
-    <topicmeta><linktext>udf_samples</linktext></topicmeta>
+    <topicmeta><linktext>the udf_samples github repo</linktext></topicmeta>
   </keydef>
 
-  <keydef href="http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH5/latest/CDH-Version-and-Packaging-Information/CDH-Version-and-Packaging-Information.html" scope="external" format="html" keys="CDH-Version-and-Packaging-Information"/>
-  <keydef href="http://www.cloudera.com/content/cloudera-content/cloudera-docs/Navigator/latest/Cloudera-Navigator-Installation-and-User-Guide/Cloudera-Navigator-Installation-and-User-Guide.html" scope="external" format="html" keys="Cloudera-Navigator-Installation-and-User-Guide"/>
-  <keydef href="http://www.cloudera.com/content/support/en/downloads/quickstart_vms.html" scope="external" format="html" keys="quickstart_vms"/>
-
   <keydef href="https://chromium.googlesource.com/breakpad/breakpad/" scope="external" format="html" keys="breakpad_project"/>
 
   <keydef href="http://gethue.com/" scope="external" format="html" keys="gethue.com">
     <topicmeta><linktext>Hue</linktext></topicmeta>
   </keydef>
 
-  <keydef href="http://radar.oreilly.com/2013/10/cloudera-impala-bringing-the-sql-and-hadoop-worlds-together.html" scope="external" format="html" keys="cloudera-impala-bringing-the-sql-and-hadoop-worlds-together"/>
-  <keydef href="http://shop.oreilly.com/product/0636920033936.do" scope="external" format="html" keys="0636920033936.do"/>
-  <keydef href="http://www.cloudera.com/content/cloudera/en/resources/library/recordedwebinar/impala-real-time-queries-in-hadoop-webinar-slides.html" scope="external" format="html" keys="impala-real-time-queries-in-hadoop-webinar-slides"/>
+  <keydef href="http://shop.oreilly.com/product/0636920033936.do" scope="external" format="html" keys="0636920033936.do">
+    <topicmeta><linktext>Getting Started with Impala</linktext></topicmeta>
+  </keydef>
 
-  <keydef href="http://www.cloudera.com/content/cloudera/en/products-and-services/cdh/impala.html" scope="external" format="html" keys="impala-product"/>
-  <!-- <keydef href="https://groups.google.com/a/cloudera.org/forum/?fromgroups#!forum/impala-user" scope="external" format="html" keys="impala-user"/> -->
   <keydef href="https://mail-archives.apache.org/mod_mbox/incubator-impala-user/" scope="external" format="html" keys="impala-user"/>
   <keydef href="https://issues.cloudera.org/browse/IMPALA" scope="external" format="html" keys="impala-jira"/>
-  <keydef href="http://www.cloudera.com/content/dam/cloudera/Resources/PDF/whitepaper/AWS_Reference_Architecture_Whitepaper.pdf" scope="external" format="html" keys="AWS_Reference_Architecture_Whitepaper.pdf"/>
 
-  <keydef href="https://archive.cloudera.com/cdh5/cdh/5/hadoop/hadoop-project-dist/hadoop-hdfs/HdfsDesign.html" scope="external" format="html" keys="HdfsDesign"/>
-  <keydef href="https://archive.cloudera.com/cdh5/cdh/5/hadoop/hadoop-project-dist/hadoop-common/FileSystemShell.html" scope="external" format="html" keys="FileSystemShell"/>
-  <keydef href="http://archive.cloudera.com/cdh5/cdh/5/hadoop/hadoop-project-dist/hadoop-hdfs/HdfsPermissionsGuide.html" scope="external" format="html" keys="HdfsPermissionsGuide"/>
   <keydef href="http://hadoop.apache.org/docs/current/hadoop-yarn/hadoop-yarn-site/FairScheduler.html#Configuration" scope="external" format="html" keys="FairScheduler"/>
+  <keydef href="https://archive.cloudera.com/cdh5/" scope="external" format="html" keys="archive_root">
+    <topicmeta><linktext>the top level of this software archive</linktext></topicmeta>
+  </keydef>
   <keydef href="https://archive.cloudera.com/gplextras/redhat/5/x86_64/gplextras/" scope="external" format="html" keys="gplextras"/>
+  <keydef href="https://archive.cloudera.com/gplextras/redhat/5/x86_64/gplextras/cloudera-gplextras4.repo" scope="external" format="html" keys="gplextras_rhel5"/>
+  <keydef href="https://archive.cloudera.com/gplextras/redhat/6/x86_64/gplextras/cloudera-gplextras4.repo" scope="external" format="html" keys="gplextras_rhel6"/>
+  <keydef href="https://archive.cloudera.com/gplextras/sles/11/x86_64/gplextras/cloudera-gplextras4.repo" scope="external" format="html" keys="gplextras_sles11"/>
+  <keydef href="https://archive.cloudera.com/gplextras/ubuntu/lucid/amd64/gplextras/cloudera.list" scope="external" format="html" keys="gplextras_ubuntu_lucid"/>
+  <keydef href="https://archive.cloudera.com/gplextras/ubuntu/precise/amd64/gplextras/cloudera.list" scope="external" format="html" keys="gplextras_ubuntu_precise"/>
+  <keydef href="https://archive.cloudera.com/gplextras/debian/squeeze/amd64/gplextras/cloudera.list" scope="external" format="html" keys="gplextras_debian_squeeze"/>
 
   <keydef href="https://code.google.com/p/re2/" scope="external" format="html" keys="re2"/>
   <keydef href="http://goog-perftools.sourceforge.net/doc/tcmalloc.html" scope="external" format="html" keys="tcmalloc"/>
@@ -116,14 +115,11 @@ under the License.
   <keydef href="http://sentry.incubator.apache.org/" scope="external" format="html" keys="sentry"/>
 
   <!-- Download page that leads to ODBC drivers. -->
-  <keydef href="http://www.cloudera.com/content/support/en/downloads/download-components/download-products.html?productID=3mDesWddUS" scope="external" format="html" keys="3mDesWddUS"/>
+  <keydef href="https://www.cloudera.com/downloads/connectors/impala/odbc.html" scope="external" format="html" keys="odbc_driver_download"/>
   <keydef href="http://www.cloudera.com/content/support/en/documentation/cloudera-connectors-documentation/connector-documentation-latest.html" scope="external" format="html" keys="connector-documentation-latest"/>
   <keydef href="http://www.iodbc.org/dataspace/iodbc/wiki/iODBC/Downloads" scope="external" format="html" keys="iODBC_Downloads"/>
-  <keydef href="http://go.cloudera.com/odbc-driver-hive-impala.html" scope="external" format="html" keys="odbc-driver-hive-impala"/>
-  <keydef href="http://www.cloudera.com/content/cloudera-content/cloudera-docs/Connectors/PDF/Cloudera-ODBC-Driver-for-Impala-Install-Guide.pdf" scope="external" format="html" keys="Cloudera-ODBC-Driver-for-Impala-Install-Guide.pdf"/>
 
-  <keydef href="http://www.cloudera.com/content/cloudera/en/downloads/connectors/impala/jdbc/impala-jdbc-v2-5-5.html" scope="external" format="html" keys="impala-jdbc-v2-5-5"/>
-  <keydef href="https://github.com/onefoursix/Cloudera-Impala-JDBC-Example" scope="external" format="html" keys="Cloudera-Impala-JDBC-Example"/>
+  <keydef href="https://github.com/onefoursix/Cloudera-Impala-JDBC-Example" scope="external" format="html" keys="Impala-JDBC-Example"/>
 
   <keydef href="https://issues.apache.org/jira/browse/HIVE-8648" scope="external" format="html" keys="HIVE-8648"/>
 
@@ -131,24 +127,17 @@ under the License.
   <keydef href="http://www.mysql.com/products/connector/" scope="external" format="html" keys="mysql-connector"/>
   <keydef href="http://jdbc.postgresql.org/download.html" scope="external" format="html" keys="postgresql-connector"/>
   <keydef href="http://haproxy.1wt.eu/" scope="external" format="html" keys="haproxy"/>
-  <keydef href="http://www.cloudera.com/documentation/other/reference-architecture/PDF/Impala-HA-with-F5-BIG-IP.pdf" scope="external" format="html" keys="Impala-HA-with-F5-BIG-IP.pdf"/>
 
   <keydef href="http://aws.amazon.com/s3/" scope="external" format="html" keys="amazon-s3"/>
   <keydef href="https://console.aws.amazon.com/s3/home" scope="external" format="html" keys="amazon-s3-home"/>
   <keydef href="http://aws.amazon.com/cli/" scope="external" format="html" keys="amazon-aws-cli"/>
   <keydef href="http://s3tools.org/s3cmd" scope="external" format="html" keys="s3cmd"/>
 
-  <keydef href="http://www.cloudera.com/content/support/en/documentation.html" scope="external" format="html" keys="vendor-docs"/>
-
   <keydef href="http://stat-computing.org/dataexpo/2009/" scope="external" format="html" keys="dataexpo-2009"/>
   <keydef href="http://stat-computing.org/dataexpo/2009/the-data.html" scope="external" format="html" keys="dataexpo-2009-the-data"/>
 
   <keydef href="http://www.lzop.org/" scope="external" format="html" keys="lzop.org"/>
 
-<!-- Links to discussion forums. -->
-  <keydef href="http://community.cloudera.com/t5/Interactive-Short-cycle-SQL/bd-p/Impala" scope="external" format="html" keys="interactive_sql_forum"/>
-  <keydef href="http://community.cloudera.com/t5/Release-Announcements/bd-p/RelAnnounce" scope="external" format="html" keys="release_announcements_forum"/>
-
 <!-- Links to Wikipedia pages for background on industry terminology. -->
   <keydef href="http://en.wikipedia.org/wiki/.htpasswd" scope="external" format="html" keys=".htpasswd"/>
   <keydef href="http://en.wikipedia.org/wiki/Coordinated_Universal_Time" scope="external" format="html" keys="Coordinated_Universal_Time"/>
@@ -174,6 +163,16 @@ under the License.
     <topicmeta><linktext>the documentation for your Apache Hadoop distribution</linktext></topicmeta>
   </keydef>
   <keydef href="" scope="external" format="html" keys="setup_hdfs_caching">
+  <keydef href="" scope="external" format="html" keys="cdh_hag_cdh_other_ha">
+    <topicmeta><linktext>the documentation for your Apache Hadoop distribution</linktext></topicmeta>
+  </keydef>
+  <keydef href="" scope="external" format="html" keys="cdh_admin_performance">
+    <topicmeta><linktext>the documentation for your Apache Hadoop distribution</linktext></topicmeta>
+  </keydef>
+  <keydef href="" scope="external" format="html" keys="cdh_ig_hbase_installation">
+    <topicmeta><linktext>the documentation for your Apache Hadoop distribution</linktext></topicmeta>
+  </keydef>
+  <keydef href="" scope="external" format="html" keys="cdh_ig_hdfs_caching">
     <topicmeta><linktext>the documentation for HDFS caching</linktext></topicmeta>
   </keydef>
   <keydef href="" scope="external" format="html" keys="cdh_ig_hive_installation">
@@ -288,11 +287,8 @@ under the License.
   <keydef href="" scope="external" format="html" keys="sg_redaction">
     <topicmeta><linktext>the documentation for your Apache Hadoop distribution</linktext></topicmeta>
   </keydef>
-  <keydef href="" scope="external" format="html" keys="cdh_rn_fixed_in_51">
-    <topicmeta><linktext>the documentation for your Apache Hadoop distribution</linktext></topicmeta>
-  </keydef>
-  <keydef href="https://www.cloudera.com/documentation/enterprise/latest/topics/sg_hive_sql.html" scope="external" format="html" keys="sg_hive_sql">
-    <topicmeta><linktext>the documentation for your Apache Hadoop distribution</linktext></topicmeta>
+  <keydef href="" scope="external" format="html" keys="sg_hive_sql">
+    <topicmeta><linktext>the documentation for Apache Sentry</linktext></topicmeta>
   </keydef>
 
 <!-- Links to pages on Hive wiki. -->
@@ -305,10 +301,7 @@ under the License.
 
 <!-- Pointers to blog posts. -->
   <keydef href="http://blog.cloudera.com/blog/2012/03/hbase-hadoop-xceivers/" scope="external" format="html" keys="hbase-hadoop-xceivers"/>
-  <keydef href="http://blog.cloudera.com/blog/2012/10/cloudera-impala-real-time-queries-in-apache-hadoop-for-real" scope="external" format="html" keys="cloudera-impala-real-time-queries-in-apache-hadoop-for-real"/>
   <keydef href="http://blog.cloudera.com/blog/2013/07/how-hiveserver2-brings-security-and-concurrency-to-apache-hive/" scope="external" format="html" keys="how-hiveserver2-brings-security-and-concurrency-to-apache-hive"/>
-  <keydef href="http://blog.cloudera.com/blog/2013/09/whats-next-for-impala-after-release-1-1/" scope="external" format="html" keys="whats-next-for-impala-after-release-1-1"/>
-  <keydef href="http://blog.cloudera.com/blog/2014/01/impala-performance-dbms-class-speed/" scope="external" format="html" keys="impala-performance-dbms-class-speed"/>
 
 <!-- Pointers to external Impala JIRA URLs.
      All the way up to IMPALA-9999, so even future JIRAs are
@@ -10344,6 +10337,7 @@ under the License.
   <keydef keys="impala250"><topicmeta><keywords><keyword>Impala 2.5.0</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala241"><topicmeta><keywords><keyword>Impala 2.4.1</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala240"><topicmeta><keywords><keyword>Impala 2.4.0</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala2310"><topicmeta><keywords><keyword>Impala 2.3.10</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala234"><topicmeta><keywords><keyword>Impala 2.3.4</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala232"><topicmeta><keywords><keyword>Impala 2.3.2</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala231"><topicmeta><keywords><keyword>Impala 2.3.1</keyword></keywords></topicmeta></keydef>
@@ -10352,8 +10346,12 @@ under the License.
   <keydef keys="impala223"><topicmeta><keywords><keyword>Impala 2.2.3</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala2210"><topicmeta><keywords><keyword>Impala 2.2.10</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala229"><topicmeta><keywords><keyword>Impala 2.2.9</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala228"><topicmeta><keywords><keyword>Impala 2.2.8</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala227"><topicmeta><keywords><keyword>Impala 2.2.7</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala225"><topicmeta><keywords><keyword>Impala 2.2.5</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala221"><topicmeta><keywords><keyword>Impala 2.2.1</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala220"><topicmeta><keywords><keyword>Impala 2.2.0</keyword></keywords></topicmeta></keydef>
+  <keydef keys="impala217"><topicmeta><keywords><keyword>Impala 2.1.7</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala210"><topicmeta><keywords><keyword>Impala 2.1.0</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala200"><topicmeta><keywords><keyword>Impala 2.0.0</keyword></keywords></topicmeta></keydef>
   <keydef keys="impala140"><topicmeta><keywords><keyword>Impala 1.4.0</keyword></keywords></topicmeta></keydef>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/shared/impala_common.xml
----------------------------------------------------------------------
diff --git a/docs/shared/impala_common.xml b/docs/shared/impala_common.xml
index 40a6c2b..f5443cb 100644
--- a/docs/shared/impala_common.xml
+++ b/docs/shared/impala_common.xml
@@ -316,7 +316,7 @@ under the License.
               <entry>SELECT<p>-You can grant the SELECT privilege on a view to
                   give users access to specific columns of a table they do not
                   otherwise have access to.</p><p>-See
-                  <xref audience="integrated" href="../topics/sg_hive_sql.xml#concept_c2q_4qx_p4/col_level_auth_sentry"/><xref audience="standalone" href="https://www.cloudera.com/documentation/enterprise/latest/topics/sg_hive_sql.html" format="html" scope="external"/>
+                  <xref keyref="sg_hive_sql"/>
                   for details on allowed column-level
                 operations.</p></entry>
               <entry>VIEW/TABLE; COLUMN</entry>
@@ -1176,9 +1176,7 @@ drop database temp;
       <p id="redaction_yes" rev="2.2.0">
         If these statements in your environment contain sensitive literal values such as credit card numbers or tax
         identifiers, Impala can redact this sensitive information when displaying the statements in log files and
-        other administrative contexts. See
-        <xref audience="integrated" href="../topics/sg_redaction.xml#log_redact"/><xref audience="standalone" href="http://www.cloudera.com/content/cloudera/en/documentation/core/latest/topics/sg_redaction.html" scope="external" format="html"/>
-        for details.
+        other administrative contexts. See <xref keyref="sg_redaction"/> for details.
       </p>
 
       <p id="incremental_partition_spec">
@@ -1868,8 +1866,8 @@ show functions in _impala_builtins like '*<varname>substring</varname>*';
       <p rev="2.3.0" id="jdbc_odbc_complex_types">
         The Impala complex types (<codeph>STRUCT</codeph>, <codeph>ARRAY</codeph>, or <codeph>MAP</codeph>)
         are available in <keyword keyref="impala23_full"/> and higher.
-        To use these types with JDBC requires version 2.5.28 or higher of the Cloudera JDBC Connector for Impala.
-        To use these types with ODBC requires version 2.5.30 or higher of the Cloudera ODBC Connector for Impala.
+        To use these types with JDBC requires version 2.5.28 or higher of the JDBC Connector for Impala.
+        To use these types with ODBC requires version 2.5.30 or higher of the ODBC Connector for Impala.
         Consider upgrading all JDBC and ODBC drivers at the same time you upgrade from <keyword keyref="impala23_full"/> or higher.
       </p>
 
@@ -3110,9 +3108,8 @@ sudo pip-python install ssl</codeblock>
       <p id="hive_jdbc_ssl_kerberos_caveat">
         Prior to <keyword keyref="impala25_full"/>, the Hive JDBC driver did not support connections that use both Kerberos authentication
         and SSL encryption. If your cluster is running an older release that has this restriction,
-        to use both of these security features with Impala through a JDBC application,
-        use the <xref href="http://www.cloudera.com/content/www/en-us/downloads.html.html" scope="external" format="html">Cloudera JDBC Connector</xref>
-        as the JDBC driver.
+        use an alternative JDBC driver that supports
+        both of these security features.
       </p>
 
     </section>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_admission.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_admission.xml b/docs/topics/impala_admission.xml
index 10b4052..76002e0 100644
--- a/docs/topics/impala_admission.xml
+++ b/docs/topics/impala_admission.xml
@@ -128,13 +128,6 @@ under the License.
         or the expected memory usage of the concurrent queries is exceeded, subsequent queries
         are queued until the concurrent workload falls below the threshold again.
       </p>
-      <p>
-        See
-        <xref audience="integrated" href="cm_mc_resource_pools.xml#concept_xkk_l1d_wr"/><xref audience="standalone" href="http://www.cloudera.com/documentation/enterprise/latest/topics/cm_mc_resource_pools.html" scope="external" format="html"/>
-        for information about all these dynamic resource
-        pool settings, how to use them together, and how to divide different parts of your workload among
-        different pools.
-      </p>
     </conbody>
   </concept>
 
@@ -165,13 +158,6 @@ under the License.
         or the expected memory usage of the concurrent queries is exceeded, subsequent queries
         are queued until the concurrent workload falls below the threshold again.
       </p>
-      <p>
-        See
-        <xref audience="integrated" href="cm_mc_resource_pools.xml#concept_xkk_l1d_wr"/><xref audience="standalone" href="http://www.cloudera.com/documentation/enterprise/latest/topics/cm_mc_resource_pools.html" scope="external" format="html"/>
-        for information about all these dynamic resource
-        pool settings, how to use them together, and how to divide different parts of your workload among
-        different pools.
-      </p>
     </conbody>
   </concept>
 
@@ -873,8 +859,7 @@ drop table huge_table;
 
       <p>
         For details about all the Fair Scheduler configuration settings, see
-        <xref href="https://archive.cloudera.com/cdh5/cdh/5/hadoop/hadoop-yarn/hadoop-yarn-site/FairScheduler.html#Configuration" scope="external" format="html">Fair
-        Scheduler Configuration</xref>, in particular the tags such as <codeph>&lt;queue&gt;</codeph> and
+        <xref keyref="FairScheduler">Fair Scheduler Configuration</xref>, in particular the tags such as <codeph>&lt;queue&gt;</codeph> and
         <codeph>&lt;aclSubmitApps&gt;</codeph> to map users and groups to particular resource pools (queues).
       </p>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_allow_unsupported_formats.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_allow_unsupported_formats.xml b/docs/topics/impala_allow_unsupported_formats.xml
index 8d7b0a5..55ec545 100644
--- a/docs/topics/impala_allow_unsupported_formats.xml
+++ b/docs/topics/impala_allow_unsupported_formats.xml
@@ -32,12 +32,6 @@ under the License.
 
   <conbody>
 
-<!--
-The original brief explanation with not enough detail comes from the comments at:
-  http://github.sf.cloudera.com/CDH/Impala/raw/master/common/thrift/ImpalaService.thrift
-Removing that wording from here after discussions with dev team. Just recording the URL for posterity.
--->
-
     <p>
       An obsolete query option from early work on support for file formats. Do not use. Might be removed in the
       future.

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_authorization.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_authorization.xml b/docs/topics/impala_authorization.xml
index 1996b49..f82a790 100644
--- a/docs/topics/impala_authorization.xml
+++ b/docs/topics/impala_authorization.xml
@@ -1197,355 +1197,6 @@ server=server1-&gt;uri=hdfs://namenode:port/path/to/dir
         </tgroup>
       </table>
 
-<!-- Original table, now replaced by content conref'ed from Security Guide
-<table>
-<title>Sentry privileges for Impala SQL operations</title>
-          <tgroup cols="3">
-              <colspec colnum="1" colname="col1" colwidth="*"/>
-              <colspec colnum="2" colname="col2" colwidth="*"/>
-              <colspec colnum="3" colname="col3" colwidth="4*"/>
-<thead>
-<row>
-<entry>Impala SQL Operation</entry>
-<entry>Privileges Required</entry>
-<entry>Object on which Privileges Required</entry>
-</row>
-</thead>
-<tbody>
-<row>
-<entry>EXPLAIN</entry>
-<entry>SELECT</entry>
-<entry>Table</entry>
-</row>
-<row>
-<entry>LOAD DATA</entry>
-<entry>INSERT, SELECT</entry>
-<entry>Table (INSERT) and URI (ALL); write privilege is required on the URI because the data files are physically moved from there</entry>
-</row>
-<row>
-<entry>CREATE DATABASE</entry>
-<entry>ALL</entry>
-<entry><ph rev="1.4.0">Server</ph></entry>
-</row>
-<row>
-<entry>DROP DATABASE</entry>
-<entry>ALL</entry>
-<entry><ph rev="1.4.0">Server</ph></entry>
-</row>
-<row>
-<entry>CREATE TABLE</entry>
-<entry>ALL</entry>
-<entry><ph rev="1.4.0">Database</ph></entry>
-</row>
-<row>
-<entry>DROP TABLE</entry>
-<entry>ALL</entry>
-<entry><ph rev="1.4.0">Database</ph></entry>
-</row>
-<row>
-<entry>DESCRIBE TABLE</entry>
-<entry>SELECT or INSERT</entry>
-<entry>Table</entry>
-</row>
-<row>
-<entry>ALTER TABLE</entry>
-<entry>ALL</entry>
-<entry><ph rev="1.4.0">Database</ph></entry>
-</row>
-<row>
-<entry>SHOW DATABASES</entry>
-<entry>Any privilege</entry>
-<entry>Any object in the database; only databases for which the user has privileges on some object are shown</entry>
-</row>
-<row>
-<entry>SHOW TABLES</entry>
-<entry>Any privilege</entry>
-<entry>Any table in the database; only tables for which the user has privileges are shown</entry>
-</row>
-<row>
-<entry>CREATE VIEW</entry>
-<entry>ALL, SELECT</entry>
-<entry rev="2.3.0 collevelauth">
-You need <codeph>ALL</codeph> privilege on the named view <ph rev="1.4.0">and the parent database</ph>, plus <codeph>SELECT</codeph> privilege for any tables or views referenced by the view query.
-Once the view is created or altered by a high-privileged system administrator,
-it can be queried by a lower-privileged user who does not have full query privileges for the base tables.
-</entry>
-</row>
-<row>
-<entry>DROP VIEW</entry>
-<entry>ALL</entry>
-<entry><ph rev="1.4.0">Database</ph></entry>
-</row>
-<row>
-<entry>ALTER VIEW</entry>
-<entry>ALL, SELECT</entry>
-<entry rev="2.3.0 collevelauth">
-You need <codeph>ALL</codeph> privilege on the named view <ph rev="1.4.0">and the parent database</ph>, plus <codeph>SELECT</codeph> privilege for any tables or views referenced by the view query.
-Once the view is created or altered by a high-privileged system administrator,
-it can be queried by a lower-privileged user who does not have full query privileges for the base tables.
-</entry>
-</row>
-<row>
-<entry>ALTER TABLE LOCATION</entry>
-<entry>ALL</entry>
-<entry>Table, URI</entry>
-</row>
-<row>
-<entry>CREATE EXTERNAL TABLE</entry>
-<entry>ALL, SELECT</entry>
-<entry>Database (ALL), URI (SELECT)</entry>
-</row>
-<row>
-<entry>SELECT</entry>
-<entry>SELECT</entry>
-<entry rev="2.3.0 collevelauth">Table, View; you can have SELECT privilege for a view without having SELECT privilege
-for the underlying tables. See
-<xref audience="integrated" href="sg_hive_sql.xml#concept_c2q_4qx_p4/col_level_auth_sentry"/><xref audience="standalone" href="https://www.cloudera.com/documentation/enterprise/latest/topics/sg_hive_sql.html" format="html" scope="external"/>
-for details about column-level authorization.
-Before column-level authorization was added in <keyword keyref="impala23_full"/> the way to implement
-column-level security was by creating views that referenced particular sets of columns.</entry>
-</row>
-<row>
-<entry>USE</entry>
-<entry>Any privilege</entry>
-<entry>Any object in the database</entry>
-</row>
-<row rev="1.2">
-<entry>CREATE FUNCTION</entry>
-<entry>ALL</entry>
-<entry>Server</entry>
-</row>
-<row rev="1.2">
-<entry>DROP FUNCTION</entry>
-<entry>ALL</entry>
-<entry>Server</entry>
-</row>
-<row>
-<entry>REFRESH</entry>
-<entry>ALL</entry>
-<entry>Table</entry>
-</row>
-<row>
-<entry>INVALIDATE METADATA</entry>
-<entry>ALL</entry>
-<entry>Server</entry>
-</row>
-<row rev="1.2.2">
-<entry>COMPUTE STATS</entry>
-<entry>ALL</entry>
-<entry>Table</entry>
-</row>
-<row>
-<entry>SHOW TABLE STATS, SHOW PARTITIONS</entry>
-<entry>?</entry>
-<entry>?</entry>
-</row>
-<row>
-<entry>SHOW COLUMN STATS</entry>
-<entry>?</entry>
-<entry>?</entry>
-</row>
-<row>
-<entry>SHOW FUNCTIONS</entry>
-<entry>?</entry>
-<entry>?</entry>
-</row>
-<row>
-<entry>SHOW DATABASES, SHOW SCHEMAS</entry>
-<entry>?</entry>
-<entry>?</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
--->
-
-<!-- Here are pieces from the original Hive table that do not apply to Impala because of differences in the SQL syntax.
-   Might resurrect some of these later as features are added to Impala, in particular CREATE TABLE AS SELECT.
-<row>
-<entry>EXPORT</entry>
-<entry>SELECT, INSERT@URI</entry>
-<entry>Table</entry>
-</row>
-<row>
-<entry>IMPORT</entry>
-<entry>ALL, SELECT@URI</entry>
-<entry>Database</entry>
-</row>
-<row>
-<entry>ANALYZE</entry>
-<entry>INSERT, SELECT</entry>
-<entry>Table</entry>
-</row>
-<row>
-<entry>SWITCH DATABASE</entry>
-<entry>Any</entry>
-<entry>Any Table, View in the DB</entry>
-</row>
-<row>
-<entry>DESCRIBE FUNCTION&#42;</entry>
-<entry>Not Restricted</entry>
-</row>
-<row>
-<entry>MSCK</entry>
-<entry>ALL</entry>
-<entry>Database</entry>
-</row>
-<row>
-<entry>SHOW COLUMNS</entry>
-<entry>SELECT or INSERT</entry>
-<entry>Table</entry>
-</row>
-<row>
-<entry>SHOW TABLE STATUS</entry>
-<entry>SELECT or INSERT</entry>
-<entry>Table</entry>
-</row>
-<row>
-<entry>SHOW TABLE PROPERTIES</entry>
-<entry>SELECT or INSERT</entry>
-<entry>Table</entry>
-</row>
-<row>
-<entry>SHOW CREATE TABLE</entry>
-<entry>SELECT or INSERT</entry>
-<entry>Table</entry>
-</row>
-<row>
-<entry>SHOW FUNCTIONS&#42;</entry>
-<entry>Not restricted</entry>
-</row>
-<row>
-<entry>SHOW PARTITIONS</entry>
-<entry>SELECT or INSERT</entry>
-<entry>Table</entry>
-</row>
-<row>
-<entry>SHOW INDEXES</entry>
-<entry>SELECT or INSERT</entry>
-<entry>Table</entry>
-</row>
-<row>
-<entry>SHOW LOCKS</entry>
-<entry>Not Restricted</entry>
-</row>
-<row>
-<entry>CREATE FUNCTION</entry>
-<entry>Any Privilege</entry>
-<entry>Any Object</entry>
-</row>
-<row>
-<entry>CREATE INDEX</entry>
-<entry>ALL</entry>
-<entry>Database</entry>
-</row>
-<row>
-<entry>DROP FUNCTION</entry>
-<entry>Any Privilege</entry>
-<entry>Any Object</entry>
-</row>
-<row>
-<entry>DROP INDEX</entry>
-<entry>ALL</entry>
-<entry>Database</entry>
-</row>
-<row>
-<entry>ALTER INDEX REBUILD</entry>
-<entry>ALL</entry>
-<entry>Database</entry>
-</row>
-<row>
-<entry>ALTER VIEW PROPERTIES</entry>
-<entry>ALL</entry>
-<entry>Database</entry>
-</row>
-<row>
-<entry>GRANT PRIVILEGE</entry>
-<entry>Allowed, but has no effect on HS2 auth</entry>
-</row>
-<row>
-<entry>REVOKE PRIVILEGE</entry>
-<entry>Allowed, but has no effect on HS2 auth</entry>
-</row>
-<row>
-<entry>SHOW GRANTS</entry>
-<entry>Allowed, but has no effect on HS2 auth</entry>
-</row>
-<row>
-<entry>ALTER TABLE PROTECT MODE</entry>
-<entry>ALL</entry>
-<entry>Database</entry>
-</row>
-<row>
-<entry>ALTER TABLE FILE FORMAT</entry>
-<entry>ALL</entry>
-<entry>Database</entry>
-</row>
-<row>
-<entry>ALTER PARTITION PROTECT MODE</entry>
-<entry>ALL</entry>
-<entry>Database</entry>
-</row>
-<row>
-<entry>ALTER PARTITION FILE FORMAT</entry>
-<entry>ALL</entry>
-<entry>Database</entry>
-</row>
-<row>
-<entry>ALTER PARTITION LOCATION&#42;</entry>
-<entry>ALL</entry>
-<entry>Server</entry>
-</row>
-<row>
-<entry>CREATE TABLE AS SELECT</entry>
-<entry>ALL, SELECT</entry>
-<entry>Database, Table/View</entry>
-</row>
-<row>
-<entry>ALTER INDEX PROP</entry>
-<entry>ALL</entry>
-<entry>Database</entry>
-</row>
-<row>
-<entry>ALTER DATABASE</entry>
-<entry>ALL</entry>
-<entry>Database</entry>
-</row>
-<row>
-<entry>DESCRIBE DATABASE</entry>
-<entry>ALL</entry>
-<entry>Database</entry>
-</row>
-<row>
-<entry>ALTER TABLE MERGE FILE</entry>
-<entry>ALL</entry>
-<entry>Database</entry>
-</row>
-<row>
-<entry>ALTER PARTITION MERGE FILE</entry>
-<entry>ALL</entry>
-<entry>Database</entry>
-</row>
-<row>
-<entry>ALTER TABLE SKEWED</entry>
-<entry>ALL</entry>
-<entry>Database</entry>
-</row>
-<row>
-<entry>ALTER TABLE PARTITION SKEWED LOCATION</entry>
-<entry>ALL</entry>
-<entry>Database</entry>
-</row>
-<row>
-<entry>ADD JAR&#42;</entry>
-<entry>Restricted unless hive.server2.authorization.external.exec = true</entry>
-</row>
-<row>
-<entry>TRANSFORM&#42;</entry>
-<entry>ALL</entry>
-<entry>Server</entry>
-</row>
--->
     </conbody>
   </concept>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_complex_types.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_complex_types.xml b/docs/topics/impala_complex_types.xml
index f55c7f0..06a070f 100644
--- a/docs/topics/impala_complex_types.xml
+++ b/docs/topics/impala_complex_types.xml
@@ -2627,8 +2627,7 @@ STORED AS PARQUET;
       <conbody>
 
         <p>
-          You can produce Parquet data files through several Hadoop components and APIs, as explained in
-          <xref audience="integrated" href="cdh_ig_parquet.xml#parquet_format"/><xref audience="standalone" href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_ig_parquet.html" scope="external" format="html"/>.
+          You can produce Parquet data files through several Hadoop components and APIs.
         </p>
 
         <p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_create_table.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_create_table.xml b/docs/topics/impala_create_table.xml
index a3c9ce8..2552392 100644
--- a/docs/topics/impala_create_table.xml
+++ b/docs/topics/impala_create_table.xml
@@ -439,10 +439,6 @@ CREATE TABLE ctas_t1
 ]]>
 </codeblock>
 
-<!-- This clause restriction and other syntax nuances come from this blog post:
-     http://blog.cloudera.com/blog/2015/11/how-to-use-impala-with-kudu/
-     which has some details and examples not found in the actual Kudu docs. -->
-
     <p rev="kudu">
       The following <codeph>CREATE TABLE</codeph> clauses are not supported for Kudu tables:
     </p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_delegation.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_delegation.xml b/docs/topics/impala_delegation.xml
index 1ea80a2..73ae658 100644
--- a/docs/topics/impala_delegation.xml
+++ b/docs/topics/impala_delegation.xml
@@ -73,10 +73,9 @@ under the License.
     <p>
       See <xref href="impala_config_options.xml#config_options"/> for details about adding or changing
       <cmdname>impalad</cmdname> startup options. See
-      <xref href="http://blog.cloudera.com/blog/2013/07/how-hiveserver2-brings-security-and-concurrency-to-apache-hive/" scope="external" format="html">this
-      Cloudera blog post</xref> for background information about the delegation capability in HiveServer2.
+      <xref keyref="how-hiveserver2-brings-security-and-concurrency-to-apache-hive">this
+      blog post</xref> for background information about the delegation capability in HiveServer2.
     </p>
-    <!-- Link to Cloudera blog post -->
     <p>
       To set up authentication for the delegated users:
     </p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_fixed_issues.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_fixed_issues.xml b/docs/topics/impala_fixed_issues.xml
index d70327c..7cb4b32 100644
--- a/docs/topics/impala_fixed_issues.xml
+++ b/docs/topics/impala_fixed_issues.xml
@@ -595,8 +595,7 @@ select 2061013007, conv(cast(cast(2061013007 as decimal(20,0)) as bigint), 16, 1
 
       <p>
         This section lists the most serious or frequently encountered customer
-        issues fixed in <keyword keyref="impala232"/>. For the full list of fixed Impala issues,
-        see <xref audience="standalone" href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_552.html" format="html" scope="external">the CDH 5.5.x release notes</xref><xref href="cdh_rn_fixed_in_55.xml#fixed_issues_552" audience="integrated"/>.
+        issues fixed in <keyword keyref="impala232"/>.
       </p>
 
     </conbody>
@@ -886,12 +885,8 @@ select 2061013007, conv(cast(cast(2061013007 as decimal(20,0)) as bigint), 16, 1
         issues fixed in <keyword keyref="impala23_full"/>. Any issues already fixed in
         <keyword keyref="impala22"/> maintenance releases (up through <keyword keyref="impala228"/>) are also included.
         Those issues are listed under the respective <keyword keyref="impala22"/> sections and are
-        not repeated here. For the full list of fixed Impala issues, see <xref
-          audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_550.html"
-          format="html" scope="external">the CDH 5.5.x release notes</xref><xref
-          href="cdh_rn_fixed_in_55.xml#concept_hjb_1pf_x5" audience="integrated"
-        />. </p>
+        not repeated here.
+      </p>
 
 <!-- Raw "Fixed Issue" info from Silvius' working doc: https://docs.google.com/document/d/1PCboHo2Em-fySAHr3YF1ZZxMEfK8_vFFpP1rkWzyRZM/edit#
 
@@ -1150,14 +1145,6 @@ IMPALA-1917
         This section lists the most frequently encountered customer issues fixed in <keyword keyref="impala229"/>.
       </p>
 
-      <p>
-        For the full list of fixed issues, see
-        <xref audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_549.html"
-          format="html" scope="external">the CDH 5.4.x release notes</xref><xref
-            audience="integrated" href="cdh_rn_fixed_in_54.xml#fixed_issues_549"/>.
-      </p>
-
     </conbody>
 
 <!-- List of fixed issues from Juan Yu's spreadsheet: https://docs.google.com/spreadsheets/d/1Ia06xOLKQInKfsJzQfQ6Sf1fO3nYLOpZ-0OWfFNgNSc/edit#gid=1566007471
@@ -1364,12 +1351,6 @@ d9d2a10 IMPALA-0000: Log backtrace on all MEM_LIMIT_EXCEEDED errors
         This section lists the most frequently encountered customer issues fixed in <keyword keyref="impala228"/>.
       </p>
 
-      <p>
-        For the full list of fixed issues, see
-        <xref audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_548.html" format="html" scope="external">the CDH 5.4.x release notes</xref><xref audience="integrated" href="cdh_rn_fixed_in_54.xml#fixed_issues_548"/>.
-      </p>
-
     </conbody>
 
 <!--
@@ -1484,12 +1465,6 @@ d93fb5a IMPALA-1899: Cleanup handling of Hive's field schema
         This section lists the most frequently encountered customer issues fixed in <keyword keyref="impala227"/>.
       </p>
 
-      <p>
-        For the full list of fixed issues, see
-        <xref audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_547.html" format="html" scope="external">the CDH 5.4.x release notes</xref><xref audience="integrated" href="cdh_rn_fixed_in_54.xml#fixed_issues_547"/>.
-      </p>
-
     </conbody>
 <!--
 8736dba IMPALA-1983: Warn if table stats are potentially corrupt.
@@ -1677,12 +1652,6 @@ ce9fa25 IMPALA-2201: Unconditionally update the partition stats and row count.
         This section lists the most frequently encountered customer issues fixed in <keyword keyref="impala225"/>.
       </p>
 
-      <p>
-        For the full list of fixed issues, see
-        <xref audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_545.html" format="html" scope="external">the CDH 5.4.x release notes</xref><xref audience="integrated" href="cdh_rn_fixed_in_54.xml#fixed_issues_545"/>.
-      </p>
-
     </conbody>
 
 <!--
@@ -1805,12 +1774,6 @@ c2b8852 IMPALA-2018: Where clause does not propagate to joins inside nested view
         This section lists the most frequently encountered customer issues fixed in <keyword keyref="impala223"/>.
       </p>
 
-      <p>
-        For the full list of fixed issues, see
-        <xref audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_543.html" format="html" scope="external">the CDH 5.4.1 release notes</xref><xref audience="integrated" href="cdh_rn_fixed_in_54.xml#fixed_issues_543"/>.
-      </p>
-
     </conbody>
 
 <!-- List of fixed issues from Juan's spreadsheet: https://docs.google.com/spreadsheets/d/1Ia06xOLKQInKfsJzQfQ6Sf1fO3nYLOpZ-0OWfFNgNSc/edit#gid=1566007471
@@ -1928,12 +1891,6 @@ ce601ec : Enable using isilon as the underlying filesystem.
         This section lists the most frequently encountered customer issues fixed in <keyword keyref="impala221"/>.
       </p>
 
-      <p>
-        For the full list of fixed issues, see
-        <xref audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_541.html" format="html" scope="external">the CDH 5.4.1 release notes</xref><xref audience="integrated" href="cdh_rn_fixed_in_54.xml#fixed_issues_541"/>.
-      </p>
-
     </conbody>
   </concept>
 
@@ -2146,13 +2103,6 @@ IMPALA-1607
         This section lists the most significant Impala issues fixed in <keyword keyref="impala217"/>.
       </p>
 
-      <p> For the full list of Impala fixed issues in this release, see <xref
-          audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_539.html"
-          format="html" scope="external">the CDH 5.3.9 release notes</xref><xref
-          href="cdh_rn_fixed_in_53.xml#fixed_issues_539" audience="integrated"
-        />. </p>
-
     </conbody>
 <!--
 5e7e50d IMPALA-1917: Do not register aux equivalence predicates with NULL on either side.
@@ -2242,13 +2192,6 @@ e591cf4 IMPALA-2141: UnionNode::GetNext() doesn't check for query errors
         This section lists the most significant Impala issues fixed in Impala 2.1.6.
       </p>
 
-      <p> For the full list of Impala fixed issues in this release, see <!-- Don't think we have quite the right combination of conditional options to make this reference be a web link in Impala PDF and a normal xref in Release Notes PDF. -->
-        <xref audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_538.html"
-          format="html" scope="external">the CDH 5.3.8 release notes</xref><xref
-          href="cdh_rn_fixed_in_53.xml#fixed_issues_538" audience="integrated"
-        />. </p>
-
     </conbody>
 
 <!--
@@ -2328,13 +2271,6 @@ e591cf4 IMPALA-2141: UnionNode::GetNext() doesn't check for query errors
         This section lists the most significant Impala issues fixed in Impala 2.1.5.
       </p>
 
-      <p> For the full list of Impala fixed issues in this release, see <!-- Don't think we have quite the right combination of conditional options to make this reference be a web link in Impala PDF and a normal xref in Release Notes PDF. -->
-        <xref audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_536.html"
-          format="html" scope="external">the CDH 5.3.6 release notes</xref><xref
-          href="cdh_rn_fixed_in_53.xml#fixed_issues_536" audience="integrated"
-        />. </p>
-
     </conbody>
 
 <!--
@@ -2368,13 +2304,6 @@ e591cf4 IMPALA-2141: UnionNode::GetNext() doesn't check for query errors
         This section lists the most significant Impala issues fixed in Impala 2.1.4.
       </p>
 
-      <p> For the full list of Impala fixed issues in Impala 2.1.4,
-        see <xref audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_534.html"
-          format="html" scope="external">the CDH 5.3.4 release notes</xref><xref
-          href="cdh_rn_fixed_in_53.xml#fixed_issues_534" audience="integrated"
-        />. </p>
-
       <p outputclass="toc inpage"/>
     </conbody>
 
@@ -2511,16 +2440,6 @@ c132c75 IMPALA-1808: AnalyticEvalNode cannot handle partition/order by exprs wit
         This section lists the most significant issues fixed in Impala 2.1.3.
       </p>
 
-      <p> For the full list of fixed issues in Impala 2.1.3, see <xref
-          audience="standalone"
-          href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_rn_fixed_in_533.html"
-          format="html" scope="external">the CDH 5.3.3 release notes</xref><xref
-          href="cdh_rn_fixed_in_53.xml#fixed_issues_533" audience="integrated"
-        />.
-        <!-- <xref href="https://issues.cloudera.org/secure/IssueNavigator.jspa?reset=true&amp;jqlQuery=project%3Dimpala+and+fixVersion%3D%22Impala+2.1.3%22+and+resolution%3D%22Fixed%22" format="html" scope="external">
-        this report in the JIRA system</xref>. -->
-      </p>
-
       <p outputclass="toc inpage"/>
     </conbody>
 
@@ -3511,9 +3430,8 @@ db3362f IMPALA-1801: external-data-source-executor leaking global jni refs
   <concept rev="1.4.4" id="fixed_issues_144">
   <title>Issues Fixed in Impala 1.4.4</title>
     <conbody>
+
       <p>
-        For the list of fixed issues, see
-        <xref href="http://www.cloudera.com/documentation/enterprise/release-notes/topics/cdh_rn_fixed_in_51.html" scope="external" format="html">Issues Fixed in CDH 5.1.5</xref>.
       </p>
 
     </conbody>
@@ -4679,7 +4597,6 @@ Bad stats:
           the query.
         </p>
 
-<!-- <p><b>Bug:</b> <xref href="https://jira.cloudera.com/browse/IMP-1258" scope="external" format="html">IMP-1258</xref></p> -->
       </conbody>
     </concept>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_grant.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_grant.xml b/docs/topics/impala_grant.xml
index a245180..03ad518 100644
--- a/docs/topics/impala_grant.xml
+++ b/docs/topics/impala_grant.xml
@@ -91,9 +91,7 @@ object_type ::= TABLE | DATABASE | SERVER | URI
 
     <p rev="2.3.0 collevelauth">
       The ability to grant or revoke <codeph>SELECT</codeph> privilege on specific columns is available
-      in <keyword keyref="impala23_full"/> and higher. See
-      <xref audience="integrated" href="sg_hive_sql.xml#concept_c2q_4qx_p4/col_level_auth_sentry"/><xref audience="standalone" href="https://www.cloudera.com/documentation/enterprise/latest/topics/sg_hive_sql.html" format="html" scope="external"/>
-      for details.
+      in <keyword keyref="impala23_full"/> and higher. See <xref keyref="sg_hive_sql"/> for details.
     </p>
 
 <!-- Turn compatibility info into a conref or series of conrefs. (In both GRANT and REVOKE.) -->

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_hbase.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_hbase.xml b/docs/topics/impala_hbase.xml
index 0b3754b..cb1aa48 100644
--- a/docs/topics/impala_hbase.xml
+++ b/docs/topics/impala_hbase.xml
@@ -535,7 +535,6 @@ explain
           queries by turning off the <codeph>HBASE_CACHE_BLOCKS</codeph> setting
           and specifying a large number for the <codeph>HBASE_CACHING</codeph>
           setting.
-          <!-- That recommendation w.r.t. full-table scans comes from the Cloudera HBase forum: http://community.cloudera.com/t5/Realtime-Random-Access-Apache/How-to-optimise-Full-Table-Scan-FTS-in-HBase/td-p/97 -->
         </p>
 
         <p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_incompatible_changes.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_incompatible_changes.xml b/docs/topics/impala_incompatible_changes.xml
index 40d9d9b..5e14297 100644
--- a/docs/topics/impala_incompatible_changes.xml
+++ b/docs/topics/impala_incompatible_changes.xml
@@ -813,7 +813,7 @@ under the License.
   </concept>
 
   <concept rev="1.4.4" id="incompatible_changes_144">
-    <title>Incompatible Changes Introduced in Impala 1.4.4 /</title>
+    <title>Incompatible Changes Introduced in Impala 1.4.4</title>
     <conbody>
       <p>
         No incompatible changes.
@@ -878,12 +878,8 @@ under the License.
             There is a slight change to required security privileges in the Sentry framework. To create a new
             object, now you need the <codeph>ALL</codeph> privilege on the parent object. For example, to create a
             new table, view, or function requires having the <codeph>ALL</codeph> privilege on the database
-            containing the new object. <ph audience="PDF">See
-              <xref
-                href="http://www.cloudera.com/documentation/enterprise/latest/topics/impala_authorization.html"
-                scope="external" format="html">Privilege Model and Object Hierarchy</xref>
-              for a full list of operations and
-            associated privileges.</ph>
+            containing the new object. See <xref href="impala_authorization.xml"/> for a full list of operations and
+            associated privileges.
           </p>
         </li>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_jdbc.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_jdbc.xml b/docs/topics/impala_jdbc.xml
index 62fa285..8d3599f 100644
--- a/docs/topics/impala_jdbc.xml
+++ b/docs/topics/impala_jdbc.xml
@@ -176,9 +176,8 @@ under the License.
             Download the JAR files listed above to each client machine.
             <note>
               For Maven users, see
-              <xref href="https://github.com/onefoursix/Cloudera-Impala-JDBC-Example" scope="external" format="html">this
-              sample github page</xref> for an example of the dependencies you could add to a <codeph>pom</codeph>
-              file instead of downloading the individual JARs.
+              <xref keyref="Impala-JDBC-Example">this sample github page</xref> for an example of the
+              dependencies you could add to a <codeph>pom</codeph> file instead of downloading the individual JARs.
             </note>
           </li>
 
@@ -187,8 +186,7 @@ under the License.
             <codeph>CLASSPATH</codeph> setting. For example:
             <ul>
               <li>
-                On Linux, you might use a location such as
-                <codeph>/</codeph><codeph>opt</codeph><codeph>/jars/</codeph>.
+                On Linux, you might use a location such as <codeph>/opt/jars/</codeph>.
               </li>
 
               <li>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_kerberos.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_kerberos.xml b/docs/topics/impala_kerberos.xml
index d74c8bb..5032fba 100644
--- a/docs/topics/impala_kerberos.xml
+++ b/docs/topics/impala_kerberos.xml
@@ -72,9 +72,6 @@ under the License.
 
       <p conref="../shared/impala_common.xml#common/rhel5_kerberos"/>
 
-<!-- This note adapted from the one at http://www.cloudera.com/content/cloudera-content/cloudera-docs/CDH4/latest/CDH4-Security-Guide/cdh4sg_topic_3_4.html.
-   Ideally should be conref'ed in both places. -->
-
       <note type="important">
         <p>
           If you plan to use Impala in your cluster, you must configure your KDC to allow tickets to be renewed,

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_known_issues.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_known_issues.xml b/docs/topics/impala_known_issues.xml
index 748b933..3a08201 100644
--- a/docs/topics/impala_known_issues.xml
+++ b/docs/topics/impala_known_issues.xml
@@ -1384,11 +1384,6 @@ ALTER TABLE table_name SET TBLPROPERTIES('EXTERNAL'='TRUE');
 
       <conbody>
 
-        <p audience="hidden">
-          <b>Cloudera Bug:</b> <xref href="https://jira.cloudera.com/browse/IMP-469" scope="external" format="html"/>; KI added 0.1
-          <i>Cloudera internal only</i>
-        </p>
-
         <p>
           <b>Anticipated Resolution</b>: None
         </p>
@@ -1414,11 +1409,6 @@ ALTER TABLE table_name SET TBLPROPERTIES('EXTERNAL'='TRUE');
           allowed value of type (Hive returns NULL).
         </p>
 
-        <p audience="hidden">
-          <b>Cloudera Bug:</b> <xref href="https://jira.cloudera.com/browse/IMP-175" scope="external" format="html">IMPALA-175</xref> ; KI
-          added 0.1 <i>Cloudera internal only</i>
-        </p>
-
         <p>
           <b>Workaround:</b> None
         </p>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_logging.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_logging.xml b/docs/topics/impala_logging.xml
index fb74ffb..5238e8b 100644
--- a/docs/topics/impala_logging.xml
+++ b/docs/topics/impala_logging.xml
@@ -449,9 +449,7 @@ I0107 08:42:12.292706 14876 logging.cc:76] Flags (see also /varz are on debug we
       </p>
 
       <p>
-        See
-        <xref audience="integrated" href="sg_redaction.xml#log_redact"/><xref audience="standalone" href="http://www.cloudera.com/documentation/enterprise/latest/topics/sg_redaction.html" scope="external" format="html"/>
-        for details about how to enable this feature and set
+        See <xref keyref="sg_redaction"/> for details about how to enable this feature and set
         up the regular expressions to detect and redact sensitive information within SQL statement text.
       </p>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_mem_limit.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_mem_limit.xml b/docs/topics/impala_mem_limit.xml
index b478a8f..2abfaf7 100644
--- a/docs/topics/impala_mem_limit.xml
+++ b/docs/topics/impala_mem_limit.xml
@@ -153,7 +153,7 @@ MEM_LIMIT set to 3m
 +---+
 [localhost:21000] > set mem_limit=3mb;
 MEM_LIMIT set to 3mb
-[nightly55-2.vpc.cloudera.com:21000] > select 5;
+[localhost:21000] > select 5;
 +---+
 | 5 |
 +---+

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_new_features.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_new_features.xml b/docs/topics/impala_new_features.xml
index 9a3128d..0c80447 100644
--- a/docs/topics/impala_new_features.xml
+++ b/docs/topics/impala_new_features.xml
@@ -1376,7 +1376,8 @@ under the License.
             Column-level authorization lets you define access to particular columns within a table,
             rather than the entire table. This feature lets you reduce the reliance on creating views to
             set up authorization schemes for subsets of information.
-            <ph audience="integrated">See <xref href="sg_hive_sql.xml#concept_c2q_4qx_p4/col_level_auth_sentry"/> for background details, and <xref href="impala_grant.xml#grant"/> and <xref href="impala_revoke.xml#revoke"/> for Impala-specific syntax.</ph>
+            See <xref keyref="sg_hive_sql"/> for background details, and
+            <xref href="impala_grant.xml#grant"/> and <xref href="impala_revoke.xml#revoke"/> for Impala-specific syntax.
           </p>
         </li>
 
@@ -1432,10 +1433,7 @@ under the License.
           </ul>
           <p audience="PDF">
             See <xref href="impala_parquet.xml#parquet"/> for instructions about using Parquet data files
-            with Impala, and
-            <xref audience="integrated" href="cdh_ig_parquet.xml#parquet_format"/><xref audience="standalone" href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_ig_parquet.html" scope="external" format="html"/>
-            for instructions for
-            other components that can read and write Parquet files.
+            with Impala.
           </p>
         </li>
 
@@ -1833,9 +1831,7 @@ under the License.
             Redaction of sensitive data from Impala log files. This feature protects details such as credit card
             numbers or tax IDs from administrators who see the text of SQL statements in the course of monitoring
             and troubleshooting a Hadoop cluster. See <xref href="impala_logging.xml#redaction"/> for background
-            information for Impala users, and
-            <xref audience="integrated" href="sg_redaction.xml#log_redact"/><xref audience="standalone" href="http://www.cloudera.com/documentation/enterprise/latest/topics/sg_redaction.html" scope="external" format="html">the CDH 5 Security Guide</xref>
-            for usage details.
+            information for Impala users, and <xref keyref="sg_redaction"/> for usage details.
           </p>
         </li>
 
@@ -1844,12 +1840,8 @@ under the License.
             Lineage information is available for data created or queried by Impala. This feature lets you track who
             has accessed data through Impala SQL statements, down to the level of specific columns, and how data
             has been propagated between tables. See <xref href="impala_lineage.xml#lineage"/> for background
-            information for Impala users,
-            <xref audience="integrated" href="datamgmt_impala_lineage_log.xml"/><xref audience="standalone" href="http://www.cloudera.com/documentation/enterprise/latest/topics/datamgmt_impala_lineage_log.html" scope="external" format="html"/>
-            for usage details, and
-            <xref audience="integrated" href="cn_iu_lineage.xml" /><xref audience="standalone" href="http://www.cloudera.com/documentation/enterprise/latest/topics/cn_iu_lineage.html" scope="external" format="html"/>.
-            for how to interpret the lineage
-            information.
+            information for Impala users, <xref keyref="datamgmt_impala_lineage_log"/> for usage details and
+            how to interpret the lineage information.
           </p>
         </li>
 
@@ -2159,11 +2151,7 @@ under the License.
 
           <p>
             The new security-related SQL statements work along with the Sentry authorization framework. See
-            <xref
-              href="http://www.cloudera.com/documentation/enterprise/latest/topics/impala_authorization.html#authorization"
-              format="html" scope="external">Enabling
-              Sentry
-              Authorization for Impala</xref> for details.
+            <xref keyref="authorization"/> for details.
           </p>
         </li>
 
@@ -2383,10 +2371,7 @@ under the License.
           <p>
             Impala can now use Sentry-based authorization based either on the original policy file, or on rules
             defined by <codeph>GRANT</codeph> and <codeph>REVOKE</codeph> statements issued through Hive.
-            <ph audience="PDF">See <xref
-              href="http://www.cloudera.com/documentation/enterprise/latest/topics/impala_authorization.html#authorization"
-              scope="external" format="html">Enabling Sentry Authorization for Impala</xref>
-              for details.</ph>
+            See <xref keyref="authorization"/> for details.
           </p>
         </li>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_odbc.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_odbc.xml b/docs/topics/impala_odbc.xml
index 402bc11..6cd761d 100644
--- a/docs/topics/impala_odbc.xml
+++ b/docs/topics/impala_odbc.xml
@@ -59,11 +59,9 @@ under the License.
       </note>
 
         <p>
-          See the
-          <xref href="http://www.cloudera.com/content/support/en/downloads/download-components/download-products.html?productID=3mDesWddUS" scope="external" format="html">downloads
-          page</xref> for a matrix of the certified driver version for different products. See the
-          <xref href="http://www.cloudera.com/content/support/en/documentation/cloudera-connectors-documentation/connector-documentation-latest.html" scope="external" format="html">documentation
-          page</xref> for installation instructions.
+          See <xref keyref="odbc_driver_download">this downloads page</xref> for a matrix of the certified
+          driver version for different products. See
+          <xref keyref="connector-documentation-latest">this documentation page</xref> for installation instructions.
         </p>
 
       </conbody>
@@ -73,14 +71,14 @@ under the License.
       <title>Configuring the ODBC Port</title>
       <conbody>
         <p>
-          Versions 2.5 and 2.0 of the Cloudera ODBC Connector, currently certified for some but not all BI applications,
+          Versions 2.5 and 2.0 of the ODBC Connector, currently certified for some but not all BI applications,
           use the HiveServer2 protocol, corresponding to Impala port 21050. Impala supports Kerberos authentication with
           all the supported versions of the driver, and requires ODBC 2.05.13 for Impala or higher for LDAP username/password
           authentication.
         </p>
 
         <p>
-          Version 1.x of the Cloudera ODBC Connector uses the original HiveServer1 protocol, corresponding to Impala
+          Version 1.x of the ODBC Connector uses the original HiveServer1 protocol, corresponding to Impala
           port 21000.
         </p>
 
@@ -96,7 +94,7 @@ under the License.
           all required drivers and a business intelligence application
           that uses the ODBC driver, under Mac OS X. Each <codeph>.dmg</codeph> file runs a GUI-based
           installer, first for the <xref href="http://www.iodbc.org/dataspace/iodbc/wiki/iODBC/Downloads" scope="external" format="html">underlying IODBC driver</xref> needed for non-Windows systems, then for
-          the Cloudera ODBC Connector, and finally for the BI tool itself.
+          the ODBC Connector, and finally for the BI tool itself.
         </p>
 
 <codeblock>$ ls -1
@@ -107,7 +105,7 @@ ClouderaImpalaODBC.dmg
 $ open iodbc-sdk-3.52.7-macosx-10.dmg
 <varname>Install the IODBC driver using its installer</varname>
 $ open ClouderaImpalaODBC.dmg
-<varname>Install the Cloudera ODBC Connector using its installer</varname>
+<varname>Install the ODBC Connector using its installer</varname>
 $ installer_dir=$(pwd)
 $ cd /opt/cloudera/impalaodbc
 $ ls -1
@@ -134,7 +132,7 @@ Sample Cloudera Impala DSN=Cloudera ODBC Driver for Impala
 
 # Description: DSN Description.
 # This key is not necessary and is only to give a description of the data source.
-Description=Cloudera ODBC Driver for Impala DSN
+Description=ODBC Driver for Impala DSN
 
 # Driver: The location where the ODBC driver is installed to.
 Driver=/opt/cloudera/impalaodbc/lib/universal/libclouderaimpalaodbc.dylib

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_parquet.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_parquet.xml b/docs/topics/impala_parquet.xml
index 1809342..934736a 100644
--- a/docs/topics/impala_parquet.xml
+++ b/docs/topics/impala_parquet.xml
@@ -405,9 +405,8 @@ Add an example here.
 <!-- Old name, now deprecated: <codeph>dfs.datanode.max.xcievers</codeph>. -->
             <codeph>dfs.datanode.max.transfer.threads</codeph>. For example, if you were loading 12 years of data
             partitioned by year, month, and day, even a value of 4096 might not be high enough. This
-            <xref href="http://blog.cloudera.com/blog/2012/03/hbase-hadoop-xceivers/" scope="external" format="html">blog
-            post</xref> explores the considerations for setting this value higher or lower, using HBase examples
-            for illustration.
+            <xref keyref="hbase-hadoop-xceivers">blog post</xref> explores the considerations for setting this value
+            higher or lower, using HBase examples for illustration.
           </li>
 
           <li>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_perf_cookbook.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_perf_cookbook.xml b/docs/topics/impala_perf_cookbook.xml
index d0e40af..54377e9 100644
--- a/docs/topics/impala_perf_cookbook.xml
+++ b/docs/topics/impala_perf_cookbook.xml
@@ -275,8 +275,7 @@ under the License.
       <title>Use appropriate operating system settings.</title>
 
       <p>
-        See <xref href="http://www.cloudera.com/content/www/en-us/documentation/enterprise/latest/topics/cdh_admin_performance.html" scope="external" format="html">Optimizing Performance in CDH</xref>
-        for recommendations about operating system
+        See <xref keyref="cdh_admin_performance"/> for recommendations about operating system
         settings that you can change to influence Impala performance. In particular, you might find
         that changing the <codeph>vm.swappiness</codeph> Linux kernel setting to a non-zero value improves
         overall performance.

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_perf_stats.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_perf_stats.xml b/docs/topics/impala_perf_stats.xml
index 21564ae..86800f7 100644
--- a/docs/topics/impala_perf_stats.xml
+++ b/docs/topics/impala_perf_stats.xml
@@ -126,8 +126,8 @@ 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. <ph rev="upstream">Cloudera</ph> recommends
-        using the Impala <codeph>COMPUTE STATS</codeph> statement to avoid potential configuration and scalability
+        Hive wiki</xref> for information about the required configuration on the Hive side. Where practical,
+        use the Impala <codeph>COMPUTE STATS</codeph> statement to avoid potential configuration and scalability
         issues with the statistics-gathering process.
       </p>
 
@@ -141,8 +141,6 @@ show table stats parquet_snappy;
 
     <conbody>
 
-<!-- Cloudera+Hive background information: http://blog.cloudera.com/blog/2012/08/column-statistics-in-hive/ -->
-
       <p>
         The Impala query planner can make use of statistics about individual columns when that metadata is
         available in the metastore database. This technique is most valuable for columns compared across tables in

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_prereqs.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_prereqs.xml b/docs/topics/impala_prereqs.xml
index 3fa6429..4f92f63 100644
--- a/docs/topics/impala_prereqs.xml
+++ b/docs/topics/impala_prereqs.xml
@@ -66,13 +66,10 @@ under the License.
         <indexterm audience="hidden">SLES</indexterm>
         <indexterm audience="hidden">Ubuntu</indexterm>
         <indexterm audience="hidden">SUSE</indexterm>
-        <indexterm audience="hidden">Debian</indexterm> The relevant supported operating systems
-        and versions for Impala are the same as for the corresponding CDH 5 platforms. For
-        details, see the <cite>Supported Operating Systems</cite> page for
-        <ph audience="integrated"><xref href="rn_consolidated_pcm.xml#cdh_cm_supported_os">CDH
-            5</xref></ph><ph audience="standalone"><xref
-            href="http://www.cloudera.com/documentation/enterprise/latest/topics/rn_consolidated_pcm.html#cdh_cm_supported_os"
-            scope="external" format="html">CDH 5</xref></ph>. </p>
+        <indexterm audience="hidden">Debian</indexterm>
+        Apache Impala runs on Linux systems only. See the <filepath>README.md</filepath>
+        file for more information.
+      </p>
     </conbody>
   </concept>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_proxy.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_proxy.xml b/docs/topics/impala_proxy.xml
index e45ae72..cd68d97 100644
--- a/docs/topics/impala_proxy.xml
+++ b/docs/topics/impala_proxy.xml
@@ -153,8 +153,6 @@ under the License.
       <note>
         The following sections use the HAProxy software as a representative example of a load balancer
         that you can use with Impala.
-        For information specifically about using Impala with the F5 BIG-IP load balancer, see
-        <xref href="http://www.cloudera.com/documentation/other/reference-architecture/PDF/Impala-HA-with-F5-BIG-IP.pdf" scope="external" format="html">Impala HA with F5 BIG-IP</xref>.
       </note>
 
     </conbody>
@@ -248,9 +246,8 @@ under the License.
       <ol>
         <li>
           This section assumes you are starting with a Kerberos-enabled cluster. See
-          <xref href="impala_kerberos.xml#kerberos"/> for instructions for setting up Impala with Kerberos. See the
-          <cite>CDH Security Guide</cite> for
-          <xref href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_sg_kerberos_prin_keytab_deploy.html" scope="external" format="html">general steps to set up Kerberos</xref>.
+          <xref href="impala_kerberos.xml#kerberos"/> for instructions for setting up Impala with Kerberos. See
+          <xref keyref="cdh_sg_kerberos_prin_keytab_deploy"/> for general steps to set up Kerberos.
         </li>
 
         <li>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_relnotes.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_relnotes.xml b/docs/topics/impala_relnotes.xml
index f189ad9..ba1d83b 100644
--- a/docs/topics/impala_relnotes.xml
+++ b/docs/topics/impala_relnotes.xml
@@ -44,7 +44,7 @@ under the License.
 
     <p>
       Once you are finished reviewing these release notes, for more information about using Impala, see
-      <xref audience="integrated" href="impala.xml"/><xref audience="standalone" href="http://www.cloudera.com/documentation/enterprise/latest/topics/impala.html" scope="external" format="html"/>.
+      <xref href="impala_concepts.xml"/>.
     </p>
 
     <p outputclass="toc"/>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_revoke.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_revoke.xml b/docs/topics/impala_revoke.xml
index 7299150..78eda00 100644
--- a/docs/topics/impala_revoke.xml
+++ b/docs/topics/impala_revoke.xml
@@ -66,8 +66,7 @@ object_type ::= TABLE | DATABASE | SERVER | URI
     <p rev="2.3.0 collevelauth">
       The ability to grant or revoke <codeph>SELECT</codeph> privilege on specific columns is available
       in <keyword keyref="impala23_full"/> and higher. See
-      <xref audience="integrated" href="sg_hive_sql.xml#concept_c2q_4qx_p4/col_level_auth_sentry"/><xref audience="standalone" href="https://www.cloudera.com/documentation/enterprise/latest/topics/sg_hive_sql.html" format="html" scope="external"/>
-      for details.
+      <xref keyref="sg_hive_sql"/> for details.
     </p>
 
     <p conref="../shared/impala_common.xml#common/privileges_blurb"/>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_security_metastore.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_security_metastore.xml b/docs/topics/impala_security_metastore.xml
index fd0474b..6e30c4c 100644
--- a/docs/topics/impala_security_metastore.xml
+++ b/docs/topics/impala_security_metastore.xml
@@ -39,9 +39,8 @@ under the License.
     <p>
       It is important to secure the Hive metastore, so that users cannot access the names or other information
       about databases and tables the through the Hive client or by querying the metastore database. Do this by
-      turning on Hive metastore security, using the instructions in the
-      <xref href="http://www.cloudera.com/documentation/enterprise/latest/topics/cdh_sg_hive_security.html" scope="external" format="html">CDH 5 Security Guide</xref>
-      for securing different Hive components:
+      turning on Hive metastore security, using the instructions in
+      <xref keyref="cdh_sg_hive_security"/> for securing different Hive components:
     </p>
 
     <ul>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_txtfile.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_txtfile.xml b/docs/topics/impala_txtfile.xml
index 317bddc..ecbf4ca 100644
--- a/docs/topics/impala_txtfile.xml
+++ b/docs/topics/impala_txtfile.xml
@@ -487,38 +487,31 @@ INSERT INTO csv SELECT * FROM other_file_format_table;</codeblock>
             <p>
               Download and install the appropriate file to each machine on which you intend to use LZO with Impala.
               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:
+              <xref keyref="gplextras">this GPL extras</xref> download site. Install the:
             </p>
             <ul>
               <li>
-                <xref href="https://archive.cloudera.com/gplextras/redhat/5/x86_64/gplextras/cloudera-gplextras4.repo" scope="external" format="repo">Red
-                Hat 5 repo file</xref> to <filepath>/etc/yum.repos.d/</filepath>.
+                <xref keyref="gplextras_rhel5">Red Hat 5 repo file</xref> to <filepath>/etc/yum.repos.d/</filepath>.
               </li>
 
               <li>
-                <xref href="https://archive.cloudera.com/gplextras/redhat/6/x86_64/gplextras/cloudera-gplextras4.repo" scope="external" format="repo">Red
-                Hat 6 repo file</xref> to <filepath>/etc/yum.repos.d/</filepath>.
+                <xref keyref="gplextras_rhel6">Red Hat 6 repo file</xref> to <filepath>/etc/yum.repos.d/</filepath>.
               </li>
 
               <li>
-                <xref href="https://archive.cloudera.com/gplextras/sles/11/x86_64/gplextras/cloudera-gplextras4.repo" scope="external" format="repo">SUSE
-                repo file</xref> to <filepath>/etc/zypp/repos.d/</filepath>.
+                <xref keyref="gplextras_sles11">SUSE repo file</xref> to <filepath>/etc/zypp/repos.d/</filepath>.
               </li>
 
               <li>
-                <xref href="https://archive.cloudera.com/gplextras/ubuntu/lucid/amd64/gplextras/cloudera.list" scope="external" format="list">Ubuntu
-                10.04 list file</xref> to <filepath>/etc/apt/sources.list.d/</filepath>.
+                <xref keyref="gplextras_ubuntu_lucid">Ubuntu 10.04 list file</xref> to <filepath>/etc/apt/sources.list.d/</filepath>.
               </li>
 
               <li>
-                <xref href="https://archive.cloudera.com/gplextras/ubuntu/precise/amd64/gplextras/cloudera.list" scope="external" format="list">Ubuntu
-                12.04 list file</xref> to <filepath>/etc/apt/sources.list.d/</filepath>.
+                <xref keyref="gplextras_ubuntu_precise">Ubuntu 12.04 list file</xref> to <filepath>/etc/apt/sources.list.d/</filepath>.
               </li>
 
               <li>
-                <xref href="https://archive.cloudera.com/gplextras/debian/squeeze/amd64/gplextras/cloudera.list" scope="external" format="list">Debian
-                list file</xref> to <filepath>/etc/apt/sources.list.d/</filepath>.
+                <xref keyref="gplextras_debian_squeeze">Debian list file</xref> to <filepath>/etc/apt/sources.list.d/</filepath>.
               </li>
             </ul>
           </li>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_udf.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_udf.xml b/docs/topics/impala_udf.xml
index a0ddd3e..f385baf 100644
--- a/docs/topics/impala_udf.xml
+++ b/docs/topics/impala_udf.xml
@@ -382,13 +382,7 @@ Returned 1 row(s) in 0.11s
 Returned 1 row(s) in 0.11s</codeblock>
 
           <p>
-            You can find the sample files mentioned here in
-            <xref href="https://github.com/cloudera/impala/tree/master/be/src/udf_samples" scope="external" format="html">the
-            Impala github repo</xref>.
-<!-- Internal-only repo, don't know an external equivalent.
-and other examples demonstrating this technique in
-<xref href="http://github.sf.cloudera.com/CDH/Impala/blob/master/testdata/workloads/functional-query/queries/QueryTest/load-hive-udfs.test" scope="external" format="html">the Impala test files</xref>.
--->
+            You can find the sample files mentioned here in <xref keyref="udf_samples"/>.
           </p>
 
         </example>
@@ -422,13 +416,11 @@ and other examples demonstrating this technique in
 
       <ol>
         <li>
-          Start at <xref href="https://archive.cloudera.com/cdh5/" scope="external" format="html"/>.
+          Start at <xref keyref="archive_root"/>.
         </li>
 
         <li>
-          Locate the appropriate <codeph>.repo</codeph> or list file for your operating system version, such as
-          <xref href="https://archive.cloudera.com/impala/redhat/6/x86_64/impala/cloudera-impala.repo" scope="external" format="html">the
-          <codeph>.repo</codeph> file for RHEL 6</xref>.
+          Locate the appropriate <codeph>.repo</codeph> or list file for your operating system version.
         </li>
 
         <li>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/d9602df7/docs/topics/impala_views.xml
----------------------------------------------------------------------
diff --git a/docs/topics/impala_views.xml b/docs/topics/impala_views.xml
index 8d74f86..09693fe 100644
--- a/docs/topics/impala_views.xml
+++ b/docs/topics/impala_views.xml
@@ -113,10 +113,7 @@ select * from report;</codeblock>
         Set up fine-grained security where a user can query some columns from a table but not other columns.
         Because <keyword keyref="impala23_full"/> and higher support column-level authorization, this technique is no longer
         required. If you formerly implemented column-level security through views, see
-        <xref audience="integrated" href="sg_hive_sql.xml#concept_c2q_4qx_p4/col_level_auth_sentry"/><xref audience="standalone" href="https://www.cloudera.com/documentation/enterprise/latest/topics/sg_hive_sql.html" format="html" scope="external"/>
-        for details about the
-        column-level authorization feature.
-        <!-- See <xref href="impala_authorization.xml#security_examples/sec_ex_views"/> for details. -->
+        <xref keyref="sg_hive_sql"/> for details about the column-level authorization feature.
       </li>
     </ul>