http://git-wip-us.apache.org/repos/asf/incubator-hawq-site/blob/1b0cdd8e/docs/userguide/2.1.0.0-incubating/bestpractices/general_bestpractices.html
----------------------------------------------------------------------
diff --git 
a/docs/userguide/2.1.0.0-incubating/bestpractices/general_bestpractices.html 
b/docs/userguide/2.1.0.0-incubating/bestpractices/general_bestpractices.html
index 3be5879..269b7a7 100644
--- a/docs/userguide/2.1.0.0-incubating/bestpractices/general_bestpractices.html
+++ b/docs/userguide/2.1.0.0-incubating/bestpractices/general_bestpractices.html
@@ -170,6 +170,9 @@
           <li>
             <a 
href="/docs/userguide/2.1.0.0-incubating/admin/monitor.html">Monitoring a HAWQ 
System</a>
           </li>
+          <li>
+            <a 
href="/docs/userguide/2.1.0.0-incubating/admin/logfiles.html">HAWQ 
Administrative Log Files</a>
+          </li>
         </ul>
       </li>
       <li class="has_submenu">
@@ -443,6 +446,7 @@
       </li>
       <li class="has_submenu"><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/HAWQBestPracticesOverview.html">Best
 Practices</a>
         <ul>
+          <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/config_hawq_bestpractices.html">Configuring
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/operating_hawq_bestpractices.html">Operating
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/secure_bestpractices.html">Securing
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/managing_resources_bestpractices.html">Managing
 Resources</a></li>
@@ -565,11 +569,17 @@
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_filerep_tcp_keepalives_interval">gp_filerep_tcp_keepalives_interval</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_hashjoin_tuples_per_bucket">gp_hashjoin_tuples_per_bucket</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_idf_deduplicate">gp_idf_deduplicate</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_cache_future_packets">gp_interconnect_cache_future_packets</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_default_rtt">gp_interconnect_default_rtt</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_fc_method">gp_interconnect_fc_method</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_hash_multiplier">gp_interconnect_hash_multiplier</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_retries_before_timeout">gp_interconnect_min_retries_before_timeout</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_rto">gp_interconnect_min_rto</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_queue_depth">gp_interconnect_queue_depth</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_setup_timeout">gp_interconnect_setup_timeout</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_snd_queue_depth">gp_interconnect_snd_queue_depth</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_checking_period">gp_interconnect_timer_checking_period</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_period">gp_interconnect_timer_period</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_type">gp_interconnect_type</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_log_format">gp_log_format</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_max_csv_line_length">gp_max_csv_line_length</a></li>
@@ -967,7 +977,26 @@
         <div class="to-top" id="js-to-top">
           <a href="#top" title="back to top"></a>
         </div>
-        <p>This topic addresses general best practices for users who are new 
to HAWQ.</p>
+        <!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<p>This topic addresses general best practices for users who are new to 
HAWQ.</p>
 
 <p>When using HAWQ, adhere to the following guidelines for best results:</p>
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq-site/blob/1b0cdd8e/docs/userguide/2.1.0.0-incubating/bestpractices/managing_data_bestpractices.html
----------------------------------------------------------------------
diff --git 
a/docs/userguide/2.1.0.0-incubating/bestpractices/managing_data_bestpractices.html
 
b/docs/userguide/2.1.0.0-incubating/bestpractices/managing_data_bestpractices.html
index 047a1a9..9f99cc0 100644
--- 
a/docs/userguide/2.1.0.0-incubating/bestpractices/managing_data_bestpractices.html
+++ 
b/docs/userguide/2.1.0.0-incubating/bestpractices/managing_data_bestpractices.html
@@ -170,6 +170,9 @@
           <li>
             <a 
href="/docs/userguide/2.1.0.0-incubating/admin/monitor.html">Monitoring a HAWQ 
System</a>
           </li>
+          <li>
+            <a 
href="/docs/userguide/2.1.0.0-incubating/admin/logfiles.html">HAWQ 
Administrative Log Files</a>
+          </li>
         </ul>
       </li>
       <li class="has_submenu">
@@ -443,6 +446,7 @@
       </li>
       <li class="has_submenu"><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/HAWQBestPracticesOverview.html">Best
 Practices</a>
         <ul>
+          <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/config_hawq_bestpractices.html">Configuring
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/operating_hawq_bestpractices.html">Operating
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/secure_bestpractices.html">Securing
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/managing_resources_bestpractices.html">Managing
 Resources</a></li>
@@ -565,11 +569,17 @@
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_filerep_tcp_keepalives_interval">gp_filerep_tcp_keepalives_interval</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_hashjoin_tuples_per_bucket">gp_hashjoin_tuples_per_bucket</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_idf_deduplicate">gp_idf_deduplicate</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_cache_future_packets">gp_interconnect_cache_future_packets</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_default_rtt">gp_interconnect_default_rtt</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_fc_method">gp_interconnect_fc_method</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_hash_multiplier">gp_interconnect_hash_multiplier</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_retries_before_timeout">gp_interconnect_min_retries_before_timeout</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_rto">gp_interconnect_min_rto</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_queue_depth">gp_interconnect_queue_depth</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_setup_timeout">gp_interconnect_setup_timeout</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_snd_queue_depth">gp_interconnect_snd_queue_depth</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_checking_period">gp_interconnect_timer_checking_period</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_period">gp_interconnect_timer_period</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_type">gp_interconnect_type</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_log_format">gp_log_format</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_max_csv_line_length">gp_max_csv_line_length</a></li>
@@ -972,7 +982,26 @@
         <div class="to-top" id="js-to-top">
           <a href="#top" title="back to top"></a>
         </div>
-        <p>This topic describes best practices for creating databases, loading 
data, partioning data, and recovering data in HAWQ.</p>
+        <!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<p>This topic describes best practices for creating databases, loading data, 
partioning data, and recovering data in HAWQ.</p>
 
 <h2><a id="topic_xhy_v2j_1v"></a>Best Practices for Loading Data</h2>
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq-site/blob/1b0cdd8e/docs/userguide/2.1.0.0-incubating/bestpractices/managing_resources_bestpractices.html
----------------------------------------------------------------------
diff --git 
a/docs/userguide/2.1.0.0-incubating/bestpractices/managing_resources_bestpractices.html
 
