You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2013/02/18 15:53:26 UTC

svn commit: r1447289 [2/2] - in /cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge: ./ class-use/

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropColumnToModel.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropColumnToModel.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropColumnToModel.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropColumnToModel.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Class org.apache.cayenne.merge.DropColumnToModel (Cayenne Documentation 3.1B1 API)
+Uses of Class org.apache.cayenne.merge.DropColumnToModel (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Class org.apache.cayenne.merge.D
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.cayenne.merge.DropColumnToModel (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Class org.apache.cayenne.merge.DropColumnToModel (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -140,6 +140,6 @@ No usage of org.apache.cayenne.merge.Dro
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropRelationshipToDb.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropRelationshipToDb.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropRelationshipToDb.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropRelationshipToDb.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Class org.apache.cayenne.merge.DropRelationshipToDb (Cayenne Documentation 3.1B1 API)
+Uses of Class org.apache.cayenne.merge.DropRelationshipToDb (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Class org.apache.cayenne.merge.D
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.cayenne.merge.DropRelationshipToDb (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Class org.apache.cayenne.merge.DropRelationshipToDb (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -140,6 +140,6 @@ No usage of org.apache.cayenne.merge.Dro
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropRelationshipToModel.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropRelationshipToModel.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropRelationshipToModel.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropRelationshipToModel.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Class org.apache.cayenne.merge.DropRelationshipToModel (Cayenne Documentation 3.1B1 API)
+Uses of Class org.apache.cayenne.merge.DropRelationshipToModel (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Class org.apache.cayenne.merge.D
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.cayenne.merge.DropRelationshipToModel (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Class org.apache.cayenne.merge.DropRelationshipToModel (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -140,6 +140,6 @@ No usage of org.apache.cayenne.merge.Dro
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropTableToDb.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropTableToDb.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropTableToDb.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropTableToDb.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Class org.apache.cayenne.merge.DropTableToDb (Cayenne Documentation 3.1B1 API)
+Uses of Class org.apache.cayenne.merge.DropTableToDb (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Class org.apache.cayenne.merge.D
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.cayenne.merge.DropTableToDb (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Class org.apache.cayenne.merge.DropTableToDb (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -140,6 +140,6 @@ No usage of org.apache.cayenne.merge.Dro
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropTableToModel.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropTableToModel.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropTableToModel.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/DropTableToModel.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Class org.apache.cayenne.merge.DropTableToModel (Cayenne Documentation 3.1B1 API)
+Uses of Class org.apache.cayenne.merge.DropTableToModel (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Class org.apache.cayenne.merge.D
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.cayenne.merge.DropTableToModel (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Class org.apache.cayenne.merge.DropTableToModel (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -140,6 +140,6 @@ No usage of org.apache.cayenne.merge.Dro
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/ExecutingMergerContext.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/ExecutingMergerContext.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/ExecutingMergerContext.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/ExecutingMergerContext.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Class org.apache.cayenne.merge.ExecutingMergerContext (Cayenne Documentation 3.1B1 API)
+Uses of Class org.apache.cayenne.merge.ExecutingMergerContext (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Class org.apache.cayenne.merge.E
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.cayenne.merge.ExecutingMergerContext (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Class org.apache.cayenne.merge.ExecutingMergerContext (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -140,6 +140,6 @@ No usage of org.apache.cayenne.merge.Exe
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/MergeDirection.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/MergeDirection.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/MergeDirection.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/MergeDirection.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Class org.apache.cayenne.merge.MergeDirection (Cayenne Documentation 3.1B1 API)
+Uses of Class org.apache.cayenne.merge.MergeDirection (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Class org.apache.cayenne.merge.M
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.cayenne.merge.MergeDirection (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Class org.apache.cayenne.merge.MergeDirection (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -217,6 +217,6 @@ the order they are declared.</TD>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/MergerContext.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/MergerContext.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/MergerContext.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/MergerContext.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Interface org.apache.cayenne.merge.MergerContext (Cayenne Documentation 3.1B1 API)
+Uses of Interface org.apache.cayenne.merge.MergerContext (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Interface org.apache.cayenne.mer
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Interface org.apache.cayenne.merge.MergerContext (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Interface org.apache.cayenne.merge.MergerContext (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -326,6 +326,6 @@ Uses of <A HREF="../../../../../org/apac
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/MergerFactory.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/MergerFactory.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/MergerFactory.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/MergerFactory.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Class org.apache.cayenne.merge.MergerFactory (Cayenne Documentation 3.1B1 API)
+Uses of Class org.apache.cayenne.merge.MergerFactory (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Class org.apache.cayenne.merge.M
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.cayenne.merge.MergerFactory (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Class org.apache.cayenne.merge.MergerFactory (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -884,6 +884,6 @@ Uses of <A HREF="../../../../../org/apac
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/MergerToken.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/MergerToken.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/MergerToken.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/MergerToken.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Interface org.apache.cayenne.merge.MergerToken (Cayenne Documentation 3.1B1 API)
+Uses of Interface org.apache.cayenne.merge.MergerToken (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Interface org.apache.cayenne.mer
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Interface org.apache.cayenne.merge.MergerToken (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Interface org.apache.cayenne.merge.MergerToken (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -1383,6 +1383,6 @@ Uses of <A HREF="../../../../../org/apac
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/ModelMergeDelegate.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/ModelMergeDelegate.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/ModelMergeDelegate.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/ModelMergeDelegate.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Interface org.apache.cayenne.merge.ModelMergeDelegate (Cayenne Documentation 3.1B1 API)
+Uses of Interface org.apache.cayenne.merge.ModelMergeDelegate (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Interface org.apache.cayenne.mer
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Interface org.apache.cayenne.merge.ModelMergeDelegate (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Interface org.apache.cayenne.merge.ModelMergeDelegate (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -201,6 +201,6 @@ Uses of <A HREF="../../../../../org/apac
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetAllowNullToDb.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetAllowNullToDb.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetAllowNullToDb.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetAllowNullToDb.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Class org.apache.cayenne.merge.SetAllowNullToDb (Cayenne Documentation 3.1B1 API)
+Uses of Class org.apache.cayenne.merge.SetAllowNullToDb (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Class org.apache.cayenne.merge.S
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.cayenne.merge.SetAllowNullToDb (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Class org.apache.cayenne.merge.SetAllowNullToDb (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -140,6 +140,6 @@ No usage of org.apache.cayenne.merge.Set
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetAllowNullToModel.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetAllowNullToModel.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetAllowNullToModel.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetAllowNullToModel.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Class org.apache.cayenne.merge.SetAllowNullToModel (Cayenne Documentation 3.1B1 API)
+Uses of Class org.apache.cayenne.merge.SetAllowNullToModel (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Class org.apache.cayenne.merge.S
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.cayenne.merge.SetAllowNullToModel (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Class org.apache.cayenne.merge.SetAllowNullToModel (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -140,6 +140,6 @@ No usage of org.apache.cayenne.merge.Set
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetColumnTypeToDb.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetColumnTypeToDb.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetColumnTypeToDb.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetColumnTypeToDb.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Class org.apache.cayenne.merge.SetColumnTypeToDb (Cayenne Documentation 3.1B1 API)
+Uses of Class org.apache.cayenne.merge.SetColumnTypeToDb (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Class org.apache.cayenne.merge.S
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.cayenne.merge.SetColumnTypeToDb (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Class org.apache.cayenne.merge.SetColumnTypeToDb (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -140,6 +140,6 @@ No usage of org.apache.cayenne.merge.Set
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetColumnTypeToModel.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetColumnTypeToModel.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetColumnTypeToModel.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetColumnTypeToModel.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Class org.apache.cayenne.merge.SetColumnTypeToModel (Cayenne Documentation 3.1B1 API)
+Uses of Class org.apache.cayenne.merge.SetColumnTypeToModel (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Class org.apache.cayenne.merge.S
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.cayenne.merge.SetColumnTypeToModel (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Class org.apache.cayenne.merge.SetColumnTypeToModel (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -140,6 +140,6 @@ No usage of org.apache.cayenne.merge.Set
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetNotNullToDb.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetNotNullToDb.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetNotNullToDb.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetNotNullToDb.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Class org.apache.cayenne.merge.SetNotNullToDb (Cayenne Documentation 3.1B1 API)
+Uses of Class org.apache.cayenne.merge.SetNotNullToDb (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Class org.apache.cayenne.merge.S
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.cayenne.merge.SetNotNullToDb (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Class org.apache.cayenne.merge.SetNotNullToDb (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -140,6 +140,6 @@ No usage of org.apache.cayenne.merge.Set
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetNotNullToModel.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetNotNullToModel.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetNotNullToModel.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetNotNullToModel.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Class org.apache.cayenne.merge.SetNotNullToModel (Cayenne Documentation 3.1B1 API)
+Uses of Class org.apache.cayenne.merge.SetNotNullToModel (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Class org.apache.cayenne.merge.S
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.cayenne.merge.SetNotNullToModel (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Class org.apache.cayenne.merge.SetNotNullToModel (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -140,6 +140,6 @@ No usage of org.apache.cayenne.merge.Set
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetPrimaryKeyToDb.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetPrimaryKeyToDb.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetPrimaryKeyToDb.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetPrimaryKeyToDb.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Class org.apache.cayenne.merge.SetPrimaryKeyToDb (Cayenne Documentation 3.1B1 API)
+Uses of Class org.apache.cayenne.merge.SetPrimaryKeyToDb (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Class org.apache.cayenne.merge.S
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.cayenne.merge.SetPrimaryKeyToDb (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Class org.apache.cayenne.merge.SetPrimaryKeyToDb (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -140,6 +140,6 @@ No usage of org.apache.cayenne.merge.Set
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetPrimaryKeyToModel.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetPrimaryKeyToModel.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetPrimaryKeyToModel.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetPrimaryKeyToModel.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Class org.apache.cayenne.merge.SetPrimaryKeyToModel (Cayenne Documentation 3.1B1 API)
+Uses of Class org.apache.cayenne.merge.SetPrimaryKeyToModel (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Class org.apache.cayenne.merge.S
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.cayenne.merge.SetPrimaryKeyToModel (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Class org.apache.cayenne.merge.SetPrimaryKeyToModel (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -140,6 +140,6 @@ No usage of org.apache.cayenne.merge.Set
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetValueForNullToDb.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetValueForNullToDb.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetValueForNullToDb.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/SetValueForNullToDb.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Class org.apache.cayenne.merge.SetValueForNullToDb (Cayenne Documentation 3.1B1 API)
+Uses of Class org.apache.cayenne.merge.SetValueForNullToDb (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Class org.apache.cayenne.merge.S
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.cayenne.merge.SetValueForNullToDb (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Class org.apache.cayenne.merge.SetValueForNullToDb (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -140,6 +140,6 @@ No usage of org.apache.cayenne.merge.Set
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/ValueForNullProvider.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/ValueForNullProvider.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/ValueForNullProvider.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/class-use/ValueForNullProvider.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Interface org.apache.cayenne.merge.ValueForNullProvider (Cayenne Documentation 3.1B1 API)
+Uses of Interface org.apache.cayenne.merge.ValueForNullProvider (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Interface org.apache.cayenne.mer
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Interface org.apache.cayenne.merge.ValueForNullProvider (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Interface org.apache.cayenne.merge.ValueForNullProvider (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -219,6 +219,6 @@ Uses of <A HREF="../../../../../org/apac
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/package-frame.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/package-frame.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/package-frame.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/package-frame.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:42 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:25 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-org.apache.cayenne.merge (Cayenne Documentation 3.1B1 API)
+org.apache.cayenne.merge (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
 

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/package-summary.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/package-summary.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/package-summary.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/package-summary.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:42 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:25 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-org.apache.cayenne.merge (Cayenne Documentation 3.1B1 API)
+org.apache.cayenne.merge (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ org.apache.cayenne.merge (Cayenne Docume
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="org.apache.cayenne.merge (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="org.apache.cayenne.merge (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -306,6 +306,6 @@ Package org.apache.cayenne.merge
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/package-tree.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/package-tree.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/package-tree.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/package-tree.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:42 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:25 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-org.apache.cayenne.merge Class Hierarchy (Cayenne Documentation 3.1B1 API)
+org.apache.cayenne.merge Class Hierarchy (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ org.apache.cayenne.merge Class Hierarchy
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="org.apache.cayenne.merge Class Hierarchy (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="org.apache.cayenne.merge Class Hierarchy (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -172,6 +172,6 @@ Enum Hierarchy
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>

Modified: cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/package-use.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/package-use.html?rev=1447289&r1=1447288&r2=1447289&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/package-use.html (original)
+++ cayenne/site/cms/trunk/content/docs/3.1/api/org/apache/cayenne/merge/package-use.html Mon Feb 18 14:53:25 2013
@@ -2,13 +2,13 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_31) on Mon May 28 16:26:44 EDT 2012 -->
+<!-- Generated by javadoc (build 1.6.0_37) on Mon Feb 18 13:24:26 WET 2013 -->
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
-Uses of Package org.apache.cayenne.merge (Cayenne Documentation 3.1B1 API)
+Uses of Package org.apache.cayenne.merge (Cayenne Documentation 3.1B2 API)
 </TITLE>
 
-<META NAME="date" CONTENT="2012-05-28">
+<META NAME="date" CONTENT="2013-02-18">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
 
@@ -16,7 +16,7 @@ Uses of Package org.apache.cayenne.merge
 function windowTitle()
 {
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Package org.apache.cayenne.merge (Cayenne Documentation 3.1B1 API)";
+        parent.document.title="Uses of Package org.apache.cayenne.merge (Cayenne Documentation 3.1B2 API)";
     }
 }
 </SCRIPT>
@@ -532,6 +532,6 @@ Classes in <A HREF="../../../../org/apac
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
 <HR>
-Copyright &#169; 2001-2012 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
+Copyright &#169; 2001-2013 <a href="http://cayenne.apache.org/">Apache Cayenne</a>. All Rights Reserved.
 </BODY>
 </HTML>