This is an automated email from the ASF dual-hosted git repository.

cbrisson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/velocity-site.git

commit e3794903bc7d6409b21966640b20590e50dc48a3
Author: Henning Schmiedehausen <[email protected]>
AuthorDate: Fri Jan 13 17:43:07 2006 +0000

    Fixed up links, reworked some texts. Site should now be in shape.
    
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/jakarta/velocity/site/trunk@368797 
13f79535-47bb-0310-9956-ffa450edef68
---
 project.xml                     |  5 ++-
 xdocs/index.xml                 | 84 +++++++++++++++++++++++++----------------
 xdocs/navigation.xml            | 29 ++++++++------
 xdocs/releases/dvsl/index.xml   |  8 ++--
 xdocs/releases/engine/index.xml | 20 ++++++----
 xdocs/releases/index.xml        | 22 +++++++++++
 xdocs/releases/tools/index.xml  |  7 +++-
 7 files changed, 114 insertions(+), 61 deletions(-)

diff --git a/project.xml b/project.xml
index 967fd60..eb832b4 100644
--- a/project.xml
+++ b/project.xml
@@ -75,7 +75,7 @@
       <name>Henning P. Schmiedehausen</name>
       <id>henning</id>
       <email>[email protected]</email>
-      <organization>INTERMETA - Gesellschaft fuer Mehrwertdienste 
mbH</organization>
+      <organization>INTERMETA - Gesellschaft für Mehrwertdienste 
mbH</organization>
       <roles>
         <role>Java Developer</role>
       </roles>
@@ -95,9 +95,10 @@
 
   <contributors/>
 
-  <!-- Can you believe that? -->
   <reports>
     <report>maven-license-plugin</report>
+<!-- The link check report is not referenced from the site but useful to check 
whether a referenced link has been broken -->
+    <report>maven-linkcheck-plugin</report>
   </reports>
 </project>
 
diff --git a/xdocs/index.xml b/xdocs/index.xml
index 5b02398..89cdff0 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -11,7 +11,7 @@
   <body>
     <section name="What is Velocity?" href="WhatisVelocity?">
       <p>Velocity is a Java-based template engine. It permits anyone to use a 
simple yet
-        powerful template language to reference objects defined in Java code. 
</p>
+        powerful template language to reference objects defined in Java 
code.</p>
       
       <p>Velocity is written in 100% pure Java and can be easily embedded into 
your own
         applications. It also provides easy integration into web applications 
through a
@@ -28,16 +28,16 @@
           Velocity separates Java code from the web pages, making the web site 
more
           maintainable over its lifespan and providing a viable alternative to
           <a href="http://java.sun.com/products/jsp/";>Java Server Pages</a> 
(JSPs) or
-          <a href="http://www.php.net/";>PHP</a>. </p>
+          <a href="http://www.php.net/";>PHP</a>.</p>
       </subsection>
       
       <subsection name="Template based code and report generation">
         <p> Velocity's capabilities reach well beyond the realm of the web; 
for example, it
           can be used to generate SQL, PostScript and XML (see
-          <a href="/engine/anakia/index.html">Anakia</a> for more information 
on XML
+          <a href="engine/anakia/">Anakia</a> for more information on XML
           transformations) from templates. It can be used either as a 
standalone utility for
           generating source code and reports, or as an integrated component of 
other
-          systems. </p>
+          systems.</p>
       </subsection>
       
       <subsection name="Framework Integration">
@@ -51,7 +51,7 @@
           <li>
             <a href="http://struts.apache.org/";>Struts</a> offers Velocity
             integration through a Velocity subproject called
-            <a href="/tools/">Velocity Tools</a>
+            <a href="tools/">Velocity Tools</a>
             .</li>
           <li>
             <a href="http://www.springframework.org";>Spring Framework</a> 
supports
@@ -60,68 +60,86 @@
         </ul>
       </subsection>
     </section>
+
+    <section name="How do I get started">
+      <p>
+        The Velocity engine subproject contains the documentation to get 
started using
+        Velocity and embedding Velocity into your own applications. Please 
select either
+        a <a href="releases/engine/">released version</a> to get started.
+      </p>
+    </section>
     
-    <section name="Velocity projects">
-      <p> Velocity currently consists of three sub-projects:</p>
+    <section name="Velocity subprojects">
+      <p> Velocity currently consists of three subprojects:</p>
       
       <ul>
         <li>
-          <a href="/engine/">Velocity Engine</a>. This is the actual
-          templating engine which does all the work. This sub-project contains 
also the task
+          <a href="engine/">Velocity Engine</a>. This is the actual
+          templating engine which does all the work. This subproject contains 
also the task
           definitions for using Velocity from
