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/08 19:01:29 UTC

svn commit: r837685 [9/9] - in /websites/staging/cayenne/trunk/content: ./ 2010/11/29/ 2010/12/02/ 2011/03/08/ 2011/06/21/ 2011/09/26/ 2012/06/12/ doc/ doc/1.2/ doc/1.2/grammar/ doc/2.0/ doc/3.0/ doc/3.1/

Modified: websites/staging/cayenne/trunk/content/doc/3.0/tutorial.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/tutorial.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/tutorial.html Thu Nov  8 18:00:49 2012
@@ -32,13 +32,13 @@
  
 <div id="sidebar">
 <ul id="nav">
-	<li><a href="/doc30/index.html">3.0.x Documentation</a>
+	<li><a href="/doc/3.0/index.html">3.0.x Documentation</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>
+			<li><a href="/doc/3.0/overview.html">Overview</a></li>
+			<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 			<li><a href="/index.html">Back...</a>
 		</ul>
 	</li>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/understanding-transactions.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/understanding-transactions.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/understanding-transactions.html Thu Nov  8 18:00:49 2012
@@ -32,13 +32,13 @@
  
 <div id="sidebar">
 <ul id="nav">
-	<li><a href="/doc30/index.html">3.0.x Documentation</a>
+	<li><a href="/doc/3.0/index.html">3.0.x Documentation</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>
+			<li><a href="/doc/3.0/overview.html">Overview</a></li>
+			<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 			<li><a href="/index.html">Back...</a>
 		</ul>
 	</li>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/upgrade.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/upgrade.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/upgrade.html Thu Nov  8 18:00:49 2012
@@ -32,13 +32,13 @@
  
 <div id="sidebar">
 <ul id="nav">
-	<li><a href="/doc30/index.html">3.0.x Documentation</a>
+	<li><a href="/doc/3.0/index.html">3.0.x Documentation</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>
+			<li><a href="/doc/3.0/overview.html">Overview</a></li>
+			<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 			<li><a href="/index.html">Back...</a>
 		</ul>
 	</li>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/using-jndi.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/using-jndi.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/using-jndi.html Thu Nov  8 18:00:49 2012
@@ -32,13 +32,13 @@
  
 <div id="sidebar">
 <ul id="nav">
-	<li><a href="/doc30/index.html">3.0.x Documentation</a>
+	<li><a href="/doc/3.0/index.html">3.0.x Documentation</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>
+			<li><a href="/doc/3.0/overview.html">Overview</a></li>
+			<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 			<li><a href="/index.html">Back...</a>
 		</ul>
 	</li>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/using-orderings.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/using-orderings.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/using-orderings.html Thu Nov  8 18:00:49 2012
@@ -32,13 +32,13 @@
  
 <div id="sidebar">
 <ul id="nav">
-	<li><a href="/doc30/index.html">3.0.x Documentation</a>
+	<li><a href="/doc/3.0/index.html">3.0.x Documentation</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>
+			<li><a href="/doc/3.0/overview.html">Overview</a></li>
+			<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 			<li><a href="/index.html">Back...</a>
 		</ul>
 	</li>

Modified: websites/staging/cayenne/trunk/content/doc/3.0/web-applications.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.0/web-applications.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.0/web-applications.html Thu Nov  8 18:00:49 2012
@@ -32,13 +32,13 @@
  
 <div id="sidebar">
 <ul id="nav">
-	<li><a href="/doc30/index.html">3.0.x Documentation</a>
+	<li><a href="/doc/3.0/index.html">3.0.x Documentation</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>
+			<li><a href="/doc/3.0/overview.html">Overview</a></li>
+			<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+			<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+			<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+			<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 			<li><a href="/index.html">Back...</a>
 		</ul>
 	</li>

Modified: websites/staging/cayenne/trunk/content/doc/3.1/index.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/3.1/index.html (original)
+++ websites/staging/cayenne/trunk/content/doc/3.1/index.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

Modified: websites/staging/cayenne/trunk/content/doc/index.html
==============================================================================
--- websites/staging/cayenne/trunk/content/doc/index.html (original)
+++ websites/staging/cayenne/trunk/content/doc/index.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

Modified: websites/staging/cayenne/trunk/content/download.html
==============================================================================
--- websites/staging/cayenne/trunk/content/download.html (original)
+++ websites/staging/cayenne/trunk/content/download.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

Modified: websites/staging/cayenne/trunk/content/eclipse.html
==============================================================================
--- websites/staging/cayenne/trunk/content/eclipse.html (original)
+++ websites/staging/cayenne/trunk/content/eclipse.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

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 Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

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 Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

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 Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

Modified: websites/staging/cayenne/trunk/content/index.html
==============================================================================
--- websites/staging/cayenne/trunk/content/index.html (original)
+++ websites/staging/cayenne/trunk/content/index.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

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 Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

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 Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

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 Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

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 Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

Modified: websites/staging/cayenne/trunk/content/mailing-lists.html
==============================================================================
--- websites/staging/cayenne/trunk/content/mailing-lists.html (original)
+++ websites/staging/cayenne/trunk/content/mailing-lists.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

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 Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

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 Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

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 Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

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 Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

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 Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

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 Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

Modified: websites/staging/cayenne/trunk/content/support.html
==============================================================================
--- websites/staging/cayenne/trunk/content/support.html (original)
+++ websites/staging/cayenne/trunk/content/support.html Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>

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 Thu Nov  8 18:00:49 2012
@@ -52,29 +52,29 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/index.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc/3.0/index.html">Version 3.0 (stable)</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>
+					<li><a href="/doc/3.0/overview.html">Overview</a></li>
+					<li><a href="/doc/3.0/cayenne-guide.html">Cayenne Guide</a></li>
+					<li><a href="/doc/3.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/3.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc20/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</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>
+					<li><a href="/doc/2.0/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/2.0/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc12/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</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>
+					<li><a href="/doc/1.2/user-guide.html">User Guide</a></li>
+					<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client Guide</a></li>
+					<li><a href="/doc/1.2/modeler-guide.html">Modeler Guide</a></li>
+					<li><a href="/doc/1.2/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
 		</ul>