b/docs/userguide/2.1.0.0-incubating/bestpractices/managing_resources_bestpractices.html
index f50dbd9..18884d5 100644
--- 
a/docs/userguide/2.1.0.0-incubating/bestpractices/managing_resources_bestpractices.html
+++ 
b/docs/userguide/2.1.0.0-incubating/bestpractices/managing_resources_bestpractices.html
@@ -170,6 +170,9 @@
           <li>
             <a 
href="/docs/userguide/2.1.0.0-incubating/admin/monitor.html">Monitoring a HAWQ 
System</a>
           </li>
+          <li>
+            <a 
href="/docs/userguide/2.1.0.0-incubating/admin/logfiles.html">HAWQ 
Administrative Log Files</a>
+          </li>
         </ul>
       </li>
       <li class="has_submenu">
@@ -443,6 +446,7 @@
       </li>
       <li class="has_submenu"><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/HAWQBestPracticesOverview.html">Best
 Practices</a>
         <ul>
+          <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/config_hawq_bestpractices.html">Configuring
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/operating_hawq_bestpractices.html">Operating
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/secure_bestpractices.html">Securing
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/managing_resources_bestpractices.html">Managing
 Resources</a></li>
@@ -565,11 +569,17 @@
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_filerep_tcp_keepalives_interval">gp_filerep_tcp_keepalives_interval</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_hashjoin_tuples_per_bucket">gp_hashjoin_tuples_per_bucket</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_idf_deduplicate">gp_idf_deduplicate</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_cache_future_packets">gp_interconnect_cache_future_packets</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_default_rtt">gp_interconnect_default_rtt</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_fc_method">gp_interconnect_fc_method</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_hash_multiplier">gp_interconnect_hash_multiplier</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_retries_before_timeout">gp_interconnect_min_retries_before_timeout</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_rto">gp_interconnect_min_rto</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_queue_depth">gp_interconnect_queue_depth</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_setup_timeout">gp_interconnect_setup_timeout</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_snd_queue_depth">gp_interconnect_snd_queue_depth</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_checking_period">gp_interconnect_timer_checking_period</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_period">gp_interconnect_timer_period</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_type">gp_interconnect_type</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_log_format">gp_log_format</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_max_csv_line_length">gp_max_csv_line_length</a></li>
@@ -970,7 +980,26 @@
         <div class="to-top" id="js-to-top">
           <a href="#top" title="back to top"></a>
         </div>
-        <p>This topic describes best practices for managing resources in 
HAWQ.</p>
+        <!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<p>This topic describes best practices for managing resources in HAWQ.</p>
 
 <h2><a id="topic_ikz_ndx_15"></a>Best Practices for Configuring Resource 
Management</h2>
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq-site/blob/1b0cdd8e/docs/userguide/2.1.0.0-incubating/bestpractices/operating_hawq_bestpractices.html
----------------------------------------------------------------------
diff --git 
a/docs/userguide/2.1.0.0-incubating/bestpractices/operating_hawq_bestpractices.html
 
b/docs/userguide/2.1.0.0-incubating/bestpractices/operating_hawq_bestpractices.html
index 1e2b158..e3c1014 100644
--- 
a/docs/userguide/2.1.0.0-incubating/bestpractices/operating_hawq_bestpractices.html
+++ 
b/docs/userguide/2.1.0.0-incubating/bestpractices/operating_hawq_bestpractices.html
@@ -170,6 +170,9 @@
           <li>
             <a 
href="/docs/userguide/2.1.0.0-incubating/admin/monitor.html">Monitoring a HAWQ 
System</a>
           </li>
+          <li>
+            <a 
href="/docs/userguide/2.1.0.0-incubating/admin/logfiles.html">HAWQ 
Administrative Log Files</a>
+          </li>
         </ul>
       </li>
       <li class="has_submenu">
@@ -443,6 +446,7 @@
       </li>
       <li class="has_submenu"><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/HAWQBestPracticesOverview.html">Best
 Practices</a>
         <ul>
+          <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/config_hawq_bestpractices.html">Configuring
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/operating_hawq_bestpractices.html">Operating
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/secure_bestpractices.html">Securing
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/managing_resources_bestpractices.html">Managing
 Resources</a></li>
@@ -565,11 +569,17 @@
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_filerep_tcp_keepalives_interval">gp_filerep_tcp_keepalives_interval</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_hashjoin_tuples_per_bucket">gp_hashjoin_tuples_per_bucket</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_idf_deduplicate">gp_idf_deduplicate</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_cache_future_packets">gp_interconnect_cache_future_packets</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_default_rtt">gp_interconnect_default_rtt</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_fc_method">gp_interconnect_fc_method</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_hash_multiplier">gp_interconnect_hash_multiplier</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_retries_before_timeout">gp_interconnect_min_retries_before_timeout</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_rto">gp_interconnect_min_rto</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_queue_depth">gp_interconnect_queue_depth</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_setup_timeout">gp_interconnect_setup_timeout</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_snd_queue_depth">gp_interconnect_snd_queue_depth</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_checking_period">gp_interconnect_timer_checking_period</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_period">gp_interconnect_timer_period</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_type">gp_interconnect_type</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_log_format">gp_log_format</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_max_csv_line_length">gp_max_csv_line_length</a></li>
@@ -963,37 +973,52 @@
 
           <div id="js-quick-links" >
             <div class="quick-links"><ul>
-<li><a href="#best_practice_config">Best Practices for Configuring HAWQ 
Parameters</a></li>
-<li><a href="#task_qgk_bz3_1v">Best Practices to Start/Stop HAWQ Cluster 
Members</a></li>
+<li><a href="#task_qgk_bz3_1v">Best Practices Using the Command Line to 
Start/Stop HAWQ Cluster Members</a></li>
 <li><a href="#id_trr_m1j_1v">Guidelines for Cluster Expansion</a></li>
