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 2014/12/12 05:07:51 UTC

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

Author: jamestaylor
Date: Fri Dec 12 04:07:50 2014
New Revision: 1644823

URL: http://svn.apache.org/r1644823
Log:
Add link to Phoenix blog, add upgrade information

Added:
    phoenix/site/publish/upgrading.html
    phoenix/site/source/src/site/markdown/upgrading.md
Removed:
    phoenix/site/publish/upgrade_from_2_2.html
    phoenix/site/source/src/site/markdown/upgrade_from_2_2.md
Modified:
    phoenix/site/publish/Phoenix-in-15-minutes-or-less.html
    phoenix/site/publish/array_type.html
    phoenix/site/publish/building.html
    phoenix/site/publish/building_website.html
    phoenix/site/publish/bulk_dataload.html
    phoenix/site/publish/contributing.html
    phoenix/site/publish/download.html
    phoenix/site/publish/dynamic_columns.html
    phoenix/site/publish/faq.html
    phoenix/site/publish/flume.html
    phoenix/site/publish/index.html
    phoenix/site/publish/issues.html
    phoenix/site/publish/joins.html
    phoenix/site/publish/language/datatypes.html
    phoenix/site/publish/language/functions.html
    phoenix/site/publish/language/index.html
    phoenix/site/publish/mailing_list.html
    phoenix/site/publish/multi-tenancy.html
    phoenix/site/publish/news.html
    phoenix/site/publish/paged.html
    phoenix/site/publish/performance.html
    phoenix/site/publish/phoenix_on_emr.html
    phoenix/site/publish/pig_integration.html
    phoenix/site/publish/recent.html
    phoenix/site/publish/release.html
    phoenix/site/publish/resources.html
    phoenix/site/publish/roadmap.html
    phoenix/site/publish/salted.html
    phoenix/site/publish/secondary_indexing.html
    phoenix/site/publish/sequences.html
    phoenix/site/publish/skip_scan.html
    phoenix/site/publish/source.html
    phoenix/site/publish/subqueries.html
    phoenix/site/publish/team.html
    phoenix/site/publish/tracing.html
    phoenix/site/publish/tuning.html
    phoenix/site/publish/update_statistics.html
    phoenix/site/publish/views.html
    phoenix/site/source/src/site/markdown/news.md
    phoenix/site/source/src/site/markdown/resources.md
    phoenix/site/source/src/site/site.xml

Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/Phoenix-in-15-minutes-or-less.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/Phoenix-in-15-minutes-or-less.html (original)
+++ phoenix/site/publish/Phoenix-in-15-minutes-or-less.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<li class="active"><a href="" 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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -274,7 +274,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/array_type.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/array_type.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/array_type.html (original)
+++ phoenix/site/publish/array_type.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -300,7 +300,7 @@ SELECT region_name FROM regions WHERE '9
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/building.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/building.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/building.html (original)
+++ phoenix/site/publish/building.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<li ><a href="Phoenix-in-15-minutes-or-less.html" title="Quick Start">Quick Start</a></li>
 									<li class="active"><a href="" title="Building">Building</a></li>
 									<li ><a href="tuning.html" title="Tuning">Tuning</a></li>
-									<li ><a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -281,7 +281,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/building_website.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/building_website.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/building_website.html (original)
+++ phoenix/site/publish/building_website.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -231,7 +231,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/bulk_dataload.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/bulk_dataload.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/bulk_dataload.html (original)
+++ phoenix/site/publish/bulk_dataload.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -371,7 +371,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/contributing.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/contributing.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/contributing.html (original)
+++ phoenix/site/publish/contributing.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -273,7 +273,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/download.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/download.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/download.html (original)
+++ phoenix/site/publish/download.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -302,7 +302,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/dynamic_columns.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/dynamic_columns.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/dynamic_columns.html (original)
+++ phoenix/site/publish/dynamic_columns.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -236,7 +236,7 @@ WHERE eventType = 'OOM' AND lastGCTime &
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/faq.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/faq.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/faq.html (original)
+++ phoenix/site/publish/faq.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -431,7 +431,7 @@ conn.commit();
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/flume.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/flume.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/flume.html (original)
+++ phoenix/site/publish/flume.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -320,7 +320,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/index.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/index.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/index.html (original)
+++ phoenix/site/publish/index.html Fri Dec 12 04:07:50 2014
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -332,7 +332,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/issues.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/issues.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/issues.html (original)
+++ phoenix/site/publish/issues.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -224,7 +224,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/joins.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/joins.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/joins.html (original)
+++ phoenix/site/publish/joins.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li class="active"><a href="" title="Joins">Joins</a></li>
@@ -632,7 +632,7 @@ ON O.ItemID = I.ItemID;
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/language/datatypes.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/language/datatypes.html (original)
+++ phoenix/site/publish/language/datatypes.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="../upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="../upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="../secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="../joins.html" title="Joins">Joins</a></li>
@@ -510,7 +510,7 @@ TIME
 TIME
 </pre>
 syntax-end -->
