You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by bu...@apache.org on 2012/11/03 15:44:11 UTC

svn commit: r837151 - in /websites/staging/cayenne/trunk/content: ./ 2010/11/29/ 2010/12/02/ 2011/03/08/ 2011/06/21/ 2011/09/26/ 2012/06/12/

Author: buildbot
Date: Sat Nov  3 14:44:10 2012
New Revision: 837151

Log:
Staging update by buildbot for cayenne

Added:
    websites/staging/cayenne/trunk/content/mailing-lists.html
Removed:
    websites/staging/cayenne/trunk/content/commercial-support.html
Modified:
    websites/staging/cayenne/trunk/content/   (props changed)
    websites/staging/cayenne/trunk/content/2010/11/29/cayenne-at-the-sydney-apache-unconference.html
    websites/staging/cayenne/trunk/content/2010/12/02/cayenne-31-its-alive.html
    websites/staging/cayenne/trunk/content/2011/03/08/cayenne-31m2-is-released.html
    websites/staging/cayenne/trunk/content/2011/06/21/cayenne-302-is-released.html
    websites/staging/cayenne/trunk/content/2011/09/26/cayenne-31m3-is-released.html
    websites/staging/cayenne/trunk/content/2012/06/12/cayenne-31-beta-released.html
    websites/staging/cayenne/trunk/content/about.html
    websites/staging/cayenne/trunk/content/building-cayenne.html
    websites/staging/cayenne/trunk/content/code-repository.html
    websites/staging/cayenne/trunk/content/collaboration.html
    websites/staging/cayenne/trunk/content/contributors.html
    websites/staging/cayenne/trunk/content/developer-guide.html
    websites/staging/cayenne/trunk/content/documentation.html
    websites/staging/cayenne/trunk/content/download.html
    websites/staging/cayenne/trunk/content/eclipse.html
    websites/staging/cayenne/trunk/content/getting-started.html
    websites/staging/cayenne/trunk/content/how-can-i-help.html
    websites/staging/cayenne/trunk/content/how_development_happens.html
    websites/staging/cayenne/trunk/content/index.html
    websites/staging/cayenne/trunk/content/legacy-ant-build.html
    websites/staging/cayenne/trunk/content/legacy-ant-documentation-export.html
    websites/staging/cayenne/trunk/content/legacy-ant-unit-tests.html
    websites/staging/cayenne/trunk/content/legacy-eclipse.html
    websites/staging/cayenne/trunk/content/privacy-policy.html
    websites/staging/cayenne/trunk/content/release-guide-2.0.html
    websites/staging/cayenne/trunk/content/release-guide.html
    websites/staging/cayenne/trunk/content/running-unit-tests.html
    websites/staging/cayenne/trunk/content/submit-patch.html
    websites/staging/cayenne/trunk/content/success-stories.html
    websites/staging/cayenne/trunk/content/support.html
    websites/staging/cayenne/trunk/content/why-cayenne.html

Propchange: websites/staging/cayenne/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Nov  3 14:44:10 2012
@@ -1 +1 @@
-1405350
+1405352