-          <a href="http://ant.apache.org/";>Apache Ant</a>. </li>
+          <a href="http://ant.apache.org/";>Apache Ant</a>.</li>
         <li>
-          <a href="/tools/">Velocity Tools</a>. This sub-project contains
+          <a href="tools/">Velocity Tools</a>. This subproject contains
           tools and other useful infrastructure to build web- and non-web 
application using
           Velocity. You will find e.g. code for
           <a href="http://struts.apache.org/";>Struts</a> integration or the
-          standalone Velocity View Servlet here. </li>
+          standalone Velocity View Servlet here.</li>
         
         <li>
-          <a href="/dvsl/">Velocity DVSL</a>. DVSL
+          <a href="dvsl/">Velocity DVSL</a>. DVSL
           (Declarative Velocity Style Language) is a tool modeled after XSLT 
and is intended
           for general XML transformations using the Velocity Template Language 
as the
-          transformation language. </li>
+          transformation language.</li>
       </ul>
     </section>
     
-    <section name="Where do I get releases?" href="WheredoIgetreleases?">
-      
-      <p> The current release version is version 1.5. </p>
+    <section name="What are the current releases and where do I get them?">
+
+      <p>
+        These are the current releases of all subprojects:
+        <table>
+          <tr><th>Project</th><th>Release Version</th><th>Development 
Version</th></tr>
+          <tr><td>Engine</td><td><a 
href="releases/engine/1.4/">1.4</a></td><td><a href="engine/">1.5</a></td></tr>
+          <tr><td>Tools</td> <td><a href="releases/tools/1.2/">1.2</a></td> 
<td><a href="tools/">1.3</a></td></tr>
+          <tr><td>DVSL</td>  <td>-</td>                                     
<td><a href="dvsl/">1.0</a></td></tr>
+        </table>
+     </p>
       
       <p> The release distribution is available as a combined source/binary 
distribution in
         <code>tar.gz</code> and
         <code>zip</code> formats, and can be downloaded through the
         <a
-          
href="http://jakarta.apache.org/site/downloads/downloads_velocity-engine.cgi";>
-          Apache Mirror system</a>. </p>
+          
href="http://jakarta.apache.org/site/downloads/downloads_velocity.cgi";>
+          Apache Mirror system</a>.</p>
       
       <p> The Velocity jars are also available through the
         <a href="http://www.ibiblio.org/maven/velocity/";>central Maven
-          repository</a>. </p>
+          repository</a>.</p>
       
       <p> Older releases are archived at the
         <a href="http://archive.apache.org/dist/jakarta/velocity/";>Jakarta
-          Velocity archives</a>. </p>
+          Velocity archives</a>.</p>
       
     </section>
     
     <section name="Where do I get nightly snapshots?"
       href="WheredoIgetnightlysnapshots?">
       
-      <p> Nightly snapshots of the Velocity subversion source code tree can be 
found
-        <a href="http://cvs.apache.org/snapshots/jakarta-velocity/";> here</a>. 
</p>
+      <p> Nightly snapshots of the source code for all subprojects can be found
+        <a href="http://svn.apache.org/dist/jakarta/velocity/nightly/";> 
here</a>.<br/>
       
-      <p> These are meant to provide easy access to the actual project source 
control tree. As
+        They are meant to provide easy access to the project source code if 
you are located
+        behind a firewall or don't want to deal with a subversion client and
+        are created automatically from the Subversion repository.<br/>As
         this is our live development workspace, there are no guarantees as to 
what you will
         find there, although we do our best to maintain a buildable source 
tree. If you are
-        looking for the stable supported release, please use the current 
release of
-        Velocity. </p>
+        looking for the stable supported release, please use <a 
href="releases/">a released
+        version</a>.</p>
       
       <p> If you are willing to risk getting dirty, we invite you to try the 
nightly snapshot to
         see the current state of affairs. (and help out!)
         <a href="http://www.apache.org/dev/version-control.html";>Public 
Subversion
-          access</a> is also available. </p>
+          access</a> is also available.</p>
       
     </section>
     
@@ -130,15 +148,15 @@
       
       <p> The Velocity project appreciates any contributions, including 
documentation
         help, source code and feedback. Suggested changes should come in the 
form of source
-        code and/or feedback. </p>
+        code and/or feedback.</p>
       
       <ul>
         <li> Report bugs, ask questions, and help new users on the
-          <a href="http://jakarta.apache.org/site/mail2.html#Velocity";> 
Velocity
-            mailing lists</a>. </li>
+          <a href="mail-lists.html"> Velocity
+            mailing lists</a>.</li>
         
         <li> There's a list of issues waiting to be addressed in