-<p>The time data type. The format is yyyy-<code>MM</code>-dd hh:mm:ss, with both the date and time parts maintained. Mapped to <code>java.sql.Time</code>. The binary representation is an 8 byte long (the number of milliseconds from the epoch).</p>
+<p>The time data type. The format is yyyy-<code>MM</code>-dd hh:mm:ss, with both the date and time parts maintained. Mapped to <code>java.sql.Time</code>. The binary representation is an 8 byte long (the number of milliseconds from the epoch), making it possible (although not necessarily recommended) to store more information within a <code>TIME</code> column than what is provided by <code>java.sql.Time</code>. Note that the internal representation is based on a number of milliseconds since the epoch (which is based on a time in <code>GMT</code>), while <code>java.sql.Time</code> will format times based on the client&#39;s local time zone.</p>
 <p>Example:</p>
 <p class="notranslate">TIME</p>
 
@@ -528,7 +528,7 @@ DATE
 DATE
 </pre>
 syntax-end -->
-<p>The date data type. The format is yyyy-<code>MM</code>-dd hh:mm:ss, with both the date and time parts maintained to a millisecond accuracy. Mapped to <code>java.sql.Date</code>. The binary representation is an 8 byte long (the number of milliseconds from the epoch).</p>
+<p>The date data type. The format is yyyy-<code>MM</code>-dd hh:mm:ss, with both the date and time parts maintained to a millisecond accuracy. Mapped to <code>java.sql.Date</code>. The binary representation is an 8 byte long (the number of milliseconds from the epoch), making it possible (although not necessarily recommended) to store more information within a <code>DATE</code> column than what is provided by <code>java.sql.Date</code>. Note that the internal representation is based on a number of milliseconds since the epoch (which is based on a time in <code>GMT</code>), while <code>java.sql.Date</code> will format dates based on the client&#39;s local time zone.</p>
 <p>Example:</p>
 <p class="notranslate">DATE</p>
 
@@ -546,7 +546,7 @@ TIMESTAMP
 TIMESTAMP
 </pre>
 syntax-end -->
-<p>The timestamp data type. The format is yyyy-<code>MM</code>-dd hh:mm:ss[.nnnnnnnnn]. Mapped to <code>java.sql.Timestamp</code> with an internal representation of the number of nanos from the epoch. The binary representation is 12 bytes: an 8 byte long for the epoch time plus a 4 byte integer for the nanos.</p>
+<p>The timestamp data type. The format is yyyy-<code>MM</code>-dd hh:mm:ss[.nnnnnnnnn]. Mapped to <code>java.sql.Timestamp</code> with an internal representation of the number of nanos from the epoch. The binary representation is 12 bytes: an 8 byte long for the epoch time plus a 4 byte integer for the nanos. Note that the internal representation is based on a number of milliseconds since the epoch (which is based on a time in <code>GMT</code>), while <code>java.sql.Timestamp</code> will format timestamps based on the client&#39;s local time zone.</p>
 <p>Example:</p>
 <p class="notranslate">TIMESTAMP</p>
 
@@ -769,7 +769,7 @@ syntax-end -->
 							<a href="../tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="../upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="../upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/language/functions.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/language/functions.html (original)
+++ phoenix/site/publish/language/functions.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="../upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="../upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="../secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="../joins.html" title="Joins">Joins</a></li>
@@ -1132,20 +1132,20 @@ syntax-end -->
 <h3 id="to_date" class="notranslate">TO_DATE</h3>
 <!-- railroad-start -->
 <pre name="bnf" style="display: none">
