Return-Path: 
 <svn-return-5456-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 2914 invoked from network); 18 May 2006 17:53:21 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 18 May 2006 17:53:21 -0000
Received: (qmail 84272 invoked by uid 500); 18 May 2006 17:53:20 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 84232 invoked by uid 500); 18 May 2006 17:53:20 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 84220 invoked by uid 99); 18 May 2006 17:53:20 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 May 2006 10:53:20 -0700
X-ASF-Spam-Status: No, hits=0.6 required=10.0
	tests=NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 May 2006 10:53:19 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 76DC21A9835; Thu, 18 May 2006 10:52:59 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r407597 - in /forrest/trunk/site-author/content/xdocs:
 contrib.xml flyer.xml guidelines.xml howto-dev.xml index.xml site.xml
Date: Thu, 18 May 2006 17:52:57 -0000
To: svn@forrest.apache.org
From: ferdinand@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060518175259.76DC21A9835@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: ferdinand
Date: Thu May 18 10:52:57 2006
New Revision: 407597

URL: http://svn.apache.org/viewvc?rev=407597&view=rev
Log:
Fixing and correcting links after restructuring

Modified:
    forrest/trunk/site-author/content/xdocs/contrib.xml
    forrest/trunk/site-author/content/xdocs/flyer.xml
    forrest/trunk/site-author/content/xdocs/guidelines.xml
    forrest/trunk/site-author/content/xdocs/howto-dev.xml
    forrest/trunk/site-author/content/xdocs/index.xml
    forrest/trunk/site-author/content/xdocs/site.xml

Modified: forrest/trunk/site-author/content/xdocs/contrib.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/contrib.xml?rev=407597&r1=407596&r2=407597&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/contrib.xml (original)
+++ forrest/trunk/site-author/content/xdocs/contrib.xml Thu May 18 10:52:57 2006
@@ -150,7 +150,7 @@
         method is appropriate for a certain situation and how to go about it without
         confusion. This section explains when to use the developer
         <link href="site:mail-lists">mailing list</link> and the
-        <link href="site:forrest-issues">issue tracker</link>. </p>
+          <link href="site:bugs">issue tracker</link>. </p>
       <p> Research your topic thoroughly before beginning to discuss a new
         development issue. Search and browse through the email archives - your issue
         may have been discussed before. Prepare your post clearly and concisely. </p>

Modified: forrest/trunk/site-author/content/xdocs/flyer.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/flyer.xml?rev=407597&r1=407596&r2=407597&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/flyer.xml (original)
+++ forrest/trunk/site-author/content/xdocs/flyer.xml Thu May 18 10:52:57 2006
@@ -49,11 +49,11 @@
     </p>
     <ul>
       <li>Multiple task-specific source XML formats can be used
-       (<a href="site:v0.70//howto">How-To</a>,
-        <a href="site:v0.70//faq"><acronym title="Frequently Asked
+          (<a href="site:write-howto">How-To</a>,
+        <a href="site:faq"><acronym title="Frequently Asked
             Questions">FAQ</acronym></a>,
         <a href="site:v0.70//changes">changelogs</a> and
-        <a href="site:v0.70//todo">todo lists</a> supported natively).
+        <a href="site:todo">todo lists</a> supported natively).
         Source formats include: Apache xdocs xml format, plain html
         documents, some Wiki formats, a subset of DocBook, ...
       </li>

Modified: forrest/trunk/site-author/content/xdocs/guidelines.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/guidelines.xml?rev=407597&r1=407596&r2=407597&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/guidelines.xml (original)
+++ forrest/trunk/site-author/content/xdocs/guidelines.xml Thu May 18 10:52:57 2006
@@ -740,7 +740,7 @@
       </li>
       <li>
         Committers add an entry for each significant contribution to the
-        top-level <link href="site:changes">changes</link> document (site-author/status.xml)
+        top-level <link href="site:v0.70//changes">changes</link> document (site-author/status.xml)
         and detailed entries to the relevant plugin's changes document. This enables linkage
         to the relevant issue and shows the contributor's name. It also shows
         the initials of the committer who did the work to add the patch.

Modified: forrest/trunk/site-author/content/xdocs/howto-dev.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/howto-dev.xml?rev=407597&r1=407596&r2=407597&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/howto-dev.xml (original)
+++ forrest/trunk/site-author/content/xdocs/howto-dev.xml Thu May 18 10:52:57 2006
@@ -108,7 +108,7 @@
         integrated development environments such as Eclipse or IDEA.
       </p>
       <p>
