Merge branch 'feature/cli_ambari_note' of https://github.com/janebeck…

…man/incubator-hawq-docs into develop

bestpractices/general_bestpractices.html.md.erb

@@ -9,6 +9,8 @@ When using HAWQ, adhere to the following guidelines for best results:
 -   **Use a consistent `hawq-site.xml` file to configure your entire cluster**:
 
     Configuration guc/parameters are located in `$GPHOME/etc/hawq-site.xml`. This configuration file resides on all HAWQ instances and can be modified by using the `hawq config` utility. You can use the same configuration file cluster-wide across both master and segments.
+
+    If you install and manage HAWQ using Ambari, do not use `hawq config` to set or change HAWQ configuration properties. Use the Ambari interface for all configuration changes. Configuration changes to `hawq-site.xml` made outside the Ambari interface will be overwritten when you restart or reconfigure  HAWQ using Ambari.
 
     **Note:** While `postgresql.conf` still exists in HAWQ, any parameters defined in `hawq-site.xml` will overwrite configurations in `postgresql.conf`. For this reason, we recommend that you only use `hawq-site.xml` to configure your HAWQ cluster.
 

reference/HAWQSiteConfig.html.md.erb

@@ -8,6 +8,8 @@ Configuration guc/parameters are located in `$GPHOME/etc/hawq-site.xml`. This co
 
 **Note:** While `postgresql.conf` still exists in HAWQ, any parameters defined in `hawq-site.xml` will overwrite configurations in `postgresql.conf`. For this reason, we recommend that you only use `hawq-site.xml` to configure your HAWQ cluster.
 
+**Note:** If you install and manage HAWQ using Ambari, be aware that any property changes to `hawq-site.xml` made using the command line could be overwritten by Ambari. For Ambari-managed HAWQ clusters, always use the Ambari administration interface to set or change HAWQ configuration properties.
+
 -   **[About Server Configuration Parameters](../reference/guc/guc_config.html)**
 
 -   **[Configuration Parameter Categories](../reference/guc/guc_category-list.html)**

reference/cli/admin_utilities/hawqactivate.html.md.erb

@@ -4,6 +4,8 @@ title: hawq activate
 
 Activates a standby master host and makes it the active master for the HAWQ system.
 
+**Note:** If HAWQ was installed using Ambari, do not use `hawq activate` to activate a standby master host. The system catalogs could become unsynchronized if you mix Ambari and command line functions. For Ambari-managed HAWQ clusters, always use the Ambari administration interface to activate a standby master. For more information, see [Manging HAWQ Using Ambari](../../../admin/ambari-admin.html#topic1).
+
 ## <a id="topic1__section2"></a>Synopsis
 
 ``` pre

reference/guc/guc_category-list.html.md.erb

@@ -4,7 +4,6 @@ title: Configuration Parameter Categories
 
 Configuration parameters affect categories of server behaviors, such as resource consumption, query tuning, and authentication. The following sections describe HAWQ configuration parameter categories.
 
-
 ## <a id="topic_hfd_1tl_zp"></a>Append-Only Table Parameters
 
 The following parameters configure the <span class="ph">append-only</span> tables feature of HAWQ.
@@ -349,6 +348,8 @@ When automatic statistics collection is enabled, you can run `ANALYZE` automatic
 -   [gp\_autostats\_mode](parameter_definitions.html#gp_autostats_mode)
 -   [log\_autostats](parameter_definitions.html#log_autostats)
 
+**Note:** If you install and manage HAWQ using Ambari, be aware that property changes made using `hawq config` could be overwritten by Ambari. For Ambari-managed HAWQ clusters, always use the Ambari administration interface to set or change HAWQ configuration properties.
+
 ### <a id="topic37"></a>Runtime Statistics Collection Parameters
 
 These parameters control the server statistics collection feature. When statistics collection is enabled, you can access the statistics data using the *pg\_stat* and *pg\_statio* family of system catalog views.

reference/guc/guc_config.html.md.erb

@@ -27,7 +27,7 @@ Many of the configuration parameters have limitations on who can change them and
 
 By design, all HAWQ instances (including master and segments) host identical `hawq-site.xml` files. Using a common `hawq-site.xml` file across all HAWQ instances simplifies configuration of the cluster. Within each `hawq-site.xml` configuration file, some parameters are considered *segment* parameters, meaning that each segment instance looks to its own `hawq-site.xml` file to get the value of that parameter. By convention, these parameter names begin with the string `hawq_segment`. Others parameters are considered *master* parameters. By convention, these parameter names begin with the string `hawq_master`. Master parameters are only applied at the master instance and ignored by segments.
 
-**Note:** If you use the `hawq config` utility to set configuration parameter values in `hawq-site.xml`, the utility synchronizes all configuration files. Any manual modifications that you made to individual `hawq-site.xml` files may be lost.
+**Note:** If you use the `hawq config` utility to set configuration parameter values in `hawq-site.xml`, the utility synchronizes all configuration files. Any manual modifications that you made to individual `hawq-site.xml` files may be lost. Additionally, if you install and manage HAWQ using Ambari, do not use `hawq config` to configure HAWQ properties. If the cluster is restarted, Ambari will overwrite any changes made by `hawq config` For Ambari-managed HAWQ clusters, only  use the Ambari administration interface to set or change HAWQ configuration properties.
 
 This table describes the values in the Set Classifications column of the table in the description of a server configuration parameter.