You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2017/03/25 01:43:59 UTC

svn commit: r1788626 [2/2] - in /phoenix/site: publish/ publish/language/ source/src/site/ source/src/site/markdown/

Modified: phoenix/site/publish/skip_scan.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/skip_scan.html?rev=1788626&r1=1788625&r2=1788626&view=diff
==============================================================================
--- phoenix/site/publish/skip_scan.html (original)
+++ phoenix/site/publish/skip_scan.html Sat Mar 25 01:43:58 2017
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2017-03-23
+ Generated by Apache Maven Doxia at 2017-03-24
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -77,7 +77,8 @@
 									<li ><a href="faq.html" title="F.A.Q.">F.A.Q.</a></li>
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
-									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning_guide.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning.html" title="Configuration">Configuration</a></li>
 									<li ><a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a></li>
 									<li ><a href="release_notes.html" title="Release Notes">Release Notes</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
@@ -258,7 +259,10 @@ AND KEY2 IN (1, 2)
 							<a href="building.html" title="Building">Building</a>
 						</li>
 						<li >
-							<a href="tuning.html" title="Tuning">Tuning</a>
+							<a href="tuning_guide.html" title="Tuning">Tuning</a>
+						</li>
+						<li >
+							<a href="tuning.html" title="Configuration">Configuration</a>
 						</li>
 						<li >
 							<a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a>

Modified: phoenix/site/publish/source.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/source.html?rev=1788626&r1=1788625&r2=1788626&view=diff
==============================================================================
--- phoenix/site/publish/source.html (original)
+++ phoenix/site/publish/source.html Sat Mar 25 01:43:58 2017
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2017-03-23
+ Generated by Apache Maven Doxia at 2017-03-24
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -77,7 +77,8 @@
 									<li ><a href="faq.html" title="F.A.Q.">F.A.Q.</a></li>
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
-									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning_guide.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning.html" title="Configuration">Configuration</a></li>
 									<li ><a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a></li>
 									<li ><a href="release_notes.html" title="Release Notes">Release Notes</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
@@ -264,7 +265,10 @@
 							<a href="building.html" title="Building">Building</a>
 						</li>
 						<li >
-							<a href="tuning.html" title="Tuning">Tuning</a>
+							<a href="tuning_guide.html" title="Tuning">Tuning</a>
+						</li>
+						<li >
+							<a href="tuning.html" title="Configuration">Configuration</a>
 						</li>
 						<li >
 							<a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a>

Modified: phoenix/site/publish/subqueries.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/subqueries.html?rev=1788626&r1=1788625&r2=1788626&view=diff
==============================================================================
--- phoenix/site/publish/subqueries.html (original)
+++ phoenix/site/publish/subqueries.html Sat Mar 25 01:43:58 2017
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2017-03-23
+ Generated by Apache Maven Doxia at 2017-03-24
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -77,7 +77,8 @@
 									<li ><a href="faq.html" title="F.A.Q.">F.A.Q.</a></li>
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
-									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning_guide.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning.html" title="Configuration">Configuration</a></li>
 									<li ><a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a></li>
 									<li ><a href="release_notes.html" title="Release Notes">Release Notes</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
@@ -402,7 +403,10 @@ ORDER BY count(*) DESC;
 							<a href="building.html" title="Building">Building</a>
 						</li>
 						<li >
-							<a href="tuning.html" title="Tuning">Tuning</a>
+							<a href="tuning_guide.html" title="Tuning">Tuning</a>
+						</li>
+						<li >
+							<a href="tuning.html" title="Configuration">Configuration</a>
 						</li>
 						<li >
 							<a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a>

Modified: phoenix/site/publish/team.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/team.html?rev=1788626&r1=1788625&r2=1788626&view=diff
==============================================================================
--- phoenix/site/publish/team.html (original)
+++ phoenix/site/publish/team.html Sat Mar 25 01:43:58 2017
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2017-03-23
+ Generated by Apache Maven Doxia at 2017-03-24
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -77,7 +77,8 @@
 									<li ><a href="faq.html" title="F.A.Q.">F.A.Q.</a></li>
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
-									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning_guide.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning.html" title="Configuration">Configuration</a></li>
 									<li ><a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a></li>
 									<li ><a href="release_notes.html" title="Release Notes">Release Notes</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