Modified: websites/staging/cayenne/trunk/content/2010/11/29/cayenne-at-the-sydney-apache-unconference.html
==============================================================================
--- websites/staging/cayenne/trunk/content/2010/11/29/cayenne-at-the-sydney-apache-unconference.html (original)
+++ websites/staging/cayenne/trunk/content/2010/11/29/cayenne-at-the-sydney-apache-unconference.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/2010/12/02/cayenne-31-its-alive.html
==============================================================================
--- websites/staging/cayenne/trunk/content/2010/12/02/cayenne-31-its-alive.html (original)
+++ websites/staging/cayenne/trunk/content/2010/12/02/cayenne-31-its-alive.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/2011/03/08/cayenne-31m2-is-released.html
==============================================================================
--- websites/staging/cayenne/trunk/content/2011/03/08/cayenne-31m2-is-released.html (original)
+++ websites/staging/cayenne/trunk/content/2011/03/08/cayenne-31m2-is-released.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/2011/06/21/cayenne-302-is-released.html
==============================================================================
--- websites/staging/cayenne/trunk/content/2011/06/21/cayenne-302-is-released.html (original)
+++ websites/staging/cayenne/trunk/content/2011/06/21/cayenne-302-is-released.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/2011/09/26/cayenne-31m3-is-released.html
==============================================================================
--- websites/staging/cayenne/trunk/content/2011/09/26/cayenne-31m3-is-released.html (original)
+++ websites/staging/cayenne/trunk/content/2011/09/26/cayenne-31m3-is-released.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/2012/06/12/cayenne-31-beta-released.html
==============================================================================
--- websites/staging/cayenne/trunk/content/2012/06/12/cayenne-31-beta-released.html (original)
+++ websites/staging/cayenne/trunk/content/2012/06/12/cayenne-31-beta-released.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/about.html
==============================================================================
--- websites/staging/cayenne/trunk/content/about.html (original)
+++ websites/staging/cayenne/trunk/content/about.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/building-cayenne.html
==============================================================================
--- websites/staging/cayenne/trunk/content/building-cayenne.html (original)
+++ websites/staging/cayenne/trunk/content/building-cayenne.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/code-repository.html
==============================================================================
--- websites/staging/cayenne/trunk/content/code-repository.html (original)
+++ websites/staging/cayenne/trunk/content/code-repository.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/collaboration.html
==============================================================================
--- websites/staging/cayenne/trunk/content/collaboration.html (original)
+++ websites/staging/cayenne/trunk/content/collaboration.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/contributors.html
==============================================================================
--- websites/staging/cayenne/trunk/content/contributors.html (original)
+++ websites/staging/cayenne/trunk/content/contributors.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/developer-guide.html
==============================================================================
--- websites/staging/cayenne/trunk/content/developer-guide.html (original)
+++ websites/staging/cayenne/trunk/content/developer-guide.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/documentation.html
==============================================================================
--- websites/staging/cayenne/trunk/content/documentation.html (original)
+++ websites/staging/cayenne/trunk/content/documentation.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/download.html
==============================================================================
--- websites/staging/cayenne/trunk/content/download.html (original)
+++ websites/staging/cayenne/trunk/content/download.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/eclipse.html
==============================================================================
--- websites/staging/cayenne/trunk/content/eclipse.html (original)
+++ websites/staging/cayenne/trunk/content/eclipse.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/getting-started.html
==============================================================================
--- websites/staging/cayenne/trunk/content/getting-started.html (original)
+++ websites/staging/cayenne/trunk/content/getting-started.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/how-can-i-help.html
==============================================================================
--- websites/staging/cayenne/trunk/content/how-can-i-help.html (original)
+++ websites/staging/cayenne/trunk/content/how-can-i-help.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/how_development_happens.html
==============================================================================
--- websites/staging/cayenne/trunk/content/how_development_happens.html (original)
+++ websites/staging/cayenne/trunk/content/how_development_happens.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/index.html
==============================================================================
--- websites/staging/cayenne/trunk/content/index.html (original)
+++ websites/staging/cayenne/trunk/content/index.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/legacy-ant-build.html
==============================================================================
--- websites/staging/cayenne/trunk/content/legacy-ant-build.html (original)
+++ websites/staging/cayenne/trunk/content/legacy-ant-build.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/legacy-ant-documentation-export.html
==============================================================================
--- websites/staging/cayenne/trunk/content/legacy-ant-documentation-export.html (original)
+++ websites/staging/cayenne/trunk/content/legacy-ant-documentation-export.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/legacy-ant-unit-tests.html
==============================================================================
--- websites/staging/cayenne/trunk/content/legacy-ant-unit-tests.html (original)
+++ websites/staging/cayenne/trunk/content/legacy-ant-unit-tests.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/legacy-eclipse.html
==============================================================================
--- websites/staging/cayenne/trunk/content/legacy-eclipse.html (original)
+++ websites/staging/cayenne/trunk/content/legacy-eclipse.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Added: websites/staging/cayenne/trunk/content/mailing-lists.html
==============================================================================
--- websites/staging/cayenne/trunk/content/mailing-lists.html (added)
+++ websites/staging/cayenne/trunk/content/mailing-lists.html Sat Nov  3 14:44:10 2012
@@ -0,0 +1,147 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+<title>Apache Cayenne &#187; Mailing Lists</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="description" content="Apache Cayenne is a powerful, full-featured, open-source object relational mapping framework created for developers working with relational databases.">
+<meta name="robots" content="index,follow">
+<link rel="stylesheet" type="text/css" media="screen, projection" href="/css/styles.css">
+<link rel="stylesheet" type="text/css" media="print" href="/css/print.css">
+<link rel="shortcut icon" href="/img/favicon.ico" type="image/ico">
+<script type="text/javascript" src="/js/scripts.js"></script>
+</head>
+<body>
+<div id="wrap"><div id="wrap-inner">
+
+<div id="header">
+	<h1><a href="/" title="Return to Apache Cayenne home"><span>The Apache Cayenne Project</span></a></h1>
+	<h2><a href="http://www.apache.org" title="The Apache Software Foundation"><span>The Apache Software Foundation</span></a></h2>
+</div>
+
+<div id="container">
+
+ 
+<div id="sidebar">
+<ul id="nav">
+	<li><a href="/about.html">About</a>
+		<ul>
+			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
+			<li><a href="/download.html">Download</a></li>
+			<li><a href="/success-stories.html">Success Stories</a></li>
+			<li><a href="/support.html">Support</a></li>
+		</ul>
+	</li>
+	<li><a href="/documentation.html">Documentation</a>
+		<ul>
+			<li><a href="/doc30/tutorial.html">Getting Started</a></li>
+			<li class="trigger"><a href="/doc30/documentation.html">Version 3 (released)</a>
+				<ul>
+					<li><a href="/doc30/overview.html">Overview</a></li>
+					<li><a href="/doc30/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc30/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc30/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc30/api/index.html">JavaDoc</a></li>
+				</ul>
+			</li>
+			<li class="trigger"><a href="/doc20/documentation.html">Version 2 (released)</a>
+				<ul>
+					<li><a href="/doc20/user-guide.html">User Guide</a></li>
+					<li><a href="/doc20/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc20/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc20/api/cayenne/index.html">JavaDoc</a></li>
+				</ul>
+			</li>
+			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (archived)</a>
+				<ul>
+					<li><a href="/doc12/user-guide.html">User Guide</a></li>
+					<li><a href="/doc12/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc12/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc12/api/cayenne/index.html">JavaDoc</a></li>
+				</ul>
+			</li>
+		</ul>
+	</li>
+	<li><a href="/collaboration.html">Collaboration</a>
+		<ul>
+			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
+			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
+			<li><a href="/code-repository.html">Code Repository</a></li>
+			<li><a href="/developer-guide.html">Developer Guide</a></li>
+			<li><a href="/how-can-i-help.html">How Can I Help?</a></li>
+			<li><a href="/contributors.html">Contributors</a></li>
+		</ul>
+	</li>
+</ul>
+</div>
+
+
+<hr>
+<div id="content">
+       <h2 id="mailing-lists">Mailing Lists</h2>
+<h3 id="user-mailing-list">User Mailing List</h3>
+<p>This is a general discussion and support list for Cayenne users. It is the
+primary source of free Cayenne support. It is also a place for general
+discussion of Cayenne-related topics.</p>
+<p>To subscribe send empty email to user-subscribe@cayenne.apache.org<br />
+To unsubscribe send empty email to user-unsubscribe@cayenne.apache.org<br />
+To post a message use the following address: user@cayenne.apache.org</p>
+<ul>
+<li>Markmail Archive:
+<a href="http://cayenne.markmail.org/search/+list:org.apache.cayenne.user">http://cayenne.markmail.org/search/+list:org.apache.cayenne.user</a></li>
+<li>Apache Message Archive:
+<a href="http://mail-archives.apache.org/mod_mbox/cayenne-user/">http://mail-archives.apache.org/mod_mbox/cayenne-user/</a></li>
+<li>Gmane Archive: <a href="http://dir.gmane.org/gmane.comp.java.cayenne.user">http://dir.gmane.org/gmane.comp.java.cayenne.user</a></li>
+<li>ObjectStyle.org Archive (legacy, does not store new messages, but has
+very old messages not available elsewhere)  :
+<a href="http://objectstyle.org/cayenne/lists/cayenne-user/">http://objectstyle.org/cayenne/lists/cayenne-user/</a></li>
+</ul>
+<h3 id="developer-mailing-list">Developer Mailing List</h3>
+<p>'dev' is a mailing list where Cayenne design issues are discussed. This
+includes current and future features, release schedules, and simply
+developer discussion of various Cayenne-related topics. It is a good idea
+for all Cayenne committers to subscribe to this list. Others are welcomed to
+subscribe and participate if they are interested in the topics discussed
+here.</p>
+<p>To subscribe send empty email to dev-subscribe@cayenne.apache.org<br />
+To unsubscribe send empty email to dev-unsubscribe@cayenne.apache.org<br />
+To post a message use the following address: dev@cayenne.apache.org</p>
+<ul>
+<li>Markmail Archive:
+<a href="http://cayenne.markmail.org/search/+list:org.apache.cayenne.dev">http://cayenne.markmail.org/search/+list:org.apache.cayenne.dev</a></li>
+<li>Apache Message Archive:
+<a href="http://mail-archives.apache.org/mod_mbox/cayenne-dev/">http://mail-archives.apache.org/mod_mbox/cayenne-dev/</a></li>
+<li>Gmane Archive: <a href="http://dir.gmane.org/gmane.comp.java.cayenne.devel">http://dir.gmane.org/gmane.comp.java.cayenne.devel</a></li>
+<li>ObjectStyle.org Archive (legacy, does not store new messages, but has
+very old messages not available elsewhere) :
+<a href="http://objectstyle.org/cayenne/lists/cayenne-devel/">http://objectstyle.org/cayenne/lists/cayenne-devel/</a></li>
+</ul>
+<h3 id="commits-mailing-list">Commits Mailing List</h3>
+<p>'commits' is a mailing list that receives all of the Cayenne SVN commit
+messages. You can subscribe to this list to keep track of changes to the
+Cayenne SVN repository.</p>
+<p>To subscribe send empty email to commits-subscribe@cayenne.apache.org<br />
+To unsubscribe send empty email to commits-unsubscribe@cayenne.apache.org</p>
+<ul>
+<li>Message Archive:
+<a href="http://mail-archives.apache.org/mod_mbox/cayenne-commits/">http://mail-archives.apache.org/mod_mbox/cayenne-commits/</a></li>
+<li>Markmail Archive:
+<a href="http://cayenne.markmail.org/search/+list:org.apache.cayenne.commits">http://cayenne.markmail.org/search/+list:org.apache.cayenne.commits</a></li>
+</ul>
+       <hr>
+       <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.
+</div>
+</div>
+
+</div></div>
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+try {
+var pageTracker = _gat._getTracker("UA-7036673-1");
+pageTracker._trackPageview();
+} catch(err) {}</script>
+</body>
+</html>

