http://git-wip-us.apache.org/repos/asf/incubator-hawq-site/blob/1b0cdd8e/docs/userguide/2.1.0.0-incubating/admin/maintain.html
----------------------------------------------------------------------
diff --git a/docs/userguide/2.1.0.0-incubating/admin/maintain.html 
b/docs/userguide/2.1.0.0-incubating/admin/maintain.html
index 71a4085..38fe52d 100644
--- a/docs/userguide/2.1.0.0-incubating/admin/maintain.html
+++ b/docs/userguide/2.1.0.0-incubating/admin/maintain.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>
@@ -964,40 +974,42 @@
           <div id="js-quick-links" >
             <div class="quick-links"><ul>
 <li><a href="#overview-topic">Overview</a></li>
-<li><a href="#topic10">Database Server Log Files</a></li>
-<li><a href="#topic11">Management Utility Log Files</a></li>
+<li><a href="#topic10">Log File Maintenance</a></li>
 </ul></div>
           </div>
         <div class="to-top" id="js-to-top">
           <a href="#top" title="back to top"></a>
         </div>
-        <h2><a id="overview-topic"></a>Overview</h2>
-
-<p>To keep a HAWQ system running efficiently, the database must be regularly 
cleared of expired data and the table statistics must be updated so that the 
query optimizer has accurate information.</p>
-
-<p>HAWQ requires that certain tasks be performed regularly to achieve optimal 
performance. The tasks discussed here are required, but database administrators 
can automate them using standard UNIX tools such as <code>cron</code> scripts. 
An administrator sets up the appropriate scripts and checks that they execute 
successfully. See <a 
href="/docs/userguide/2.1.0.0-incubating/admin/RecommendedMonitoringTasks.html">Recommended
 Monitoring and Maintenance Tasks</a> for additional suggested maintenance 
activities you can implement to keep your HAWQ system running optimally.</p>
-
-<h2><a id="topic10"></a>Database Server Log Files</h2>
-
-<p>HAWQ log output tends to be voluminous, especially at higher debug levels, 
and you do not need to save it indefinitely. Administrators rotate the log 
files periodically so new log files are started and old ones are removed.</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
 
-<p>HAWQ has log file rotation enabled on the master and all segment instances. 
Daily log files are created in the <code>pg_log</code> subdirectory of the 
master and each segment data directory using the following naming convention: 
<code>hawq-<i>YYYY-MM-DD_hhmmss</i>.csv</code>. Although log files are rolled 
over daily, they are not automatically truncated or deleted. Administrators 
need to implement scripts or programs to periodically clean up old log files in 
the <code>pg_log</code> directory of the master and of every segment 
instance.</p>
+  http://www.apache.org/licenses/LICENSE-2.0
 
-<p>For information about viewing the database server log files, see <a 
href="/docs/userguide/2.1.0.0-incubating/admin/monitor.html">Viewing the 
Database Server Log Files</a>.</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.
+-->
 
-<h2><a id="topic11"></a>Management Utility Log Files</h2>
+<h2><a id="overview-topic"></a>Overview</h2>
 
-<p>Log files for the HAWQ management utilities are written to 
<code>~/hawqAdminLogs</code> by default. The naming convention for management 
log files is:</p>
+<p>To keep a HAWQ system running efficiently, the database must be regularly 
cleared of expired data and the table statistics must be updated so that the 
query optimizer has accurate information.</p>
 
-<pre><code><i>script_name_date</i>.log
-</code></pre>
+<p>HAWQ requires that certain tasks be performed regularly to achieve optimal 
performance. The tasks discussed here are required, but database administrators 
can automate them using standard UNIX tools such as <code>cron</code> scripts. 
An administrator sets up the appropriate scripts and checks that they execute 
successfully. See <a 
href="/docs/userguide/2.1.0.0-incubating/admin/RecommendedMonitoringTasks.html">Recommended
 Monitoring and Maintenance Tasks</a> for additional suggested maintenance 
activities you can implement to keep your HAWQ system running optimally.</p>
 
-<p>The log entry format is:</p>
+<h2><a id="topic10"></a>Log File Maintenance</h2>
 
-<pre><code><i>timestamp:utility:host:user</i>:[INFO|WARN|FATAL]:<i>message</i>
-</code></pre>
+<p>Every database instance in HAWQ (master and segments) runs a PostgreSQL 
database server with its own server log file. For information about managing 
these log files, refer to <a 
href="/docs/userguide/2.1.0.0-incubating/admin/logfiles.html#topic28">HAWQ 
Database Server Log Files</a>.</p>
 