-        Ensure to <a href="site:v0.70//catalog">configure</a> your xml editor to take
+        Ensure to <a href="site:catalog">configure</a> your xml editor to take
         advantage of the local sets of DTDs provided by Forrest. This also explains how
         to use xml validators such as 'xmllint'. If your editor of choice doesn't
         validate XML, then most XML validation issues can be discovered using
@@ -147,7 +147,7 @@
 
       <p>
         To get started, see the
-        <a href="site:v0.80//documentation/developers/build">instructions</a>
+        <a href="site:v0.80//build">instructions</a>
         for obtaining the Apache Forrest sources via SVN.
       </p>
 
@@ -330,11 +330,11 @@
         The Cocoon sitemap is essential for Forrest developers. See some introductions ....
       </p>
       <ul>
-        <li><a href="site:v0.80//developers/sitemap-ref">Forrest sitemap reference</a>.</li>
+        <li><a href="site:v0.80//sitemap-ref">Forrest sitemap reference</a>.</li>
         <li>Introduction to Pipelines in this
-          <a href="site:v0.80//howto/custom-html-source">How-to</a>.</li>
+          <a href="site:v0.80//howto//custom-html-source">How-to</a>.</li>
         <li>About
-          <a href="site:v0.80//developers/project-sitemap">Forrest project sitemaps</a>.</li>
+          <a href="site:v0.80//project-sitemap">Forrest project sitemaps</a>.</li>
         <li><a href="ext:cocoon/concepts">Cocoon concepts</a>.</li>
         <li><a href="ext:cocoon/sitemap">Cocoon sitemap</a>.</li>
         <li><a href="ext:cocoon/protocols">Cocoon protocols</a>, i.e. cocoon:/ and

Modified: forrest/trunk/site-author/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/index.xml?rev=407597&r1=407596&r2=407597&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/index.xml (original)
+++ forrest/trunk/site-author/content/xdocs/index.xml Thu May 18 10:52:57 2006
@@ -99,8 +99,8 @@
       </p>
       <ul>
         <li>Multiple task-specific source XML formats can be used
-         (<link href="site:v0.70//howto">How-To</link>,
-          <link href="site:v0.70//documentation/faq"><acronym title="Frequently Asked
+            (<link href="site:write-howto">How-To</link>,
+          <link href="site:v0.70//faq"><acronym title="Frequently Asked
               Questions">FAQ</acronym></link>,
           <link href="site:v0.70//changes">changelogs</link> and
           <link href="site:v0.70//todo">todo lists</link> supported natively).

Modified: forrest/trunk/site-author/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/site.xml?rev=407597&r1=407596&r2=407597&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/site.xml (original)
+++ forrest/trunk/site-author/content/xdocs/site.xml Thu May 18 10:52:57 2006
@@ -209,6 +209,8 @@
     <xxe label="XXE-Editor" href="xxe.html"/>
   </tools>
 
+    
+    
   <!-- Versioned Documentation
        
        The surrounding version number element allows linking to a specific
@@ -223,9 +225,14 @@
        
        -->
   
+    
+      
     <v0.80>
       <documentation label="0.80-dev" tab="v0_80" href="docs_0_80/">
         <index label="Overview" href="index.html"/>
+          <!-- Needed to avoid moving files -->
+          <catalog href="catalog.html"/>
+          <project-sitemap href="project-sitemap.html"/>
         <!-- Insert all instructional documentation here -->
         <howto label="How-To" href="howto/">
             <overview label="Overview" href="index.html"/>
@@ -257,12 +264,12 @@
                 <pdf-tab label="Create tab PDF" href="howto-pdf-tab.html" 
                     description="Generate one pdf-document for all pages of a tab"/>
                 <custom-html-source label="Custom html source" href="howto-custom-html-source.html"/>
-                <project-sitemap label="Project sitemap" href="project-sitemap.html"/>
+                <project-sitemapRef label="Project sitemap" href="site:project-sitemap"/>
             </ForrestAdapt>
                 
-            <ForrestIntegrate label="Intergrate Forrest with tools">
+            <ForrestIntegrate label="Integrate Forrest with tools">
                 <maven label="Maven Integration" href="howto-forrest-from-maven.html"/>
-                <catalog label="Using DTD Catalogs" href="catalog.html"/>   
+                <catalogRef1 label="Using DTD Catalogs" href="site:catalog"/>   
             </ForrestIntegrate>
             
             <ForrestExtend label="Extend Forrest" description="Extend Forrest with new functionalities">