cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1407192 - in /cayenne/site/cms/trunk: content/ content/doc/1.2/ content/doc/2.0/ templates/
Date Thu, 08 Nov 2012 18:04:50 GMT
Author: aadamchik
Date: Thu Nov  8 18:04:50 2012
New Revision: 1407192

URL: http://svn.apache.org/viewvc?rev=1407192&view=rev
Log:
merging documentation and index in 3.0 ... both are the same

Removed:
    cayenne/site/cms/trunk/content/doc/1.2/documentation.html
    cayenne/site/cms/trunk/content/doc/2.0/documentation.html
Modified:
    cayenne/site/cms/trunk/content/.htaccess
    cayenne/site/cms/trunk/content/doc/1.2/index.html
    cayenne/site/cms/trunk/content/doc/2.0/index.html
    cayenne/site/cms/trunk/templates/legacy_menu12.html
    cayenne/site/cms/trunk/templates/legacy_menu20.html
    cayenne/site/cms/trunk/templates/menu.html

Modified: cayenne/site/cms/trunk/content/.htaccess
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/.htaccess?rev=1407192&r1=1407191&r2=1407192&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/.htaccess (original)
+++ cayenne/site/cms/trunk/content/.htaccess Thu Nov  8 18:04:50 2012
@@ -2,6 +2,8 @@
 # Individual deleted/renamed pages
 Redirect permanent /commercial-support.html /support.html
 Redirect permanent /documentation.html /doc/index.html
+Redirect permanent /doc12/documentation.html /doc/1.2/index.html
+Redirect permanent /doc20/documentation.html /doc/2.0/index.html
 Redirect permanent /doc30/documentation.html /doc/3.0/index.html
 
 # Remaping legacy doc folders

Modified: cayenne/site/cms/trunk/content/doc/1.2/index.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc/1.2/index.html?rev=1407192&r1=1407191&r2=1407192&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc/1.2/index.html (original)
+++ cayenne/site/cms/trunk/content/doc/1.2/index.html Thu Nov  8 18:04:50 2012
@@ -1,3 +1,10 @@
-Title: 1.2 » Index
+Title: 1.2 » Documentation
+
+	<H2>Cayenne Documentation - v. 1.2</H2>
+
+<UL>
+	<LI><A href="user-guide.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>
+	<LI><A href="modeler-guide.html" title="Modeler Guide">Modeler Guide</A>:
Object-relational mapping with CayenneModeler GUI tool.</LI>
+	<LI><A href="remote-object-persistence-guide.html" title="Remote Object Persistence
Guide">Remote Object Persistence Guide</A>: Writing distributed Java applications
with Cayenne remote object persistence mechanism.</LI>
+</UL>
 
-	<P><B><A href="documentation.html" title="Documentation">Apache Cayenne
Documentation v1.2</A></B></P>

Modified: cayenne/site/cms/trunk/content/doc/2.0/index.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc/2.0/index.html?rev=1407192&r1=1407191&r2=1407192&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc/2.0/index.html (original)
+++ cayenne/site/cms/trunk/content/doc/2.0/index.html Thu Nov  8 18:04:50 2012
@@ -1,3 +1,10 @@
-Title: 2.0 &raquo; Index
+Title: 2.0 &raquo; Documentation
+
+	<H2>Cayenne Documentation - v. 2.0 (STABLE)</H2>
+
+<UL>
+	<LI><A href="user-guide.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>
+	<LI><A href="modeler-guide.html" title="Modeler Guide">Modeler Guide</A>:
Object-relational mapping with CayenneModeler GUI tool.</LI>
+	<LI><A href="remote-object-persistence-guide.html" title="Remote Object Persistence
Guide">Remote Object Persistence Guide</A>: Writing distributed Java applications
with Cayenne remote object persistence mechanism.</LI>
+</UL>
 
-	<P><B><A href="documentation.html" title="Documentation">Apache Cayenne
Documentation, development release - v2.0</A></B></P>

Modified: cayenne/site/cms/trunk/templates/legacy_menu12.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/templates/legacy_menu12.html?rev=1407192&r1=1407191&r2=1407192&view=diff
==============================================================================
--- cayenne/site/cms/trunk/templates/legacy_menu12.html (original)
+++ cayenne/site/cms/trunk/templates/legacy_menu12.html Thu Nov  8 18:04:50 2012
@@ -1,7 +1,7 @@
 
 <div id="sidebar">
 <ul id="nav">
-	<li><a href="/doc/1.2/documentation.html">1.2.x Documentation</a>
+	<li><a href="/doc/1.2/index.html">1.2.x Documentation</a>
 		<ul>
 			<li><a href="/doc/1.2/user-guide.html">Cayenne Guide</a></li>
 			<li><a href="/doc/1.2/remote-object-persistence-guide.html">Remote Client
Guide</a></li>

Modified: cayenne/site/cms/trunk/templates/legacy_menu20.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/templates/legacy_menu20.html?rev=1407192&r1=1407191&r2=1407192&view=diff
==============================================================================
--- cayenne/site/cms/trunk/templates/legacy_menu20.html (original)
+++ cayenne/site/cms/trunk/templates/legacy_menu20.html Thu Nov  8 18:04:50 2012
@@ -1,7 +1,7 @@
 
 <div id="sidebar">
 <ul id="nav">
-	<li><a href="/doc/2.0/documentation.html">2.0.x Documentation</a>
+	<li><a href="/doc/2.0/index.html">2.0.x Documentation</a>
 		<ul>
 			<li><a href="/doc/2.0/user-guide.html">Cayenne Guide</a></li>
 			<li><a href="/doc/2.0/remote-object-persistence-guide.html">Remote Client
Guide</a></li>

Modified: cayenne/site/cms/trunk/templates/menu.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/templates/menu.html?rev=1407192&r1=1407191&r2=1407192&view=diff
==============================================================================
--- cayenne/site/cms/trunk/templates/menu.html (original)
+++ cayenne/site/cms/trunk/templates/menu.html Thu Nov  8 18:04:50 2012
@@ -30,7 +30,7 @@
 					<li><a href="/doc/3.0/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc/2.0/documentation.html">Version 2.0 (legacy)</a>
+			<li class="trigger"><a href="/doc/2.0/index.html">Version 2.0 (legacy)</a>
 				<ul>
 					<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>
@@ -38,7 +38,7 @@
 					<li><a href="/doc/2.0/api/cayenne/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc/1.2/documentation.html">Version 1.2 (legacy)</a>
+			<li class="trigger"><a href="/doc/1.2/index.html">Version 1.2 (legacy)</a>
 				<ul>
 					<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>



Mime
View raw message