-<p>The log file for a particular utility execution is appended to its daily 
log file each time that utility is run.</p>
+<p>Log files are also generated when you invoke HAWQ management utilities such 
as <code>hawq start</code> and <code>gpfdist</code>. <a 
href="/docs/userguide/2.1.0.0-incubating/admin/logfiles.html#mgmtutil_log">Management
 Utility Log Files</a> provides information and maintenance strategies for 
these log files.</p>
 
         
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq-site/blob/1b0cdd8e/docs/userguide/2.1.0.0-incubating/admin/monitor.html
----------------------------------------------------------------------
diff --git a/docs/userguide/2.1.0.0-incubating/admin/monitor.html 
b/docs/userguide/2.1.0.0-incubating/admin/monitor.html
index 46ce844..204c022 100644
--- a/docs/userguide/2.1.0.0-incubating/admin/monitor.html
+++ b/docs/userguide/2.1.0.0-incubating/admin/monitor.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>
@@ -973,12 +983,6 @@
 </ul>
 </li>
 <li>
-<a href="#topic28">Viewing the Database Server Log Files</a><ul>
-<li><a href="#topic29">Log File Format</a></li>
-<li><a href="#topic30">Searching the HAWQ Server Log Files</a></li>
-</ul>
-</li>
-<li>
 <a href="#topic_jx2_rqg_kp">HAWQ Error Codes</a><ul><li><a 
href="#topic_pyh_sqg_kp">SQL Standard Error Codes</a></li></ul>
 </li>
 </ul></div>
@@ -986,7 +990,26 @@
         <div class="to-top" id="js-to-top">
           <a href="#top" title="back to top"></a>
         </div>
-        <p>You can monitor a HAWQ system using a variety of tools included 
with the system or available as add-ons.</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 can monitor a HAWQ system using a variety of tools included with the 
system or available as add-ons.</p>
 
 <p>Observing the HAWQ system day-to-day performance helps administrators 
understand the system behavior, plan workflow, and troubleshoot problems. This 
chapter discusses tools for monitoring database performance and activity.</p>
 
@@ -1109,62 +1132,6 @@ Distributed by: (id)
 <li>  <em>hawq_workfile_usage_per_segment</em> - one row for each segment 
where each row displays the total amount of disk space currently in use for 
workfiles on the segment</li>
 </ul>
 