+<li>
+<a href="#best_pract_monitoring">Best Practices for Monitoring a HAWQ 
System</a><ul>
 <li><a href="#id_o5n_p1j_1v">Database State Monitoring Activities</a></li>
 <li><a href="#id_d3w_p1j_1v">Hardware and Operating System Monitoring</a></li>
 <li><a href="#id_khd_q1j_1v">Data Maintenance</a></li>
 <li><a href="#id_lx4_q1j_1v">Database Maintenance</a></li>
 <li><a href="#id_blv_q1j_1v">Patching and Upgrading</a></li>
+</ul>
+</li>
 </ul></div>
           </div>
         <div class="to-top" id="js-to-top">
           <a href="#top" title="back to top"></a>
         </div>
-        <p>This topic provides best practices for operating HAWQ, including 
recommendations for stopping, starting and monitoring HAWQ.</p>
-
-<h2><a id="best_practice_config"></a>Best Practices for Configuring HAWQ 
Parameters</h2>
+        <!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
 
-<p>The HAWQ configuration guc/parameters are located in 
<code>$GPHOME/etc/hawq-site.xml</code>. This configuration file resides on all 
HAWQ instances and can be modified either by the Ambari interface or the 
command line. </p>
+  http://www.apache.org/licenses/LICENSE-2.0
 
-<p>If you install and manage HAWQ using Ambari, use the Ambari interface for 
all configuration changes. Do not use command line utilities such as <code>hawq 
config</code> to set or change HAWQ configuration properties for Ambari-managed 
clusters. Configuration changes to <code>hawq-site.xml</code> made outside the 
Ambari interface will be overwritten when you restart or reconfigure HAWQ using 
Ambari.</p>
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
 
-<p>If you manage your cluster using command line tools instead of Ambari, use 
a consistent <code>hawq-site.xml</code> file to configure your entire cluster. 
</p>
+<p>This topic provides best practices for operating HAWQ, including 
recommendations for stopping, starting and monitoring HAWQ.</p>
 
-<p><strong>Note:</strong> While <code>postgresql.conf</code> still exists in 
HAWQ, any parameters defined in <code>hawq-site.xml</code> will overwrite 
configurations in <code>postgresql.conf</code>. For this reason, we recommend 
that you only use <code>hawq-site.xml</code> to configure your HAWQ cluster. 
For Ambari clusters, always use Ambari for configuring 
<code>hawq-site.xml</code> parameters.</p>
+<h2><a id="task_qgk_bz3_1v"></a>Best Practices Using the Command Line to 
Start/Stop HAWQ Cluster Members</h2>
 
-<h2><a id="task_qgk_bz3_1v"></a>Best Practices to Start/Stop HAWQ Cluster 
Members</h2>
-
-<p>For best results in using <code>hawq start</code> and <code>hawq 
stop</code> to manage your HAWQ system, the following best practices are 
recommended.</p>
+<p>The following best practices are recommended when using <code>hawq 
start</code> and <code>hawq stop</code> to manage your HAWQ cluster.</p>
 
 <ul>
-<li>  Issue the <code>CHECKPOINT</code> command to update and flush all data 
files to disk and update the log file before stopping the cluster. A checkpoint 
ensures that, in the event of a crash, files can be restored from the 
checkpoint snapshot.</li>
+<li>  Always use HAWQ management commands to start and stop HAWQ, instead of 
Postgres equivalents.</li>
+<li>  Use <code>hawq start cluster</code> or <code>hawq restart cluster</code> 
to start the entire cluster, rather than starting the master and individual 
segments.</li>
+<li>  If you do decide to use <code>hawq start standby|master|segment</code> 
to start nodes individually, always start the standby before the active master. 
Otherwise, the standby can become unsynchronized with the active master.</li>
+<li>  When stopping a cluster, issue the <code>CHECKPOINT</code> command to 
update and flush all data files to disk and update the log file before stopping 
the cluster. A checkpoint ensures that, in the event of a crash, files can be 
restored from the checkpoint snapshot.</li>
 <li><p>Stop the entire HAWQ system by stopping the cluster on the master host:
 <code>shell
 $ hawq stop cluster
@@ -1013,7 +1038,6 @@ $ hawq stop cluster
 </code></pre>
 <pre class="highlight shell"><code><span class="gp">$ </span>hawq stop 
allsegments
 </code></pre></li>
-<li><p>Typically you should always use <code>hawq start cluster</code> or 
<code>hawq               restart cluster</code> to start the cluster. If you do 
end up using <code>hawq start standby|master|segment</code> to start nodes 
individually, make sure you always start the standby before the active master. 
Otherwise, the standby can become unsynchronized with the active 
master.</p></li>
 </ul>
 
 <h2><a id="id_trr_m1j_1v"></a>Guidelines for Cluster Expansion</h2>
@@ -1030,7 +1054,13 @@ $ hawq stop cluster
 <li>  If you are using hash tables, consider updating the 
<code>default_hash_table_bucket_number</code> server configuration parameter to 
a larger value after expanding the cluster but before redistributing the hash 
tables.</li>
 </ul>
 
-<h2><a id="id_o5n_p1j_1v"></a>Database State Monitoring Activities</h2>
+<h2><a id="best_pract_monitoring"></a>Best Practices for Monitoring a HAWQ 
System</h2>
+
+<p>The sections below provide recommendations for common monitoring tasks. </p>
+
+<p><strong>Note:</strong> If your HAWQ cluster is managed through the Ambari 
interface, use Ambari to perform the suggested monitoring tasks. </p>
+
+<h3><a id="id_o5n_p1j_1v"></a>Database State Monitoring Activities</h3>
 
 <p><a id="id_o5n_p1j_1v__d112e31"></a></p>
 
@@ -1065,7 +1095,7 @@ WHERE status &lt;&gt; &#39;u&#39;;</code></pre></td>
 </tbody>
 </table>
 
-<h2><a id="id_d3w_p1j_1v"></a>Hardware and Operating System Monitoring</h2>
+<h3><a id="id_d3w_p1j_1v"></a>Hardware and Operating System Monitoring</h3>
 
 <p><a id="id_d3w_p1j_1v__d112e111"></a></p>
 
