Mailing-List: contact commits-help@hawq.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@hawq.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: yozie@apache.org
To: commits@hawq.incubator.apache.org
Date: Mon, 31 Oct 2016 22:13:43 -0000
Message-Id: <9e3e5ec071d148c1ac7149aa2f34093f@git.apache.org>
In-Reply-To: <46253954dc4b473fb6d92e410a2918e1@git.apache.org>
References: <46253954dc4b473fb6d92e410a2918e1@git.apache.org>
Subject: [33/50] incubator-hawq-docs git commit: Edits
archived-at: Mon, 31 Oct 2016 22:15:50 -0000

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/e0d83918
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/tree/e0d83918
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/diff/e0d83918

Branch: refs/heads/tutorial-proto
Commit: e0d839185a160552ff67fc47accd855af6f8441c
Parents: 56a046d
Author: Jane Beckman <jbeckman@pivotal.io>
Authored: Tue Oct 25 16:36:39 2016 -0700
Committer: Jane Beckman <jbeckman@pivotal.io>
Committed: Tue Oct 25 16:36:39 2016 -0700

----------------------------------------------------------------------
 admin/startstop.html.md.erb                        | 2 +-
 reference/cli/admin_utilities/hawqstop.html.md.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/blob/e0d83918/admin/startstop.html.md.erb
----------------------------------------------------------------------
diff --git a/admin/startstop.html.md.erb b/admin/startstop.html.md.erb
index 0cc7539..907a582 100644
--- a/admin/startstop.html.md.erb
+++ b/admin/startstop.html.md.erb
@@ -147,7 +147,7 @@ For best results in using `hawq start` and `hawq stop` to manage your HAWQ syste
     $ hawq stop master -M fast
     $ hawq stop master -M immediate
     ```
--   If you want to reload server parameter setting on a HAWQ database where there are active connections, use the command:
+-   If you want to reload server parameter settings on a HAWQ database where there are active connections, use the command:
 
 
 	```shell

http://git-wip-us.apache.org/repos/asf/incubator-hawq-docs/blob/e0d83918/reference/cli/admin_utilities/hawqstop.html.md.erb
----------------------------------------------------------------------
diff --git a/reference/cli/admin_utilities/hawqstop.html.md.erb b/reference/cli/admin_utilities/hawqstop.html.md.erb
index 67ced1c..aea4437 100644
--- a/reference/cli/admin_utilities/hawqstop.html.md.erb
+++ b/reference/cli/admin_utilities/hawqstop.html.md.erb
@@ -23,7 +23,7 @@ The `hawq stop` utility is used to stop the database servers that comprise a HAW
 By default, you are not allowed to shut down HAWQ if there are any client connections to the database. Use the `-M fast` option to roll back all in progress transactions and terminate any connections before shutting down. If there are any transactions in progress, the default behavior is to wait for them to commit before shutting down.
 
 With the `-u` option, the utility uploads changes made to the master `pg_hba.conf` file or to *runtime* configuration parameters in the master `hawq-site.xml` file without interruption of service. Note that any active sessions will not pick up the changes until they reconnect to the database.
-When active connections to the database are present, use the command `hawq stop cluster -u -M fast` to ensure that changes to the parameters are reloaded.  
+If the hawq cluster has active connections, use the command `hawq stop cluster -u -M fast` to ensure that changes to the parameters are reloaded.  
 
 ## Objects