Modified: websites/staging/cayenne/trunk/content/privacy-policy.html
==============================================================================
--- websites/staging/cayenne/trunk/content/privacy-policy.html (original)
+++ websites/staging/cayenne/trunk/content/privacy-policy.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/release-guide-2.0.html
==============================================================================
--- websites/staging/cayenne/trunk/content/release-guide-2.0.html (original)
+++ websites/staging/cayenne/trunk/content/release-guide-2.0.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/release-guide.html
==============================================================================
--- websites/staging/cayenne/trunk/content/release-guide.html (original)
+++ websites/staging/cayenne/trunk/content/release-guide.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/running-unit-tests.html
==============================================================================
--- websites/staging/cayenne/trunk/content/running-unit-tests.html (original)
+++ websites/staging/cayenne/trunk/content/running-unit-tests.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/submit-patch.html
==============================================================================
--- websites/staging/cayenne/trunk/content/submit-patch.html (original)
+++ websites/staging/cayenne/trunk/content/submit-patch.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/success-stories.html
==============================================================================
--- websites/staging/cayenne/trunk/content/success-stories.html (original)
+++ websites/staging/cayenne/trunk/content/success-stories.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>

Modified: websites/staging/cayenne/trunk/content/support.html
==============================================================================
--- websites/staging/cayenne/trunk/content/support.html (original)
+++ websites/staging/cayenne/trunk/content/support.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>
@@ -78,67 +78,21 @@
 
 <hr>
 <div id="content">