-TO_DATE( <a href="index.html#term">stringTerm</a> [, <a href="index.html#string">formatString</a>] )
+TO_DATE( <a href="index.html#term">stringTerm</a> [, <a href="index.html#string">formatString</a> [, <a href="index.html#string">timeZoneIdString</a>]] )
 </pre>
 <div name="railroad">
-<table class="railroad"><tr class="railroad"><td class="d"><code class="c">TO_DATE ( <a href="index.html#term">stringTerm</a></code></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d">&nbsp;</td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><table class="railroad"><tr class="railroad"><td class="d"><code class="c">, <a href="index.html#string">formatString</a></code></td></tr></table></td><td class="le"></td></tr></table></td><td class="d"><code class="c">)</code></td></tr></table>
+<table class="railroad"><tr class="railroad"><td class="d"><code class="c">TO_DATE ( <a href="index.html#term">stringTerm</a></code></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d">&nbsp;</td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><table class="railroad"><tr class="railroad"><td class="d"><code class="c">, <a href="index.html#string">formatString</a></code></td><td class="d"><table class="railroad"><tr class="railroad"><td class="ts"></td><td class="d">&nbsp;</td><td class="te"></td></tr><tr class="railroad"><td class="ls"></td><td class="d"><table class="railroad"><tr class="railroad"><td class="d"><code class="c">, <a href="index.html#string">timeZoneIdString</a></code></td></tr></table></td><td class="le"></td></tr></table></td></tr></table></td><td class="le"></td></tr></table></td><td class="d"><code class="c">)</code></td></tr></table>
 </div>
 <!-- railroad-end -->
 <!-- syntax-start
 <pre>
-TO_DATE( <a href="index.html#term">stringTerm</a> [, <a href="index.html#string">formatString</a>] )
+TO_DATE( <a href="index.html#term">stringTerm</a> [, <a href="index.html#string">formatString</a> [, <a href="index.html#string">timeZoneIdString</a>]] )
 </pre>
 syntax-end -->
-<p>Parses a string and returns a date. The most important format characters are: y year, M month, d day, H hour, m minute, s second. The default format string is <code>yyyy-MM-dd HH:mm:ss</code>. For details of the format, see <code>java.text.SimpleDateFormat</code>.</p>
+<p>Parses a string and returns a date. Note that the returned date is internally represented as the number of milliseconds since the java epoch. The most important format characters are: y year, M month, d day, H hour, m minute, s second. The default format string is <code>yyyy-MM-dd HH:mm:ss</code>. For details of the format, see <code>java.text.SimpleDateFormat</code>. By default, <code>GMT</code> will be used as the time zone when parsing the date. However, a time zone id can also be supplied. This is a time zone id such as &#39;<code>GMT</code>+1&#39;. If &#39;local&#39; is provided as the time zone id, the local time zone will be used for parsing. The configuration setting <code>phoenix.query.dateFormatTimeZone</code> can also be set to a time zone id, which will cause the default of <code>GMT</code> to be overridden with the configured time zone id.</p>
 <p>Example:</p>
-<p class="notranslate">TO_DATE(&#39;Sat, 3 Feb 2001 03:05:06 GMT&#39;, &#39;EEE, d MMM yyyy HH:mm:ss z&#39;)</p>
+<p class="notranslate">TO_DATE(&#39;Sat, 3 Feb 2001 03:05:06 GMT&#39;, &#39;EEE, d MMM yyyy HH:mm:ss z&#39;)<br />TO_DATE(&#39;1970-01-01&#39;, &#39;yyyy-MM-dd&#39;, &#39;GMT+1&#39;)</p>
 
 <h3 id="current_date" class="notranslate">CURRENT_DATE</h3>
 <!-- railroad-start -->
@@ -1312,7 +1312,7 @@ syntax-end -->
 							<a href="../tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="../upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="../upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/language/index.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/language/index.html (original)
+++ phoenix/site/publish/language/index.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="../upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="../upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="../secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="../joins.html" title="Joins">Joins</a></li>
@@ -1510,7 +1510,7 @@ syntax-end -->
 							<a href="../tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="../upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="../upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/mailing_list.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/mailing_list.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/mailing_list.html (original)
+++ phoenix/site/publish/mailing_list.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -263,7 +263,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/multi-tenancy.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/multi-tenancy.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/multi-tenancy.html (original)
+++ phoenix/site/publish/multi-tenancy.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -272,7 +272,7 @@ WHERE event_type='L';
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/news.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/news.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/news.html (original)
+++ phoenix/site/publish/news.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -134,9 +134,9 @@
 <p></p> 
 <div class="section"> 
  <div class="section"> 
-  <h3 id="Phoenix_4.2.2_3.2.2_released_Dec._10_2014">Phoenix 4.2.2, 3.2.2 released (Dec. 10, 2014)</h3> 
-  <p><a class="externalLink" href="https://raw.githubusercontent.com/apache/phoenix/4.2/CHANGES">Release Notes</a></p> 
-  <p>Download the latest binary and source jars from <a href="download.html">download page</a>. Note Phoenix 4.x is compatible with HBase 0.98.1+ while Phoenix 3.x is compatible with HBase 0.94.x only.</p> 
+  <h3 id="Phoenix_4.2.2_released_Dec._10_2014">Phoenix 4.2.2 <a class="externalLink" href="https://blogs.apache.org/phoenix/entry/announcing_phoenix_4_2_2">released</a>) (Dec. 10, 2014)</h3> 
+  <p>For additional news, see our <a class="externalLink" href="https://blogs.apache.org/phoenix/">blog</a></p> 
+  <p>Download the latest binary and source jars from <a href="download.html">download page</a>.</p> 
  </div> 
 </div>
 			</div>
@@ -229,7 +229,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/paged.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/paged.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/paged.html (original)
+++ phoenix/site/publish/paged.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -255,7 +255,7 @@ LIMIT 20
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/performance.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/performance.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/performance.html (original)
+++ phoenix/site/publish/performance.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -280,7 +280,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/phoenix_on_emr.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/phoenix_on_emr.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/phoenix_on_emr.html (original)
+++ phoenix/site/publish/phoenix_on_emr.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -259,7 +259,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/pig_integration.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/pig_integration.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/pig_integration.html (original)
+++ phoenix/site/publish/pig_integration.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -289,7 +289,7 @@ DUMP cnt;
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/recent.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/recent.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/recent.html (original)
+++ phoenix/site/publish/recent.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -248,7 +248,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/release.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/release.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/release.html (original)
+++ phoenix/site/publish/release.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -246,7 +246,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/resources.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/resources.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/resources.html (original)
+++ phoenix/site/publish/resources.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -129,7 +129,7 @@
 <div class="page-header">
  <h1>Resources</h1>
 </div> 
-<p>Below are some prior presentations that have been done on Apache Phoenix.</p> 
+<p>Below are some prior presentations that have been done on Apache Phoenix. Another good source of information is the Apache Phoenix <a class="externalLink" href="https://blogs.apache.org/phoenix/">blog</a>.</p> 
 <table border="0" class="bodyTable table table-striped table-hover"> 
  <thead> 
   <tr class="a"> 
@@ -261,7 +261,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/roadmap.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/roadmap.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/roadmap.html (original)
+++ phoenix/site/publish/roadmap.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -253,7 +253,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/salted.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/salted.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/salted.html (original)
+++ phoenix/site/publish/salted.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -243,7 +243,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/secondary_indexing.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/secondary_indexing.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/secondary_indexing.html (original)
+++ phoenix/site/publish/secondary_indexing.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li class="active"><a href="" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -425,7 +425,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/sequences.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/sequences.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/sequences.html (original)
+++ phoenix/site/publish/sequences.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -274,7 +274,7 @@ VALUES( NEXT VALUE FOR my_schema.my_sequ
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/skip_scan.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/skip_scan.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/skip_scan.html (original)
+++ phoenix/site/publish/skip_scan.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -232,7 +232,7 @@ AND KEY2 IN (1, 2)
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/source.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/source.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/source.html (original)
+++ phoenix/site/publish/source.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -238,7 +238,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/subqueries.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/subqueries.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/subqueries.html (original)
+++ phoenix/site/publish/subqueries.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -376,7 +376,7 @@ ORDER BY count(*) DESC;
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/team.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/team.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/team.html (original)
+++ phoenix/site/publish/team.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -347,7 +347,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/tracing.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/tracing.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/tracing.html (original)
+++ phoenix/site/publish/tracing.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -366,7 +366,7 @@ Connection conn = DriverManager.getConne
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/tuning.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/tuning.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/tuning.html (original)
+++ phoenix/site/publish/tuning.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -333,42 +333,27 @@
    <td>true</td> 
   </tr> 
   <tr class="a"> 
-   <td><small> 
-     <s>
-       phoenix.query.targetConcurrency 
-     </s></small><br />Obsolete as of 3.2/4.2</td> 
+   <td><small><s>phoenix.query.targetConcurrency</s></small><br />Obsolete as of 3.2/4.2</td> 
    <td style="text-align: left;">Target concurrent threads to use for a query. It serves as a soft limit on the number of scans into which a query may be split. The value should not exceed the hard limit imposed by<tt> phoenix.query.maxConcurrency</tt>.</td> 
    <td>32</td> 
   </tr> 
   <tr class="b"> 
-   <td><small> 
-     <s>
-       phoenix.query.maxConcurrency 
-     </s></small><br />Obsolete as of 3.2/4.2</td> 
+   <td><small><s>phoenix.query.maxConcurrency</s></small><br />Obsolete as of 3.2/4.2</td> 
    <td style="text-align: left;">Maximum concurrent threads to use for a query. It servers as a hard limit on the number of scans into which a query may be split. A soft limit is imposed by <tt>phoenix.query.targetConcurrency</tt>.</td> 
    <td>64</td> 
   </tr> 
   <tr class="a"> 
-   <td><small> 
-     <s>
-       phoenix.query.maxStatsAge 
-     </s></small><br />Obsolete as of 3.2/4.2</td> 
+   <td><small><s>phoenix.query.maxStatsAge</s></small><br />Obsolete as of 3.2/4.2</td> 
    <td>The maximum age of stats in milliseconds after which they will no longer be used (i.e. the stats were not able to be updated in this amount of time and thus are considered too old). Default is 1 day.</td> 
    <td>1</td> 
   </tr> 
   <tr class="b"> 
-   <td><small> 
-     <s>
-       phoenix.query.statsUpdateFrequency 
-     </s></small><br />Obsolete as of 3.2/4.2</td> 
+   <td><small><s>phoenix.query.statsUpdateFrequency</s></small><br />Obsolete as of 3.2/4.2</td> 
    <td style="text-align: left;">The frequency in milliseconds at which the stats for each table will be updated. Default is 15 min.</td> 
    <td>900000</td> 
   </tr> 
   <tr class="a"> 
-   <td><small> 
-     <s>
-       phoenix.query.maxIntraRegionParallelization 
-     </s></small><br />Obsolete as of 3.2/4.2</td> 
+   <td><small><s>phoenix.query.maxIntraRegionParallelization</s></small><br />Obsolete as of 3.2/4.2</td> 
    <td style="text-align: left;">The maximum number of threads that will be spawned to process data within a single region during query execution</td> 
    <td>64</td> 
   </tr> 
@@ -474,7 +459,7 @@
 							<a href="#" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>

Modified: phoenix/site/publish/update_statistics.html
URL: http://svn.apache.org/viewvc/phoenix/site/publish/update_statistics.html?rev=1644823&r1=1644822&r2=1644823&view=diff
==============================================================================
--- phoenix/site/publish/update_statistics.html (original)
+++ phoenix/site/publish/update_statistics.html Fri Dec 12 04:07:50 2014
@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 <!--
- Generated by Apache Maven Doxia at 2014-12-10
+ Generated by Apache Maven Doxia at 2014-12-11
  Rendered using Reflow Maven Skin 1.1.0 (http://andriusvelykis.github.io/reflow-maven-skin)
 -->
 <html  xml:lang="en" lang="en">
@@ -78,7 +78,7 @@
 									<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="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a></li>
+									<li ><a href="upgrading.html" title="Upgrading">Upgrading</a></li>
 									<li class="divider"/>
 									<li ><a href="secondary_indexing.html" title="Secondary Indexes">Secondary Indexes</a></li>
 									<li ><a href="joins.html" title="Joins">Joins</a></li>
@@ -276,7 +276,7 @@
 							<a href="tuning.html" title="Tuning">Tuning</a>
 						</li>
 						<li >
-							<a href="upgrade_from_2_2.html" title="Upgrade from 2.2">Upgrade from 2.2</a>
+							<a href="upgrading.html" title="Upgrading">Upgrading</a>
 						</li>
 						<li >
 							<a href="http:divider" title=""></a>