-<h2><a id="topic28"></a>Viewing the Database Server Log Files</h2>
-
-<p>Every database instance in HAWQ (master and segments) runs a PostgreSQL 
database server with its own server log file. Daily log files are created in 
the <code>pg_log</code> directory of the master  and each segment data 
directory.</p>
-
-<h3><a id="topic29"></a>Log File Format</h3>
-
-<p>The server log files are written in comma-separated values (CSV) format. 
Log entries may not include values for all log fields. For example, only log 
entries associated with a query worker process will have the 
<code>slice_id</code> populated. You can identify related log entries of a 
particular query by the query&rsquo;s session identifier 
(<code>gp_session_id</code>) and command identifier 
(<code>gp_command_count</code>).</p>
-
-<p>Log entries may include the following fields:</p>
-
-<table>
-  <tr><th>#</th><th>Field Name</th><th>Data Type</th><th>Description</th></tr>
-  <tr><td>1</td><td>event_time</td><td>timestamp with time zone</td><td>Time 
that the log entry was written to the log</td></tr>
-  <tr><td>2</td><td>user_name</td><td>varchar(100)</td><td>The database user 
name</td></tr>
-  <tr><td>3</td><td>database_name</td><td>varchar(100)</td><td>The database 
name</td></tr>
-  <tr><td>4</td><td>process_id</td><td>varchar(10)</td><td>The system process 
ID (prefixed with &ldquo;p&rdquo;)</td></tr>
-  <tr><td>5</td><td>thread_id</td><td>varchar(50)</td><td>The thread count 
(prefixed with &ldquo;th&rdquo;)</td></tr>
-  <tr><td>6</td><td>remote_host</td><td>varchar(100)</td><td>On the master, 
the hostname/address of the client machine. On the segment, the 
hostname/address of the master.</td></tr>
-  <tr><td>7</td><td>remote_port</td><td>varchar(10)</td><td>The segment or 
master port number</td></tr>
-  <tr><td>8</td><td>session_start_time</td><td>timestamp with time 
zone</td><td>Time session connection was opened</td></tr>
-  <tr><td>9</td><td>transaction_id</td><td>int</td><td>Top-level transaction 
ID on the master. This ID is the parent of any subtransactions.</td></tr>
-  <tr><td>10</td><td>gp_session_id</td><td>text</td><td>Session identifier 
number (prefixed with &ldquo;con&rdquo;)</td></tr>
-  <tr><td>11</td><td>gp_command_count</td><td>text</td><td>The command number 
within a session (prefixed with &ldquo;cmd&rdquo;)</td></tr>
-  <tr><td>12</td><td>gp_segment</td><td>text</td><td>The segment content 
identifier. The master always has a content ID of -1.</td></tr>
-  <tr><td>13</td><td>slice_id</td><td>text</td><td>The slice ID (portion of 
the query plan being executed)</td></tr>
-  <tr><td>14</td><td>distr_tranx_id</td><td>text</td><td>Distributed 
transaction ID</td></tr>
-  <tr><td>15</td><td>local_tranx_id</td><td>text</td><td>Local transaction 
ID</td></tr>
-  <tr><td>16</td><td>sub_tranx_id</td><td>text</td><td>Subtransaction 
ID</td></tr>
-  <tr><td>17</td><td>event_severity</td><td>varchar(10)</td><td>Values 
include: LOG, ERROR, FATAL, PANIC, DEBUG1, DEBUG2</td></tr>
-  <tr><td>18</td><td>sql_state_code</td><td>varchar(10)</td><td>SQL state code 
associated with the log message</td></tr>
-  <tr><td>19</td><td>event_message</td><td>text</td><td>Log or error message 
text</td></tr>
-  <tr><td>20</td><td>event_detail</td><td>text</td><td>Detail message text 
associated with an error or warning message</td></tr>
-  <tr><td>21</td><td>event_hint</td><td>text</td><td>Hint message text 
associated with an error or warning message</td></tr>
-  <tr><td>22</td><td>internal_query</td><td>text</td><td>The 
internally-generated query text</td></tr>
-  <tr><td>23</td><td>internal_query_pos</td><td>int</td><td>The cursor index 
into the internally-generated query text</td></tr>
-  <tr><td>24</td><td>event_context</td><td>text</td><td>The context in which 
this message gets generated</td></tr>
-  <tr><td>25</td><td>debug_query_string</td><td>text</td><td>User-supplied 
query string with full detail for debugging. This string can be modified for 
internal use.</td></tr>
-  <tr><td>26</td><td>error_cursor_pos</td><td>int</td><td>The cursor index 
into the query string</td></tr>
-  <tr><td>27</td><td>func_name</td><td>text</td><td>The function in which this 
message is generated</td></tr>
-  <tr><td>28</td><td>file_name</td><td>text</td><td>The internal code file 
where the message originated</td></tr>
-  <tr><td>29</td><td>file_line</td><td>int</td><td>The line of the code file 
where the message originated</td></tr>
-  <tr><td>30</td><td>stack_trace</td><td>text</td><td>Stack trace text 
associated with this message</td></tr>
-</table>
-
-<h3><a id="topic30"></a>Searching the HAWQ Server Log Files</h3>
-
-<p>You can use the <code>gplogfilter</code> HAWQ utility to search through a 
HAWQ log file for entries matching specific criteria. By default, this utility 
searches through the HAWQ master log file in the default logging location. For 
example, to display the entries to the master log file starting after 2 pm on a 
certain date:</p>
-<pre class="highlight shell"><code><span class="gp">$ </span>gplogfilter -b 
<span class="s1">'2016-01-18 14:00'</span>
-</code></pre>
-
-<p>To search through all segment log files simultaneously, run 
<code>gplogfilter</code> through the <code>hawq ssh</code> utility. For 
example, specify a &lt;seg_hosts&gt; file that includes all segment hosts of 
interest, then invoke <code>gplogfilter</code> to display the last three lines 
of each segment log file on each segment host. (Note: enter the commands after 
the <code>=&gt;</code> prompt, do not include the <code>=&gt;</code>.):</p>
-<pre class="highlight shell"><code><span class="gp">$ </span>hawq ssh -f 
&lt;seg_hosts&gt;
-<span class="gp">=&gt; </span><span class="nb">source</span> 
/usr/local/hawq/greenplum_path.sh
-<span class="gp">=&gt; </span>gplogfilter -n 3 
/data/hawq/segment/pg_log/hawq<span class="k">*</span>.csv
-</code></pre>
-
 <h2><a id="topic_jx2_rqg_kp"></a>HAWQ Error Codes</h2>
 
 <p>The following section describes SQL error codes for certain database 