@@ -1139,7 +1169,7 @@ If transfer rates are lower than expected, consult with 
your data architect rega
 </tbody>
 </table>
 
-<h2><a id="id_khd_q1j_1v"></a>Data Maintenance</h2>
+<h3><a id="id_khd_q1j_1v"></a>Data Maintenance</h3>
 
 <p><a id="id_khd_q1j_1v__d112e279"></a></p>
 
@@ -1167,7 +1197,7 @@ If transfer rates are lower than expected, consult with 
your data architect rega
 </tbody>
 </table>
 
-<h2><a id="id_lx4_q1j_1v"></a>Database Maintenance</h2>
+<h3><a id="id_lx4_q1j_1v"></a>Database Maintenance</h3>
 
 <p><a id="id_lx4_q1j_1v__d112e343"></a></p>
 
@@ -1219,7 +1249,7 @@ If transfer rates are lower than expected, consult with 
your data architect rega
 </tbody>
 </table>
 
-<h2><a id="id_blv_q1j_1v"></a>Patching and Upgrading</h2>
+<h3><a id="id_blv_q1j_1v"></a>Patching and Upgrading</h3>
 
 <p><a id="id_blv_q1j_1v__d112e472"></a></p>
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq-site/blob/1b0cdd8e/docs/userguide/2.1.0.0-incubating/bestpractices/querying_data_bestpractices.html
----------------------------------------------------------------------
diff --git 
a/docs/userguide/2.1.0.0-incubating/bestpractices/querying_data_bestpractices.html
 
b/docs/userguide/2.1.0.0-incubating/bestpractices/querying_data_bestpractices.html
index b1aa23d..bea0af3 100644
--- 
a/docs/userguide/2.1.0.0-incubating/bestpractices/querying_data_bestpractices.html
+++ 
b/docs/userguide/2.1.0.0-incubating/bestpractices/querying_data_bestpractices.html
@@ -170,6 +170,9 @@
           <li>
             <a 
href="/docs/userguide/2.1.0.0-incubating/admin/monitor.html">Monitoring a HAWQ 
System</a>
           </li>
+          <li>
+            <a 
href="/docs/userguide/2.1.0.0-incubating/admin/logfiles.html">HAWQ 
Administrative Log Files</a>
+          </li>
         </ul>
       </li>
       <li class="has_submenu">
@@ -443,6 +446,7 @@
       </li>
       <li class="has_submenu"><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/HAWQBestPracticesOverview.html">Best
 Practices</a>
         <ul>
+          <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/config_hawq_bestpractices.html">Configuring
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/operating_hawq_bestpractices.html">Operating
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/secure_bestpractices.html">Securing
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/managing_resources_bestpractices.html">Managing
 Resources</a></li>
@@ -565,11 +569,17 @@
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_filerep_tcp_keepalives_interval">gp_filerep_tcp_keepalives_interval</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_hashjoin_tuples_per_bucket">gp_hashjoin_tuples_per_bucket</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_idf_deduplicate">gp_idf_deduplicate</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_cache_future_packets">gp_interconnect_cache_future_packets</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_default_rtt">gp_interconnect_default_rtt</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_fc_method">gp_interconnect_fc_method</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_hash_multiplier">gp_interconnect_hash_multiplier</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_retries_before_timeout">gp_interconnect_min_retries_before_timeout</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_rto">gp_interconnect_min_rto</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_queue_depth">gp_interconnect_queue_depth</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_setup_timeout">gp_interconnect_setup_timeout</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_snd_queue_depth">gp_interconnect_snd_queue_depth</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_checking_period">gp_interconnect_timer_checking_period</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_period">gp_interconnect_timer_period</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_type">gp_interconnect_type</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_log_format">gp_log_format</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_max_csv_line_length">gp_max_csv_line_length</a></li>
@@ -970,7 +980,26 @@
         <div class="to-top" id="js-to-top">
           <a href="#top" title="back to top"></a>
         </div>
-        <p>To obtain the best results when querying data in HAWQ, review the 
best practices described in this topic.</p>
+        <!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<p>To obtain the best results when querying data in HAWQ, review the best 
practices described in this topic.</p>
 
 <h2><a id="virtual_seg_performance"></a>Factors Impacting Query 
Performance</h2>
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq-site/blob/1b0cdd8e/docs/userguide/2.1.0.0-incubating/bestpractices/secure_bestpractices.html
----------------------------------------------------------------------
diff --git 
a/docs/userguide/2.1.0.0-incubating/bestpractices/secure_bestpractices.html 
b/docs/userguide/2.1.0.0-incubating/bestpractices/secure_bestpractices.html
index 64adbe6..046adcb 100644
--- a/docs/userguide/2.1.0.0-incubating/bestpractices/secure_bestpractices.html
+++ b/docs/userguide/2.1.0.0-incubating/bestpractices/secure_bestpractices.html
@@ -170,6 +170,9 @@
           <li>
             <a 
href="/docs/userguide/2.1.0.0-incubating/admin/monitor.html">Monitoring a HAWQ 
System</a>
           </li>
+          <li>
+            <a 
href="/docs/userguide/2.1.0.0-incubating/admin/logfiles.html">HAWQ 
Administrative Log Files</a>
+          </li>
         </ul>
       </li>
       <li class="has_submenu">
@@ -443,6 +446,7 @@
       </li>
       <li class="has_submenu"><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/HAWQBestPracticesOverview.html">Best
 Practices</a>
         <ul>
+          <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/config_hawq_bestpractices.html">Configuring
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/operating_hawq_bestpractices.html">Operating
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/secure_bestpractices.html">Securing
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/managing_resources_bestpractices.html">Managing
 Resources</a></li>