@@ -445,7 +446,10 @@
 							<a href="building.html" title="Building">Building</a>
 						</li>
 						<li >
-							<a href="tuning.html" title="Tuning">Tuning</a>
+							<a href="tuning_guide.html" title="Tuning">Tuning</a>
+						</li>
+						<li >
+							<a href="tuning.html" title="Configuration">Configuration</a>
 						</li>
 						<li >
 							<a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a>

Modified: phoenix/site/publish/tracing.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/tracing.html?rev=1788626&r1=1788625&r2=1788626&view=diff
==============================================================================
--- phoenix/site/publish/tracing.html (original)
+++ phoenix/site/publish/tracing.html Sat Mar 25 01:43:58 2017
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2017-03-23
+ Generated by Apache Maven Doxia at 2017-03-24
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -77,7 +77,8 @@
 									<li ><a href="faq.html" title="F.A.Q.">F.A.Q.</a></li>
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
-									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning_guide.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning.html" title="Configuration">Configuration</a></li>
 									<li ><a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a></li>
 									<li ><a href="release_notes.html" title="Release Notes">Release Notes</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
@@ -440,7 +441,10 @@ Connection conn = DriverManager.getConne
 							<a href="building.html" title="Building">Building</a>
 						</li>
 						<li >
-							<a href="tuning.html" title="Tuning">Tuning</a>
+							<a href="tuning_guide.html" title="Tuning">Tuning</a>
+						</li>
+						<li >
+							<a href="tuning.html" title="Configuration">Configuration</a>
 						</li>
 						<li >
 							<a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a>

Modified: phoenix/site/publish/transactions.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/transactions.html?rev=1788626&r1=1788625&r2=1788626&view=diff
==============================================================================
--- phoenix/site/publish/transactions.html (original)
+++ phoenix/site/publish/transactions.html Sat Mar 25 01:43:58 2017
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2017-03-23
+ Generated by Apache Maven Doxia at 2017-03-24
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -77,7 +77,8 @@
 									<li ><a href="faq.html" title="F.A.Q.">F.A.Q.</a></li>
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
-									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning_guide.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning.html" title="Configuration">Configuration</a></li>
 									<li ><a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a></li>
 									<li ><a href="release_notes.html" title="Release Notes">Release Notes</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
@@ -337,7 +338,10 @@ DELETE FROM my_other_table WHERE k=2;
 							<a href="building.html" title="Building">Building</a>
 						</li>
 						<li >
-							<a href="tuning.html" title="Tuning">Tuning</a>
+							<a href="tuning_guide.html" title="Tuning">Tuning</a>
+						</li>
+						<li >
+							<a href="tuning.html" title="Configuration">Configuration</a>
 						</li>
 						<li >
 							<a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a>

Modified: phoenix/site/publish/tuning.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/tuning.html?rev=1788626&r1=1788625&r2=1788626&view=diff
==============================================================================
--- phoenix/site/publish/tuning.html (original)
+++ phoenix/site/publish/tuning.html Sat Mar 25 01:43:58 2017
@@ -1,14 +1,14 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2017-03-23
+ Generated by Apache Maven Doxia at 2017-03-24
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
 
 	<head>
 		<meta charset="UTF-8" />
-		<title>Configuration and Tuning | Apache Phoenix</title>
+		<title>Configuration | Apache Phoenix</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<meta name="description" content="" />
 		<meta http-equiv="content-language" content="en" />
@@ -77,7 +77,8 @@
 									<li ><a href="faq.html" title="F.A.Q.">F.A.Q.</a></li>
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
-									<li class="active"><a href="" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning_guide.html" title="Tuning">Tuning</a></li>
+									<li class="active"><a href="" title="Configuration">Configuration</a></li>
 									<li ><a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a></li>
 									<li ><a href="release_notes.html" title="Release Notes">Release Notes</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
@@ -156,7 +157,7 @@
 		<div class="span12">
 			<div class="body-content">
 <div class="page-header">
- <h1>Configuration and Tuning</h1>
+ <h1>Configuration</h1>
 </div> 
 <p>Phoenix provides many different knobs and dials to configure and tune the system to run more optimally on your cluster. The configuration is done through a series of Phoenix-specific properties specified both on client and server-side <tt>hbase-site.xml</tt> files. In addition to these properties, there are of course all the <a class="externalLink" href="http://hbase.apache.org/book/config.files.html" target="_blank">HBase configuration</a> properties with the most important ones documented <a class="externalLink" href="http://hbase.apache.org/book/important_configurations.html" target="_blank">here</a>.<br /> <br /> The table below outlines the full set of Phoenix-specific configuration properties and their defaults.<br /> <br /> </p> 
 <table class="bodyTable table table-striped table-hover" border="1"> 
