mpoeschl    2002/12/19 08:51:03

  Modified:    xdocs    index.xml navigation.xml
  Log:
  add links to turbine 2.2.x and torque 3.0.x docs
  
  Revision  Changes    Path
  1.9       +50 -12    jakarta-turbine-site/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-site/xdocs/index.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- index.xml 6 Dec 2002 19:48:24 -0000       1.8
  +++ index.xml 19 Dec 2002 16:51:03 -0000      1.9
  @@ -27,16 +27,29 @@
       involved, <a href="/site/getinvolved.html">click here</a>.
     </p>
   
  -</section>
  -
  -<section name="Turbine Versions">
  +<subsection name="Versions">
     <p>
       There are several versions of Turbine currently available for download.
     </p>
   
     <p>
  -    <strong>Turbine 2.2</strong>. Turbine 2.2 is the current
  -    production quality release.
  +    <strong>Turbine 2.2</strong>.
  +    <a href="http://jakarta.apache.org/turbine/turbine-22/";>Turbine 2.2</a> is
  +    the current production quality release.
  +  </p>
  +
  +  <p>
  +    <strong>Turbine 2.2.1</strong>.
  +    <a href="http://jakarta.apache.org/turbine/turbine-22/";>Turbine 2.2.1</a>
  +    will be a bugfix release. It has not been scheduled for release yet.
  +  </p>
  +
  +  <p>
  +    <strong>Turbine 2.3</strong>.
  +    <a href="http://jakarta.apache.org/turbine/turbine-2/";>Turbine 2.3</a> will
  +    be the next feature enhanced release. Starting with Turbine 2.3 we no
  +    longer support freemarker, webmacro and castor. So if you use one of these
  +    services you should switch to the supported services now.
     </p>
   
     <p>
  @@ -44,21 +57,46 @@
       tree, has <strong>not been scheduled for release</strong>, and is
       not (yet) recommended for use in a production environment.
     </p>
  +</subsection>
  +
   </section>
   
  -<section name="Turbine Status">
  +<section name="Jakarta Turbine Torque">
  +
  +  <p>
  +    Torque is a persistence layer. Torque generates all the database resources
  +    required by your application and includes a runtime environment to run the
  +    generated classes.
  +  </p>
  +
     <p>
  -    Torque (persistence layer) and Fulcrum (service framework) were decoupled
  -    from Turbine and have their own cvs repositories now.
  +    Torque was developed as part of Turbine and is now decoupled.
     </p>
  +
  +<subsection name="Versions">
     <p>
  -    Turbine 2.2 uses the decoupled Torque (the coupled version has been
  -    removed from the turbine-2 codebase). <br/>
  -    Some of the fulcrum Services could be used together with Turbine 2.2.
  +    There are several versions of Torque currently available for download.
     </p>
  +
     <p>
  -    Turbine 3.0 uses the decoupled Torque and Fulcrum.
  +    <strong>Torque 3.0</strong>.
  +    <a href="http://jakarta.apache.org/turbine/torque-30/";>Torque 3.0</a> is
  +    the current production quality release.
     </p>
  +
  +  <p>
  +    <strong>Torque 3.0.1</strong>.
  +    <a href="http://jakarta.apache.org/turbine/torque-30/";>Torque 3.0.1</a>
  +    will be a bugfix release. It has not been scheduled for release yet.
  +  </p>
  +
  +  <p>
  +    <strong>Torque 3.1</strong>.
  +    <a href="http://jakarta.apache.org/turbine/torque-3/";>Torque 3.1</a> will
  +    be the next feature enhanced release.
  +  </p>
  +</subsection>
  +
   </section>
   
   </body>
  
  
  
  1.3       +4 -2      jakarta-turbine-site/xdocs/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-site/xdocs/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml    11 Jul 2002 02:36:19 -0000      1.2
  +++ navigation.xml    19 Dec 2002 16:51:03 -0000      1.3
  @@ -22,9 +22,11 @@
       </menu>
   
       <menu name="Documentation">
  -        <item name="Turbine 2.x"           href="/turbine-2/index.html"/>
  +        <item name="Turbine 2.2.x"         href="/turbine-22/index.html"/>
  +        <item name="Turbine 2.3.x"         href="/turbine-2/index.html"/>
           <item name="Turbine 3.x"           href="/turbine-3/index.html"/>
  -        <item name="Torque"                href="/torque/index.html"/>
  +        <item name="Torque 3.0.x"          href="/torque-30/index.html"/>
  +        <item name="Torque 3.1.x"          href="/torque/index.html"/>
           <item name="Fulcrum"               href="/fulcrum/index.html"/>
           <item name="TDK"                   href="/tdk/index.html"/>
           <item name="Maven"                 href="/maven/index.html"/>
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to