You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by yo...@apache.org on 2016/11/01 22:45:25 UTC

[2/5] incubator-hawq-docs git commit: Edits

Edits


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/commit/1bb14ff0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/tree/1bb14ff0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/diff/1bb14ff0

Branch: refs/heads/develop
Commit: 1bb14ff00a7093f1bad61c93bee3a210a02f32c2
Parents: 384b9cb
Author: Jane Beckman <jb...@pivotal.io>
Authored: Fri Oct 28 14:37:22 2016 -0700
Committer: Jane Beckman <jb...@pivotal.io>
Committed: Fri Oct 28 14:37:22 2016 -0700

----------------------------------------------------------------------
 bestpractices/general_bestpractices.html.md.erb        | 2 +-
 reference/cli/admin_utilities/hawqactivate.html.md.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/blob/1bb14ff0/bestpractices/general_bestpractices.html.md.erb
----------------------------------------------------------------------
diff --git a/bestpractices/general_bestpractices.html.md.erb b/bestpractices/general_bestpractices.html.md.erb
index 5c15806..1c49636 100644
--- a/bestpractices/general_bestpractices.html.md.erb
+++ b/bestpractices/general_bestpractices.html.md.erb
@@ -10,7 +10,7 @@ When using HAWQ, adhere to the following guidelines for best results:
 
     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, 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, not `hawq config`, to set or change HAWQ configuration properties. 
+    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 HAWQ restarted or reconfigured 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.
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/blob/1bb14ff0/reference/cli/admin_utilities/hawqactivate.html.md.erb
----------------------------------------------------------------------
diff --git a/reference/cli/admin_utilities/hawqactivate.html.md.erb b/reference/cli/admin_utilities/hawqactivate.html.md.erb
index 2b37a64..7afd6c7 100644
--- a/reference/cli/admin_utilities/hawqactivate.html.md.erb
+++ b/reference/cli/admin_utilities/hawqactivate.html.md.erb
@@ -4,7 +4,7 @@ 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.
+**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