You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by fe...@apache.org on 2005/06/12 19:22:15 UTC

svn commit: r190303 - in /forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60: catalog.xml document-v13.xml document-v20.xml faq.xml howto/howto-howto.xml howto/howto-pdf-tab.xml howto/index.xml howto/multi/step3.xml linking.xml project-sitemap.xml sitemap-ref.xml upgrading_06.xml validation.xml your-project.xml

Author: ferdinand
Date: Sun Jun 12 10:22:14 2005
New Revision: 190303

URL: http://svn.apache.org/viewcvs?rev=190303&view=rev
Log:
version-localized 0.6 site-links

Modified:
    forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/catalog.xml
    forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/document-v13.xml
    forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/document-v20.xml
    forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/faq.xml
    forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/howto-howto.xml
    forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/howto-pdf-tab.xml
    forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/index.xml
    forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/multi/step3.xml
    forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/linking.xml
    forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/project-sitemap.xml
    forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/sitemap-ref.xml
    forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/upgrading_06.xml
    forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/validation.xml
    forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/your-project.xml

Modified: forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/catalog.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/catalog.xml?rev=190303&r1=190302&r2=190303&view=diff
==============================================================================
--- forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/catalog.xml (original)
+++ forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/catalog.xml Sun Jun 12 10:22:14 2005
@@ -224,7 +224,7 @@
       <p>
         Other Forrest documentation has some notes about configuring the
         entity resolver for your own DTDs. See
-        <link href="site:validation">XML Validation</link>.
+        <link href="site:v0.60//validation">XML Validation</link>.
       </p>
       <p>
         Cocoon has extensive documentation about the entity resolver. See

Modified: forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/document-v13.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/document-v13.xml?rev=190303&r1=190302&r2=190303&view=diff
==============================================================================
--- forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/document-v13.xml (original)
+++ forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/document-v13.xml Sun Jun 12 10:22:14 2005
@@ -34,7 +34,7 @@
       <p><strong>Hint:</strong> See the xml source to see how the various
       elements are used and see the
 <!-- FOR-321 workaround
-      <link href="site:dtd-docs">DTD reference documentation</link>.
+      <link href="site:v0.60//dtd-docs">DTD reference documentation</link>.
 -->
       <link href="dtd-docs.html">DTD documentation</link>.
       </p>
@@ -329,7 +329,7 @@
       <title>DTD changes</title>
       <p>See the generated
 <!-- FOR-321 workaround
-        <link href="site:dtd-docs">DTD reference documentation</link>.
+        <link href="site:v0.60//dtd-docs">DTD reference documentation</link>.
 -->
         <link href="dtd-docs.html">DTD documentation</link>.
       </p>

Modified: forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/document-v20.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/document-v20.xml?rev=190303&r1=190302&r2=190303&view=diff
==============================================================================
--- forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/document-v20.xml (original)
+++ forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/document-v20.xml Sun Jun 12 10:22:14 2005
@@ -34,7 +34,7 @@
       <p><strong>Hint:</strong> See the xml source to see how the various
       elements are used and see the
 <!-- FOR-321 workaround
-      <a href="site:dtd-docs">DTD reference documentation</a>.
+      <a href="site:v0.60//dtd-docs">DTD reference documentation</a>.
 -->
       <a href="dtd-docs.html">DTD documentation</a>.
       </p>
@@ -342,7 +342,7 @@
       <title>DTD changes</title>
       <p>See the generated
 <!-- FOR-321 workaround
-        <a href="site:dtd-docs">DTD reference documentation</a>.
+        <a href="site:v0.60//dtd-docs">DTD reference documentation</a>.
 -->
         <a href="dtd-docs.html">DTD documentation</a>.
       </p>

Modified: forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/faq.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/faq.xml?rev=190303&r1=190302&r2=190303&view=diff
==============================================================================
--- forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/faq.xml (original)
+++ forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/faq.xml Sun Jun 12 10:22:14 2005
@@ -28,7 +28,7 @@
       </question>
       <answer>
         <p>
-          See the <link href="site:your-project">Using Forrest</link> guide.
+          See the <link href="site:v0.60//your-project">Using Forrest</link> guide.
         </p>
       </answer>
     </faq>
@@ -78,10 +78,10 @@
       </question>
       <answer>
         <p>
-          Follow these <link href="site:build">Building Forrest</link> notes.
+          Follow these <link href="site:v0.60//build">Building Forrest</link> notes.
         </p>
         <p>