-          <a href="http://issues.apache.org/jira/browse/VELOCITY";> JIRA</a>. 
</li>
+          <a href="http://issues.apache.org/jira/browse/VELOCITY";> 
JIRA</a>.</li>
         
         <li>
           <a href="http://wiki.apache.org/jakarta-velocity/FrontPage";> Our 
Wiki</a>
@@ -146,10 +164,10 @@
           contribute to the FAQ! </li>
         <li> Read-only access to the Subversion
           <strong>jakarta-velocity</strong> repository is available both
-          <a href="http://svn.apache.org/repos/asf/jakarta/velocity/trunk/";>
+          <a href="http://svn.apache.org/repos/asf/jakarta/velocity/";>
             online</a> and with a
           <a href="http://www.apache.org/dev/version-control.html";> Subversion
-            client</a>. </li>
+            client</a>.</li>
       </ul>
       
     </section>
diff --git a/xdocs/navigation.xml b/xdocs/navigation.xml
index c534ab3..4c6511b 100644
--- a/xdocs/navigation.xml
+++ b/xdocs/navigation.xml
@@ -8,6 +8,7 @@
       <item name="Home"   href="/index.html"/>
       <item name="Engine" href="/engine/"/>
       <item name="Tools"  href="/tools/"/>
+      <item name="DVSL"   href="/dvsl/"/>
     </links>
 
     <menu name="General">
@@ -22,28 +23,31 @@
       <item name="Velocity DVSL"   href="/dvsl/"/>
     </menu>
 
+<!-- If you remove the index.html from the collapsed links, they no longer 
work! -->
     <menu name="Releases">
       <item name="Downloads"
         
href="http://jakarta.apache.org/site/downloads/downloads_velocity.cgi"/>
       <item name="Velocity" href="/releases/engine/index.html" collapse="true">
-        <item name="Velocity-1.3.1" 
href="/releases/engine/velocity-1.3.1/index.html" collapse="true"/>
-        <item name="Velocity-1.4" 
href="/releases/engine/velocity-1.4/index.html" collapse="true"/>
-        <item name="Velocity-1.5" 
href="/releases/engine/velocity-1.5/index.html" collapse="true"/>
+        <item name="Velocity 1.3.1" href="/releases/engine/1.3.1/" 
collapse="true"/>
+        <item name="Velocity 1.4"   href="/releases/engine/1.4/"   
collapse="true"/>
+        <item name="Velocity 1.5"   href="/releases/engine/1.5/"   
collapse="true"/>
       </item>
       <item name="Velocity Tools" href="/releases/tools/index.html" 
collapse="true">
         <item name="Velocity Tools 1.1"
-          href="/releases/tools/velocity-tools-1.1/index.html" 
collapse="true"/>
+          href="/releases/tools/1.1/" collapse="true"/>
         <item name="Velocity Tools 1.2"
-          href="/releases/tools/velocity-tools-1.2/index.html" 
collapse="true"/>
+          href="/releases/tools/1.2/" collapse="true"/>
       </item>
-      <item name="Velocity DVSL" href="/releases/dvsl/index.html" 
collapse="true">
+<!-- DVSL has no release yet 
+      <item name="Velocity DVSL" href="/releases/dvsl/" collapse="true">
         <item name="Velocity DVSL 1.0"
-          href="/releases/dvsl/velocity-dvsl-1.0/index.html" collapse="true"/>
+          href="/releases/dvsl/velocity-dvsl-1.0/" collapse="true"/>
       </item>
+-->
     </menu>
 
     <menu name="Community">
-        <item name="Wiki"                     
href="http://wiki.apache.org/jakarta-velocity/"/>
+        <item name="Wiki"                     
href="http://wiki.apache.org/jakarta-velocity/FrontPage"/>
         <item name="Recent News"              
href="http://wiki.apache.org/jakarta-velocity/VelocityNews"/>
         <item name="Powered By Velocity"      
href="http://wiki.apache.org/jakarta-velocity/PoweredByVelocity"/>
         <item name="IDE/Editor Plugins"       
href="http://wiki.apache.org/jakarta-velocity/VelocityEditors"/>
@@ -55,10 +59,11 @@
     <menu name="Developers">
         <item name="Source Code Repository"   
href="http://www.apache.org/dev/version-control.html"/>
         <item name="Issues"                   
href="http://issues.apache.org/jira/browse/VELOCITY"/>
-        <item name="Nightly Snapshots"        
href="http://cvs.apache.org/snapshots/velocity/"/>
+        <item name="Nightly Snapshots"        
href="http://svn.apache.org/dist/jakarta/velocity/nightly/"/>
         <item name="Road Map"                 
