Conditionalizing gppkg docs for MADlib install; updating MADlib package version

87b10163 · David Yozie · a73c7fef · 87b10163 · 87b10163 · 87b10163
3 changed file
--- a/gpdb-doc/dita/admin_guide/managing/gptransfer.xml
+++ b/gpdb-doc/dita/admin_guide/managing/gptransfer.xml
@@ -19,8 +19,8 @@
      views, roles, user-defined functions, and resource queues. Configuration files, including
        <codeph>postgres.conf</codeph> and <codeph>pg_hba.conf</codeph>, must be transferred
      manually by an administrator. Extensions installed in the database with
-      <codeph>gppkg</codeph>, such as MADlib and programming language extensions, must be installed
-      in the destination database by an administrator. </p>
+      <codeph>gppkg</codeph>, such as MADlib, must be installed in the destination database by an
+      administrator. </p>
    <p>See the <cite>Greenplum Database Utility Guide</cite> for complete syntax and usage
      information for the <codeph>gptransfer</codeph> utility. </p>
    <section>

--- a/gpdb-doc/dita/admin_guide/query/topics/functions-operators.xml
+++ b/gpdb-doc/dita/admin_guide/query/topics/functions-operators.xml
@@ -644,11 +644,10 @@ SELECT foo();
            <p>The following built-in advanced aggregate functions are Greenplum extensions of the
                PostgreSQL database. These functions are <i>immutable</i>. <note>The Greenplum
                    MADlib Extension for Analytics provides additional advanced functions to perform
-                    statistical analysis and machine learning with Greenplum Database data. For
-                    information about installing and using the MADlib extension package, see <xref
-                        href="../../../ref_guide/extensions/madlib.xml#topic1">Greenplum MADlib
-                        Extension for Analytics</xref> in the <cite>Greenplum Database Reference
-                        Guide</cite>.</note></p>
+                    statistical analysis and machine learning with Greenplum Database data. See
+                        <xref href="../../../ref_guide/extensions/madlib.xml#topic1">Greenplum
+                        MADlib Extension for Analytics</xref> in the <cite>Greenplum Database
+                        Reference Guide</cite>.</note></p>
            <table id="in2073121">
                <title>Advanced Aggregate Functions</title>
                <tgroup cols="4">

--- a/gpdb-doc/dita/ref_guide/extensions/madlib.xml
+++ b/gpdb-doc/dita/ref_guide/extensions/madlib.xml
@@ -7,9 +7,9 @@
    <p>This chapter includes the following information:</p>
    <ul>
      <li id="pz219023"><xref href="#topic2" type="topic" format="dita"/></li>
-      <li id="pz213664"><xref href="#topic3" type="topic" format="dita"/></li>
-      <li><xref href="#topic_eqm_klx_hw" format="dita"/></li>
-      <li id="pz213668"><xref href="#topic6" type="topic" format="dita"/></li>
+      <li id="pz213664" otherprops="pivotal"><xref href="#topic3" type="topic" format="dita"/></li>
+      <li otherprops="pivotal"><xref href="#topic_eqm_klx_hw" format="dita"/></li>
+      <li id="pz213668" otherprops="pivotal"><xref href="#topic6" type="topic" format="dita"/></li>
      <li id="pz215253"><xref href="#topic9" type="topic" format="dita"/></li>
      <li id="pz213676"><xref href="#topic10" type="topic" format="dita"/></li>
    </ul>
@@ -29,13 +29,13 @@
          format="dita"/>.</p>
    </body>
  </topic>
-  <topic id="topic3" xml:lang="en">
+  <topic id="topic3" xml:lang="en" otherprops="pivotal">
    <title id="pz214493">Installing MADlib</title>
    <body>
      <p>For Pivotal Greenplum Database, the MADlib extension is available as a package. Download
-        the package from <xref href="https://network.pivotal.io" scope="external"
-          format="html" class="- topic/xref ">Pivotal Network</xref> and then install it with the
-        Greenplum Package Manager (<codeph>gppkg</codeph>). </p>
+        the package from <xref href="https://network.pivotal.io" scope="external" format="html"
+          class="- topic/xref ">Pivotal Network</xref> and then install it with the Greenplum
+        Package Manager (<codeph>gppkg</codeph>). </p>
      <p>To install MADlib on Greenplum Database, you install the Greenplum MADlib package on
        Greenplum Database and then install the MADlib function libraries on the databases that use
        MADlib. For the versions of the MADlib extension supported by your version of Greenplum
@@ -57,8 +57,8 @@
              href="https://network.pivotal.io/products/pivotal-gpdb" format="html" scope="external"
              >Pivotal Network</xref>, then copy it to the master host.</li>
          <li id="pz216990">Install the software package by running the <codeph>gppkg</codeph>
-            command. This example installs the MADlib 1.9.1 package on a Linux
-            system:<codeblock>$ gppkg -i madlib-ossv1.9.1_pv1.9.6_gpdb&lt;version>-rhel6-x86_64.gppkg</codeblock></li>
+            command. This example installs the MADlib 1.11 package on a Linux
+            system:<codeblock>$ gppkg -i madlib-ossv1.11_pv1.9.8_gpdb&lt;version>-rhel6-x86_64.gppkg</codeblock></li>
        </ol>
      </body>
    </topic>
@@ -87,7 +87,7 @@
      </body>
    </topic>
  </topic>
-  <topic id="topic_eqm_klx_hw">
+  <topic id="topic_eqm_klx_hw" otherprops="pivotal">
    <title>Upgrading MADlib </title>
    <body>
      <p>You upgrade an installed MADlib package with the Greenplum Database <codeph>gppkg</codeph>
@@ -96,11 +96,11 @@
    <topic id="topic_tb3_2gd_3w">
      <title>Upgrading a MADlib Package</title>
      <body>
-        <p>These steps upgrade an installed MADlib package to MADlib 1.9.1.</p>
+        <p>These steps upgrade an installed MADlib package to MADlib 1.11.</p>
        <ol>
          <li> Run the <codeph>gppkg</codeph> utility with the <codeph>-u</codeph> option. This
            command upgrades an installed MADlib package to MADlib
-            1.9.1.<codeblock>gppkg -u madlib-ossv1.9.1_pv1.9.6_gpdb&lt;version>-rhel6-x86_64.gppkg</codeblock></li>
+            1.11.<codeblock>gppkg -u madlib-ossv1.11_pv1.9.8_gpdb&lt;version>-rhel6-x86_64.gppkg</codeblock></li>
        </ol>
      </body>
    </topic>
@@ -116,7 +116,7 @@
      </body>
    </topic>
  </topic>
-  <topic id="topic6" xml:lang="en">
+  <topic id="topic6" xml:lang="en" otherprops="pivotal">
    <title id="pz213704">Uninstalling MADlib</title>
    <body>
      <ul>
@@ -142,7 +142,7 @@
          utility with the <codeph>-r</codeph> option to uninstall the MADlib package. When removing
          the package you must specify the package and version. This example uninstalls MADlib
          package version 1.9.</p>
-        <codeblock>$ gppkg -r madlib-ossv1.9_pv1.9.5_gpdb&lt;version></codeblock>
+        <codeblock>$ gppkg -r madlib-ossv1.11_pv1.9.8_gpdb&lt;version>-rhel6-x86_64.gppkg</codeblock>
        <p>You can run the <codeph>gppkg</codeph> utility with the options <codeph>-q --all</codeph>
          to list the installed extensions and their versions.</p>
        <p>After you uninstall the package, restart the database.</p>