events.</p>

http://git-wip-us.apache.org/repos/asf/incubator-hawq-site/blob/1b0cdd8e/docs/userguide/2.1.0.0-incubating/admin/setuphawqopenv.html
----------------------------------------------------------------------
diff --git a/docs/userguide/2.1.0.0-incubating/admin/setuphawqopenv.html 
b/docs/userguide/2.1.0.0-incubating/admin/setuphawqopenv.html
index b1bb127..5c7e455 100644
--- a/docs/userguide/2.1.0.0-incubating/admin/setuphawqopenv.html
+++ b/docs/userguide/2.1.0.0-incubating/admin/setuphawqopenv.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>Before invoking operations on a HAWQ cluster, you must set up your 
HAWQ environment. This set up is required for both administrative and 
non-administrative HAWQ users.</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>Before invoking operations on a HAWQ cluster, you must set up your HAWQ 
environment. This set up is required for both administrative and 
non-administrative HAWQ users.</p>
 
 <h2><a id="hawq_setupenv"></a>Procedure: Setting Up Your HAWQ Operating 
Environment</h2>
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq-site/blob/1b0cdd8e/docs/userguide/2.1.0.0-incubating/admin/startstop.html
----------------------------------------------------------------------
diff --git a/docs/userguide/2.1.0.0-incubating/admin/startstop.html 
b/docs/userguide/2.1.0.0-incubating/admin/startstop.html
index 6bb8181..0e70383 100644
--- a/docs/userguide/2.1.0.0-incubating/admin/startstop.html
+++ b/docs/userguide/2.1.0.0-incubating/admin/startstop.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>
@@ -974,7 +984,26 @@
         <div class="to-top" id="js-to-top">
           <a href="#top" title="back to top"></a>
         </div>
-        <p>In a HAWQ DBMS, the database server instances (the master and all 
segments) are started or stopped across all of the hosts in the system in such 
a way that they can work together as a unified DBMS.</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>In a HAWQ DBMS, the database server instances (the master and all segments) 
are started or stopped across all of the hosts in the system in such a way that 
they can work together as a unified DBMS.</p>
 
 <p>Because a HAWQ system is distributed across many machines, the process for 
starting and stopping a HAWQ system is different than the process for starting 
and stopping a regular PostgreSQL DBMS.</p>
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq-site/blob/1b0cdd8e/docs/userguide/2.1.0.0-incubating/bestpractices/HAWQBestPracticesOverview.html
----------------------------------------------------------------------
diff --git 
a/docs/userguide/2.1.0.0-incubating/bestpractices/HAWQBestPracticesOverview.html
 
b/docs/userguide/2.1.0.0-incubating/bestpractices/HAWQBestPracticesOverview.html
index 9f3e7d3..fd60069 100644
--- 
a/docs/userguide/2.1.0.0-incubating/bestpractices/HAWQBestPracticesOverview.html
+++ 
b/docs/userguide/2.1.0.0-incubating/bestpractices/HAWQBestPracticesOverview.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,9 +977,31 @@
         <div class="to-top" id="js-to-top">
           <a href="#top" title="back to top"></a>
         </div>
-        <p>This chapter provides best practices on using the components and 
features that are part of a HAWQ system.</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 chapter provides best practices on using the components and features 
that are part of a HAWQ system.</p>
 
 <ul>
+<li><p><strong><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/config_hawq_bestpractices.html">Best
 Practices for Configuring HAWQ Parameters</a></strong></p>
+
+<p>This topic provides best practices for configuring the parameters in 
<code>hawq-site.xml</code>.</p></li>
 <li><p><strong><a 
href="/docs/userguide/2.1.0.0-incubating/bestpractices/operating_hawq_bestpractices.html">Best
 Practices for Operating HAWQ</a></strong></p>
 
 <p>This topic provides best practices for operating HAWQ, including 
recommendations for stopping, starting and monitoring HAWQ.</p></li>


Reply via email to