-       <h2 id="user-support">User support</h2>
-<h3 id="user-mailing-list">User mailing list</h3>
-<p>This is a general discussion and support list for Cayenne users. It is the
-primary source of free Cayenne support. It is also a place for general
-discussion of Cayenne-related topics.</p>
-<p>To subscribe send empty email to user-subscribe@cayenne.apache.org<br />
-To unsubscribe send empty email to user-unsubscribe@cayenne.apache.org<br />
-To post a message use the following address: user@cayenne.apache.org</p>
-<ul>
-<li>Markmail Archive:
-<a href="http://cayenne.markmail.org/search/+list:org.apache.cayenne.user">http://cayenne.markmail.org/search/+list:org.apache.cayenne.user</a></li>
-<li>Apache Message Archive:
-<a href="http://mail-archives.apache.org/mod_mbox/cayenne-user/">http://mail-archives.apache.org/mod_mbox/cayenne-user/</a></li>
-<li>Gmane Archive: <a href="http://dir.gmane.org/gmane.comp.java.cayenne.user">http://dir.gmane.org/gmane.comp.java.cayenne.user</a></li>
-<li>ObjectStyle.org Archive (legacy, does not store new messages, but has
-very old messages not available elsewhere)  :
-<a href="http://objectstyle.org/cayenne/lists/cayenne-user/">http://objectstyle.org/cayenne/lists/cayenne-user/</a></li>
-</ul>
-<h3 id="knowledgebase">Knowledgebase</h3>
-<p><a href="http://stackoverflow.com/questions/tagged/apache-cayenne">Stackoverflow</a> is place to ask questions and search the existing knowledgebase of answers.</p>
-<h2 id="developer-communications">Developer communications</h2>
-<p>Please where developers of Cayenne itself can be found.</p>
-<h3 id="developer-mailing-list">Developer mailing list</h3>
-<p>dev is a mailing list where Cayenne design issues are discussed. This
-includes current and future features, release schedules, and simply
-developer discussion of various Cayenne-related topics. It is a good idea
-for all Cayenne committers to subscribe to this list. Others are welcomed to
-subscribe and participate if they are interested in the topics discussed
-here.</p>
-<p>To subscribe send empty email to dev-subscribe@cayenne.apache.org<br />
-To unsubscribe send empty email to dev-unsubscribe@cayenne.apache.org<br />
-To post a message use the following address: dev@cayenne.apache.org</p>
+       <h2 id="community-support">Community Support</h2>
 <ul>