href="http://wiki.apache.org/jakarta-velocity/RoadMap"/>
-        <item name="Coding Standards"         
href="http://wiki.apache.org/jakarta-velocity/CodeStandards"/>    
-        <item name="Documentation Guidelines" 
href="http://wiki.apache.org/jakarta-velocity/DocumentationGuidelines"/>    
+        <item name="Coding Standards"         
href="http://wiki.apache.org/jakarta-velocity/CodeStandards"/>
+        <item name="Documentation Guidelines" 
href="http://wiki.apache.org/jakarta-velocity/DocumentationGuidelines"/>
+        <item name="Site building"            
href="http://wiki.apache.org/jakarta-velocity/VelocitySite"/>
     </menu>
 
     <powered-by>
@@ -66,4 +71,4 @@
     </powered-by>
   </body>
 </project>
-        
+
diff --git a/xdocs/releases/dvsl/index.xml b/xdocs/releases/dvsl/index.xml
index 4193d47..f143922 100644
--- a/xdocs/releases/dvsl/index.xml
+++ b/xdocs/releases/dvsl/index.xml
@@ -14,12 +14,10 @@
           for general XML transformations using the Velocity Template Language 
as the
           transformation language. </p>
 
-      <p>From this page, you can branch to the official documentation for
-         released versions:</p>
+      <p>DVSL has had no official release yet.</p>
+
+      <p>The latest development version is available <a href="../../dvsl">from 
the development tree</a>.</p>
 
-      <ul>
-        <li><a href="/releases/DVSL/velocity-dvsl-1.0">Velocity DVSL 
1.0</a></li>
-      </ul>
     </section>
   </body>
 </document>
diff --git a/xdocs/releases/engine/index.xml b/xdocs/releases/engine/index.xml
index f7592b8..b78a370 100644
--- a/xdocs/releases/engine/index.xml
+++ b/xdocs/releases/engine/index.xml
@@ -9,19 +9,25 @@
   
   <body>
     <section name="Velocity Engine">
-      <p>This is the actual templating engine which does all the
-          work. This sub-project contains also the task definitions
+      <p>This is the release page for the Velocity templating engine. This 
subproject contains also the task definitions
           for using Velocity from <a
           href="http://ant.apache.org/";>Apache Ant</a>.</p>
 
-      <p>From this page, you can branch to the official documentation for
-         released versions:</p>
+      <p>
+        If you are getting started with Velocity, this is probably the right 
place to begin.</p>
+
+          
+      <p>Released versions of the Velocity engine:
 
       <ul>
-        <li><a href="/releases/engine/velocity-1.3.1">Velocity 1.3.1</a></li>
-        <li><a href="/releases/engine/velocity-1.4">Velocity 1.4</a></li>
-        <li><a href="/releases/engine/velocity-1.5">Velocity 1.5</a></li>
+        <li><a href="1.3.1">Velocity 1.3.1</a></li>
+        <li><a href="1.4">Velocity 1.4</a></li>
+        <li><a href="1.5">Velocity 1.5</a></li>
       </ul>
+      </p>
+
+      <p>The latest development documentation is available <a 
href="../../engine">from the development tree</a>.</p>
+
     </section>
   </body>
 </document>
diff --git a/xdocs/releases/index.xml b/xdocs/releases/index.xml
new file mode 100644
index 0000000..df5cd28
--- /dev/null
+++ b/xdocs/releases/index.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+  <properties>
+    <title>Released Subprojects</title>
+    <author email="[email protected]">Velocity Documentation
+      Team</author>
+  </properties>
+  
+  <body>
+    <section name="Subproject releases">
+      <p>
+        These are the currently released subprojects for Velocity.
+         
+      <ul>
+        <li><a href="engine">Velocity Engine</a></li>
+        <li><a href="tools">Velocity Tools</a></li>
+      </ul>
+      </p>
+    </section>
+  </body>
+</document>
diff --git a/xdocs/releases/tools/index.xml b/xdocs/releases/tools/index.xml
index 1e0762e..86f2be7 100644
--- a/xdocs/releases/tools/index.xml
+++ b/xdocs/releases/tools/index.xml
@@ -19,9 +19,12 @@
          released versions:</p>
 
       <ul>
-        <li><a href="/releases/tools/velocity-tools-1.1">Velocity Tools 
1.1</a></li>
-        <li><a href="/releases/tools/velocity-tools-1.2">Velocity Tools 
1.2</a></li>
+        <li><a href="1.1">Velocity Tools 1.1</a></li>
+        <li><a href="1.2">Velocity Tools 1.2</a></li>
       </ul>
+
+      <p>The latest development version is available <a 
href="../../tools">from the development tree</a>.</p>
+
     </section>
   </body>
 </document>

Reply via email to