-          The <link href="site:your-project">Using Forrest</link> guide provides
+          The <link href="site:v0.60//your-project">Using Forrest</link> guide provides
           further step-by-step assistance in getting started with Forrest for your project.
         </p>
       </answer>
@@ -143,11 +143,11 @@
        <p>
        In this case the menu labeled "About" will have 2 new items: 
        "Full PDF" and "Full HTML". (See also
-       <link href="site:howto/pdf-tab">How to create a PDF document for each tab</link>.)
+       <link href="site:v0.60//howto/pdf-tab">How to create a PDF document for each tab</link>.)
        </p>
        <p>
          This assumes that you use the
-         <link href="site:linking">site.xml</link> method for your site
+         <link href="site:v0.60//linking">site.xml</link> method for your site
          structure and navigation, rather than the old book.xml method.
        </p>
        </answer>
@@ -170,7 +170,7 @@
       $&#60;/version&#62;</code>The &#39;1.30&#39; will be extracted and
       displayed at the bottom of the page as &#34;version 1.30&#34;. See for
       example the bottom of the
-      <link href="site:your-project"> Using Forrest</link> document.</p>
+      <link href="site:v0.60//your-project"> Using Forrest</link> document.</p>
       <p>This technique could also be used for a modification date with
       $Date: 2004/01/15 08:52:47 $</p>
       </answer>
@@ -208,7 +208,7 @@
           your site.</p>
         <note>
           Wildcards may be used.  These are a powerful feature of Cocoon's