-<li>Markmail Archive:
-<a href="http://cayenne.markmail.org/search/+list:org.apache.cayenne.dev">http://cayenne.markmail.org/search/+list:org.apache.cayenne.dev</a></li>
-<li>Apache Message Archive:
-<a href="http://mail-archives.apache.org/mod_mbox/cayenne-dev/">http://mail-archives.apache.org/mod_mbox/cayenne-dev/</a></li>
-<li>Gmane Archive: <a href="http://dir.gmane.org/gmane.comp.java.cayenne.devel">http://dir.gmane.org/gmane.comp.java.cayenne.devel</a></li>
-<li>ObjectStyle.org Archive (legacy, does not store new messages, but has
-very old messages not available elsewhere) :
-<a href="http://objectstyle.org/cayenne/lists/cayenne-devel/">http://objectstyle.org/cayenne/lists/cayenne-devel/</a></li>
+<li><a href="/mailing-lists.html">Cayenne user mailing list</a> is a place to get help from the Cayenne community and discuss general Cayenne topics. Subscription is required to post messages and participate in discussion, and of course you can browse past archives anonymously.</li>
+<li><a href="http://stackoverflow.com/questions/tagged/apache-cayenne">Stackoverflow</a> is another place to ask questions and search the existing knowledgebase of answers.</li>
 </ul>
