Return-Path: 
 <commits-return-12205-apmail-cayenne-commits-archive=cayenne.apache.org@cayenne.apache.org>
X-Original-To: apmail-cayenne-commits-archive@www.apache.org
Delivered-To: apmail-cayenne-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id EA4ABD451
	for <apmail-cayenne-commits-archive@www.apache.org>;
 Thu,  8 Nov 2012 17:53:11 +0000 (UTC)
Received: (qmail 11842 invoked by uid 500); 8 Nov 2012 17:53:11 -0000
Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org
Received: (qmail 11814 invoked by uid 500); 8 Nov 2012 17:53:11 -0000
Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cayenne.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cayenne.apache.org>
List-Post: <mailto:commits@cayenne.apache.org>
List-Id: <commits.cayenne.apache.org>
Reply-To: dev@cayenne.apache.org
Delivered-To: mailing list commits@cayenne.apache.org
Received: (qmail 11807 invoked by uid 99); 8 Nov 2012 17:53:11 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Nov 2012 17:53:11 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Nov 2012 17:53:09 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id E464F2388A6E
	for <commits@cayenne.apache.org>; Thu,  8 Nov 2012 17:52:47 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1407185 - in /cayenne/site/cms/trunk: content/.htaccess
 content/doc/3.0/documentation.html content/doc/3.0/index.html
 templates/legacy_menu30.html templates/menu.html
Date: Thu, 08 Nov 2012 17:52:47 -0000
To: commits@cayenne.apache.org
From: aadamchik@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121108175247.E464F2388A6E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: aadamchik
Date: Thu Nov  8 17:52:47 2012
New Revision: 1407185

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

Removed:
    cayenne/site/cms/trunk/content/doc/3.0/documentation.html
Modified:
    cayenne/site/cms/trunk/content/.htaccess
    cayenne/site/cms/trunk/content/doc/3.0/index.html
    cayenne/site/cms/trunk/templates/legacy_menu30.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=1407185&r1=1407184&r2=1407185&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/.htaccess (original)
+++ cayenne/site/cms/trunk/content/.htaccess Thu Nov  8 17:52:47 2012
@@ -2,6 +2,7 @@
 # Individual deleted/renamed pages
 Redirect permanent /commercial-support.html /support.html
 Redirect permanent /documentation.html /doc/index.html
+Redirect permanent /doc30/documentation.html /doc/3.0/index.html
 
 # Remaping legacy doc folders
 Redirect permanent /doc12/ /doc/1.2/

Modified: cayenne/site/cms/trunk/content/doc/3.0/index.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/content/doc/3.0/index.html?rev=1407185&r1=1407184&r2=1407185&view=diff
==============================================================================
--- cayenne/site/cms/trunk/content/doc/3.0/index.html (original)
+++ cayenne/site/cms/trunk/content/doc/3.0/index.html Thu Nov  8 17:52:47 2012
@@ -1,3 +1,22 @@
-Title: 3.0 &raquo; Index
+Title: 3.0 &raquo; Documentation
+
+	<H2>Cayenne Documentation - v. 3.0</H2>
+
+<P>Cayenne documentation consists of the following &quot;books&quot;:</P>
+
+<UL>
+	<LI><A href="overview.html" title="Overview">Overview</A>: Flavors of Cayenne; what's new in the latest version.</LI>
+	<LI><A href="cayenne-guide.html" title="Cayenne Guide">Cayenne Guide</A>: Writing applications based on Cayenne persistence API. Includes &quot;getting started&quot; tutorials, main concepts, API details and deployment procedures.</LI>
+	<LI><A href="remote-object-persistence-guide.html" title="Remote Object Persistence Guide">Remote Object Persistence Guide</A>: Writing distributed Cayenne client applications.</LI>
+	<LI><A href="modeler-guide.html" title="Modeler Guide">Modeler Guide</A>: A guide to object-relational mapping (ORM) with CayenneModeler GUI tool.</LI>
+</UL>
+
+
+<H2>External Documentation</H2>
+
+<P>This section lists documentation and reference materials that are maintained outside of Cayenne project.</P>
+
+<UL>
+	<LI><A href="http://sourceforge.net/projects/tapcaycrud" class="external-link" rel="nofollow">TapCayCrud</A> - a Tapestry/Cayenne/Maven2 tutorial.</LI>
+</UL>
 
-	<P><B><A href="documentation.html" title="Documentation">Apache Cayenne Documentation - v3.0</A></B></P>

Modified: cayenne/site/cms/trunk/templates/legacy_menu30.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/templates/legacy_menu30.html?rev=1407185&r1=1407184&r2=1407185&view=diff
==============================================================================
--- cayenne/site/cms/trunk/templates/legacy_menu30.html (original)
+++ cayenne/site/cms/trunk/templates/legacy_menu30.html Thu Nov  8 17:52:47 2012
@@ -1,7 +1,7 @@
 
 <div id="sidebar">
 <ul id="nav">
-	<li><a href="/doc30/documentation.html">3.0.x Documentation</a>
+	<li><a href="/doc30/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>

Modified: cayenne/site/cms/trunk/templates/menu.html
URL: http://svn.apache.org/viewvc/cayenne/site/cms/trunk/templates/menu.html?rev=1407185&r1=1407184&r2=1407185&view=diff
==============================================================================
--- cayenne/site/cms/trunk/templates/menu.html (original)
+++ cayenne/site/cms/trunk/templates/menu.html Thu Nov  8 17:52:47 2012
@@ -21,7 +21,7 @@
 					<li><a href="/doc/3.1/api/index.html">JavaDoc</a></li>
 				</ul>
 			</li>
-			<li class="trigger"><a href="/doc30/documentation.html">Version 3.0 (stable)</a>
+			<li class="trigger"><a href="/doc30/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>