-          <link href="site:sitemap-ref">sitemap</link>.
+          <link href="site:v0.60//sitemap-ref">sitemap</link>.
           For example, <strong>foo/*</strong> would match
           <code>foo/bar</code>, but not <code>foo/bar/baz</code>
            &mdash; use <strong>foo/**</strong> to match that.
@@ -364,7 +364,7 @@
       <answer>
         <p>
           Notes are provided for various tools at
-          <link href="site:catalog">Using Catalog Entity Resolver for
+          <link href="site:v0.60//catalog">Using Catalog Entity Resolver for
           local DTDs</link>.
         </p>
       </answer>
@@ -396,16 +396,16 @@
       </question>
       <answer>
         <p>
-        There are <link href="site:skins">default skins</link> provided,
+        There are <link href="site:v0.60//skins">default skins</link> provided,
         which are configurable and so should meet the needs of most projects.
         The aim is to provide many capabilities so that extra skins are not
         needed.
         </p>
         <p>
         See notes about
-        <link href="site:your-project/skins">configuration</link> of the skins.
+        <link href="site:v0.60//your-project/skins">configuration</link> of the skins.
         Some projects may have special needs and can define their
-        <link href="site:your-project/new-skin">own skin</link>.
+        <link href="site:v0.60//your-project/new-skin">own skin</link>.
         </p>
       </answer>
     </faq>
@@ -542,8 +542,8 @@
       </question>
       <answer>
         <p>
-          You are using an old version of sitemap.xmap (see the document
-          <link href="site:upgrading_05">Upgrading to Forrest 0.5</link>).
+          You are using an old version of sitemap.xmap (download the historic document
+          'Upgrading to Forrest 0.5' from the subversion repository).
         </p>
       </answer>
     </faq>
@@ -566,7 +566,7 @@
           preserved.  If a directory has a book.xml file, the book.xml will be
           used to generate the menu.  This supplement is useful in situations
           where &s;-generated menus aren't appropriate.
-          See <link href="site:linking">Menus and Linking</link>.
+          See <link href="site:v0.60//linking">Menus and Linking</link>.
       </p>
       </answer>
     </faq>
@@ -590,9 +590,9 @@
          will need to have the DocBook stylesheets on your system (they are
          too massive to ship with Forrest) and configure Forrest accordingly.
          You will need to create a
-         <link href="site:project-sitemap">project sitemap</link>
+         <link href="site:v0.60//project-sitemap">project sitemap</link>
           as explained in
-         <link href="site:your-project">Using Forrest</link>
+         <link href="site:v0.60//your-project">Using Forrest</link>
          and add matches to handle your DocBook documents.
          Here is an example. Note that you need to change it to suit your
          situation. The match must be very specific so that only the
@@ -622,7 +622,7 @@
          Ensure that the document type declaration in your xml instance is
          well specified. Use a public identifier. The DTD will then be properly
          resolved by Forrest. If you need to use different DTDs, then see
-         <link href="site:your-project/new_dtd">Using Forrest</link>
+         <link href="site:v0.60//your-project/new_dtd">Using Forrest</link>
          for configuration guidance.
         </p>
       </answer>
@@ -704,7 +704,7 @@
           It is always a good idea to check the Forrest
           <link href="site:bugs">issue tracker</link>
           and 
-          <link href="site:todo">to do list</link>
+          <link href="site:v0.60//todo">to do list</link>
           before diving in.
         </p>
       </answer>

Modified: forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/howto-howto.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/howto-howto.xml?rev=190303&r1=190302&r2=190303&view=diff
==============================================================================
--- forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/howto-howto.xml (original)
+++ forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/howto-howto.xml Sun Jun 12 10:22:14 2005
@@ -63,7 +63,7 @@
       contributing your document.</li>
     </ul>
 
-    <note>See the <link href="site:howto-v13-dtd">DTD documentation</link>
+    <note>See the <link href="site:v0.60//howto-v13-dtd">DTD documentation</link>
     which explains the document structure.</note>
   </prerequisites>
 

Modified: forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/howto-pdf-tab.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/howto-pdf-tab.xml?rev=190303&r1=190302&r2=190303&view=diff
==============================================================================
--- forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/howto-pdf-tab.xml (original)
+++ forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/howto-pdf-tab.xml Sun Jun 12 10:22:14 2005
@@ -45,7 +45,7 @@
   <prerequisites title="Prerequisites">
     <ul>
       <li>Understand how to create project-specific sitemaps by following the
-      <link href="site:your-project">Using Forrest</link> document.</li>
+      <link href="site:v0.60//your-project">Using Forrest</link> document.</li>
     </ul>
   </prerequisites>
 
@@ -158,7 +158,7 @@
     </source>
     <p>
       This allows you to link to it via a
-      <code><![CDATA[<link href="site:whole_foosite">]]></code>
+      <code><![CDATA[<link href="site:v0.60//whole_foosite">]]></code>
       reference. 
     </p>
 	  <p>Add to every element that should be included in the pdf-tab.pdf

Modified: forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/index.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/index.xml?rev=190303&r1=190302&r2=190303&view=diff
==============================================================================
--- forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/index.xml (original)
+++ forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/index.xml Sun Jun 12 10:22:14 2005
@@ -24,16 +24,16 @@
 
   <body>
     <ul>
-      <li><link href="site:howto/write-howto">How to write a How-To</link>
+      <li><link href="site:v0.60//howto/write-howto">How to write a How-To</link>
         - Provides instructions about writing documents. Please copy this
         file to serve as a template for your own document.
       </li>
-      <li><link href="site:howto/asf-mirror">Generate an ASF mirrors page using interactive web form</link>
+      <li><link href="site:v0.60//howto/asf-mirror">Generate an ASF mirrors page using interactive web form</link>
         - Use ihtml (interpreted html) to include html form elements
         into a forrest-generated html page. For example, this enables building
         automated download mirror pages for ASF project websites.
       </li>
-      <li><link href="site:howto/pdf-tab">How to create a PDF document for each tab</link>
+      <li><link href="site:v0.60//howto/pdf-tab">How to create a PDF document for each tab</link>
         - Describes the generation of a PDF document for each
         group of documents that is defined by a tab.
       </li>

Modified: forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/multi/step3.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/multi/step3.xml?rev=190303&r1=190302&r2=190303&view=diff
==============================================================================
--- forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/multi/step3.xml (original)
+++ forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/howto/multi/step3.xml Sun Jun 12 10:22:14 2005
@@ -31,7 +31,7 @@
       <title>Second section of this step</title>
       <p>Description here.</p>
       <p>Congratulations, you have finished. Now return to the
-      <link href="site:multi-page/intro">start</link>.</p>
+      <link href="site:v0.60//multi-page/intro">start</link>.</p>
     </section>
   </steps>
 </howto>

Modified: forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/linking.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/linking.xml?rev=190303&r1=190302&r2=190303&view=diff
==============================================================================
--- forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/linking.xml (original)
+++ forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/linking.xml Sun Jun 12 10:22:14 2005
@@ -67,7 +67,7 @@
         <dd>&s; is used to generate the menus for the HTML website.</dd>
         <dt><link href="#semantic_linking">Indirect linking</link></dt>
         <dd>&s; provides a basic aliasing mechanism for linking, e.g. one
-          can write &lt;link href="site:changes"> from anywhere in the site, and
+          can write &lt;link href="site:v0.60//changes"> from anywhere in the site, and
           link to the "changes" information node (translated to changes.html).
           More on this below.</dd>
       </dl>
@@ -362,7 +362,7 @@
         <title>Indirect linking</title>
         <p>
           Forrest's solution is simple: instead of &lt;link href="todo.html">,
-          write &lt;link href="site:todo"> where:
+          write &lt;link href="site:v0.60//todo"> where:
         </p>
         <dl>
           <dt>site</dt>
@@ -543,9 +543,9 @@
     <section id="implementation">
       <title>Implementation</title>
       <p>Full details on the implementation of
-      <link href="site:linkrewriting_impl">link rewriting</link> and
-      <link href="site:menu_generation_impl">menu generation</link> are available in
-      the <link href="site:sitemap-ref">Sitemap Reference</link></p>
+      <link href="site:v0.60//linkrewriting_impl">link rewriting</link> and
+      <link href="site:v0.60//menu_generation_impl">menu generation</link> are available in
+      the <link href="site:v0.60//sitemap-ref">Sitemap Reference</link></p>
     </section>
 
   </body>

Modified: forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/project-sitemap.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/project-sitemap.xml?rev=190303&r1=190302&r2=190303&view=diff
==============================================================================
--- forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/project-sitemap.xml (original)
+++ forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/project-sitemap.xml Sun Jun 12 10:22:14 2005
@@ -35,7 +35,7 @@
         and related component documentation.
         The Forrest sitemap is broken into multiple files. The main one is
         <strong>sitemap.xmap</strong> which delegates to others.  See the
-         <link href="site:sitemap-ref">Sitemap Reference</link> for a tour of the
+         <link href="site:v0.60//sitemap-ref">Sitemap Reference</link> for a tour of the
         default sitemap.
       </note>
     </section>
@@ -70,9 +70,9 @@
         <title>Adding a new content type</title>
         <p>
           See the section "Advanced customizations: sitemap.xmap" in
-          the <link href="site:your-project">Using Forrest</link> document
+          the <link href="site:v0.60//your-project">Using Forrest</link> document
           and then follow the
-          <link href="site:your-project/new_content_type">Example:
+          <link href="site:v0.60//your-project/new_content_type">Example:
           Adding a new content type</link>.
         </p>
       </section>

Modified: forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/sitemap-ref.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/sitemap-ref.xml?rev=190303&r1=190302&r2=190303&view=diff
==============================================================================
--- forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/sitemap-ref.xml (original)
+++ forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/sitemap-ref.xml Sun Jun 12 10:22:14 2005
@@ -59,7 +59,7 @@
         is not handled, passes through to be handled by the default Forrest
         sitemaps - obviously extremely powerful. The capability is described
         in 
-        "<link href="site:project-sitemap">Using project sitemaps</link>".
+        "<link href="site:v0.60//project-sitemap">Using project sitemaps</link>".
       </p>
 
       <p>
@@ -101,7 +101,7 @@
           <th>linkmap.xmap</th>
           <td>Defines a mapping from abstract ("site:index") to physical
             ("../index.html") links for the current page.  See 
-            <link href="site:linking">Menus and Linking</link> for a conceptual
+            <link href="site:v0.60//linking">Menus and Linking</link> for a conceptual
             overview, and the <link href="#linkrewriting_impl">Link
               rewriting</link> section for technical details.</td>
         </tr>
@@ -125,8 +125,8 @@
         </tr>
         <tr>
           <th>status.xmap</th>
-          <td>Generates <link href="site:changes">changes</link> and 
-          <link href="site:todo">todo</link> pages from a single
+          <td>Generates <link href="site:v0.60//changes">changes</link> and 
+          <link href="site:v0.60//todo">todo</link> pages from a single
             <code>status.xml</code> in the project root.
           </td>
         </tr>
@@ -151,7 +151,7 @@
             <link href="http://www.apache.org/~andyc/neko/doc/dtd/index.html">DTD
               Parser</link>.  Useful for documenting DTD-based XML schemas, such
 <!-- FOR-321 workaround
-            as <link href="site:dtd-docs">Forrest's own DTDs</link>.
+            as <link href="site:v0.60//dtd-docs">Forrest's own DTDs</link>.
 -->
             as <link href="dtd-docs.html">Forrest's own DTDs</link>.
           </td>
@@ -219,10 +219,10 @@
           Most of the usual Source pipelines are defined in
           <code>forrest.xmap</code> which is the default (fallback) handler for
           <code>**.xml</code> pages. The forrest.xmap uses the 
-          <link href="site:cap">SourceTypeAction</link> to determine the type of XML
+          <link href="site:v0.60//cap">SourceTypeAction</link> to determine the type of XML
           it is processing, and converts it to document-v13 if necessary.
         </p>
-        <p>For instance, say we are rendering <link href="site:write-howto">a
+        <p>For instance, say we are rendering <link href="site:v0.60//write-howto">a
             Howto document</link> called "howto-howto.xml".  It contains this DOCTYPE
           declaration:</p>
         <source>
@@ -498,7 +498,7 @@
         ]]></source>
       <p>Meaning that it is defined in the <code>menu.xmap</code> file.  In there we find
         the real definition, which is quite complicated, because there are three
-        supported menu systems (see <link href="site:linking">menus and
+        supported menu systems (see <link href="site:v0.60//linking">menus and
           linking</link>).  We will not go through the sitemap itself
         (menu.xmap), but will instead describe the logical steps involved:</p>
       <ol>
@@ -506,7 +506,7 @@
           root-relative.</li>
         <li><p>Depending on the <code>forrest.menu-scheme</code> property, we
             now apply one of the two algorithms for choosing a set of menu links
-            (described in <link href="site:menu_generation">menu
+            (described in <link href="site:v0.60//menu_generation">menu
               generation</link>):</p>
           <ul>
             <li>
@@ -572,7 +572,7 @@
         "linkrewriter" transformer in action.  For example:</p>
       <source><![CDATA[<map:transform type="linkrewriter" src="cocoon:/{1}linkmap-{2}.html"/>]]></source>
       <p>This statement is Cocoon's linking system in action.  A full
-        description is provided in <link href="site:linking">Menus and
+        description is provided in <link href="site:v0.60//linking">Menus and
           Linking</link>.  Here we describe the implementation of linking.</p>
       <section id="input_modules">
         <title>Cocoon foundations: Input Modules</title>

Modified: forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/upgrading_06.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/upgrading_06.xml?rev=190303&r1=190302&r2=190303&view=diff
==============================================================================
--- forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/upgrading_06.xml (original)
+++ forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/upgrading_06.xml Sun Jun 12 10:22:14 2005
@@ -32,11 +32,7 @@
       mailing lists.
       As more experience is gained, this document will be updated.  
       </p>
-      <p>
-      (If you are upgrading from a version prior to 0.5 then you may want
-      to see the notes for the <link href="site:v0.50//upgrading_05">previous</link>
-      upgrade. However you should be fine with the notes from this 0.6 document.)
-      </p>
+      
     </section>
 
     <section id="new">

Modified: forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/validation.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/validation.xml?rev=190303&r1=190302&r2=190303&view=diff
==============================================================================
--- forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/validation.xml (original)
+++ forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/validation.xml Sun Jun 12 10:22:14 2005
@@ -97,7 +97,7 @@
         <code>forrest/src/core/context/resources/schema/catalog.xcat</code>
         as a means of associating public identifiers
         (e.g. <code>-//APACHE//DTD Documentation V1.1//EN</code> above) with DTDs.
-        If you <link href="site:new_content_type">add a new content type</link>, you
+        If you <link href="site:v0.60//new_content_type">add a new content type</link>, you
         should add the DTD to <code>${project.schema-dir}/dtd/</code> and add
         an entry to the <code>${project.schema-dir}/catalog.xcat</code> file.  This
         section describes the details of this process.
@@ -109,7 +109,7 @@
           The main Forrest DTDs are designed to be modular and extensible, so
           it is fairly easy to create a new document type that is a superset
           of one from Forrest.  This is what we'll demonstrate here, using our
-          earlier <link href="site:new_content_type">download format</link>
+          earlier <link href="site:v0.60//new_content_type">download format</link>
           as an example.  Our download format adds a group of new elements to
           the standard 'documentv13' format.  Our new elements are described
           by the following DTD:
@@ -335,7 +335,7 @@
         it know where the Forrest catalog file is, and you will be able to
         validate any Forrest XML file, regardless of location, as you edit
         your files. See the 
-        <link href="site:catalog">configuration notes</link> your favourite
+        <link href="site:v0.60//catalog">configuration notes</link> your favourite
         editor.
       </p>
     </section>

Modified: forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/your-project.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/your-project.xml?rev=190303&r1=190302&r2=190303&view=diff
==============================================================================
--- forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/your-project.xml (original)
+++ forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/your-project.xml Sun Jun 12 10:22:14 2005
@@ -546,7 +546,7 @@
           <code>site.xml</code> file. This site.xml is like a site index, and is rendered as
           the vertical column of links in the default skin.  Look at Forrest's own
           xdocs for an example.  More detailed info about site.xml is provided in 
-          the document <link href="site:linking">Menus and Linking</link>.
+          the document <link href="site:v0.60//linking">Menus and Linking</link>.
         </p>
       </section>
       <section id="tabs.xml">
@@ -555,7 +555,7 @@
           The <code>tabs.xml</code> file is used to produce the 'tabs'.
           which enable users to quickly jump to sections of your site.
           See the
-          <link href="site:menu_generation">menu generation</link> documentation
+          <link href="site:v0.60//menu_generation">menu generation</link> documentation
           for more details, and again, consult Forrest's own docs for a usage
           example.
         </p>
@@ -637,7 +637,7 @@
         is not handled, passes through to be handled by the default Forrest
         sitemaps - obviously extremely powerful. The capability is described
         in 
-        "<link href="site:project-sitemap">Using project sitemaps</link>"
+        "<link href="site:v0.60//project-sitemap">Using project sitemaps</link>"
         and some worked examples are shown in the following sections here.
       </p>
       <note>
@@ -647,7 +647,7 @@
         and related component documentation.
         The Forrest sitemap is broken into multiple files. The main one is
         <strong>sitemap.xmap</strong> which delegates to others.  See the
-         <link href="site:sitemap-ref">Sitemap Reference</link> for a tour of the
+         <link href="site:v0.60//sitemap-ref">Sitemap Reference</link> for a tour of the
         default sitemap.
       </note>
       <section id="adding_new_content_type">
@@ -757,7 +757,7 @@
             structure into the Forrest intermediate xdocs structure.
           </p>
           <note>
-            The <link href="site:sitemap-ref">Sitemap
+            The <link href="site:v0.60//sitemap-ref">Sitemap
             Reference</link> provides details about how the sitemap works.
           </note>
           <p>
@@ -791,7 +791,7 @@
                  By default, Forrest requires that all XML files be valid, i.e.
                  they must have a DOCTYPE declaration and associated DTD, and
                  validate against it.  Our new 'downloads' document type is no
-                 exception.  The <link href="site:validation">XML
+                 exception.  The <link href="site:v0.60//validation">XML
                    Validation</link> document continues this example, showing how
                  to register a new document type.  Briefly, this involves:
                </p>
@@ -805,7 +805,7 @@
                  <li>Tell the system about your catalog.</li>
                </ul>
                <note>
-                 Please see <link href="site:validation">XML Validation</link>
+                 Please see <link href="site:v0.60//validation">XML Validation</link>
                  for the complete description for those steps.
                </note>
             </section>
@@ -870,7 +870,7 @@
               This is the type of processing that happens in the main
               <code>src/core/context/forrest.xmap</code> sitemap. We have
               added similar handling to our project sitemap. Basically, this
-              uses the <link href="site:cap">SourceTypeAction (content aware pipelines)</link>
+              uses the <link href="site:v0.60//cap">SourceTypeAction (content aware pipelines)</link>
               to detect the doctype. The new document-v11.dtd needs to be also
               added to your project Catalog.
             </p>
@@ -926,7 +926,7 @@
         </p>
         <note>
           Forrest supplies a collection of 
-          <link href="site:skins">default skins</link> which are configurable
+          <link href="site:v0.60//skins">default skins</link> which are configurable
           and so should meet the needs of most projects. The aim is to provide
           many capabilities so that extra skins are not needed.
         </note>
@@ -1007,7 +1007,7 @@
         In comparison to simpler tools (like 
         <link href="ext:anakia">Anakia</link>) the Cocoon command-line mode
         (and hence Forrest command-line mode) is slow.
-        As the <link href="site:dreams">dream list</link> notes, Forrest was
+        As the <link href="site:v0.70//dreams">dream list</link> notes, Forrest was
         originally intended to be used for
         dynamic sites, and the Cocoon crawler used only to create static
         snapshots for mirroring.  This section describes how, by using