@@ -565,11 +569,17 @@
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_filerep_tcp_keepalives_interval">gp_filerep_tcp_keepalives_interval</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_hashjoin_tuples_per_bucket">gp_hashjoin_tuples_per_bucket</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_idf_deduplicate">gp_idf_deduplicate</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_cache_future_packets">gp_interconnect_cache_future_packets</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_default_rtt">gp_interconnect_default_rtt</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_fc_method">gp_interconnect_fc_method</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_hash_multiplier">gp_interconnect_hash_multiplier</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_retries_before_timeout">gp_interconnect_min_retries_before_timeout</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_rto">gp_interconnect_min_rto</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_queue_depth">gp_interconnect_queue_depth</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_setup_timeout">gp_interconnect_setup_timeout</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_snd_queue_depth">gp_interconnect_snd_queue_depth</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_checking_period">gp_interconnect_timer_checking_period</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_period">gp_interconnect_timer_period</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_type">gp_interconnect_type</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_log_format">gp_log_format</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_max_csv_line_length">gp_max_csv_line_length</a></li>
@@ -967,7 +977,26 @@
         <div class="to-top" id="js-to-top">
           <a href="#top" title="back to top"></a>
         </div>
-        <p>To secure your HAWQ deployment, review the recommendations listed 
in this topic.</p>
+        <!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<p>To secure your HAWQ deployment, review the recommendations listed in this 
topic.</p>
 
 <ul>
 <li>  Set up SSL to encrypt your client server communication channel. See <a 
href="/docs/userguide/2.1.0.0-incubating/clientaccess/client_auth.html#topic5">Encrypting
 Client/Server Connections</a>.</li>

http://git-wip-us.apache.org/repos/asf/incubator-hawq-site/blob/1b0cdd8e/docs/userguide/2.1.0.0-incubating/clientaccess/client_auth.html
----------------------------------------------------------------------
diff --git a/docs/userguide/2.1.0.0-incubating/clientaccess/client_auth.html 
b/docs/userguide/2.1.0.0-incubating/clientaccess/client_auth.html
index aeac621..cf801f9 100644
--- a/docs/userguide/2.1.0.0-incubating/clientaccess/client_auth.html
+++ b/docs/userguide/2.1.0.0-incubating/clientaccess/client_auth.html
@@ -170,6 +170,9 @@
           <li>
             <a 
href="/docs/userguide/2.1.0.0-incubating/admin/monitor.html">Monitoring a HAWQ 
System</a>
           </li>
+          <li>
+            <a 
href="/docs/userguide/2.1.0.0-incubating/admin/logfiles.html">HAWQ 
Administrative Log Files</a>
+          </li>
         </ul>
       </li>
       <li class="has_submenu">
@@ -443,6 +446,7 @@
       </li>
       <li class="has_submenu"><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/HAWQBestPracticesOverview.html">Best
 Practices</a>
         <ul>
+          <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/config_hawq_bestpractices.html">Configuring
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/operating_hawq_bestpractices.html">Operating
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/secure_bestpractices.html">Securing
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/managing_resources_bestpractices.html">Managing
 Resources</a></li>
@@ -565,11 +569,17 @@
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_filerep_tcp_keepalives_interval">gp_filerep_tcp_keepalives_interval</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_hashjoin_tuples_per_bucket">gp_hashjoin_tuples_per_bucket</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_idf_deduplicate">gp_idf_deduplicate</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_cache_future_packets">gp_interconnect_cache_future_packets</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_default_rtt">gp_interconnect_default_rtt</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_fc_method">gp_interconnect_fc_method</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_hash_multiplier">gp_interconnect_hash_multiplier</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_retries_before_timeout">gp_interconnect_min_retries_before_timeout</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_rto">gp_interconnect_min_rto</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_queue_depth">gp_interconnect_queue_depth</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_setup_timeout">gp_interconnect_setup_timeout</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_snd_queue_depth">gp_interconnect_snd_queue_depth</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_checking_period">gp_interconnect_timer_checking_period</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_period">gp_interconnect_timer_period</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_type">gp_interconnect_type</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_log_format">gp_log_format</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_max_csv_line_length">gp_max_csv_line_length</a></li>
@@ -977,7 +987,26 @@
         <div class="to-top" id="js-to-top">
           <a href="#top" title="back to top"></a>
         </div>
-        <p>When a HAWQ system is first initialized, the system contains one 
predefined <em>superuser</em> role. This role will have the same name as the 
operating system user who initialized the HAWQ system. This role is referred to 
as <code>gpadmin</code>. By default, the system is configured to only allow 
local connections to the database from the <code>gpadmin</code> role. To allow 
any other roles to connect, or to allow connections from remote hosts, you 
configure HAWQ to allow such connections.</p>
+        <!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<p>When a HAWQ system is first initialized, the system contains one predefined 
<em>superuser</em> role. This role will have the same name as the operating 
system user who initialized the HAWQ system. This role is referred to as 
<code>gpadmin</code>. By default, the system is configured to only allow local 
connections to the database from the <code>gpadmin</code> role. To allow any 
other roles to connect, or to allow connections from remote hosts, you 
configure HAWQ to allow such connections.</p>
 
 <h2><a id="topic2"></a>Allowing Connections to HAWQ</h2>
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq-site/blob/1b0cdd8e/docs/userguide/2.1.0.0-incubating/clientaccess/disable-kerberos.html
----------------------------------------------------------------------
diff --git 
a/docs/userguide/2.1.0.0-incubating/clientaccess/disable-kerberos.html 
b/docs/userguide/2.1.0.0-incubating/clientaccess/disable-kerberos.html
index 4b9dcc9..582bb02 100644
--- a/docs/userguide/2.1.0.0-incubating/clientaccess/disable-kerberos.html
+++ b/docs/userguide/2.1.0.0-incubating/clientaccess/disable-kerberos.html
@@ -170,6 +170,9 @@
           <li>
             <a 
href="/docs/userguide/2.1.0.0-incubating/admin/monitor.html">Monitoring a HAWQ 
System</a>
           </li>
+          <li>
+            <a 
href="/docs/userguide/2.1.0.0-incubating/admin/logfiles.html">HAWQ 
Administrative Log Files</a>
+          </li>
         </ul>
       </li>
       <li class="has_submenu">
@@ -443,6 +446,7 @@
       </li>
       <li class="has_submenu"><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/HAWQBestPracticesOverview.html">Best
 Practices</a>
         <ul>
