From 2c3ba635823f72dbe6e790ef341f8756235396f0 Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 26 Sep 2005 06:17:44 +0000
Subject: [PATCH] By default, pom.currentVersion is used. Update the doc.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@291567 13f79535-47bb-0310-9956-ffa450edef68
---
 xdoc/src/plugin-resources/site.jsl |  6 +++---
 xdoc/xdocs/properties.xml          | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index de59f428..26e0b50e 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -255,10 +255,10 @@
         </div>
 
         <div id="breadcrumbs">
-          <j:if test="${!empty(pom.currentVersion)}">
-            <maven:property var="version" name="maven.xdoc.version" defaultValue="${pom.currentVersion}"/>
+          <maven:property var="version" name="maven.xdoc.version" defaultValue=""/>
+          <j:if test="${empty(version)}">
+            <j:set var="version" value="${pom.currentVersion}"/>
           </j:if>
-                
           <j:set var="breadcrumbsUsed" value=""/>  
           <x:if select="$nav/body/breadcrumbs">
             <j:set var="breadcrumbsUsed" value="'true'"/>  
diff --git a/xdoc/xdocs/properties.xml b/xdoc/xdocs/properties.xml
index 9de961af..48f31e36 100644
--- a/xdoc/xdocs/properties.xml
+++ b/xdoc/xdocs/properties.xml
@@ -302,11 +302,11 @@
           <td>maven.xdoc.version</td>
           <td>Yes</td>
           <td>
-            The version number to show next to the date. This only works if you also set
-            <code>maven.xdoc.date</code> to either <code>left</code> or <code>right</code>.
-            A common way to use it is like this:
-            <code>maven.xdoc.version=${pom.currentVersion}</code>.
-            If <code>maven.xdoc.version</code> is left empty, no version is shown on the site (default).
+            The version number to show next to the date. <b>This only works if you also set
+            <code>maven.xdoc.date</code> to either <code>left</code> or <code>right</code>.</b>
+            By default, <code>maven.xdoc.version</code> isn't setted and the value of 
+            <code>pom.currentVersion</code> is displayed.
+            If <code>maven.xdoc.version</code> is setted to empty, no version is shown on the site.
           </td>
         </tr>
         <tr>