-<h3 id="commits-mailing-list">Commits mailing list</h3>
-<p>commits is a mailing list that receives all of the Cayenne SVN commit
-messages. You can subscribe to this list to keep track of changes to the
-Cayenne SVN repository.</p>
-<p>To subscribe send empty email to commits-subscribe@cayenne.apache.org<br />
-To unsubscribe send empty email to commits-unsubscribe@cayenne.apache.org</p>
+<h2 id="commercial-support-and-consulting">Commercial Support And Consulting</h2>
 <ul>
-<li>Message Archive:
-<a href="http://mail-archives.apache.org/mod_mbox/cayenne-commits/">http://mail-archives.apache.org/mod_mbox/cayenne-commits/</a></li>
-<li>Markmail Archive:
-<a href="http://cayenne.markmail.org/search/+list:org.apache.cayenne.commits">http://cayenne.markmail.org/search/+list:org.apache.cayenne.commits</a></li>
+<li><a href="http://www.objectstyle.com/cayenne-consulting">ObjectStyle</a>. Cayenne commercial support, consulting services, and training provuded by the company employing its original authors and a number of committers.</li>
 </ul>
-<h2 id="other-resources">Other resources</h2>
+<p><em>If your company also provides commercial services supporting Apache Cayenne, please drop a note to Cayenne PMC (private at cayenne dot apache dot org), we'll review your request add a note to this page.</em></p>
+<h2 id="other-resources">Other Resources</h2>
 <ul>
 <li><a href="https://www.ohloh.net/p/cayenne">Ohloh</a></li>
 <li>Cayenne IRC channel - #cayenne on irc.freenode.net</li>
-<li><a href="http://www.zeesource.net/maps/map.do?group=1128">Community Map</a></li>
-<li>a map of where some of our committers and users are. You can login with
-password "cay" and doubleclick on your location to add your name. ;-)</li>
+<li><a href="http://www.zeesource.net/maps/map.do?group=1128">Community Map</a> - a map of where some of our committers and users are. You can login with password "cay" and doubleclick on your location to add your name. ;-)</li>
 </ul>
        <hr>
        <p id="footer">Copyright &#169; 2001-2012 Apache Software Foundation. Apache Cayenne, Cayenne, Apache, the Apache feather logo, and the Apache Cayenne project logo are trademarks of The Apache Software Foundation. <a href="/privacy-policy.html">Privacy policy</a>.

Modified: websites/staging/cayenne/trunk/content/why-cayenne.html
==============================================================================
--- websites/staging/cayenne/trunk/content/why-cayenne.html (original)
+++ websites/staging/cayenne/trunk/content/why-cayenne.html Sat Nov  3 14:44:10 2012
@@ -28,7 +28,7 @@
 			<li><a href="/why-cayenne.html">Why Cayenne?</a></li>
 			<li><a href="/download.html">Download</a></li>
 			<li><a href="/success-stories.html">Success Stories</a></li>
-			<li><a href="/commercial-support.html">Commercial Support</a></li>
+			<li><a href="/support.html">Support</a></li>
 		</ul>
 	</li>
 	<li><a href="/documentation.html">Documentation</a>
@@ -64,7 +64,7 @@
 	<li><a href="/collaboration.html">Collaboration</a>
 		<ul>
 			<li><a href="http://issues.apache.org/jira/browse/CAY">Bug/Feature Tracker</a></li>
-			<li><a href="/support.html">Support</a></li>
+			<li><a href="/mailing-lists.html">Mailing Lists</a></li>
 			<li><a href="https://cwiki.apache.org/confluence/display/CAY/Index">Wiki</a></li>
 			<li><a href="/code-repository.html">Code Repository</a></li>
 			<li><a href="/developer-guide.html">Developer Guide</a></li>