+          <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/config_hawq_bestpractices.html">Configuring
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/operating_hawq_bestpractices.html">Operating
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/secure_bestpractices.html">Securing
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/managing_resources_bestpractices.html">Managing
 Resources</a></li>
@@ -565,11 +569,17 @@
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_filerep_tcp_keepalives_interval">gp_filerep_tcp_keepalives_interval</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_hashjoin_tuples_per_bucket">gp_hashjoin_tuples_per_bucket</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_idf_deduplicate">gp_idf_deduplicate</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_cache_future_packets">gp_interconnect_cache_future_packets</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_default_rtt">gp_interconnect_default_rtt</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_fc_method">gp_interconnect_fc_method</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_hash_multiplier">gp_interconnect_hash_multiplier</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_retries_before_timeout">gp_interconnect_min_retries_before_timeout</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_rto">gp_interconnect_min_rto</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_queue_depth">gp_interconnect_queue_depth</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_setup_timeout">gp_interconnect_setup_timeout</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_snd_queue_depth">gp_interconnect_snd_queue_depth</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_checking_period">gp_interconnect_timer_checking_period</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_period">gp_interconnect_timer_period</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_type">gp_interconnect_type</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_log_format">gp_log_format</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_max_csv_line_length">gp_max_csv_line_length</a></li>
@@ -967,7 +977,26 @@
         <div class="to-top" id="js-to-top">
           <a href="#top" title="back to top"></a>
         </div>
-        <p>Follow these steps to disable Kerberos security for HAWQ and PXF 
for manual installations.</p>
+        <!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<p>Follow these steps to disable Kerberos security for HAWQ and PXF for manual 
installations.</p>
 
 <p><strong>Note:</strong> If you install or manage your cluster using Ambari, 
then the HAWQ Ambari plug-in automatically disables security for HAWQ and PXF 
when you disable security for Hadoop. The following instructions are only 
necessary for manual installations, or when Hadoop security is disabled outside 
of Ambari.</p>
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq-site/blob/1b0cdd8e/docs/userguide/2.1.0.0-incubating/clientaccess/g-connecting-with-psql.html
----------------------------------------------------------------------
diff --git 
a/docs/userguide/2.1.0.0-incubating/clientaccess/g-connecting-with-psql.html 
b/docs/userguide/2.1.0.0-incubating/clientaccess/g-connecting-with-psql.html
index 48a91de..70a2c00 100644
--- a/docs/userguide/2.1.0.0-incubating/clientaccess/g-connecting-with-psql.html
+++ b/docs/userguide/2.1.0.0-incubating/clientaccess/g-connecting-with-psql.html
@@ -170,6 +170,9 @@
           <li>
             <a 
href="/docs/userguide/2.1.0.0-incubating/admin/monitor.html">Monitoring a HAWQ 
System</a>
           </li>
+          <li>
+            <a 
href="/docs/userguide/2.1.0.0-incubating/admin/logfiles.html">HAWQ 
Administrative Log Files</a>
+          </li>
         </ul>
       </li>
       <li class="has_submenu">
@@ -443,6 +446,7 @@
       </li>
       <li class="has_submenu"><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/HAWQBestPracticesOverview.html">Best
 Practices</a>
         <ul>
+          <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/config_hawq_bestpractices.html">Configuring
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/operating_hawq_bestpractices.html">Operating
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/secure_bestpractices.html">Securing
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/managing_resources_bestpractices.html">Managing
 Resources</a></li>
@@ -565,11 +569,17 @@
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_filerep_tcp_keepalives_interval">gp_filerep_tcp_keepalives_interval</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_hashjoin_tuples_per_bucket">gp_hashjoin_tuples_per_bucket</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_idf_deduplicate">gp_idf_deduplicate</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_cache_future_packets">gp_interconnect_cache_future_packets</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_default_rtt">gp_interconnect_default_rtt</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_fc_method">gp_interconnect_fc_method</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_hash_multiplier">gp_interconnect_hash_multiplier</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_retries_before_timeout">gp_interconnect_min_retries_before_timeout</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_rto">gp_interconnect_min_rto</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_queue_depth">gp_interconnect_queue_depth</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_setup_timeout">gp_interconnect_setup_timeout</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_snd_queue_depth">gp_interconnect_snd_queue_depth</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_checking_period">gp_interconnect_timer_checking_period</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_period">gp_interconnect_timer_period</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_type">gp_interconnect_type</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_log_format">gp_log_format</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_max_csv_line_length">gp_max_csv_line_length</a></li>
@@ -967,7 +977,26 @@
         <div class="to-top" id="js-to-top">
           <a href="#top" title="back to top"></a>
         </div>
-        <p>Depending on the default values used or the environment variables 
you have set, the following examples show how to access a database via 
<code>psql</code>:</p>
+        <!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<p>Depending on the default values used or the environment variables you have 
set, the following examples show how to access a database via 
<code>psql</code>:</p>
 <pre class="highlight shell"><code><span class="gp">$ </span>psql -d 
gpdatabase -h master_host -p 5432 -U <span class="sb">`</span>gpadmin<span 
class="sb">`</span>
 </code></pre>
 <pre class="highlight shell"><code><span class="gp">$ </span>psql gpdatabase

http://git-wip-us.apache.org/repos/asf/incubator-hawq-site/blob/1b0cdd8e/docs/userguide/2.1.0.0-incubating/clientaccess/g-database-application-interfaces.html
----------------------------------------------------------------------
diff --git 
a/docs/userguide/2.1.0.0-incubating/clientaccess/g-database-application-interfaces.html
 
b/docs/userguide/2.1.0.0-incubating/clientaccess/g-database-application-interfaces.html
index 3f08a41..d5ecddf 100644
--- 
a/docs/userguide/2.1.0.0-incubating/clientaccess/g-database-application-interfaces.html
+++ 
b/docs/userguide/2.1.0.0-incubating/clientaccess/g-database-application-interfaces.html
@@ -170,6 +170,9 @@
           <li>
             <a 
href="/docs/userguide/2.1.0.0-incubating/admin/monitor.html">Monitoring a HAWQ 
System</a>
           </li>
