Return-Path: 
 <commits-return-7709-apmail-archiva-commits-archive=archiva.apache.org@archiva.apache.org>
X-Original-To: apmail-archiva-commits-archive@www.apache.org
Delivered-To: apmail-archiva-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 0B3C39663
	for <apmail-archiva-commits-archive@www.apache.org>;
 Mon, 10 Sep 2012 10:31:00 +0000 (UTC)
Received: (qmail 47669 invoked by uid 500); 10 Sep 2012 10:30:59 -0000
Delivered-To: apmail-archiva-commits-archive@archiva.apache.org
Received: (qmail 47634 invoked by uid 500); 10 Sep 2012 10:30:59 -0000
Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@archiva.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@archiva.apache.org>
List-Post: <mailto:commits@archiva.apache.org>
List-Id: <commits.archiva.apache.org>
Reply-To: dev@archiva.apache.org
Delivered-To: mailing list commits@archiva.apache.org
Received: (qmail 47609 invoked by uid 99); 10 Sep 2012 10:30:58 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Sep 2012 10:30:58 +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; Mon, 10 Sep 2012 10:30:56 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 4198F23888EA
	for <commits@archiva.apache.org>; Mon, 10 Sep 2012 10:30:12 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1382742 - in /archiva/site/src/site/xdoc:
 features.xml.vm
 index.xml.vm
Date: Mon, 10 Sep 2012 10:30:12 -0000
To: commits@archiva.apache.org
From: olamy@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120910103012.4198F23888EA@eris.apache.org>

Author: olamy
Date: Mon Sep 10 10:30:11 2012
New Revision: 1382742

URL: http://svn.apache.org/viewvc?rev=1382742&view=rev
Log:
link to features from archiva-docs page no need to maintain 2 pages

Removed:
    archiva/site/src/site/xdoc/features.xml.vm
Modified:
    archiva/site/src/site/xdoc/index.xml.vm

Modified: archiva/site/src/site/xdoc/index.xml.vm
URL: http://svn.apache.org/viewvc/archiva/site/src/site/xdoc/index.xml.vm?rev=1382742&r1=1382741&r2=1382742&view=diff
==============================================================================
--- archiva/site/src/site/xdoc/index.xml.vm (original)
+++ archiva/site/src/site/xdoc/index.xml.vm Mon Sep 10 10:30:11 2012
@@ -45,28 +45,28 @@
               <img alt="" src="http://archiva.apache.org/docs/${newUiDocVersion}/images/tour/project-info.png"/>
               <div class="carousel-caption">
                 <p>Informative display for artifacts stored in the repository.</p>
-                <p><a href="features.html">View all.</a></p>
+                <p><a href="http://archiva.apache.org/docs/${newUiDocVersion}/tour/index.html">View all.</a></p>
               </div>
             </div>
             <div class="item">
               <img alt="" src="http://archiva.apache.org/docs/${newUiDocVersion}/images/tour/search-form.png"/>
               <div class="carousel-caption">
                 <p>User-friendly browsing interface, and powerful search functionalities.</p>
-                <p><a href="features.html">View all.</a></p>
+                <p><a href="http://archiva.apache.org/docs/${newUiDocVersion}/tour/index.html">View all.</a></p>
               </div>
             </div>
             <div class="item">
               <img alt="" src="http://archiva.apache.org/docs/${newUiDocVersion}/images/tour/search-results.png"/>
               <div class="carousel-caption">
                 <p>Filterable search results.</p>
-                <p><a href="features.html">View all.</a></p>
+                <p><a href="http://archiva.apache.org/docs/${newUiDocVersion}/tour/index.html">View all.</a></p>
               </div>
             </div>
             <div class="item">
               <img alt="" src="http://archiva.apache.org/docs/${newUiDocVersion}/images/tour/browse.png"/>
               <div class="carousel-caption">
                 <p>Browse interface.</p>
-                <p><a href="features.html">View all.</a></p>
+                <p><a href="http://archiva.apache.org/docs/${newUiDocVersion}/tour/index.html">View all.</a></p>
               </div>
             </div>
 
@@ -75,21 +75,21 @@
               <img alt="" src="http://archiva.apache.org/docs/${newUiDocVersion}/images/tour/remote-proxy-cache.png"/>
               <div class="carousel-caption">
                 <p>drag&#38;drop remote proxies ordering.</p>
-                <p><a href="features.html">View all.</a></p>
+                <p><a href="http://archiva.apache.org/docs/${newUiDocVersion}/tour/index.html">View all.</a></p>
               </div>
             </div>
             <div class="item">
               <img alt="" src="http://archiva.apache.org/docs/${newUiDocVersion}/images/tour/upload-files.png"/>
               <div class="carousel-caption">
                 <p>drag&#38;drop upload artifacts via UI.</p>
-                <p><a href="features.html">View all.</a></p>
+                <p><a href="http://archiva.apache.org/docs/${newUiDocVersion}/tour/index.html">View all.</a></p>
               </div>
             </div>
             <div class="item">
               <img alt="" src="http://archiva.apache.org/docs/${newUiDocVersion}/images/tour/graphical-admin.png"/>
               <div class="carousel-caption">
                 <p>Comprehensive web-based administration interface.</p>
-                <p><a href="features.html">View all.</a></p>
+                <p><a href="http://archiva.apache.org/docs/${newUiDocVersion}/tour/index.html">View all.</a></p>
               </div>
             </div>