Repository: incubator-impala Updated Branches: refs/heads/doc_prototype 4303a448a -> 63a355217
Conditionalize out xref to non-Impala topic. Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/63a35521 Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/63a35521 Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/63a35521 Branch: refs/heads/doc_prototype Commit: 63a355217111d699abe0d09b552f4780c1813095 Parents: 4303a44 Author: John Russell <[email protected]> Authored: Mon Oct 31 15:51:09 2016 -0700 Committer: John Russell <[email protected]> Committed: Mon Oct 31 15:51:09 2016 -0700 ---------------------------------------------------------------------- docs/shared/ImpalaVariables.xml | 24 +++++++++++++++--------- docs/shared/impala_common.xml | 4 ++-- 2 files changed, 17 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/63a35521/docs/shared/ImpalaVariables.xml ---------------------------------------------------------------------- diff --git a/docs/shared/ImpalaVariables.xml b/docs/shared/ImpalaVariables.xml index 226eee9..164bbb2 100644 --- a/docs/shared/ImpalaVariables.xml +++ b/docs/shared/ImpalaVariables.xml @@ -1,25 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd"> -<concept xmlns:ditaarch="http://dita.oasis-open.org/architecture/2005/"; id="impala_vars" ditaarch:DITAArchVersion="1.2" domains="(topic concept) (topic hi-d) (topic ut-d) (topic indexing-d) (topic hazard-d) (topic abbrev-d) (topic pr-d) (topic sw-d) (topic ui-d) " xml:lang="en-US"> +<concept id="impala_vars"> <title>Cloudera Impala Variables</title> <prolog id="prolog_slg_nmv_km"> <metadata id="metadata_ecq_qmv_km"> - <prodinfo id="prodinfo_pmw_tmv_km"> - <prodname>Apache Impala (incubating)</prodname> + <prodinfo audience="PDF" id="prodinfo_for_html"> + <prodname>Impala</prodname> <vrmlist> - <vrm version="Impala 2.3.x (separated)" id="vrm_pj3_3hv_impala"/> - <vrm version="CDH 5.5. (separated)" id="vrm_pj3_3hv_cdh"/> + <vrm version="Impala 2.7.x / CDH 5.9.x"/> + </vrmlist> + </prodinfo> + <prodinfo audience="HTML" id="prodinfo_for_pdf"> + <prodname></prodname> + <vrmlist> + <vrm version="Impala 2.7.x / CDH 5.9.x"/> </vrmlist> </prodinfo> </metadata> </prolog> <conbody> - <p>Release Version Variable - <ph id="ReleaseVersion">Impala 2.3.x / CDH 5.5.x (combined)</ph></p> <p>Substitution variables for denoting features available in release X or higher. The upstream docs can refer to the Impala release number. The docs included with a distro can refer to the distro release number by editing the values here. <ul> + <li><ph id="impala27">CDH 5.9</ph></li> <li><ph id="impala26">CDH 5.8</ph></li> <li><ph id="impala25">CDH 5.7</ph></li> <li><ph id="impala24">CDH 5.6</ph></li> @@ -31,10 +36,11 @@ <li><ph id="impala13">CDH 5.0</ph></li> </ul> </p> - <p>Banner for examples showing shell version - <ph id="ShellBanner">(Shell - build version: Impala Shell v2.3.x (<varname>hash</varname>) built on + <p>Release Version Variable - <ph id="ReleaseVersion">Impala 2.7.x / CDH 5.9.x</ph></p> + <p>Banner for examples showing shell version -<ph id="ShellBanner">(Shell + build version: Impala Shell v2.7.x (<varname>hash</varname>) built on <varname>date</varname>)</ph></p> - <p>Banner for examples showing impalad version -<ph id="ImpaladBanner">Server version: impalad version 2.3.x (build + <p>Banner for examples showing impalad version -<ph id="ImpaladBanner">Server version: impalad version 2.7.x (build x.y.z)</ph></p> <data name="version-message" id="version-message"> <foreign> http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/63a35521/docs/shared/impala_common.xml ---------------------------------------------------------------------- diff --git a/docs/shared/impala_common.xml b/docs/shared/impala_common.xml index cdde360..b151277 100644 --- a/docs/shared/impala_common.xml +++ b/docs/shared/impala_common.xml @@ -2905,8 +2905,8 @@ sudo pip-python install ssl</codeblock> </note> <p id="impala_mr"> For a detailed information about configuring a cluster to share resources - between Impala queries and MapReduce jobs, see <xref - href="../topics/admin_howto_multitenancy.xml#howto_multitenancy"/> and <xref + between Impala queries and MapReduce jobs, see <ph audience="integrated"><xref + href="../topics/admin_howto_multitenancy.xml#howto_multitenancy"/> and </ph><xref href="../topics/impala_howto_rm.xml#howto_impala_rm"/>.</p> <note id="llama_beta" type="warning">
