svn commit: r427420 [5/5] - in /incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs: ./ Documentation/ Documentation/Modeler Guide/ Documentation/Modeler Guide/Cayenne Project Structure/ Documentation/Modeler Guide/Cayenne Projec...

[aa...@apache.org]

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Stored Procedures/Stored Procedures and Transactions/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Stored%20Procedures/Stored%20Procedures%20and%20Transactions/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Stored Procedures/Stored Procedures and Transactions/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Stored Procedures/Stored Procedures and Transactions/index.html Mon Jul 31 20:13:21 2006
@@ -52,7 +52,8 @@
 <li><a href="../../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>There maybe a situations when stored procedures handle their own transactions and an application is configured to use Cayenne-managed transactions. This is obviously conflicting and undesirable behavior. In this case ProcedureQueries should be executed explicitly wrapped in an "external" Transaction. This is one of the few cases when a user should worry about transactions at all. Read more about manual transactions <a href="../../../../Documentation/User Guide/Design/Understanding Transactions/index.html" title="Understanding Transactions">here</a>.</p></div>
+<div id="ConfluenceContent"><p><br/>
+There maybe a situations when stored procedures handle their own transactions and an application is configured to use Cayenne-managed transactions. This is obviously conflicting and undesirable behavior. In this case ProcedureQueries should be executed explicitly wrapped in an "external" Transaction. This is one of the few cases when a user should worry about transactions at all. Read more about manual transactions <a href="../../../../Documentation/User Guide/Design/Understanding Transactions/index.html" title="Understanding Transactions">here</a>.</p></div>
 </div>
   <div class="clearer">.</div>
   <div style="height: 12px; background-image: url('../../../../images/border_bottom.gif'); background-repeat: repeat-x;"></div>

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Stored Procedures/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/Stored%20Procedures/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Stored Procedures/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/Stored Procedures/index.html Mon Jul 31 20:13:21 2006
@@ -50,7 +50,8 @@
 <li><a href="../../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><p>In addition to mapping database tables and views as entities, Cayenne allows mapping and executing database stored procedures. Just like table structure is described by DbEntities, stored procedures are described by Procedure class. Stored procedures are created using CayenneModeler, and are executed using <span class="nobr"><a href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/query/ProcedureQuery.html" title="Visit page outside Confluence" rel="nofollow">ProcedureQuery<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>, as described in the following chapters.</p>
+<div id="ConfluenceContent">
+<p>In addition to mapping database tables and views as entities, Cayenne allows mapping and executing database stored procedures. Just like table structure is described by DbEntities, stored procedures are described by Procedure class. Stored procedures are created using CayenneModeler, and are executed using <span class="nobr"><a href="http://objectstyle.org/cayenne/api/cayenne/org/objectstyle/cayenne/query/ProcedureQuery.html" title="Visit page outside Confluence" rel="nofollow">ProcedureQuery<sup><img class="rendericon" src="../../../images/linkext7.gif" height="7" width="7" align="absmiddle" alt="" border="0"/></sup></a></span>, as described in the following chapters.</p>
 </div>
 </div>
   <div class="clearer">.</div>

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User%20Guide/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/User Guide/index.html Mon Jul 31 20:13:21 2006
@@ -45,7 +45,8 @@
 <li><a href="../../Documentation/User Guide/DataViews/index.html">DataViews</a></li>
 </ul>
 </div>
-<div id="ConfluenceContent"><h3><a name="UserGuide-USERGUIDE"></a>USER GUIDE</h3>
+<div id="ConfluenceContent">
+<h3><a name="UserGuide-USERGUIDE"></a>USER GUIDE</h3>
 <ol>
 	<li><a href="../../Documentation/User Guide/Introduction/index.html" title="Introduction">Introduction</a></li>
 	<li><a href="../../Documentation/User Guide/Installation/index.html" title="Installation">Installation</a></li>

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/Documentation/index.html Mon Jul 31 20:13:21 2006
@@ -27,7 +27,8 @@
     <span class="logoSpaceLink"><a href="../index.html">Cayenne User Documentation</a></span><br />
     <span class="pagetitle">Documentation</span>
   </div>
-<div id="ConfluenceContent"><h2><a name="Documentation-CayenneDocumentation"></a>Cayenne Documentation</h2>
+<div id="ConfluenceContent">
+<h2><a name="Documentation-CayenneDocumentation"></a>Cayenne Documentation</h2>
 
 <ul>
 	<li><a href="../Documentation/User Guide/index.html" title="User Guide">User Guide</a>:  General information on how to get started with Cayenne, main Cayenne concepts, API details and deployment procedures.</li>

Modified: incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/index.html
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/index.html?rev=427420&r1=427419&r2=427420&view=diff
==============================================================================
--- incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/index.html (original)
+++ incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-other/wiki-docs/index.html Mon Jul 31 20:13:21 2006
@@ -36,10 +36,10 @@
 
 <h2>Online Resources:</h2>
 <ul>
-	<li><a href="http://objectstyle.org/cayenne">Cayenne Home</a></li>
-	<li><a href="http://objectstyle.org/cayenne/download.html">Downloads</a></li>
-	<li><a href="http://objectstyle.org/cayenne/bugs-features.html">Report Bugs</a></li>
-	<li><a href="http://objectstyle.org/cayenne/cayenne-commercial-support.html">Commercial Support</a></li>
+	<li><a href="http://incubator.apache.org/cayenne">Cayenne Home</a></li>
+	<li><a href="http://incubator.apache.org/cayenne/download.html">Downloads</a></li>
+	<li><a href="http://incubator.apache.org/cayenne/bugs-features.html">Report Bugs</a></li>
+	<li><a href="http://incubator.apache.org/cayenne/cayenne-commercial-support.html">Commercial Support</a></li>
 </ul>
 </body>
 </html>