diff --git a/src/main/org/apache/tools/ant/taskdefs/Input.java b/src/main/org/apache/tools/ant/taskdefs/Input.java
index c14413a62..f8022add6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Input.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Input.java
@@ -60,14 +60,16 @@ import  java.io.IOException;
 import  java.util.StringTokenizer;
 import  java.util.Vector;
 import org.apache.tools.ant.Task;
+
 import org.apache.tools.ant.BuildException;
+
 import org.apache.tools.ant.Project;
 
 
 /**
  * Ant task to read input line from console.
  *
- * @author Ulrich Schmidt <usch@usch.net>
+ * @author <a href="mailto:usch@usch.net">Ulrich Schmidt</a>
  */
 public class Input extends Task {
     private String validargs = null;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
index 58e8396cc..afa6f34c0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
@@ -73,7 +73,7 @@ import org.apache.tools.ant.types.Path;
  * ANTLR task.
  *
  * @author <a href="mailto:emeade@geekfarm.org">Erik Meade</a>
- * @author <a href="mailto:sbailliez@apache.org>Stephane Bailliez</a>
+ * @author <a href="mailto:sbailliez@apache.org">Stephane Bailliez</a>
  */
 public class ANTLR extends Task {
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
index 0bd5057a5..dc0282833 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
@@ -55,14 +55,21 @@
 package org.apache.tools.ant.taskdefs.optional.ejb;
 
 import java.io.File;
+
 import java.io.IOException;
+
 import java.io.FileOutputStream;
+
 import java.io.InputStream;
 import java.util.jar.JarFile;
+
 import java.util.jar.JarOutputStream;
+
 import java.util.jar.JarEntry;
 import java.util.Iterator;
+
 import java.util.Hashtable;
+
 import java.util.Enumeration;
 
 
@@ -70,17 +77,22 @@ import java.util.Enumeration;
 
 
 import org.apache.tools.ant.Project;
+
 import org.apache.tools.ant.BuildException;
+
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.taskdefs.Java;
 import org.apache.tools.ant.types.EnumeratedAttribute;
+
 import org.apache.tools.ant.types.Path;
+
 import org.apache.tools.ant.types.Environment;
+
 import org.apache.tools.ant.types.Commandline;
 
 /**
  * Websphere deployment tool that augments the ejbjar task.
- * @author <mailto:msahu@interkeel.com>Maneesh Sahu</mailto>
+ * @author <a href="mailto:msahu@interkeel.com">Maneesh Sahu</a>
  */
 public class WebsphereDeploymentTool extends GenericDeploymentTool {
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
index 3b85573d2..fd560b7d9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.java
@@ -71,11 +71,14 @@ import org.apache.tools.ant.Project;
 /**
  * This class logs into StarTeam checks out any changes that have occurred since
  * the last successful build. It also creates all working directories on the
- * local directory if appropriate. Ant Usage: <taskdef name="starteamcheckout"
- * classname="org.apache.tools.ant.taskdefs.StarTeamCheckout"/>
- * <starteamcheckout username="BuildMaster" password="ant" starteamFolder="Source"
+ * local directory if appropriate. Ant Usage:
+ * <pre>
+ * &lt;taskdef name="starteamcheckout"
+ * classname="org.apache.tools.ant.taskdefs.StarTeamCheckout"/&gt;
+ * &lt;starteamcheckout username="BuildMaster" password="ant" starteamFolder="Source"
  * starteamurl="servername:portnum/project/view"
- * createworkingdirectories="true"/>
+ * createworkingdirectories="true"/&gt;
+ * </pre>
  *
  * @author Christopher Charlier, ThoughtWorks, Inc. 2001
  * @author <a href="mailto:jcyip@thoughtworks.com">Jason Yip</a>
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java
index ee2a09de0..e418b000d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java
@@ -69,12 +69,14 @@ import org.apache.tools.ant.BuildException;
  * This class logs into StarTeam and creates a label for the repository at the
  * time of the last successful build.
  * Ant Usage:
- * <taskdef name="stlabel"
- *                classname="org.apache.tools.ant.taskdefs.optional.starteam.StarTeamLabel"/>
- *     <stlabel
+ * <pre>
+ * &lt;taskdef name="stlabel"
+ *          classname="org.apache.tools.ant.taskdefs.optional.starteam.StarTeamLabel"/&lt;
+ *     &lt;stlabel
  * label="1.0" lastbuild="20011514100000" description="Successful Build"
  * username="BuildMaster" password="ant"
- * starteamurl="server:port/project/view"/>
+ * starteamurl="server:port/project/view"/&gt;
+ * </pre>
  *
  * @author Christopher Charlier, ThoughtWorks, Inc. 2001
  * @author <a href="mailto:jcyip@thoughtworks.com">Jason Yip</a>