+          <li>
+            <a 
href="/docs/userguide/2.1.0.0-incubating/admin/logfiles.html">HAWQ 
Administrative Log Files</a>
+          </li>
         </ul>
       </li>
       <li class="has_submenu">
@@ -443,6 +446,7 @@
       </li>
       <li class="has_submenu"><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/HAWQBestPracticesOverview.html">Best
 Practices</a>
         <ul>
+          <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/config_hawq_bestpractices.html">Configuring
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/operating_hawq_bestpractices.html">Operating
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/secure_bestpractices.html">Securing
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/managing_resources_bestpractices.html">Managing
 Resources</a></li>
@@ -565,11 +569,17 @@
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_filerep_tcp_keepalives_interval">gp_filerep_tcp_keepalives_interval</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_hashjoin_tuples_per_bucket">gp_hashjoin_tuples_per_bucket</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_idf_deduplicate">gp_idf_deduplicate</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_cache_future_packets">gp_interconnect_cache_future_packets</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_default_rtt">gp_interconnect_default_rtt</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_fc_method">gp_interconnect_fc_method</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_hash_multiplier">gp_interconnect_hash_multiplier</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_retries_before_timeout">gp_interconnect_min_retries_before_timeout</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_rto">gp_interconnect_min_rto</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_queue_depth">gp_interconnect_queue_depth</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_setup_timeout">gp_interconnect_setup_timeout</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_snd_queue_depth">gp_interconnect_snd_queue_depth</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_checking_period">gp_interconnect_timer_checking_period</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_period">gp_interconnect_timer_period</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_type">gp_interconnect_type</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_log_format">gp_log_format</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_max_csv_line_length">gp_max_csv_line_length</a></li>
@@ -975,7 +985,26 @@
         <div class="to-top" id="js-to-top">
           <a href="#top" title="back to top"></a>
         </div>
-        <p>You may want to connect your existing Business Intelligence (BI) or 
Analytics applications with HAWQ. The database application programming 
interfaces most commonly used with HAWQ are the Postgres and ODBC and JDBC 
APIs.</p>
+        <!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<p>You may want to connect your existing Business Intelligence (BI) or 
Analytics applications with HAWQ. The database application programming 
interfaces most commonly used with HAWQ are the Postgres and ODBC and JDBC 
APIs.</p>
 
 <p>HAWQ provides the following connectivity tools for connecting to the 
database:</p>
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq-site/blob/1b0cdd8e/docs/userguide/2.1.0.0-incubating/clientaccess/g-establishing-a-database-session.html
----------------------------------------------------------------------
diff --git 
a/docs/userguide/2.1.0.0-incubating/clientaccess/g-establishing-a-database-session.html
 
b/docs/userguide/2.1.0.0-incubating/clientaccess/g-establishing-a-database-session.html
index 69fd8d7..01dc5ef 100644
--- 
a/docs/userguide/2.1.0.0-incubating/clientaccess/g-establishing-a-database-session.html
+++ 
b/docs/userguide/2.1.0.0-incubating/clientaccess/g-establishing-a-database-session.html
@@ -170,6 +170,9 @@
           <li>
             <a 
href="/docs/userguide/2.1.0.0-incubating/admin/monitor.html">Monitoring a HAWQ 
System</a>
           </li>
+          <li>
+            <a 
href="/docs/userguide/2.1.0.0-incubating/admin/logfiles.html">HAWQ 
Administrative Log Files</a>
+          </li>
         </ul>
       </li>
       <li class="has_submenu">
@@ -443,6 +446,7 @@
       </li>
       <li class="has_submenu"><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/HAWQBestPracticesOverview.html">Best
 Practices</a>
         <ul>
+          <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/config_hawq_bestpractices.html">Configuring
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/operating_hawq_bestpractices.html">Operating
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/secure_bestpractices.html">Securing
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/managing_resources_bestpractices.html">Managing
 Resources</a></li>
@@ -565,11 +569,17 @@
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_filerep_tcp_keepalives_interval">gp_filerep_tcp_keepalives_interval</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_hashjoin_tuples_per_bucket">gp_hashjoin_tuples_per_bucket</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_idf_deduplicate">gp_idf_deduplicate</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_cache_future_packets">gp_interconnect_cache_future_packets</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_default_rtt">gp_interconnect_default_rtt</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_fc_method">gp_interconnect_fc_method</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_hash_multiplier">gp_interconnect_hash_multiplier</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_retries_before_timeout">gp_interconnect_min_retries_before_timeout</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_rto">gp_interconnect_min_rto</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_queue_depth">gp_interconnect_queue_depth</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_setup_timeout">gp_interconnect_setup_timeout</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_snd_queue_depth">gp_interconnect_snd_queue_depth</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_checking_period">gp_interconnect_timer_checking_period</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_period">gp_interconnect_timer_period</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_type">gp_interconnect_type</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_log_format">gp_log_format</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_max_csv_line_length">gp_max_csv_line_length</a></li>
@@ -967,7 +977,26 @@
         <div class="to-top" id="js-to-top">
           <a href="#top" title="back to top"></a>
         </div>
-        <p>Users can connect to HAWQ using a PostgreSQL-compatible client 
program, such as <code>psql</code>. Users and administrators <em>always</em> 
connect to HAWQ through the <em>master</em>; the segments cannot accept client 
connections.</p>
+        <!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<p>Users can connect to HAWQ using a PostgreSQL-compatible client program, 
such as <code>psql</code>. Users and administrators <em>always</em> connect to 
HAWQ through the <em>master</em>; the segments cannot accept client 
connections.</p>
 
 <p>In order to establish a connection to the HAWQ master, you will need to 
know the following connection information and configure your client program 
accordingly.</p>
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq-site/blob/1b0cdd8e/docs/userguide/2.1.0.0-incubating/clientaccess/g-hawq-database-client-applications.html
----------------------------------------------------------------------
diff --git 
a/docs/userguide/2.1.0.0-incubating/clientaccess/g-hawq-database-client-applications.html
 
