conditionalizing/removing more references to Pivotal (#2175)

e4cecfb5 · David Yozie · GitHub · 7939f1e4 · e4cecfb5 · e4cecfb5
14 changed file
--- a/gpdb-doc/dita/admin_guide/access_db/topics/g-third-party-client-tools.xml
+++ b/gpdb-doc/dita/admin_guide/access_db/topics/g-third-party-client-tools.xml
@@ -6,8 +6,9 @@
   <body>
      <p id="io140183">Most third-party extract-transform-load (ETL) and business intelligence (BI)
         tools use standard database interfaces, such as ODBC and JDBC, and can be configured to
-         connect to Greenplum Database. Pivotal has worked with the following tools on previous
-         customer engagements and is in the process of becoming officially certified:</p>
+         connect to Greenplum Database<ph otherprops="pivotal">. Pivotal has worked with the
+            following tools on previous customer engagements and is in the process of becoming
+            officially certified</ph>:</p>
      <ul>
         <li id="io142400">Business Objects</li>
         <li id="io142404">Microstrategy</li>

--- a/gpdb-doc/dita/admin_guide/ddl/ddl-partition.xml
+++ b/gpdb-doc/dita/admin_guide/ddl/ddl-partition.xml
@@ -714,7 +714,7 @@ WITH TABLE jan12;
            default partition, is valid for the default partition. For example, the data in the new
            default partition must not contain data that would be valid in other leaf child
            partitions of the partitioned table. Otherwise, queries against the partitioned table
-            with the exchanged default partition that are executed by the Pivotal Query Optimizer
+            with the exchanged default partition that are executed by GPORCA
            might return incorrect results.</note></p>
      </body>
    </topic>

--- a/gpdb-doc/dita/admin_guide/intro/about_ha.xml
+++ b/gpdb-doc/dita/admin_guide/intro/about_ha.xml
@@ -21,8 +21,8 @@
      <title id="iw157552">About Segment Mirroring</title>
      <p>When you deploy your Greenplum Database system, you can configure <i>mirror</i> segments.
        Mirror segments allow database queries to fail over to a backup segment if the primary
-        segment becomes unavailable. Mirroring is strongly recommended for production systems and
-        required for Pivotal support. </p>
+        segment becomes unavailable. Mirroring is strongly recommended for production systems<ph
+          otherprops="pivotal"> and required for Pivotal support</ph>. </p>
      <p>The secondary (mirror) segment must always reside on a different host than its primary
        segment to protect against a single host failure. Mirror segments can be arranged over the
        remaining hosts in the cluster in configurations designed to maximize availability or

--- a/gpdb-doc/dita/admin_guide/intro/about_statistics.xml
+++ b/gpdb-doc/dita/admin_guide/intro/about_statistics.xml
@@ -296,8 +296,7 @@
          each table with the saved state and skips analyzing a table or partition if it is
          unchanged. Heap tables are always analyzed. </p>
        <p>If GPORCA is enabled, you also need to run <codeph>ANALYZE
-            ROOTPARTITION</codeph> to refresh the root partition statistics. The Pivotal Query
-          Optimizer requires statistics at the root level for partitioned tables. The legacy
+            ROOTPARTITION</codeph> to refresh the root partition statistics. GPORCA requires statistics at the root level for partitioned tables. The legacy
          optimizer does not use these statistics. Enable GPORCA by setting
          both the <codeph>optimizer</codeph> and <codeph>optimizer_analyze_root_partition</codeph>
          system configuration parameters to on. The root level statistics are then updated when you

--- a/gpdb-doc/dita/admin_guide/kerberos-win-client.xml
+++ b/gpdb-doc/dita/admin_guide/kerberos-win-client.xml
@@ -412,7 +412,7 @@ psql -h prod1.example.local -U dev1</codeblock>
        </p>
        <p>Also, when you reconnect to the database, pgAdmin III prompts for a password. When
          prompted, leave the field blank and click OK. </p>
-        <p>This example configures Aginity Workbench for Pivotal Greenplum. When using single
+        <p>This example configures Aginity Workbench for Greenplum Database. When using single
          sign-on, you enable Use Integrated Security.</p>
        <p>
          <image href="graphics/kerb-aginity-config.png" placement="break" width="351px"

--- a/gpdb-doc/dita/admin_guide/load/topics/g-write-a-transform.xml
+++ b/gpdb-doc/dita/admin_guide/load/topics/g-write-a-transform.xml
@@ -6,7 +6,7 @@
   <body>
      <p>The transform specifies what to extract from the data.You can use any authoring
                    environment and language appropriate for your project. For XML transformations
-                    Pivotal suggests choosing a technology such as XSLT, Joost (STX), Java, Python,
+                    choose a technology such as XSLT, Joost (STX), Java, Python,
                    or Perl, based on the goals and scope of the project.</p>
      <p>In the price example, the next step is to transform the XML data into a simple
                    two-column delimited format.</p>

--- a/gpdb-doc/dita/admin_guide/managing/backup-ddboost.xml
+++ b/gpdb-doc/dita/admin_guide/managing/backup-ddboost.xml
@@ -43,7 +43,7 @@
    <body>
      <p>Using Data Domain Boost requires the following.</p>
      <ul>
-        <li>Data Domain Boost is included only with Pivotal Greenplum Database. </li>
+        <li>Data Domain Boost is included only with the commercial release of Pivotal Greenplum Database. </li>
        <li id="kk169399">Purchase and install Dell EMC Data Domain Boost and Replicator licenses on the
          Data Domain systems.</li>
        <li id="kk169390">Obtain sizing recommendations for Data Domain Boost. Make sure the Data

--- a/gpdb-doc/dita/admin_guide/managing/gptransfer.xml
+++ b/gpdb-doc/dita/admin_guide/managing/gptransfer.xml
@@ -27,7 +27,7 @@
      <title>Prerequisites</title>
      <ul id="ul_wkb_xqd_cp">
        <li>The <codeph>gptransfer</codeph> utility can only be used with Greenplum Database,
-          including the Dell EMC DCA appliance. Pivotal HAWQ is not supported as a source or destination. </li>
+          including the Dell EMC DCA appliance. Pivotal HDB is not supported as a source or destination. </li>
        <li>The source and destination Greenplum clusters must both be version 4.2 or higher.</li>
        <li>At least one Greenplum instance must include the <codeph>gptransfer</codeph> utility in
          its distribution. The utility is included with Greenplum Database version 4.2.8.1 and

--- a/gpdb-doc/dita/admin_guide/managing/startstop.xml
+++ b/gpdb-doc/dita/admin_guide/managing/startstop.xml
@@ -87,10 +87,11 @@
    <shortdesc>Start only the master to perform maintenance or administrative tasks without
      affecting data on the segments. </shortdesc>
    <taskbody>
-      <context>Maintenance mode should only be used with direction from Pivotal Technical Support.
-        For example, you could connect to a database only on the master instance in maintenance mode
-        and edit system catalog settings. For more information about system catalog tables, see the
-          <cite>Greenplum Database Reference Guide</cite>.</context>
+      <context><ph otherprops="pivotal">Maintenance mode should only be used with direction from
+          Pivotal Technical Support. </ph>For example, you could connect to a database only on the
+        master instance in maintenance mode and edit system catalog settings. For more information
+        about system catalog tables, see the <cite>Greenplum Database Reference
+        Guide</cite>.</context>
      <steps id="steps_gnq_3rk_gp">
        <step>
          <cmd>Run <codeph>gpstart</codeph> using the <option>-m</option> option:</cmd>

--- a/gpdb-doc/dita/admin_guide/monitoring/monitoring.dita
+++ b/gpdb-doc/dita/admin_guide/monitoring/monitoring.dita
@@ -328,9 +328,8 @@ WHERE logseverity in ('FATAL', 'ERROR')
                                </entry>
                            </row>
                            <row>
-                                <entry>Run the Greenplum
-                                    <codeph>gpcheck</codeph> utility to test that the configuration
-                                    of the cluster complies with Pivotal
+                                <entry>Run the Greenplum <codeph>gpcheck</codeph> utility to test
+                                    that the configuration of the cluster complies with current
                                        recommendations.<p>Recommended frequency: when creating a
                                        cluster or adding new machines to the cluster
                                        </p><p>Severity: IMPORTANT</p></entry>
@@ -399,8 +398,9 @@ WHERE logseverity in ('FATAL', 'ERROR')
                                        Greenplum
                                    <codeph>gpcheckcat</codeph> utility in each
                                    database:<codeblock>gpcheckcat -R persistent</codeblock></entry>
-                                <entry>If any problems are identified, contact Pivotal support for
-                                    assistance.</entry>
+                                <entry>Run repair scripts for any issues detected. <ph
+                                        otherprops="pivotal">If any problems are identified, contact
+                                        Pivotal support for assistance.</ph></entry>
                            </row>
                            <row>
                                <entry>Check for <codeph>pg_class</codeph> entries that have no

--- a/gpdb-doc/dita/admin_guide/perf_troubleshoot.xml
+++ b/gpdb-doc/dita/admin_guide/perf_troubleshoot.xml
@@ -165,13 +165,14 @@ con6 /gpdata/*/pg_log/gpdb*.csv' &gt; seglog.out
 </codeblock>
            </p>
        </body>
-        <topic id="topic9" xml:lang="en">
+        <topic id="topic9" xml:lang="en" otherprops="pivotal">
            <title id="jc155267">Gathering Information for Pivotal Support</title>
            <body>
-                <p>The Greenplum Database
-                    <codeph>gpsupport</codeph> utility can collect information from a Greenplum Database system. You can then send the information file to
-                    Pivotal Customer Support to aid the diagnosis of Greenplum Database errors or system failures. For example, this <cmdname>gpsupport</cmdname>
-                    command collects all logs from the listed segment hosts in a Greenplum Database cluster:</p>
+                <p>The Greenplum Database <codeph>gpsupport</codeph> utility can collect information
+                    from a Greenplum Database system. You can then send the information file to
+                    Pivotal Customer Support to aid the diagnosis of Greenplum Database errors or
+                    system failures. For example, this <cmdname>gpsupport</cmdname> command collects
+                    all logs from the listed segment hosts in a Greenplum Database cluster:</p>
                <p>
                    <codeblock>$ gpsupport collect logs segs sdw1,sdw2,sdw3-1</codeblock>
                </p>

--- a/gpdb-doc/dita/admin_guide/query/topics/query-piv-opt-changed.xml
+++ b/gpdb-doc/dita/admin_guide/query/topics/query-piv-opt-changed.xml
@@ -34,8 +34,7 @@
          <li>Query plan <cmdname>Partition selector</cmdname> operator.</li>
          <li>Query plan <cmdname>Split</cmdname> operator. </li>
        </ul></li>
-      <li>When running <cmdname>EXPLAIN</cmdname>, the query plan generated by Pivotal Query
-        Optimizer is different than the plan generated by the legacy query optimizer.</li>
+      <li>When running <cmdname>EXPLAIN</cmdname>, the query plan generated by GPORCA is different than the plan generated by the legacy query optimizer.</li>
      <li>Greenplum Database adds the log file message <codeph>Planner produced
        plan</codeph> when GPORCA is enabled and Greenplum Database falls back to the legacy query optimizer to generate the query
        plan.</li>

--- a/gpdb-doc/dita/admin_guide/query/topics/query-piv-opt-enable.xml
+++ b/gpdb-doc/dita/admin_guide/query/topics/query-piv-opt-enable.xml
@@ -23,8 +23,7 @@
      server configuration parameter <cmdname>optimizer_control</cmdname>. For information about the
      server configuration parameters, see the <cite>Greenplum Database Reference
        Guide</cite>.</note>
-    <note type="important">If you intend to execute queries on partitioned tables with the Pivotal
-      Query Optimizer enabled, you must collect statistics on the partitioned table root partition
+    <note type="important">If you intend to execute queries on partitioned tables with GPORCA enabled, you must collect statistics on the partitioned table root partition
      with the <cmdname>ANALYZE ROOTPARTITION</cmdname> command. The command <codeph>ANALYZE
        ROOTPARTITION</codeph> collects statistics on the root partition of a partitioned table
      based on the data in the table. Statistics are not collected on the leaf partitions, leaf
@@ -89,8 +88,7 @@
      <p>You can use the <cmdname>SET</cmdname> command to set <cmdname>optimizer</cmdname> server
        configuration parameter for a session. For example, after you use the
          <cmdname>psql</cmdname> utility to connect to Greenplum Database, this
-          <cmdname>SET</cmdname> command enables the Pivotal Query
-        Optimizer:<codeblock>> set optimizer = on ;</codeblock></p>
+          <cmdname>SET</cmdname> command enables GPORCA:<codeblock>> set optimizer = on ;</codeblock></p>
      <p>To set the parameter for a specific query, include the <cmdname>SET</cmdname> command prior
        to running the query.</p>
    </body>

--- a/gpdb-doc/dita/admin_guide/query/topics/query-piv-opt-limitations.xml
+++ b/gpdb-doc/dita/admin_guide/query/topics/query-piv-opt-limitations.xml
@@ -4,8 +4,7 @@
  <title>GPORCA Limitations</title>
  <abstract>
    <shortdesc>There are limitations in Greenplum Database<ph>
-        4.3.5.0 and later</ph> when GPORCA is enabled. The Pivotal Query
-      Optimizer and the legacy query optimizer currently coexist in Greenplum Database<ph> 4.3.5.0 and later</ph> because GPORCA does not
+        4.3.5.0 and later</ph> when GPORCA is enabled. GPORCA and the legacy query optimizer currently coexist in Greenplum Database<ph> 4.3.5.0 and later</ph> because GPORCA does not
      support all Greenplum Database features. </shortdesc>
  </abstract>
  <body>