@@ -510,8 +511,11 @@
 						<li >
 							<a href="building.html" title="Building">Building</a>
 						</li>
+						<li >
+							<a href="tuning_guide.html" title="Tuning">Tuning</a>
+						</li>
 						<li class="active">
-							<a href="#" title="Tuning">Tuning</a>
+							<a href="#" title="Configuration">Configuration</a>
 						</li>
 						<li >
 							<a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a>

Modified: phoenix/site/publish/udf.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/udf.html?rev=1788626&r1=1788625&r2=1788626&view=diff
==============================================================================
--- phoenix/site/publish/udf.html (original)
+++ phoenix/site/publish/udf.html Sat Mar 25 01:43:58 2017
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2017-03-23
+ Generated by Apache Maven Doxia at 2017-03-24
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -77,7 +77,8 @@
 									<li ><a href="faq.html" title="F.A.Q.">F.A.Q.</a></li>
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
-									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning_guide.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning.html" title="Configuration">Configuration</a></li>
 									<li ><a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a></li>
 									<li ><a href="release_notes.html" title="Release Notes">Release Notes</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
@@ -390,7 +391,10 @@ Connection conn = DriverManager.getConne
 							<a href="building.html" title="Building">Building</a>
 						</li>
 						<li >
-							<a href="tuning.html" title="Tuning">Tuning</a>
+							<a href="tuning_guide.html" title="Tuning">Tuning</a>
+						</li>
+						<li >
+							<a href="tuning.html" title="Configuration">Configuration</a>
 						</li>
 						<li >
 							<a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a>

Modified: phoenix/site/publish/update_statistics.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/update_statistics.html?rev=1788626&r1=1788625&r2=1788626&view=diff
==============================================================================
--- phoenix/site/publish/update_statistics.html (original)
+++ phoenix/site/publish/update_statistics.html Sat Mar 25 01:43:58 2017
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2017-03-23
+ Generated by Apache Maven Doxia at 2017-03-24
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -77,7 +77,8 @@
 									<li ><a href="faq.html" title="F.A.Q.">F.A.Q.</a></li>
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
-									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning_guide.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning.html" title="Configuration">Configuration</a></li>
 									<li ><a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a></li>
 									<li ><a href="release_notes.html" title="Release Notes">Release Notes</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
@@ -311,7 +312,10 @@
 							<a href="building.html" title="Building">Building</a>
 						</li>
 						<li >
-							<a href="tuning.html" title="Tuning">Tuning</a>
+							<a href="tuning_guide.html" title="Tuning">Tuning</a>
+						</li>
+						<li >
+							<a href="tuning.html" title="Configuration">Configuration</a>
 						</li>
 						<li >
 							<a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a>

Modified: phoenix/site/publish/upgrading.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/upgrading.html?rev=1788626&r1=1788625&r2=1788626&view=diff
==============================================================================
--- phoenix/site/publish/upgrading.html (original)
+++ phoenix/site/publish/upgrading.html Sat Mar 25 01:43:58 2017
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2017-03-23
+ Generated by Apache Maven Doxia at 2017-03-24
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -77,7 +77,8 @@
 									<li ><a href="faq.html" title="F.A.Q.">F.A.Q.</a></li>
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
-									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning_guide.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning.html" title="Configuration">Configuration</a></li>
 									<li class="active"><a href="" title="Backward Compatibility">Backward Compatibility</a></li>
 									<li ><a href="release_notes.html" title="Release Notes">Release Notes</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
@@ -272,7 +273,10 @@
 							<a href="building.html" title="Building">Building</a>
 						</li>
 						<li >
-							<a href="tuning.html" title="Tuning">Tuning</a>
+							<a href="tuning_guide.html" title="Tuning">Tuning</a>
+						</li>
+						<li >
+							<a href="tuning.html" title="Configuration">Configuration</a>
 						</li>
 						<li class="active">
 							<a href="#" title="Backward Compatibility">Backward Compatibility</a>