b/docs/userguide/2.1.0.0-incubating/clientaccess/g-hawq-database-client-applications.html
index 57535fe..61749d7 100644
--- 
a/docs/userguide/2.1.0.0-incubating/clientaccess/g-hawq-database-client-applications.html
+++ 
b/docs/userguide/2.1.0.0-incubating/clientaccess/g-hawq-database-client-applications.html
@@ -170,6 +170,9 @@
           <li>
             <a 
href="/docs/userguide/2.1.0.0-incubating/admin/monitor.html">Monitoring a HAWQ 
System</a>
           </li>
+          <li>
+            <a 
href="/docs/userguide/2.1.0.0-incubating/admin/logfiles.html">HAWQ 
Administrative Log Files</a>
+          </li>
         </ul>
       </li>
       <li class="has_submenu">
@@ -443,6 +446,7 @@
       </li>
       <li class="has_submenu"><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/HAWQBestPracticesOverview.html">Best
 Practices</a>
         <ul>
+          <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/config_hawq_bestpractices.html">Configuring
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/operating_hawq_bestpractices.html">Operating
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/secure_bestpractices.html">Securing
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/managing_resources_bestpractices.html">Managing
 Resources</a></li>
@@ -565,11 +569,17 @@
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_filerep_tcp_keepalives_interval">gp_filerep_tcp_keepalives_interval</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_hashjoin_tuples_per_bucket">gp_hashjoin_tuples_per_bucket</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_idf_deduplicate">gp_idf_deduplicate</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_cache_future_packets">gp_interconnect_cache_future_packets</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_default_rtt">gp_interconnect_default_rtt</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_fc_method">gp_interconnect_fc_method</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_hash_multiplier">gp_interconnect_hash_multiplier</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_retries_before_timeout">gp_interconnect_min_retries_before_timeout</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_rto">gp_interconnect_min_rto</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_queue_depth">gp_interconnect_queue_depth</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_setup_timeout">gp_interconnect_setup_timeout</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_snd_queue_depth">gp_interconnect_snd_queue_depth</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_checking_period">gp_interconnect_timer_checking_period</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_period">gp_interconnect_timer_period</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_type">gp_interconnect_type</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_log_format">gp_log_format</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_max_csv_line_length">gp_max_csv_line_length</a></li>
@@ -967,7 +977,26 @@
         <div class="to-top" id="js-to-top">
           <a href="#top" title="back to top"></a>
         </div>
-        <p>HAWQ comes installed with a number of client utility applications 
located in the <code>$GPHOME/bin</code> directory of your HAWQ master host 
installation. The following are the most commonly used client utility 
applications:</p>
+        <!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<p>HAWQ comes installed with a number of client utility applications located 
in the <code>$GPHOME/bin</code> directory of your HAWQ master host 
installation. The following are the most commonly used client utility 
applications:</p>
 
 <table><thead>
 <tr>

http://git-wip-us.apache.org/repos/asf/incubator-hawq-site/blob/1b0cdd8e/docs/userguide/2.1.0.0-incubating/clientaccess/g-supported-client-applications.html
----------------------------------------------------------------------
diff --git 
a/docs/userguide/2.1.0.0-incubating/clientaccess/g-supported-client-applications.html
 
b/docs/userguide/2.1.0.0-incubating/clientaccess/g-supported-client-applications.html
index d3a5910..95e897f 100644
--- 
a/docs/userguide/2.1.0.0-incubating/clientaccess/g-supported-client-applications.html
+++ 
b/docs/userguide/2.1.0.0-incubating/clientaccess/g-supported-client-applications.html
@@ -170,6 +170,9 @@
           <li>
             <a 
href="/docs/userguide/2.1.0.0-incubating/admin/monitor.html">Monitoring a HAWQ 
System</a>
           </li>
+          <li>
+            <a 
href="/docs/userguide/2.1.0.0-incubating/admin/logfiles.html">HAWQ 
Administrative Log Files</a>
+          </li>
         </ul>
       </li>
       <li class="has_submenu">
@@ -443,6 +446,7 @@
       </li>
       <li class="has_submenu"><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/HAWQBestPracticesOverview.html">Best
 Practices</a>
         <ul>
+          <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/config_hawq_bestpractices.html">Configuring
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/operating_hawq_bestpractices.html">Operating
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/secure_bestpractices.html">Securing
 HAWQ</a></li>
           <li><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/managing_resources_bestpractices.html">Managing
 Resources</a></li>
@@ -565,11 +569,17 @@
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_filerep_tcp_keepalives_interval">gp_filerep_tcp_keepalives_interval</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_hashjoin_tuples_per_bucket">gp_hashjoin_tuples_per_bucket</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_idf_deduplicate">gp_idf_deduplicate</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_cache_future_packets">gp_interconnect_cache_future_packets</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_default_rtt">gp_interconnect_default_rtt</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_fc_method">gp_interconnect_fc_method</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_hash_multiplier">gp_interconnect_hash_multiplier</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_retries_before_timeout">gp_interconnect_min_retries_before_timeout</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_min_rto">gp_interconnect_min_rto</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_queue_depth">gp_interconnect_queue_depth</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_setup_timeout">gp_interconnect_setup_timeout</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_snd_queue_depth">gp_interconnect_snd_queue_depth</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_checking_period">gp_interconnect_timer_checking_period</a></li>
+                  <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_timer_period">gp_interconnect_timer_period</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_interconnect_type">gp_interconnect_type</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_log_format">gp_log_format</a></li>
                   <li><a 
href="/docs/userguide/2.1.0.0-incubating/reference/guc/parameter_definitions.html#gp_max_csv_line_length">gp_max_csv_line_length</a></li>
@@ -967,7 +977,26 @@
         <div class="to-top" id="js-to-top">
           <a href="#top" title="back to top"></a>
         </div>
-        <p>Users can connect to HAWQ using various client applications:</p>
+        <!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<p>Users can connect to HAWQ using various client applications:</p>
 
 <ul>
 <li>  A number of <a 
href="/docs/userguide/2.1.0.0-incubating/clientaccess/g-hawq-database-client-applications.html">HAWQ
 Client Applications</a> are provided with your HAWQ installation. The 
<code>psql</code> client application provides an interactive command-line 
interface to HAWQ.</li>

Reply via email to