Modified: phoenix/site/publish/views.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/views.html?rev=1788626&r1=1788625&r2=1788626&view=diff
==============================================================================
--- phoenix/site/publish/views.html (original)
+++ phoenix/site/publish/views.html Sat Mar 25 01:43:58 2017
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2017-03-23
+ Generated by Apache Maven Doxia at 2017-03-24
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -77,7 +77,8 @@
 									<li ><a href="faq.html" title="F.A.Q.">F.A.Q.</a></li>
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
-									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning_guide.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning.html" title="Configuration">Configuration</a></li>
 									<li ><a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a></li>
 									<li ><a href="release_notes.html" title="Release Notes">Release Notes</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
@@ -301,7 +302,10 @@ VALUES('John Doe', CURRENT_DATE(), NEXT
 							<a href="building.html" title="Building">Building</a>
 						</li>
 						<li >
-							<a href="tuning.html" title="Tuning">Tuning</a>
+							<a href="tuning_guide.html" title="Tuning">Tuning</a>
+						</li>
+						<li >
+							<a href="tuning.html" title="Configuration">Configuration</a>
 						</li>
 						<li >
 							<a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a>

Modified: phoenix/site/publish/who_is_using.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/who_is_using.html?rev=1788626&r1=1788625&r2=1788626&view=diff
==============================================================================
--- phoenix/site/publish/who_is_using.html (original)
+++ phoenix/site/publish/who_is_using.html Sat Mar 25 01:43:58 2017
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2017-03-23
+ Generated by Apache Maven Doxia at 2017-03-24
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -77,7 +77,8 @@
 									<li ><a href="faq.html" title="F.A.Q.">F.A.Q.</a></li>
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li ><a href="building.html" title="Building">Building</a></li>
-									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning_guide.html" title="Tuning">Tuning</a></li>
+									<li ><a href="tuning.html" title="Configuration">Configuration</a></li>
 									<li ><a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a></li>
 									<li ><a href="release_notes.html" title="Release Notes">Release Notes</a></li>
 									<li ><a href="pherf.html" title="Performance Testing">Performance Testing</a></li>
@@ -354,7 +355,10 @@
 							<a href="building.html" title="Building">Building</a>
 						</li>
 						<li >
-							<a href="tuning.html" title="Tuning">Tuning</a>
+							<a href="tuning_guide.html" title="Tuning">Tuning</a>
+						</li>
+						<li >
+							<a href="tuning.html" title="Configuration">Configuration</a>
 						</li>
 						<li >
 							<a href="upgrading.html" title="Backward Compatibility">Backward Compatibility</a>

Modified: phoenix/site/source/src/site/markdown/tuning.md
URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/tuning.md?rev=1788626&r1=1788625&r2=1788626&view=diff
==============================================================================
--- phoenix/site/source/src/site/markdown/tuning.md (original)
+++ phoenix/site/source/src/site/markdown/tuning.md Sat Mar 25 01:43:58 2017
@@ -1,4 +1,4 @@
-# Configuration and Tuning
+# Configuration
 
 Phoenix provides many different knobs and dials to configure and tune the system to run more optimally on your cluster. The configuration is done through a series of Phoenix-specific properties specified both on client and server-side <code>hbase-site.xml</code> files. In addition to these properties, there are of course all the <a href="http://hbase.apache.org/book/config.files.html" target="_blank">HBase configuration</a> properties with the most important ones documented <a href="http://hbase.apache.org/book/important_configurations.html" target="_blank">here</a>.<br/>
 <br/>

Modified: phoenix/site/source/src/site/site.xml
URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/site.xml?rev=1788626&r1=1788625&r2=1788626&view=diff
==============================================================================
--- phoenix/site/source/src/site/site.xml (original)
+++ phoenix/site/source/src/site/site.xml Sat Mar 25 01:43:58 2017
@@ -79,7 +79,8 @@
             <item href="faq.html" name="F.A.Q."/>
             <item href="Phoenix-in-15-minutes-or-less.html" name="Quick Start"/>
             <item href="building.html" name="Building"/>
-            <item href="tuning.html" name="Tuning"/>
+            <item href="tuning_guide.html" name="Tuning"/>
+            <item href="tuning.html" name="Configuration"/>
             <item href="upgrading.html" name="Backward Compatibility"/>
             <item href="release_notes.html" name="Release Notes"/>
             <item href="pherf.html" name="Performance Testing"/>