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

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git


The following commit(s) were added to refs/heads/master by this push:
     new db9f4477 Use Javadoc instead of HTML tag
db9f4477 is described below

commit db9f4477aa0e56d9eafa01fea0cc8086ed64015a
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Tue Aug 5 15:32:10 2025 -0400

    Use Javadoc instead of HTML tag
---
 .../org/apache/commons/jelly/CompilableTag.java    |  2 +-
 .../apache/commons/jelly/DynaBeanTagSupport.java   |  2 +-
 .../java/org/apache/commons/jelly/DynaTag.java     |  2 +-
 .../org/apache/commons/jelly/DynaTagSupport.java   |  2 +-
 .../main/java/org/apache/commons/jelly/Jelly.java  |  2 +-
 .../org/apache/commons/jelly/JellyContext.java     | 20 +++++++++---------
 .../org/apache/commons/jelly/JellyException.java   |  2 +-
 .../apache/commons/jelly/JellyTagException.java    |  2 +-
 .../org/apache/commons/jelly/LocationAware.java    |  2 +-
 .../org/apache/commons/jelly/MapTagSupport.java    |  2 +-
 .../commons/jelly/MissingAttributeException.java   |  2 +-
 .../apache/commons/jelly/NamespaceAwareTag.java    |  2 +-
 .../main/java/org/apache/commons/jelly/Script.java |  2 +-
 .../main/java/org/apache/commons/jelly/Tag.java    |  2 +-
 .../java/org/apache/commons/jelly/TagLibrary.java  |  2 +-
 .../java/org/apache/commons/jelly/TagSupport.java  |  2 +-
 .../java/org/apache/commons/jelly/XMLOutput.java   | 18 ++++++++--------
 .../jelly/expression/CompositeExpression.java      |  2 +-
 .../jelly/expression/ConstantExpression.java       |  6 +++---
 .../commons/jelly/expression/Expression.java       |  2 +-
 .../jelly/expression/ExpressionFactory.java        |  2 +-
 .../jelly/expression/ExpressionSupport.java        |  2 +-
 .../apache/commons/jelly/impl/BreakException.java  |  2 +-
 .../jelly/impl/CompositeTextScriptBlock.java       |  2 +-
 .../commons/jelly/impl/DefaultTagFactory.java      |  2 +-
 .../jelly/impl/DefaultTagLibraryResolver.java      | 10 ++++-----
 .../apache/commons/jelly/impl/DynamicBeanTag.java  |  2 +-
 .../org/apache/commons/jelly/impl/DynamicTag.java  |  2 +-
 .../commons/jelly/impl/DynamicTagLibrary.java      |  4 ++--
 .../org/apache/commons/jelly/impl/Embedded.java    |  2 +-
 .../commons/jelly/impl/ExpressionScript.java       |  2 +-
 .../org/apache/commons/jelly/impl/ScriptBlock.java |  2 +-
 .../org/apache/commons/jelly/impl/StaticTag.java   |  2 +-
 .../apache/commons/jelly/impl/StaticTagScript.java |  2 +-
 .../org/apache/commons/jelly/impl/TagFactory.java  |  2 +-
 .../commons/jelly/impl/TagLibraryResolver.java     |  2 +-
 .../org/apache/commons/jelly/impl/TagScript.java   |  2 +-
 .../org/apache/commons/jelly/impl/TextScript.java  |  2 +-
 .../org/apache/commons/jelly/parser/XMLParser.java | 12 +++++------
 .../org/apache/commons/jelly/tags/core/ArgTag.java |  2 +-
 .../jelly/tags/core/BaseClassLoaderTag.java        |  8 ++++----
 .../apache/commons/jelly/tags/core/ForEachTag.java |  2 +-
 .../apache/commons/jelly/tags/core/ImportTag.java  |  2 +-
 .../commons/jelly/util/ClassLoaderUtils.java       |  2 +-
 .../commons/jelly/util/NestedRuntimeException.java |  8 ++++----
 .../commons/jelly/tags/junit/AssertThrowsTag.java  | 12 +++++------
 .../tags/junit/JellyAssertionFailedError.java      |  2 +-
 .../jelly/tags/ant/DefaultPropsHandler.java        | 12 +++++------
 .../commons/jelly/tags/ant/FileIterator.java       |  2 +-
 .../apache/commons/jelly/tags/ant/FileScanner.java |  2 +-
 .../commons/jelly/tags/ant/GrantProject.java       | 20 +++++++++---------
 .../commons/jelly/tags/ant/JellyPropsHandler.java  |  4 ++--
 .../commons/jelly/tags/ant/PropsHandler.java       | 24 +++++++++++-----------
 .../apache/commons/jelly/task/AntJellyContext.java |  2 +-
 .../org/apache/commons/jelly/task/JellyTask.java   |  2 +-
 .../apache/commons/digester/rss/RSSDigester.java   | 16 +++++++--------
 .../commons/jelly/tags/define/ClassLoaderTag.java  |  2 +-
 .../apache/commons/jelly/tags/fmt/BundleTag.java   |  4 ++--
 .../org/apache/commons/jelly/tags/fmt/Config.java  | 18 ++++++++--------
 .../commons/jelly/tags/fmt/SetLocaleTag.java       | 10 ++++-----
 .../apache/commons/jelly/tags/fmt/TimeZoneTag.java |  2 +-
 .../apache/commons/jelly/tags/http/SessionTag.java |  6 +++---
 .../commons/jelly/tags/junit/AssertThrowsTag.java  | 12 +++++------
 .../tags/junit/JellyAssertionFailedError.java      |  2 +-
 .../apache/commons/jelly/tags/quartz/JellyJob.java |  2 +-
 .../commons/jelly/tags/regexp/ContainsTagTest.java |  2 +-
 .../commons/jelly/tags/regexp/MatchTagTest.java    |  2 +-
 .../java/javax/servlet/jsp/jstl/sql/Result.java    |  8 ++++----
 .../javax/servlet/jsp/jstl/sql/ResultImpl.java     |  8 ++++----
 .../javax/servlet/jsp/jstl/sql/ResultSupport.java  |  4 ++--
 .../servlet/jsp/jstl/sql/SQLExecutionTag.java      | 10 ++++-----
 .../commons/jelly/tags/sql/DataSourceUtil.java     |  4 ++--
 .../commons/jelly/tags/sql/DataSourceWrapper.java  |  4 ++--
 .../apache/commons/jelly/tags/sql/QueryTag.java    | 12 +++++------
 .../apache/commons/jelly/tags/sql/ResultImpl.java  |  8 ++++----
 .../commons/jelly/tags/sql/TransactionTag.java     |  4 ++--
 .../apache/commons/jelly/tags/sql/UpdateTag.java   | 12 +++++------
 .../commons/jelly/tags/swing/ComponentTag.java     |  2 +-
 .../apache/commons/jelly/tags/swing/GbcTag.java    |  2 +-
 .../jelly/tags/velocity/JellyContextAdapter.java   | 10 ++++-----
 .../commons/jelly/tags/velocity/MergeTag.java      |  4 ++--
 .../tags/velocity/JellyContextAdapterTest.java     |  2 +-
 .../commons/jelly/tags/xml/AttributeTag.java       |  2 +-
 .../apache/commons/jelly/tags/xml/ElementTag.java  |  2 +-
 .../org/apache/commons/jelly/tags/xml/SetTag.java  |  2 +-
 .../tags/xmlunit/AssertDocumentsEqualTag.java      |  4 ++--
 86 files changed, 212 insertions(+), 212 deletions(-)

diff --git a/core/src/main/java/org/apache/commons/jelly/CompilableTag.java 
b/core/src/main/java/org/apache/commons/jelly/CompilableTag.java
index 86b3cc97..b1229f54 100644
--- a/core/src/main/java/org/apache/commons/jelly/CompilableTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/CompilableTag.java
@@ -17,7 +17,7 @@
 
 package org.apache.commons.jelly;
 
-/** <p><code>Compilable</code> represents a Tag that is compilable.</p>
+/** <p>{@code Compilable} represents a Tag that is compilable.</p>
   */
 
 public interface CompilableTag {
diff --git 
a/core/src/main/java/org/apache/commons/jelly/DynaBeanTagSupport.java 
b/core/src/main/java/org/apache/commons/jelly/DynaBeanTagSupport.java
index 9a99d408..b3cd9132 100644
--- a/core/src/main/java/org/apache/commons/jelly/DynaBeanTagSupport.java
+++ b/core/src/main/java/org/apache/commons/jelly/DynaBeanTagSupport.java
@@ -21,7 +21,7 @@ import org.apache.commons.beanutils2.DynaBean;
 import org.apache.commons.beanutils2.DynaProperty;
 
 /**
- * <p><code>DynaBeanTag</code> is a DynaTag implementation which uses a 
DynaBean
+ * <p>{@code DynaBeanTag} is a DynaTag implementation which uses a DynaBean
  * to store its attribute values in. Derived tags can then process this
  * DynaBean in any way it wishes.
  * </p>
diff --git a/core/src/main/java/org/apache/commons/jelly/DynaTag.java 
b/core/src/main/java/org/apache/commons/jelly/DynaTag.java
index d44feef7..5bde31d7 100644
--- a/core/src/main/java/org/apache/commons/jelly/DynaTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/DynaTag.java
@@ -18,7 +18,7 @@
 package org.apache.commons.jelly;
 
 /**
- * <p><code>DynaTag</code> represents a Jelly custom tag which
+ * <p>{@code DynaTag} represents a Jelly custom tag which
  * can take its attributes dynamically and store them in some data structure.
  * Typically a DynaTag may use either a Map or a DynaBean to implement itself
  * which avoids writing explicit getter and setter methods for each possible 
attribute.
diff --git a/core/src/main/java/org/apache/commons/jelly/DynaTagSupport.java 
b/core/src/main/java/org/apache/commons/jelly/DynaTagSupport.java
index 85072995..9184fd66 100644
--- a/core/src/main/java/org/apache/commons/jelly/DynaTagSupport.java
+++ b/core/src/main/java/org/apache/commons/jelly/DynaTagSupport.java
@@ -18,7 +18,7 @@
 package org.apache.commons.jelly;
 
 /**
- * <p><code>DynaTagSupport</code> is an abstract base class
+ * <p>{@code DynaTagSupport} is an abstract base class
  * for any DynaTag implementation to derive from.
  * </p>
  */
diff --git a/core/src/main/java/org/apache/commons/jelly/Jelly.java 
b/core/src/main/java/org/apache/commons/jelly/Jelly.java
index 63523886..2ccd4367 100644
--- a/core/src/main/java/org/apache/commons/jelly/Jelly.java
+++ b/core/src/main/java/org/apache/commons/jelly/Jelly.java
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFactory;
 import org.xml.sax.SAXException;
 
 /**
- * <p><code>Jelly</code> is a helper class which is capable of
+ * <p>{@code Jelly} is a helper class which is capable of
  * running a Jelly script. This class can be used from the command line
  * or can be used as the basis of an Ant task.</p> Command line usage is as 
follows:
  *
diff --git a/core/src/main/java/org/apache/commons/jelly/JellyContext.java 
b/core/src/main/java/org/apache/commons/jelly/JellyContext.java
index c1e4b0ac..c8c574fc 100644
--- a/core/src/main/java/org/apache/commons/jelly/JellyContext.java
+++ b/core/src/main/java/org/apache/commons/jelly/JellyContext.java
@@ -33,7 +33,7 @@ import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
 /**
-  * <p><code>JellyContext</code> represents the Jelly context.</p>
+  * <p>{@code JellyContext} represents the Jelly context.</p>
   */
 public class JellyContext {
 
@@ -56,7 +56,7 @@ public class JellyContext {
      * The class loader to use for instantiating application objects.
      * If not specified, the context class loader, or the class loader
      * used to load this class itself, is used, based on the value of the
-     * <code>useContextClassLoader</code> variable.
+     * {@code useContextClassLoader} variable.
      */
     protected ClassLoader classLoader;
 
@@ -116,7 +116,7 @@ public class JellyContext {
     /**
      * Create a new context with the given parent context.
      * The parent's rootURL and currentURL are set on the child, and the 
parent's variables are
-     * available in the child context under the name <code>parentScope</code>.
+     * available in the child context under the name {@code parentScope}.
      *
      * @param parent the parent context for the newly created context.
      */
@@ -133,7 +133,7 @@ public class JellyContext {
     /**
      * Create a new context with the given parent context.
      * The parent's rootURL are set on the child, and the parent's variables 
are
-     * available in the child context under the name <code>parentScope</code>.
+     * available in the child context under the name {@code parentScope}.
      *
      * @param parentJellyContext the parent context for the newly created 
context.
      * @param currentURL the root URL used in resolving relative resources
@@ -145,7 +145,7 @@ public class JellyContext {
 
     /**
      * Create a new context with the given parent context.
-     * The parent's variables are available in the child context under the 
name <code>parentScope</code>.
+     * The parent's variables are available in the child context under the 
name {@code parentScope}.
      *
      * @param parentJellyContext the parent context for the newly created 
context.
      * @param rootURL the root URL used in resolving absolute resources i.e. 
those starting with '/'
@@ -319,9 +319,9 @@ public class JellyContext {
      * Gets the class loader to be used for instantiating application objects
      * when required.  This is determined based upon the following rules:
      * <ul>
-     * <li>The class loader set by <code>setClassLoader()</code>, if any</li>
+     * <li>The class loader set by {@code setClassLoader()}, if any</li>
      * <li>The thread context class loader, if it exists and the
-     *     <code>useContextClassLoader</code> property is set to true</li>
+     *     {@code useContextClassLoader} property is set to true</li>
      * <li>The class loader used to load the XMLParser class itself.
      * </ul>
      */
@@ -578,8 +578,8 @@ public class JellyContext {
 
     /**
      * Initialize the context.
-     * This includes adding the context to itself under the name 
<code>context</code> and
-     * making the System Properties available as <code>systemScope</code>
+     * This includes adding the context to itself under the name {@code 
context} and
+     * making the System Properties available as {@code systemScope}
      */
     private void init() {
         variables.put("context", this);
@@ -975,7 +975,7 @@ public class JellyContext {
 
     /**
      * Determine whether to use the Context ClassLoader (the one found by
-     * calling <code>Thread.currentThread().getContextClassLoader()</code>)
+     * calling {@code Thread.currentThread().getContextClassLoader()})
      * to resolve/load classes.  If not
      * using Context ClassLoader, then the class-loading defaults to
      * using the calling-class' ClassLoader.
diff --git a/core/src/main/java/org/apache/commons/jelly/JellyException.java 
b/core/src/main/java/org/apache/commons/jelly/JellyException.java
index 42cc4c2b..d160ce95 100644
--- a/core/src/main/java/org/apache/commons/jelly/JellyException.java
+++ b/core/src/main/java/org/apache/commons/jelly/JellyException.java
@@ -21,7 +21,7 @@ import java.io.PrintStream;
 import java.io.PrintWriter;
 
 /**
- * <p><code>JellyException</code> is the root of all Jelly exceptions.</p>
+ * <p>{@code JellyException} is the root of all Jelly exceptions.</p>
  */
 
 public class JellyException extends Exception implements LocationAware {
diff --git a/core/src/main/java/org/apache/commons/jelly/JellyTagException.java 
b/core/src/main/java/org/apache/commons/jelly/JellyTagException.java
index ac8d673a..339959b5 100644
--- a/core/src/main/java/org/apache/commons/jelly/JellyTagException.java
+++ b/core/src/main/java/org/apache/commons/jelly/JellyTagException.java
@@ -19,7 +19,7 @@ package org.apache.commons.jelly;
 
 /**
  * <p>
- * A <code>JellyTagException</code> is an exception generated by a Tag 
implementation.
+ * A {@code JellyTagException} is an exception generated by a Tag 
implementation.
  * </p>
  */
 
diff --git a/core/src/main/java/org/apache/commons/jelly/LocationAware.java 
b/core/src/main/java/org/apache/commons/jelly/LocationAware.java
index ce63f212..d84a7fb6 100644
--- a/core/src/main/java/org/apache/commons/jelly/LocationAware.java
+++ b/core/src/main/java/org/apache/commons/jelly/LocationAware.java
@@ -18,7 +18,7 @@
 package org.apache.commons.jelly;
 
 /**
- * <p><code>LocationAware</code> represents a Tag or Exception which is 
location aware.
+ * <p>{@code LocationAware} represents a Tag or Exception which is location 
aware.
  * That is to say it is capable of recording where in a Jelly script a tag or 
exception
  * is used which can aid debugging and tracing.</p>
  */
diff --git a/core/src/main/java/org/apache/commons/jelly/MapTagSupport.java 
b/core/src/main/java/org/apache/commons/jelly/MapTagSupport.java
index 61cd0f18..58403d97 100644
--- a/core/src/main/java/org/apache/commons/jelly/MapTagSupport.java
+++ b/core/src/main/java/org/apache/commons/jelly/MapTagSupport.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * <p><code>MapTag</code> is a DynaTag implementation which uses a Map
+ * <p>{@code MapTag} is a DynaTag implementation which uses a Map
  * to store its attribute values in. Derived tags can then process this
  * Map, change values, add or remove attributes or perform some other form
  * of processing pretty easily.
diff --git 
a/core/src/main/java/org/apache/commons/jelly/MissingAttributeException.java 
b/core/src/main/java/org/apache/commons/jelly/MissingAttributeException.java
index 8efe81ef..0d53cb93 100644
--- a/core/src/main/java/org/apache/commons/jelly/MissingAttributeException.java
+++ b/core/src/main/java/org/apache/commons/jelly/MissingAttributeException.java
@@ -18,7 +18,7 @@
 package org.apache.commons.jelly;
 
 /**
- * <p><code>JellyException</code> is the root of all Jelly exceptions.</p>
+ * <p>{@code JellyException} is the root of all Jelly exceptions.</p>
  */
 public class MissingAttributeException extends JellyTagException {
 
diff --git a/core/src/main/java/org/apache/commons/jelly/NamespaceAwareTag.java 
b/core/src/main/java/org/apache/commons/jelly/NamespaceAwareTag.java
index 6075b8a7..707bdc4f 100644
--- a/core/src/main/java/org/apache/commons/jelly/NamespaceAwareTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/NamespaceAwareTag.java
@@ -20,7 +20,7 @@ package org.apache.commons.jelly;
 import java.util.Map;
 
 /**
- * <p><code>NamespaceAwareTag</code> represents a Jelly custom tag which
+ * <p>{@code NamespaceAwareTag} represents a Jelly custom tag which
  * needs to be aware of the XML Namespace context in which it is used.
  * When the tag is used it will be given the namespace context which is a
  * Map keyed on the namespace prefixes and the values are the namespace URIs
diff --git a/core/src/main/java/org/apache/commons/jelly/Script.java 
b/core/src/main/java/org/apache/commons/jelly/Script.java
index 3d2aad91..b469ad73 100644
--- a/core/src/main/java/org/apache/commons/jelly/Script.java
+++ b/core/src/main/java/org/apache/commons/jelly/Script.java
@@ -18,7 +18,7 @@
 package org.apache.commons.jelly;
 
 /**
- * <p><code>Script</code> represents a Jelly script.
+ * <p>{@code Script} represents a Jelly script.
  * A Script <strong>must</strong> be thread safe so care should be taken on the
  * implementations of Scripts. However Tags are only used in a single thread
  * (each thread will have create its own Tags for the Script it is running)
diff --git a/core/src/main/java/org/apache/commons/jelly/Tag.java 
b/core/src/main/java/org/apache/commons/jelly/Tag.java
index 86616cac..e97d6730 100644
--- a/core/src/main/java/org/apache/commons/jelly/Tag.java
+++ b/core/src/main/java/org/apache/commons/jelly/Tag.java
@@ -18,7 +18,7 @@
 package org.apache.commons.jelly;
 
 /**
- * <code>Tag</code> represents a Jelly custom tag. A Tag is only ever used by 
a single thread so that Tag developers do not need to concern themselves with
+ * {@code Tag} represents a Jelly custom tag. A Tag is only ever used by a 
single thread so that Tag developers do not need to concern themselves with
  * mutli-threading issues when writing a Tag. A Tag is created per custom tag 
in a script, per invocation. So there is no need to worry about pooling errors
  * like those caused in JSP 1.x.(
  */
diff --git a/core/src/main/java/org/apache/commons/jelly/TagLibrary.java 
b/core/src/main/java/org/apache/commons/jelly/TagLibrary.java
index 39b03d87..bdcedb45 100644
--- a/core/src/main/java/org/apache/commons/jelly/TagLibrary.java
+++ b/core/src/main/java/org/apache/commons/jelly/TagLibrary.java
@@ -31,7 +31,7 @@ import org.apache.commons.jelly.impl.TagFactory;
 import org.apache.commons.jelly.impl.TagScript;
 import org.xml.sax.Attributes;
 
-/** <p><code>Taglib</code> represents the metadata for a Jelly custom tag 
library.</p>
+/** <p>{@code Taglib} represents the metadata for a Jelly custom tag 
library.</p>
   */
 
 public abstract class TagLibrary {
diff --git a/core/src/main/java/org/apache/commons/jelly/TagSupport.java 
b/core/src/main/java/org/apache/commons/jelly/TagSupport.java
index b3554224..4860e14c 100644
--- a/core/src/main/java/org/apache/commons/jelly/TagSupport.java
+++ b/core/src/main/java/org/apache/commons/jelly/TagSupport.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
 
 import org.apache.commons.jelly.util.TagUtils;
 
-/** <p><code>TagSupport</code> an abstract base class which is useful to
+/** <p>{@code TagSupport} an abstract base class which is useful to
   * inherit from if developing your own tag.</p>
   */
 
diff --git a/core/src/main/java/org/apache/commons/jelly/XMLOutput.java 
b/core/src/main/java/org/apache/commons/jelly/XMLOutput.java
index 01d9bdf6..0ce79e6e 100644
--- a/core/src/main/java/org/apache/commons/jelly/XMLOutput.java
+++ b/core/src/main/java/org/apache/commons/jelly/XMLOutput.java
@@ -40,7 +40,7 @@ import org.xml.sax.ext.LexicalHandler;
 import org.xml.sax.helpers.AttributesImpl;
 import org.xml.sax.helpers.DefaultHandler;
 
-/** <p><code>XMLOutput</code> is used to output XML events
+/** <p>{@code XMLOutput} is used to output XML events
   * in a SAX-like manner. This also allows pipelining to be done
   * such as in the <a href="http://xml.apache.org/cocoon/";>Cocoon</a> 
project.</p>
   */
@@ -336,7 +336,7 @@ public class XMLOutput implements ContentHandler, 
LexicalHandler {
      * outside of the specified range.</p>
      *
      * <p>Individual characters may consist of more than one Java
-     * <code>char</code> value.  There are two important cases where this
+     * {@code char} value.  There are two important cases where this
      * happens, because characters can't be represented in just sixteen bits.
      * In one case, characters are represented in a <em>Surrogate Pair</em>,
      * using two special Unicode values. Such characters are in the so-called
@@ -345,7 +345,7 @@ public class XMLOutput implements ContentHandler, 
LexicalHandler {
      * more accent characters.</p>
      *
      * <p> Your code should not assume that algorithms using
-     * <code>char</code>-at-a-time idioms will be working in character
+     * {@code char}-at-a-time idioms will be working in character
      * units; in some cases they will split characters.  This is relevant
      * wherever XML permits arbitrary characters, such as attribute values,
      * processing instruction data, and comments as well as in data reported
@@ -620,7 +620,7 @@ public class XMLOutput implements ContentHandler, 
LexicalHandler {
      * using this method.</p>
      *
      * <p>Like {@link #characters characters()}, processing instruction
-     * data may have characters that need more than one <code>char</code>
+     * data may have characters that need more than one {@code char}
      * value.</p>
      *
      * @param target The processing instruction target.
@@ -702,9 +702,9 @@ public class XMLOutput implements ContentHandler, 
LexicalHandler {
      * have not seen the declarations (because, for example, the
      * entity was declared in an external DTD subset).  All processors
      * may skip external entities, depending on the values of the
-     * <code>http://xml.org/sax/features/external-general-entities</code>
+     * {@code http://xml.org/sax/features/external-general-entities}
      * and the
-     * <code>http://xml.org/sax/features/external-parameter-entities</code>
+     * {@code http://xml.org/sax/features/external-parameter-entities}
      * properties.</p>
      *
      * @param name The name of the skipped entity.  If it is a
@@ -854,12 +854,12 @@ public class XMLOutput implements ContentHandler, 
LexicalHandler {
      * #IMPLIED attributes will be omitted.  The attribute list
      * will contain attributes used for Namespace declarations
      * (xmlns* attributes) only if the
-     * <code>http://xml.org/sax/features/namespace-prefixes</code>
+     * {@code http://xml.org/sax/features/namespace-prefixes}
      * property is true (it is false by default, and support for a
      * true value is optional).</p>
      *
      * <p>Like {@link #characters characters()}, attribute values may have
-     * characters that need more than one <code>char</code> value.  </p>
+     * characters that need more than one {@code char} value.  </p>
      *
      * @param uri The Namespace URI, or the empty string if the
      *        element has no Namespace URI or if Namespace
@@ -970,7 +970,7 @@ public class XMLOutput implements ContentHandler, 
LexicalHandler {
      * <p>The information from this event is not necessary for
      * normal Namespace processing: the SAX XML reader will
      * automatically replace prefixes for element and attribute
-     * names when the <code>http://xml.org/sax/features/namespaces</code>
+     * names when the {@code http://xml.org/sax/features/namespaces}
      * feature is <var>true</var> (the default).</p>
      *
      * <p>There are cases, however, when applications need to
diff --git 
a/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java
 
b/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java
index dc6e4bc5..e150b63f 100644
--- 
a/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java
+++ 
b/core/src/main/java/org/apache/commons/jelly/expression/CompositeExpression.java
@@ -26,7 +26,7 @@ import org.apache.commons.jelly.JellyContext;
 import org.apache.commons.jelly.JellyException;
 
 /**
- * <p><code>CompositeExpression</code> is a Composite expression made up of 
several
+ * <p>{@code CompositeExpression} is a Composite expression made up of several
  * Expression objects which are concatenated into a single String.</p>
  */
 public class CompositeExpression extends ExpressionSupport {
diff --git 
a/core/src/main/java/org/apache/commons/jelly/expression/ConstantExpression.java
 
b/core/src/main/java/org/apache/commons/jelly/expression/ConstantExpression.java
index ee47aba9..0474336a 100644
--- 
a/core/src/main/java/org/apache/commons/jelly/expression/ConstantExpression.java
+++ 
b/core/src/main/java/org/apache/commons/jelly/expression/ConstantExpression.java
@@ -18,7 +18,7 @@ package org.apache.commons.jelly.expression;
 
 import org.apache.commons.jelly.JellyContext;
 
-/** <p><code>ConstantExpression</code> represents a constant expression.</p>
+/** <p>{@code ConstantExpression} represents a constant expression.</p>
   *
   * <p>In other words, {@link #evaluate} returns a value independent of the 
context.</p>
   */
@@ -32,7 +32,7 @@ public class ConstantExpression extends ExpressionSupport {
     public ConstantExpression() {
     }
 
-    /** Convenience constructor sets <code>value</code> property.
+    /** Convenience constructor sets {@code value} property.
      */
     public ConstantExpression(final Object value) {
         this.value = value;
@@ -42,7 +42,7 @@ public class ConstantExpression extends ExpressionSupport {
       * Evaluate expression against given context.
       *
       * @param context evaluate expression against this context
-      * @return current value of <code>value</code> property
+      * @return current value of {@code value} property
       */
     @Override
     public Object evaluate(final JellyContext context) {
diff --git 
a/core/src/main/java/org/apache/commons/jelly/expression/Expression.java 
b/core/src/main/java/org/apache/commons/jelly/expression/Expression.java
index 73ad2c38..60a916cc 100644
--- a/core/src/main/java/org/apache/commons/jelly/expression/Expression.java
+++ b/core/src/main/java/org/apache/commons/jelly/expression/Expression.java
@@ -20,7 +20,7 @@ import java.util.Iterator;
 
 import org.apache.commons.jelly.JellyContext;
 
-/** <p><code>Expression</code> represents an arbitrary expression using some 
pluggable
+/** <p>{@code Expression} represents an arbitrary expression using some 
pluggable
   * expression language.</p>
   */
 public interface Expression {
diff --git 
a/core/src/main/java/org/apache/commons/jelly/expression/ExpressionFactory.java 
b/core/src/main/java/org/apache/commons/jelly/expression/ExpressionFactory.java
index 30272b27..c3ef0c0f 100644
--- 
a/core/src/main/java/org/apache/commons/jelly/expression/ExpressionFactory.java
+++ 
b/core/src/main/java/org/apache/commons/jelly/expression/ExpressionFactory.java
@@ -19,7 +19,7 @@ package org.apache.commons.jelly.expression;
 
 import org.apache.commons.jelly.JellyException;
 
-/** <p><code>ExpressionFactory</code> is a factory of Expression objects.</p>
+/** <p>{@code ExpressionFactory} is a factory of Expression objects.</p>
   */
 public interface ExpressionFactory {
 
diff --git 
a/core/src/main/java/org/apache/commons/jelly/expression/ExpressionSupport.java 
b/core/src/main/java/org/apache/commons/jelly/expression/ExpressionSupport.java
index 1cabb2f1..0faef4b1 100644
--- 
a/core/src/main/java/org/apache/commons/jelly/expression/ExpressionSupport.java
+++ 
b/core/src/main/java/org/apache/commons/jelly/expression/ExpressionSupport.java
@@ -29,7 +29,7 @@ import 
org.apache.commons.collections4.iterators.SingletonIterator;
 import org.apache.commons.jelly.JellyContext;
 import org.apache.commons.lang3.StringUtils;
 
-/** <p><code>ExpressionSupport</code>
+/** <p>{@code ExpressionSupport}
   * an abstract base class for Expression implementations
   * which provides default implementations of some of the
   * typesafe evaluation methods.</p>
diff --git 
a/core/src/main/java/org/apache/commons/jelly/impl/BreakException.java 
b/core/src/main/java/org/apache/commons/jelly/impl/BreakException.java
index 342ada9a..85af1994 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/BreakException.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/BreakException.java
@@ -20,7 +20,7 @@ package org.apache.commons.jelly.impl;
 import org.apache.commons.jelly.JellyTagException;
 
 /**
- * <p><code>BreakException</code> is used to terminate loops such as
+ * <p>{@code BreakException} is used to terminate loops such as
  * &lt;forEach&gt; and &lt;while&gt; tags.</p>
  */
 
diff --git 
a/core/src/main/java/org/apache/commons/jelly/impl/CompositeTextScriptBlock.java
 
b/core/src/main/java/org/apache/commons/jelly/impl/CompositeTextScriptBlock.java
index aeddc77d..2238702d 100644
--- 
a/core/src/main/java/org/apache/commons/jelly/impl/CompositeTextScriptBlock.java
+++ 
b/core/src/main/java/org/apache/commons/jelly/impl/CompositeTextScriptBlock.java
@@ -21,7 +21,7 @@ import java.util.List;
 import org.apache.commons.jelly.Script;
 
 /**
- * <p><code>CompositeTextScriptBlock</code> represents a text body of a
+ * <p>{@code CompositeTextScriptBlock} represents a text body of a
  * a tag which contains expressions, so that whitespace trimming
  * can be handled differently.</p>
  */
diff --git 
a/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagFactory.java 
b/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagFactory.java
index fee0ad7a..a1bfe1e4 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagFactory.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagFactory.java
@@ -21,7 +21,7 @@ import org.apache.commons.jelly.Tag;
 import org.xml.sax.Attributes;
 
 /**
- * <p><code>DefaultTagFactory</code> a default implementation of TagFactory
+ * <p>{@code DefaultTagFactory} a default implementation of TagFactory
  * which creates new instances of a given class.
  */
 public class DefaultTagFactory implements TagFactory {
diff --git 
a/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagLibraryResolver.java
 
b/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagLibraryResolver.java
index 2f5b89f9..74664af8 100644
--- 
a/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagLibraryResolver.java
+++ 
b/core/src/main/java/org/apache/commons/jelly/impl/DefaultTagLibraryResolver.java
@@ -26,7 +26,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
- * <p><code>DefaultTagLibraryResolver</code> is a default implementation
+ * <p>{@code DefaultTagLibraryResolver} is a default implementation
  * which attempts to interpret the URI as a String called 'jelly:className'
  * and class load the given Java class. Otherwise META-INF/services/jelly/uri
  * is searched for on the thread context's class path and, if found, that
@@ -43,7 +43,7 @@ public class DefaultTagLibraryResolver implements 
TagLibraryResolver {
      * The class loader to use for instantiating application objects.
      * If not specified, the context class loader, or the class loader
      * used to load this class itself, is used, based on the value of the
-     * <code>useContextClassLoader</code> variable.
+     * {@code useContextClassLoader} variable.
      */
     private ClassLoader classLoader;
 
@@ -63,9 +63,9 @@ public class DefaultTagLibraryResolver implements 
TagLibraryResolver {
      * Gets the class loader to be used for instantiating application objects
      * when required.  This is determined based upon the following rules:
      * <ul>
-     * <li>The class loader set by <code>setClassLoader()</code>, if any</li>
+     * <li>The class loader set by {@code setClassLoader()}, if any</li>
      * <li>The thread context class loader, if it exists and the
-     *     <code>useContextClassLoader</code> property is set to true</li>
+     *     {@code useContextClassLoader} property is set to true</li>
      * <li>The class loader used to load the XMLParser class itself.
      * </ul>
      */
@@ -207,7 +207,7 @@ public class DefaultTagLibraryResolver implements 
TagLibraryResolver {
 
     /**
      * Determine whether to use the Context ClassLoader (the one found by
-     * calling <code>Thread.currentThread().getContextClassLoader()</code>)
+     * calling {@code Thread.currentThread().getContextClassLoader()})
      * to resolve/load classes.  If not
      * using Context ClassLoader, then the class-loading defaults to
      * using the calling-class' ClassLoader.
diff --git 
a/core/src/main/java/org/apache/commons/jelly/impl/DynamicBeanTag.java 
b/core/src/main/java/org/apache/commons/jelly/impl/DynamicBeanTag.java
index 1c341e07..69fe0ed3 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/DynamicBeanTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/DynamicBeanTag.java
@@ -183,7 +183,7 @@ public class DynamicBeanTag extends DynaBeanTagSupport 
implements BeanSource {
      *
      * @param bean Bean on which <code>method</code was invoked
      * @param method Method that was invoked
-     * @param e Exception throw when <code>method</code> was invoked
+     * @param e Exception throw when {@code method} was invoked
      */
     private void methodInvocationException(final Object bean, final Method 
method, final Exception e) throws JellyTagException {
         log.error("Could not invoke " + method, e);
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/DynamicTag.java 
b/core/src/main/java/org/apache/commons/jelly/impl/DynamicTag.java
index d26376bc..8bf92708 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/DynamicTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/DynamicTag.java
@@ -29,7 +29,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
- * <p><code>DynamicTag</code> is a tag that is created from
+ * <p>{@code DynamicTag} is a tag that is created from
  * inside a Jelly script as a Jelly template and will invoke a
  * given script, passing in its instantiation attributes
  * as variables and will allow the template to invoke its instance body.</p>
diff --git 
a/core/src/main/java/org/apache/commons/jelly/impl/DynamicTagLibrary.java 
b/core/src/main/java/org/apache/commons/jelly/impl/DynamicTagLibrary.java
index b644df0b..3d98558e 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/DynamicTagLibrary.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/DynamicTagLibrary.java
@@ -26,7 +26,7 @@ import org.apache.commons.jelly.TagLibrary;
 import org.xml.sax.Attributes;
 
 /**
- * <p><code>DynamicTagLibrary</code> represents a TagLibrary which
+ * <p>{@code DynamicTagLibrary} represents a TagLibrary which
  * gets created by running a Jelly script.</p>
  */
 public class DynamicTagLibrary extends TagLibrary {
@@ -99,7 +99,7 @@ public class DynamicTagLibrary extends TagLibrary {
      * Returns the script associated with the given tag name
      *
      * @param name The tag name
-     * @return The script associated with <code>name</code>, or
+     * @return The script associated with {@code name}, or
      *         {@code null} if the tag doesn't exist or isn't a script
      */
     public Script getDynamicTag(final String name) {
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/Embedded.java 
b/core/src/main/java/org/apache/commons/jelly/impl/Embedded.java
index 1e6d773b..00d28e43 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/Embedded.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/Embedded.java
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFactory;
 
 /*
  *
- * <p><code>Embedded</code> provides easy means to embed JellyEngine
+ * <p>{@code Embedded} provides easy means to embed JellyEngine
  * and use Jelly scripts within an application</p>
  * A typical usage:
  *  <pre>
diff --git 
a/core/src/main/java/org/apache/commons/jelly/impl/ExpressionScript.java 
b/core/src/main/java/org/apache/commons/jelly/impl/ExpressionScript.java
index 589ff194..b4f63c5a 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/ExpressionScript.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/ExpressionScript.java
@@ -24,7 +24,7 @@ import org.apache.commons.jelly.expression.Expression;
 import org.xml.sax.SAXException;
 
 /**
- * <p><code>ExpressionScript</code> outputs the value of an expression as 
text.</p>
+ * <p>{@code ExpressionScript} outputs the value of an expression as text.</p>
  */
 public class ExpressionScript implements Script {
 
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/ScriptBlock.java 
b/core/src/main/java/org/apache/commons/jelly/impl/ScriptBlock.java
index 7eba6f8c..bc936c01 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/ScriptBlock.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/ScriptBlock.java
@@ -26,7 +26,7 @@ import org.apache.commons.jelly.JellyTagException;
 import org.apache.commons.jelly.Script;
 import org.apache.commons.jelly.XMLOutput;
 
-/** <p><code>ScriptBlock</code> a block of scripts.</p>
+/** <p>{@code ScriptBlock} a block of scripts.</p>
   */
 public class ScriptBlock implements Script {
 
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/StaticTag.java 
b/core/src/main/java/org/apache/commons/jelly/impl/StaticTag.java
index 51e1c07f..4d94c017 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/StaticTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/StaticTag.java
@@ -23,7 +23,7 @@ import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 
 /**
- * <p><code>StaticTag</code> represents a static XML element
+ * <p>{@code StaticTag} represents a static XML element
  * which echos itself to XMLOutput when it is invoked.</p>
  */
 
diff --git 
a/core/src/main/java/org/apache/commons/jelly/impl/StaticTagScript.java 
b/core/src/main/java/org/apache/commons/jelly/impl/StaticTagScript.java
index 25215f80..37a1ad8d 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/StaticTagScript.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/StaticTagScript.java
@@ -31,7 +31,7 @@ import org.apache.commons.jelly.expression.Expression;
 import org.xml.sax.SAXException;
 
 /**
- * <p><code>StaticTagScript</code> is a script that evaluates a StaticTag, a 
piece of static XML
+ * <p>{@code StaticTagScript} is a script that evaluates a StaticTag, a piece 
of static XML
  * though its attributes or element content may contain dynamic expressions.
  * The first time this tag evaluates, it may have become a dynamic tag, so it 
will check that
  * a new dynamic tag has not been generated.</p>
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/TagFactory.java 
b/core/src/main/java/org/apache/commons/jelly/impl/TagFactory.java
index fe27f001..ab7d02d8 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/TagFactory.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/TagFactory.java
@@ -21,7 +21,7 @@ import org.apache.commons.jelly.Tag;
 import org.xml.sax.Attributes;
 
 /**
- * <p><code>TagFactory</code> represents a Factory of {@link Tag} 
instances.</p>
+ * <p>{@code TagFactory} represents a Factory of {@link Tag} instances.</p>
  *
  * <strong>Note</strong> that this class should be re-entrant and used
  * concurrently by multiple threads.
diff --git 
a/core/src/main/java/org/apache/commons/jelly/impl/TagLibraryResolver.java 
b/core/src/main/java/org/apache/commons/jelly/impl/TagLibraryResolver.java
index c0740bfb..84aa3baf 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/TagLibraryResolver.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/TagLibraryResolver.java
@@ -19,7 +19,7 @@ package org.apache.commons.jelly.impl;
 import org.apache.commons.jelly.TagLibrary;
 
 /**
- * <p><code>TagLibraryResolver</code> represents an object capable of
+ * <p>{@code TagLibraryResolver} represents an object capable of
  * resolving a URI to a TagLibrary instance.</p>
  */
 public interface TagLibraryResolver {
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/TagScript.java 
b/core/src/main/java/org/apache/commons/jelly/impl/TagScript.java
index 70e84ffe..a43d75e1 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/TagScript.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/TagScript.java
@@ -66,7 +66,7 @@ final class ExpressionAttribute {
 }
 
 /**
- * <p><code>TagScript</code> is a Script that evaluates a custom tag.</p>
+ * <p>{@code TagScript} is a Script that evaluates a custom tag.</p>
  *
  * <strong>Note</strong> that this class should be re-entrant and used
  * concurrently by multiple threads.
diff --git a/core/src/main/java/org/apache/commons/jelly/impl/TextScript.java 
b/core/src/main/java/org/apache/commons/jelly/impl/TextScript.java
index f3820f23..ace6ee06 100644
--- a/core/src/main/java/org/apache/commons/jelly/impl/TextScript.java
+++ b/core/src/main/java/org/apache/commons/jelly/impl/TextScript.java
@@ -22,7 +22,7 @@ import org.apache.commons.jelly.Script;
 import org.apache.commons.jelly.XMLOutput;
 import org.xml.sax.SAXException;
 
-/** <p><code>TextScript</code> outputs some static text.</p>
+/** <p>{@code TextScript} outputs some static text.</p>
   */
 public class TextScript implements Script {
 
diff --git a/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java 
b/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
index 7fcd2310..4027e1c6 100644
--- a/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
+++ b/core/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
@@ -61,7 +61,7 @@ import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.AttributesImpl;
 import org.xml.sax.helpers.DefaultHandler;
 
-/** <p><code>XMLParser</code> parses the XML Jelly format.
+/** <p>{@code XMLParser} parses the XML Jelly format.
  * The SAXParser and XMLReader portions of this code come from Digester.</p>
  */
 public class XMLParser extends DefaultHandler {
@@ -104,7 +104,7 @@ public class XMLParser extends DefaultHandler {
      * The class loader to use for instantiating application objects.
      * If not specified, the context class loader, or the class loader
      * used to load XMLParser itself, is used, based on the value of the
-     * <code>useContextClassLoader</code> variable.
+     * {@code useContextClassLoader} variable.
      */
     protected ClassLoader classLoader = null;
 
@@ -689,9 +689,9 @@ public class XMLParser extends DefaultHandler {
      * Return the class loader to be used for instantiating application objects
      * when required.  This is determined based upon the following rules:
      * <ul>
-     * <li>The class loader set by <code>setClassLoader()</code>, if any</li>
+     * <li>The class loader set by {@code setClassLoader()}, if any</li>
      * <li>The thread context class loader, if it exists and the
-     *     <code>useContextClassLoader</code> property is set to true</li>
+     *     {@code useContextClassLoader} property is set to true</li>
      * <li>The class loader used to load the XMLParser class itself.
      * </ul>
      */
@@ -1125,7 +1125,7 @@ public class XMLParser extends DefaultHandler {
 
     /**
      * Determine whether to use the Context ClassLoader (the one found by
-     * calling <code>Thread.currentThread().getContextClassLoader()</code>)
+     * calling {@code Thread.currentThread().getContextClassLoader()})
      * to resolve/load classes.  If not
      * using Context ClassLoader, then the class-loading defaults to
      * using the calling-class' ClassLoader.
@@ -1138,7 +1138,7 @@ public class XMLParser extends DefaultHandler {
 
     /**
      * Sets the validating parser flag.  This must be called before
-     * <code>parse()</code> is called the first time.
+     * {@code parse()} is called the first time.
      *
      * @param validating The new validating parser flag.
      */
diff --git a/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java 
b/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
index 62d632a9..430d97a7 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/ArgTag.java
@@ -297,7 +297,7 @@ public class ArgTag extends BaseClassLoaderTag {
      * The name of the argument class or type, if any.
      * This may be a fully specified class name or
      * a primitive type name
-     * (<code>boolean</code>, <code>int</code>, <code>double</code>, etc.).
+     * ({@code boolean}, {@code int}, {@code double}, etc.).
      */
     public void setType(final String type) {
         this.typeString = type;
diff --git 
a/core/src/main/java/org/apache/commons/jelly/tags/core/BaseClassLoaderTag.java 
b/core/src/main/java/org/apache/commons/jelly/tags/core/BaseClassLoaderTag.java
index 9681d2ff..8383e56f 100644
--- 
a/core/src/main/java/org/apache/commons/jelly/tags/core/BaseClassLoaderTag.java
+++ 
b/core/src/main/java/org/apache/commons/jelly/tags/core/BaseClassLoaderTag.java
@@ -26,7 +26,7 @@ public abstract class BaseClassLoaderTag extends TagSupport {
      * The class loader to use for instantiating application objects.
      * If not specified, the context class loader, or the class loader
      * used to load XMLParser itself, is used, based on the value of the
-     * <code>useContextClassLoader</code> variable.
+     * {@code useContextClassLoader} variable.
      */
     protected ClassLoader classLoader = null;
 
@@ -40,9 +40,9 @@ public abstract class BaseClassLoaderTag extends TagSupport {
      * Gets the class loader to be used for instantiating application objects
      * when required.  This is determined based upon the following rules:
      * <ul>
-     * <li>The class loader set by <code>setClassLoader()</code>, if any</li>
+     * <li>The class loader set by {@code setClassLoader()}, if any</li>
      * <li>The thread context class loader, if it exists and the
-     *     <code>useContextClassLoader</code> property is set to true</li>
+     *     {@code useContextClassLoader} property is set to true</li>
      * <li>The class loader used to load the XMLParser class itself.
      * </ul>
      */
@@ -70,7 +70,7 @@ public abstract class BaseClassLoaderTag extends TagSupport {
 
     /**
      * Determine whether to use the Context ClassLoader (the one found by
-     * calling <code>Thread.currentThread().getContextClassLoader()</code>)
+     * calling {@code Thread.currentThread().getContextClassLoader()})
      * to resolve/load classes.  If not
      * using Context ClassLoader, then the class-loading defaults to
      * using the calling-class' ClassLoader.
diff --git 
a/core/src/main/java/org/apache/commons/jelly/tags/core/ForEachTag.java 
b/core/src/main/java/org/apache/commons/jelly/tags/core/ForEachTag.java
index 3a01c240..17ee6d9f 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/ForEachTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/ForEachTag.java
@@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFactory;
 /**
   * Iterates over a collection, iterator or an array of objects.
   * Uses the same syntax as the <a 
href="https://java.sun.com/products/jsp/jstl/";>JSTL</a>
-  * <code>forEach</code> tag does.
+  * {@code forEach} tag does.
   */
 public class ForEachTag extends TagSupport {
 
diff --git 
a/core/src/main/java/org/apache/commons/jelly/tags/core/ImportTag.java 
b/core/src/main/java/org/apache/commons/jelly/tags/core/ImportTag.java
index 9856fe19..37149dff 100644
--- a/core/src/main/java/org/apache/commons/jelly/tags/core/ImportTag.java
+++ b/core/src/main/java/org/apache/commons/jelly/tags/core/ImportTag.java
@@ -28,7 +28,7 @@ import org.apache.commons.jelly.XMLOutput;
  *  <p>
  *  By default, the imported script does not have access to
  *  the parent script's variable context.  This behavior
- *  may be modified using the <code>inherit</code> attribute.
+ *  may be modified using the {@code inherit} attribute.
  *  </p>
  */
 
diff --git 
a/core/src/main/java/org/apache/commons/jelly/util/ClassLoaderUtils.java 
b/core/src/main/java/org/apache/commons/jelly/util/ClassLoaderUtils.java
index 7933aa60..98cbfb31 100644
--- a/core/src/main/java/org/apache/commons/jelly/util/ClassLoaderUtils.java
+++ b/core/src/main/java/org/apache/commons/jelly/util/ClassLoaderUtils.java
@@ -46,7 +46,7 @@ public class ClassLoaderUtils {
      * when required.  This is determined based upon the following rules:
      * <ul>
      * <li>The specified class loader, if any</li>
-     * <li>The thread context class loader, if it exists and 
<code>useContextClassLoader</code> is true</li>
+     * <li>The thread context class loader, if it exists and {@code 
useContextClassLoader} is true</li>
      * <li>The class loader used to load the calling class.
      * <li>The System class loader.
      * </ul>
diff --git 
a/core/src/main/java/org/apache/commons/jelly/util/NestedRuntimeException.java 
b/core/src/main/java/org/apache/commons/jelly/util/NestedRuntimeException.java
index 4caeab97..efef6fb0 100644
--- 
a/core/src/main/java/org/apache/commons/jelly/util/NestedRuntimeException.java
+++ 
b/core/src/main/java/org/apache/commons/jelly/util/NestedRuntimeException.java
@@ -36,8 +36,8 @@ package org.apache.commons.jelly.util;
 public class NestedRuntimeException extends RuntimeException {
 
     /**
-     * Constructs a new <code>NestedRuntimeException</code> with specified
-     * detail message and nested <code>Throwable</code>.
+     * Constructs a new {@code NestedRuntimeException} with specified
+     * detail message and nested {@code Throwable}.
      *
      * @param msg    the error message
      * @param cause  the exception or error that caused this exception to be
@@ -48,8 +48,8 @@ public class NestedRuntimeException extends RuntimeException {
     }
 
     /**
-     * Constructs a new <code>NestedRuntimeException</code> with specified
-     * nested <code>Throwable</code>.
+     * Constructs a new {@code NestedRuntimeException} with specified
+     * nested {@code Throwable}.
      *
      * @param cause the exception or error that caused this exception to be
      * thrown
diff --git 
a/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java 
b/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
index 4339c8d1..0496b8ac 100644
--- 
a/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
+++ 
b/core/src/test/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
@@ -26,10 +26,10 @@ import org.apache.commons.logging.LogFactory;
 /**
  * Runs its body and asserts that an exception is thrown by it.  If no
  * exception is thrown the tag fails.  By default all exceptions are caught.
- * If however <code>expected</code> was specified the body must throw
+ * If however {@code expected} was specified the body must throw
  * an exception of the given class, otherwise the assertion fails.  The
  * exception thrown by the body can also be of any subtype of the specified
- * exception class.  The optional <code>var</code> attribute can be specified 
if
+ * exception class.  The optional {@code var} attribute can be specified if
  * the caught exception is to be exported to a variable.
  */
 public class AssertThrowsTag extends AssertTagSupport {
@@ -86,9 +86,9 @@ public class AssertThrowsTag extends AssertTagSupport {
     }
 
     /**
-     * Returns the <code>Class</code> corresponding to the class
-     * specified by <code>expected</code>. If
-     * <code>expected</code> was either not specified then <code>java. lang.
+     * Returns the {@code Class} corresponding to the class
+     * specified by {@code expected}. If
+     * {@code expected} was either not specified then <code>java. lang.
      * Throwable</code> is returned.
      * Otherwise if the class couldn't be
      * found or doesn't denote an exception class then an exception is thrown.
@@ -134,7 +134,7 @@ public class AssertThrowsTag extends AssertTagSupport {
      * Sets the class name of exception expected to be thrown by the body.  The
      * class name must be fully qualified and can either be the expected
      * exception class itself or any supertype of it, but must be a subtype of
-     * <code>java.lang.Throwable</code>.
+     * {@code java.lang.Throwable}.
      */
     public void setExpected(final String expected) {
         this.expected = expected;
diff --git 
a/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
 
b/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
index ad67e182..477b2213 100644
--- 
a/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
+++ 
b/core/src/test/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
@@ -25,7 +25,7 @@ import org.apache.commons.jelly.LocationAware;
 import junit.framework.AssertionFailedError;
 
 /**
- * <p><code>JellyAssertionFailedError</code> is
+ * <p>{@code JellyAssertionFailedError} is
  * a JUnit AssertionFailedError which is LocationAware so that it can include
  * details of where in the JellyUnit test case that the failure occurred.</p>
  */
diff --git 
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java
 
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java
index 42c09c41..6a725783 100644
--- 
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java
+++ 
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/DefaultPropsHandler.java
@@ -30,10 +30,10 @@ import org.apache.tools.ant.util.JavaEnvUtils;
  *  against an existing map.
  *
  * <p>
- * If extending <code>DefaultPropsHandler</code>, you can
- * implement <code>setProperty</code>, <code>getProperty</code>,
- * and <code>getProperties</code> to provide a complete
- * implementation of <code>PropsHandler</code>.
+ * If extending {@code DefaultPropsHandler}, you can
+ * implement {@code setProperty}, {@code getProperty},
+ * and {@code getProperties} to provide a complete
+ * implementation of {@code PropsHandler}.
  *
  */
 public class DefaultPropsHandler implements PropsHandler {
@@ -53,10 +53,10 @@ public class DefaultPropsHandler implements PropsHandler {
         this.properties = new HashMap();
     }
 
-    /** Initializes the object with a given <code>Map</code>
+    /** Initializes the object with a given {@code Map}
      * implementation.
      *
-     * @param properties The <code>Map</code> to use to store and retrieve 
properties.
+     * @param properties The {@code Map} to use to store and retrieve 
properties.
      */
     public DefaultPropsHandler(final Map properties) {
         this.properties = properties;
diff --git 
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileIterator.java
 
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileIterator.java
index 96a100ef..ba06612e 100644
--- 
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileIterator.java
+++ 
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileIterator.java
@@ -25,7 +25,7 @@ import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.FileSet;
 
 /**
- * <p><code>FileIterator</code> is an iterator over a
+ * <p>{@code FileIterator} is an iterator over a
  * over a number of files from a collection of FileSet instances.
  */
 public class FileIterator implements Iterator {
diff --git 
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScanner.java
 
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScanner.java
index 997b6fff..dbfc8df0 100644
--- 
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScanner.java
+++ 
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/FileScanner.java
@@ -24,7 +24,7 @@ import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.FileSet;
 
 /**
- * <p><code>FileScanner</code> is a bean which allows the iteration
+ * <p>{@code FileScanner} is a bean which allows the iteration
  * over a number of files from a collection of FileSet instances.
  */
 public class FileScanner {
diff --git 
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/GrantProject.java
 
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/GrantProject.java
index 4c95e7b9..a84edccf 100644
--- 
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/GrantProject.java
+++ 
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/GrantProject.java
@@ -24,7 +24,7 @@ import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectHelper;
 
-/** A subclass of an ant <code>Project</code> which allows
+/** A subclass of an ant {@code Project} which allows
  *  installation of delegators for particular functions.
  *
  *  <p>
@@ -39,11 +39,11 @@ public class GrantProject extends Project {
     /** Properties delegate. */
     private PropsHandler propsHandler;
 
-    /** Constructs  a new, empty <code>GrantProject</code>.
+    /** Constructs  a new, empty {@code GrantProject}.
      *
      *  <p>
-     *  Immediately after initialization, a <code>GrantProject</code>
-     *  delegates <strong>all</strong> calls to the normal ant 
<code>Project</code>
+     *  Immediately after initialization, a {@code GrantProject}
+     *  delegates <strong>all</strong> calls to the normal ant {@code Project}
      *  super class.   Only after installing delegators will custom
      *  behavior be achieved.
      *  </p>
@@ -103,10 +103,10 @@ public class GrantProject extends Project {
         return this.propsHandler.getProperty(key);
     }
 
-    /** Retrieve the currently installed <code>PropsHandler</code>.
+    /** Retrieve the currently installed {@code PropsHandler}.
      *
-     *  @return The currently installed <code>PropsHandler</code>,
-     *          or {@code null} if no <code>PropsHandler</code>
+     *  @return The currently installed {@code PropsHandler},
+     *          or {@code null} if no {@code PropsHandler}
      *          had yet to be installed.
      */
     public PropsHandler getPropsHandler() {
@@ -187,11 +187,11 @@ public class GrantProject extends Project {
         }
     }
 
-    /** Install a <code>PropsHandler</code> delegate.
+    /** Install a {@code PropsHandler} delegate.
      *
-     *  @param propsHandler The <code>PropsHandler</code> to install,
+     *  @param propsHandler The {@code PropsHandler} to install,
      *         or {@code null} to remove any currently installed
-     *         <code>PropsHandler</code>.
+     *         {@code PropsHandler}.
      */
     public void setPropsHandler(final PropsHandler propsHandler) {
         this.propsHandler = propsHandler;
diff --git 
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java
 
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java
index 39473171..c2f50ce9 100644
--- 
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java
+++ 
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/JellyPropsHandler.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
 import org.apache.commons.jelly.JellyContext;
 import org.apache.commons.jelly.expression.Expression;
 
-/** Implementation of a Commons Grant <code>propsHandler</code>
+/** Implementation of a Commons Grant {@code propsHandler}
  *  to resolve through Jelly's context.
  */
 public class JellyPropsHandler extends DefaultPropsHandler {
@@ -41,7 +41,7 @@ public class JellyPropsHandler extends DefaultPropsHandler {
 
     /** Retrieve all ant properties.
      *
-     *  @return A <code>Hashtable</code> of all properties.
+     *  @return A {@code Hashtable} of all properties.
      */
     @Override
     public Hashtable getProperties() {
diff --git 
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/PropsHandler.java
 
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/PropsHandler.java
index 21883998..ba2ad755 100644
--- 
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/PropsHandler.java
+++ 
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/tags/ant/PropsHandler.java
@@ -22,7 +22,7 @@ import java.util.Hashtable;
 import org.apache.tools.ant.Project;
 
 /** Interface for delegates supporting property management
- *  for a<code>GrantProject</code>.
+ *  for a{@code GrantProject}.
  *
  *  @see org.apache.commons.jelly.tags.ant.GrantProject#setProperty
  *  @see org.apache.commons.jelly.tags.ant.GrantProject#setNewProperty
@@ -39,21 +39,21 @@ import org.apache.tools.ant.Project;
  */
 public interface PropsHandler {
 
-    /** Copy all of the inherited properties to the other <code>Project</code>.
+    /** Copy all of the inherited properties to the other {@code Project}.
      *
-     * @param other The <code>Project</code> to copy the properties to.
+     * @param other The {@code Project} to copy the properties to.
      */
     void copyInheritedProperties(Project other);
 
-    /** Copy all of the user properties to the other <code>Project</code>.
+    /** Copy all of the user properties to the other {@code Project}.
      *
-     * @param other The <code>Project</code> to copy the properties to.
+     * @param other The {@code Project} to copy the properties to.
      */
     void copyUserProperties(Project other);
 
-    /** Retrieve a <code>Hashtable</code> of all properties.
+    /** Retrieve a {@code Hashtable} of all properties.
      *
-     *  @return A <code>Hashtable</code> of all properties.
+     *  @return A {@code Hashtable} of all properties.
      */
     Hashtable getProperties();
 
@@ -65,9 +65,9 @@ public interface PropsHandler {
      */
     String getProperty(String key);
 
-    /** Retrieve a <code>Hashtable</code> of all user properties.
+    /** Retrieve a {@code Hashtable} of all user properties.
      *
-     *  @return A <code>Hashtable</code> of all user properties.
+     *  @return A {@code Hashtable} of all user properties.
      */
     Hashtable getUserProperties();
 
@@ -86,7 +86,7 @@ public interface PropsHandler {
      */
     void setInheritedProperty(String key, String value);
 
-    /** Sets the <code>ant.java.version</code> property.
+    /** Sets the {@code ant.java.version} property.
      */
     void setJavaVersionProperty();
 
@@ -107,14 +107,14 @@ public interface PropsHandler {
     /** Sets a property that is not a user property.
      *
      * Acts as the replacement for ant's private
-     * <code>setPropertyInternal</code> method.
+     * {@code setPropertyInternal} method.
      *
      * @param key The property key.
      * @param value The value.
      */
     void setPropertyIfUndefinedByUser(String key, String value);
 
-    /** Sets the system variables for a <code>Project</code> that have
+    /** Sets the system variables for a {@code Project} that have
      * not already been assigned as user properties.
      */
     void setSystemProperties();
diff --git 
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/AntJellyContext.java
 
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/AntJellyContext.java
index 7dd04ef0..4cdcb817 100644
--- 
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/AntJellyContext.java
+++ 
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/AntJellyContext.java
@@ -26,7 +26,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.tools.ant.Project;
 
-/** <p><code>AntJellyContext</code> represents the Jelly context from inside 
Ant.</p>
+/** <p>{@code AntJellyContext} represents the Jelly context from inside 
Ant.</p>
   */
 
 public class AntJellyContext extends JellyContext {
diff --git 
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/JellyTask.java 
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/JellyTask.java
index d519a6c3..5e1306ee 100644
--- a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/JellyTask.java
+++ b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/JellyTask.java
@@ -38,7 +38,7 @@ import org.apache.tools.ant.Task;
 import org.xml.sax.SAXException;
 
 /**
- * <p><code>JellyTask</code> is an Ant task which will
+ * <p>{@code JellyTask} is an Ant task which will
  * run a given Jelly script.
  */
 
diff --git 
a/jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/RSSDigester.java
 
b/jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/RSSDigester.java
index 6d6269ee..42e79ebf 100644
--- 
a/jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/RSSDigester.java
+++ 
b/jelly-tags/betwixt/src/test/java/org/apache/commons/digester/rss/RSSDigester.java
@@ -34,10 +34,10 @@ import org.xml.sax.SAXException;
  * see the <a href="http://my.netscape.com/publish/";>My Netscape</a> site.</p>
  *
  * <p>The default implementation object returned by calling
- * <code>parse()</code> (an instance of
- * <code>org.apache.commons.digester.rss.Channel</code>)
- * knows how to render itself in XML format via the <code>render()</code>
- * method.  See the test <code>main()</code> method below for an
+ * {@code parse()} (an instance of
+ * {@code org.apache.commons.digester.rss.Channel})
+ * knows how to render itself in XML format via the {@code render()}
+ * method.  See the test {@code main()} method below for an
  * example of using these classes.</p>
  */
 
@@ -91,25 +91,25 @@ public class RSSDigester extends Digester {
     protected boolean configured = false;
 
     /**
-     * The fully qualified class name of the <code>Channel</code>
+     * The fully qualified class name of the {@code Channel}
      * implementation class.
      */
     protected String channelClass = "org.apache.commons.digester.rss.Channel";
 
     /**
-     * The fully qualified class name of the <code>Image</code>
+     * The fully qualified class name of the {@code Image}
      * implementation class.
      */
     protected String imageClass = "org.apache.commons.digester.rss.Image";
 
     /**
-     * The fully qualified class name of the <code>Item</code>
+     * The fully qualified class name of the {@code Item}
      * implementation class.
      */
     protected String itemClass = "org.apache.commons.digester.rss.Item";
 
     /**
-     * The fully qualified class name of the <code>TextInput</code>
+     * The fully qualified class name of the {@code TextInput}
      * implementation class.
      */
     protected String textInputClass =
diff --git 
a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/ClassLoaderTag.java
 
b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/ClassLoaderTag.java
index 920ae5da..4c82c68a 100644
--- 
a/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/ClassLoaderTag.java
+++ 
b/jelly-tags/define/src/main/java/org/apache/commons/jelly/tags/define/ClassLoaderTag.java
@@ -29,7 +29,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
- * Creates a new <code>URLClassLoader</code> to dynamically
+ * Creates a new {@code URLClassLoader} to dynamically
  * load tags froms.
  */
 public class ClassLoaderTag extends BeanTag {
diff --git 
a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/BundleTag.java 
b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/BundleTag.java
index 8641048e..46e305f1 100644
--- 
a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/BundleTag.java
+++ 
b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/BundleTag.java
@@ -121,12 +121,12 @@ public class BundleTag extends TagSupport {
      * Check if a match exists between the ordered set of preferred
      * locales and the available locales, for the given base name.
      * The set of preferred locales consists of a single locale
-     * (if the <code>org.apache.commons.jelly.tags.fmt.locale</code> 
configuration
+     * (if the {@code org.apache.commons.jelly.tags.fmt.locale} configuration
      * setting is present).
      *
      * <p> If no match was found in the previous step, check if a match
      * exists between the fallback locale (given by the
-     * <code>org.apache.commons.jelly.tags.fmt.fallbackLocale</code> 
configuration
+     * {@code org.apache.commons.jelly.tags.fmt.fallbackLocale} configuration
      * setting) and the available locales, for the given base name.
      *
      * @param jellyContext Page in which the resource bundle with the
diff --git 
a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/Config.java 
b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/Config.java
index 063031df..9d17de77 100644
--- a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/Config.java
+++ b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/Config.java
@@ -65,7 +65,7 @@ public class Config {
      * @param scope Scope in which the configuration variable is to be looked
      * up
      *
-     * @return The <code>java.lang.Object</code> associated with the 
configuration
+     * @return The {@code java.lang.Object} associated with the configuration
      * variable, or null if it is not defined.
      */
 //    public static Object get(JellyContext jc, String name, int scope) {
@@ -93,7 +93,7 @@ public class Config {
      * @param request Request object in which the configuration variable is to
      * be looked up
      * @param name Configuration variable name
-     * @return The <code>java.lang.Object</code> associated with the 
configuration
+     * @return The {@code java.lang.Object} associated with the configuration
      * variable, or null if it is not defined.
      */
 //    public static Object get(ServletRequest request, String name) {
@@ -110,7 +110,7 @@ public class Config {
      * @param session Session object in which the configuration variable is to
      * be looked up
      * @param name Configuration variable name
-     * @return The <code>java.lang.Object</code> associated with the 
configuration
+     * @return The {@code java.lang.Object} associated with the configuration
      * variable, or null if it is not defined.
      */
 //    public static Object get(HttpSession session, String name) {
@@ -127,7 +127,7 @@ public class Config {
      * @param context Servlet context in which the configuration variable is
      * to be looked up
      * @param name Configuration variable name
-     * @return The <code>java.lang.Object</code> associated with the 
configuration
+     * @return The {@code java.lang.Object} associated with the configuration
      * variable, or null if it is not defined.
      */
 //    public static Object get(ServletContext context, String name) {
@@ -300,18 +300,18 @@ public class Config {
      * identified by its context initialization parameter name.
      *
      * <p> For each of the JSP scopes (page, request, session, application),
-     * get the value of the configuration variable identified by 
<code>name</code>
-     * using method <code>get()</code>. Return as soon as a non-null value is
+     * get the value of the configuration variable identified by {@code name}
+     * using method {@code get()}. Return as soon as a non-null value is
      * found. If no value is found, get the value of the context initialization
-     * parameter identified by <code>name</code>.
+     * parameter identified by {@code name}.
      *
      * @param jc Page context in which the configuration setting is to be
      * searched
      * @param name Context initialization parameter name of the configuration
      * setting
      *
-     * @return The <code>java.lang.Object</code> associated with the 
configuration
-     * setting identified by <code>name</code>, or null if it is not defined.
+     * @return The {@code java.lang.Object} associated with the configuration
+     * setting identified by {@code name}, or null if it is not defined.
      */
 //    public static Object find(JellyContext jc, String name) {
 //        Object ret = jc.getVariable(name, JellyContext.PAGE_SCOPE);
diff --git 
a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetLocaleTag.java
 
b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetLocaleTag.java
index 584fc4bc..0d1e0a84 100644
--- 
a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetLocaleTag.java
+++ 
b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/SetLocaleTag.java
@@ -77,9 +77,9 @@ public class SetLocaleTag extends TagSupport {
      *
      * @param jc The context containing the formatting action
      * @param fromTag The formatting action
-     * @param format <code>true</code> if the formatting action is of type
-     * <formatXXX> (as opposed to <parseXXX>), and <code>false</code> otherwise
-     * (if set to <code>true</code>, the formatting locale that is returned by
+     * @param format {@code true} if the formatting action is of type
+     * <formatXXX> (as opposed to <parseXXX>), and {@code false} otherwise
+     * (if set to {@code true}, the formatting locale that is returned by
      * this method is used to set the response locale).
      *
      * @param avail the array of available locales
@@ -184,14 +184,14 @@ public class SetLocaleTag extends TagSupport {
     /**
      * Parses the given locale string into its language and (optionally)
      * country components, and returns the corresponding
-     * <code>java.util.Locale</code> object.
+     * {@code java.util.Locale} object.
      *
      * If the given locale string is null or empty, the runtime's default
      * locale is returned.
      *
      * @param locale the locale string to parse
      * @param variant the variant
-     * @return <code>java.util.Locale</code> object corresponding to the given
+     * @return {@code java.util.Locale} object corresponding to the given
      * locale string, or the runtime's default locale if the locale string is
      * null or empty
      *
diff --git 
a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/TimeZoneTag.java
 
b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/TimeZoneTag.java
index d4d7f522..4d1f61a9 100644
--- 
a/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/TimeZoneTag.java
+++ 
b/jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/TimeZoneTag.java
@@ -40,7 +40,7 @@ public class TimeZoneTag extends TagSupport {
      * the time zone is taken from the enclosing &lt;timeZone&gt; action.
      *
      * <p> Otherwise, the time zone configuration setting
-     * <code>javax.servlet.jsp.jstl.core.Config.FMT_TIME_ZONE</code>
+     * {@code javax.servlet.jsp.jstl.core.Config.FMT_TIME_ZONE}
      * is used.
      *
      * @param jc the page containing the action for which the
diff --git 
a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/SessionTag.java
 
b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/SessionTag.java
index 63db8849..3bd9fe8a 100644
--- 
a/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/SessionTag.java
+++ 
b/jelly-tags/http/src/main/java/org/apache/commons/jelly/tags/http/SessionTag.java
@@ -112,7 +112,7 @@ public class SessionTag extends TagSupport {
     }
 
     /**
-     * Helper method for proxy <code>port</code> property
+     * Helper method for proxy {@code port} property
      *
      * @return the {@link #getProxy() proxy's} port property
      */
@@ -188,7 +188,7 @@ public class SessionTag extends TagSupport {
     }
 
     /**
-     * Helper method for proxy <code>host</code> property
+     * Helper method for proxy {@code host} property
      *
      * @param host the {@link #getProxy() proxy's} host property
      */
@@ -197,7 +197,7 @@ public class SessionTag extends TagSupport {
     }
 
     /**
-     * Helper method for proxy <code>port</code> property
+     * Helper method for proxy {@code port} property
      *
      * @param port the {@link #getProxy() proxy's} port property
      */
diff --git 
a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
 
b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
index 59ebf4de..55d5b571 100644
--- 
a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
+++ 
b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/AssertThrowsTag.java
@@ -26,10 +26,10 @@ import org.apache.commons.logging.LogFactory;
 /**
  * Runs its body and asserts that an exception is thrown by it.  If no
  * exception is thrown the tag fails.  By default all exceptions are caught.
- * If however <code>expected</code> was specified the body must throw
+ * If however {@code expected} was specified the body must throw
  * an exception of the given class, otherwise the assertion fails.  The
  * exception thrown by the body can also be of any subtype of the specified
- * exception class.  The optional <code>var</code> attribute can be specified 
if
+ * exception class.  The optional {@code var} attribute can be specified if
  * the caught exception is to be exported to a variable.
  */
 public class AssertThrowsTag extends AssertTagSupport {
@@ -91,9 +91,9 @@ public class AssertThrowsTag extends AssertTagSupport {
     }
 
     /**
-     * Returns the <code>Class</code> corresponding to the class
-     * specified by <code>expected</code>. If
-     * <code>expected</code> was either not specified then <code>java. lang.
+     * Returns the {@code Class} corresponding to the class
+     * specified by {@code expected}. If
+     * {@code expected} was either not specified then <code>java. lang.
      * Throwable</code> is returned.
      * Otherwise if the class couldn't be
      * found or doesn't denote an exception class then an exception is thrown.
@@ -139,7 +139,7 @@ public class AssertThrowsTag extends AssertTagSupport {
      * Sets the class name of exception expected to be thrown by the body.  The
      * class name must be fully qualified and can either be the expected
      * exception class itself or any supertype of it, but must be a subtype of
-     * <code>java.lang.Throwable</code>.
+     * {@code java.lang.Throwable}.
      */
     public void setExpected(final String expected) {
         this.expected = expected;
diff --git 
a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
 
b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
index b38bebc0..3395090d 100644
--- 
a/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
+++ 
b/jelly-tags/junit/src/main/java/org/apache/commons/jelly/tags/junit/JellyAssertionFailedError.java
@@ -25,7 +25,7 @@ import org.apache.commons.jelly.LocationAware;
 import junit.framework.AssertionFailedError;
 
 /**
- * <p><code>JellyAssertionFailedError</code> is
+ * <p>{@code JellyAssertionFailedError} is
  * a JUnit AssertionFailedError which is LocationAware so that it can include
  * details of where in the JellyUnit test case that the failure occurred.</p>
  */
diff --git 
a/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/JellyJob.java
 
b/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/JellyJob.java
index cbb65ee1..75b77e0a 100644
--- 
a/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/JellyJob.java
+++ 
b/jelly-tags/quartz/src/main/java/org/apache/commons/jelly/tags/quartz/JellyJob.java
@@ -26,7 +26,7 @@ import org.quartz.JobDetail;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 
-/** Implementation of a quart <code>Job</code> to execute jellyscript.
+/** Implementation of a quart {@code Job} to execute jellyscript.
  */
 public class JellyJob implements Job
 {
diff --git 
a/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java
 
b/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java
index 42465bea..d0cf79b4 100644
--- 
a/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java
+++ 
b/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/ContainsTagTest.java
@@ -21,7 +21,7 @@ import org.apache.commons.jelly.XMLOutput;
 
 import junit.framework.TestCase;
 
-/*** <p><code>ContainsTagTest</code> a class that is useful to perform regexp 
matches
+/*** <p>{@code ContainsTagTest} a class that is useful to perform regexp 
matches
 * in strings.</p>
 */
 public class ContainsTagTest extends TestCase {
diff --git 
a/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/MatchTagTest.java
 
b/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/MatchTagTest.java
index c06d74cb..78e06f9f 100644
--- 
a/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/MatchTagTest.java
+++ 
b/jelly-tags/regexp/src/test/java/org/apache/commons/jelly/tags/regexp/MatchTagTest.java
@@ -21,7 +21,7 @@ import org.apache.commons.jelly.XMLOutput;
 
 import junit.framework.TestCase;
 
-/*** <p><code>MatchTagTest</code> a class that is useful to perform regexp 
matches
+/*** <p>{@code MatchTagTest} a class that is useful to perform regexp matches
 * in strings.</p>
 */
 public class MatchTagTest extends TestCase {
diff --git 
a/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/Result.java 
b/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/Result.java
index bc135234..c693b935 100644
--- a/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/Result.java
+++ b/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/Result.java
@@ -38,7 +38,7 @@ public interface Result {
     /**
      * Returns an array of column names.
      *
-     * @return the column names as an array of <code>String</code> objects
+     * @return the column names as an array of {@code String} objects
      */
     String[] getColumnNames();
 
@@ -55,7 +55,7 @@ public interface Result {
      * Comparator so that the key is the case insensitive representation
      * of the column name.
      *
-     * @return the result rows as an array of <code>SortedMap</code> objects
+     * @return the result rows as an array of {@code SortedMap} objects
      */
     SortedMap[] getRows();
 
@@ -64,14 +64,14 @@ public interface Result {
      * designates the Row, the second the Column. The array
      * stores the value at the specified row and column.
      *
-     * @return the result rows as an array of <code>Object[]</code> objects
+     * @return the result rows as an array of {@code Object[]} objects
      */
     Object[][] getRowsByIndex();
 
     /**
      * Returns true of the query was limited by a maximum row setting
      *
-     * @return <code>true</code> if the query was limited by a maximum
+     * @return {@code true} if the query was limited by a maximum
      * row setting
      */
     boolean isLimitedByMaxRows();
diff --git 
a/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/ResultImpl.java 
b/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/ResultImpl.java
index 83e6e9b1..dcca1910 100644
--- a/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/ResultImpl.java
+++ b/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/ResultImpl.java
@@ -26,9 +26,9 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 
 /**
- * <p>This class creates a cached version of a <code>ResultSet</code>.
- * It's represented as a <code>Result</code> implementation, capable of
- * returning an array of <code>Row</code> objects containing a 
<code>Column</code>
+ * <p>This class creates a cached version of a {@code ResultSet}.
+ * It's represented as a {@code Result} implementation, capable of
+ * returning an array of {@code Row} objects containing a {@code Column}
  * instance for each column in the row.   It is not part of the JSTL
  * API; it serves merely as a back-end to ResultSupport's static methods.
  * Thus, we scope its access to the package.
@@ -44,7 +44,7 @@ final class ResultImpl implements Result {
      * This constructor reads the ResultSet and saves a cached
      * copy.
      *
-     * @param rs an open <code>ResultSet</code>, positioned before the first
+     * @param rs an open {@code ResultSet}, positioned before the first
      * row
      * @param startRow beginning row to be cached
      * @param maxRows query maximum rows limit
diff --git 
a/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/ResultSupport.java 
b/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/ResultSupport.java
index 8f496389..a7f23bca 100644
--- a/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/ResultSupport.java
+++ b/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/ResultSupport.java
@@ -31,7 +31,7 @@ public class ResultSupport {
      * Returns an array of Row objects.
      *
      * @param resultSet the ResultSet object
-     * @return the <code>Result</code> object of the result
+     * @return the {@code Result} object of the result
      */
     public static Result toResult(final ResultSet resultSet) {
         try {
@@ -46,7 +46,7 @@ public class ResultSupport {
      *
      * @param resultSet the ResultSet object
      * @param maxRows the maximum number of rows
-     * @return the <code>Result</code> object of the result limited by maxRows
+     * @return the {@code Result} object of the result limited by maxRows
      */
     public static Result toResult(final ResultSet resultSet, final int 
maxRows) {
         try {
diff --git 
a/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java 
b/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java
index 58f76482..72220424 100644
--- 
a/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java
+++ 
b/jelly-tags/sql/src/main/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java
@@ -22,11 +22,11 @@ package javax.servlet.jsp.jstl.sql;
  * values for parameter markers ("?") in their SQL statements.</p>
  *
  * <p>This interface is implemented by both &lt;sql:query&gt; and
- * &lt;sql:update&gt;. Its <code>addSQLParameter()</code> method
+ * &lt;sql:update&gt;. Its {@code addSQLParameter()} method
  * is called by nested parameter actions (such as &lt;sql:param&gt;)
- * to substitute <code>PreparedStatement</code> parameter values for
+ * to substitute {@code PreparedStatement} parameter values for
  * "?" parameter markers in the SQL statement of the enclosing
- * <code>SQLExecutionTag</code> action.</p>
+ * {@code SQLExecutionTag} action.</p>
  *
  * <p>The given parameter values are converted to their corresponding
  * SQL type (following the rules in the JDBC specification) before
@@ -36,11 +36,11 @@ package javax.servlet.jsp.jstl.sql;
  * is the responsibility of the tag handler implementing this
  * interface</p>
  *
- * <p>The <code>SQLExecutionTag</code> interface is exposed in order
+ * <p>The {@code SQLExecutionTag} interface is exposed in order
  * to support custom parameter actions which may retrieve their
  * parameters from any source and process them before substituting
  * them for a parameter marker in the sQL statement of the
- * enclosing <code>SQLExecutionTag</code> action</p>
+ * enclosing {@code SQLExecutionTag} action</p>
  */
 public interface SQLExecutionTag {
 
diff --git 
a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DataSourceUtil.java
 
b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DataSourceUtil.java
index 72e56be1..5e280bab 100644
--- 
a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DataSourceUtil.java
+++ 
b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DataSourceUtil.java
@@ -29,8 +29,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
- * <p>A simple <code>DataSource</code> utility for the standard
- * <code>DriverManager</code> class.
+ * <p>A simple {@code DataSource} utility for the standard
+ * {@code DriverManager} class.
  *
  * TO DO: need to cache DataSource
  */
diff --git 
a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DataSourceWrapper.java
 
b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DataSourceWrapper.java
index 69ff0285..8b85dcb5 100644
--- 
a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DataSourceWrapper.java
+++ 
b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/DataSourceWrapper.java
@@ -32,8 +32,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
- * <p>A simple <code>DataSource</code> wrapper for the standard
- * <code>DriverManager</code> class.
+ * <p>A simple {@code DataSource} wrapper for the standard
+ * {@code DriverManager} class.
  */
 public class DataSourceWrapper implements DataSource {
 
diff --git 
a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/QueryTag.java 
b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/QueryTag.java
index 7b76b27a..18a3bd0f 100644
--- 
a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/QueryTag.java
+++ 
b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/QueryTag.java
@@ -64,17 +64,17 @@ public class QueryTag extends SqlTagSupport {
     // Accessor methods
 
     /**
-     * <p>Execute the SQL statement, set either through the <code>sql</code>
+     * <p>Execute the SQL statement, set either through the {@code sql}
      * attribute or as the body, and save the result as a variable
-     * named by the <code>var</code> attribute in the scope specified
-     * by the <code>scope</code> attribute, as an object that implements
+     * named by the {@code var} attribute in the scope specified
+     * by the {@code scope} attribute, as an object that implements
      * the Result interface.
      *
      * <p>The connection used to execute the statement comes either
-     * from the <code>DataSource</code> specified by the
-     * <code>dataSource</code> attribute, provided by a parent action
+     * from the {@code DataSource} specified by the
+     * {@code dataSource} attribute, provided by a parent action
      * element, or is retrieved from a JSP scope  attribute
-     * named <code>javax.servlet.jstl.sql.dataSource</code>.
+     * named {@code javax.servlet.jstl.sql.dataSource}.
      */
     @Override
     public void doTag(final XMLOutput output) throws JellyTagException {
diff --git 
a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/ResultImpl.java
 
b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/ResultImpl.java
index b06519cf..95119c41 100644
--- 
a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/ResultImpl.java
+++ 
b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/ResultImpl.java
@@ -31,9 +31,9 @@ import java.util.TreeMap;
 import javax.servlet.jsp.jstl.sql.Result;
 
 /**
- * <p>This class creates a cached version of a <code>ResultSet</code>.
- * It's represented as a <code>Result</code> implementation, capable of
- * returning an array of <code>Row</code> objects containing a 
<code>Column</code>
+ * <p>This class creates a cached version of a {@code ResultSet}.
+ * It's represented as a {@code Result} implementation, capable of
+ * returning an array of {@code Row} objects containing a {@code Column}
  * instance for each column in the row.</p>
  *
  * <p>Note -- this is a private copy for the RI to avoid making the
@@ -96,7 +96,7 @@ public class ResultImpl implements Result {
      * This constructor reads the ResultSet and saves a cached
      * copy.
      *
-     * @param rs an open <code>ResultSet</code>, positioned before the first
+     * @param rs an open {@code ResultSet}, positioned before the first
      * row
      * @param startRow beginning row to be cached
      * @param maxRows query maximum rows limit
diff --git 
a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/TransactionTag.java
 
b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/TransactionTag.java
index 1bde084b..57f129a3 100644
--- 
a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/TransactionTag.java
+++ 
b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/TransactionTag.java
@@ -61,7 +61,7 @@ public class TransactionTag extends TagSupport {
     }
 
     /**
-     * Restores the <code>Connection</code> to its initial state and
+     * Restores the {@code Connection} to its initial state and
      * closes it.
      */
     protected void doFinally() {
@@ -86,7 +86,7 @@ public class TransactionTag extends TagSupport {
 
     /**
      * Prepares for execution by setting the initial state, such as
-     * getting the <code>Connection</code> and preparing it for
+     * getting the {@code Connection} and preparing it for
      * the transaction.
      */
     @Override
diff --git 
a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/UpdateTag.java 
b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/UpdateTag.java
index a0ab0b9c..2e66ee61 100644
--- 
a/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/UpdateTag.java
+++ 
b/jelly-tags/sql/src/main/java/org/apache/commons/jelly/tags/sql/UpdateTag.java
@@ -52,17 +52,17 @@ public class UpdateTag extends SqlTagSupport {
     // Tag logic
 
     /**
-     * <p>Execute the SQL statement, set either through the <code>sql</code>
+     * <p>Execute the SQL statement, set either through the {@code sql}
      * attribute or as the body, and save the result as a variable
-     * named by the <code>var</code> attribute in the scope specified
-     * by the <code>scope</code> attribute, as an object that implements
+     * named by the {@code var} attribute in the scope specified
+     * by the {@code scope} attribute, as an object that implements
      * the Result interface.
      *
      * <p>The connection used to execute the statement comes either
-     * from the <code>DataSource</code> specified by the
-     * <code>dataSource</code> attribute, provided by a parent action
+     * from the {@code DataSource} specified by the
+     * {@code dataSource} attribute, provided by a parent action
      * element, or is retrieved from a JSP scope  attribute
-     * named <code>javax.servlet.jsp.jstl.sql.dataSource</code>.
+     * named {@code javax.servlet.jsp.jstl.sql.dataSource}.
      */
     @Override
     public void doTag(final XMLOutput output) throws JellyTagException {
diff --git 
a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
 
b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
index ac95c470..ef1306a8 100644
--- 
a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
+++ 
b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/ComponentTag.java
@@ -399,7 +399,7 @@ public class ComponentTag extends UseBeanTag implements 
ContainerTag {
     /** Puts this tag into the context under the given name
         * allowing later calls to rerun().
         * For example, it makes sense to use ${myTag.rerun()} as a child
-        * of an <code>action</code> element.
+        * of an {@code action} element.
         *
         * @param name name to be used
         */
diff --git 
a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/GbcTag.java
 
b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/GbcTag.java
index 8f3d8bb2..aa81ecbf 100644
--- 
a/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/GbcTag.java
+++ 
b/jelly-tags/swing/src/main/java/org/apache/commons/jelly/tags/swing/GbcTag.java
@@ -35,7 +35,7 @@ import org.apache.commons.lang3.StringUtils;
  * the second argument of {@link Container#add(Component,Object)}.
  * It supports inheritance between such tags in the following fashion:
  * <ul>
- *     <li>either using a <code>basedOn</code> attribute which is
+ *     <li>either using a {@code basedOn} attribute which is
  *         supposed to provide a reference to another {@link GbcTag}.</li>
  *     <li>either using a parent {@link GbcTag}.</li>
  * </ul>
diff --git 
a/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java
 
b/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java
index ce7eefb0..67c9cd98 100644
--- 
a/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java
+++ 
b/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapter.java
@@ -27,7 +27,7 @@ import org.apache.velocity.context.Context;
 /**
  * Adapts a JellyContext for use as a Velocity Context.  This context
  * can be used in either read-only or read-write mode.  When used as a
- * read-only adapter, items <code>put</code> or <code>remove</code>ed from the
+ * read-only adapter, items {@code put} or {@code remove}ed from the
  * Velocity context are not permitted to propagate to the JellyContext,
  * which is the default behavior.  The adapter can also be used in a
  * read-write mode.  This permits changes made by Velocity to propagate
@@ -104,8 +104,8 @@ public class JellyContextAdapter implements Context
     /**
      * Tests if the adapter is read-only.
      *
-     * @return <code>true</code> if the adapter is read-only; otherwise
-     * returns <code>false</code>.
+     * @return {@code true} if the adapter is read-only; otherwise
+     * returns {@code false}.
      */
     public boolean isReadOnly()
     {
@@ -164,8 +164,8 @@ public class JellyContextAdapter implements Context
      * the JellyContext.  Turning the read-only flag off enables changes
      * to propagate.
      *
-     * @param readOnly If this parameter is <code>true</code>, the adapter
-     * becomes read-only.  Setting the parameter to <code>false</code> the
+     * @param readOnly If this parameter is {@code true}, the adapter
+     * becomes read-only.  Setting the parameter to {@code false} the
      * adapter becomes read-write.
      */
     public void setReadOnly(final boolean readOnly)
diff --git 
a/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
 
b/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
index 27c05888..609aa631 100644
--- 
a/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
+++ 
b/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
@@ -152,8 +152,8 @@ public class MergeTag extends VelocityTagSupport
      * modifications in the Velocity context from propagating to the
      * JellyContext.
      *
-     * @param readOnly <code>true</code> prevents modifications from
-     * propagating (the default), or <code>false</code> which permits
+     * @param readOnly {@code true} prevents modifications from
+     * propagating (the default), or {@code false} which permits
      * modifications.
      */
     public void setReadOnly( final boolean readOnly )
diff --git 
a/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
 
b/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
index 06f32c66..abd0ce31 100644
--- 
a/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
+++ 
b/jelly-tags/velocity/src/test/java/org/apache/commons/jelly/tags/velocity/JellyContextAdapterTest.java
@@ -28,7 +28,7 @@ import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
 /**
- * Unit test for <code>JellyContextAdapter</code>.
+ * Unit test for {@code JellyContextAdapter}.
  */
 public class JellyContextAdapterTest extends TestCase
 {
diff --git 
a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/AttributeTag.java
 
b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/AttributeTag.java
index ec52da35..5c9fb5ce 100644
--- 
a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/AttributeTag.java
+++ 
b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/AttributeTag.java
@@ -21,7 +21,7 @@ import org.apache.commons.jelly.TagSupport;
 import org.apache.commons.jelly.XMLOutput;
 
 /** Adds an XML attribute to the parent element tag like
-  * the <code>&lt;xsl:attribute&gt;</code> tag.
+  * the {@code &lt;xsl:attribute&gt;} tag.
   */
 public class AttributeTag extends TagSupport {
      /** The namespace URI. */
diff --git 
a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ElementTag.java
 
b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ElementTag.java
index 0bda5082..ae7c1e30 100644
--- 
a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ElementTag.java
+++ 
b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/ElementTag.java
@@ -24,7 +24,7 @@ import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 
 /** A tag to produce an XML element which can contain other attributes
-  * or elements like the <code>&lt;xsl:element&gt;</code> tag.
+  * or elements like the {@code &lt;xsl:element&gt;} tag.
   */
 public class ElementTag extends TagSupport {
 
diff --git 
a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SetTag.java 
b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SetTag.java
index c8145891..d47885f4 100644
--- a/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SetTag.java
+++ b/jelly-tags/xml/src/main/java/org/apache/commons/jelly/tags/xml/SetTag.java
@@ -224,7 +224,7 @@ public class SetTag extends XPathTagSupport {
     }
 
     /** If set, returns a string delimited by this delimiter.
-      * Implies <code>asString</code> to be true.
+      * Implies {@code asString} to be true.
       */
     public void setDelim(final String delim) {
         this.delimiter = delim;
diff --git 
a/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/AssertDocumentsEqualTag.java
 
b/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/AssertDocumentsEqualTag.java
index d01acd6b..1097b80a 100644
--- 
a/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/AssertDocumentsEqualTag.java
+++ 
b/jelly-tags/xmlunit/src/main/java/org/apache/commons/jelly/tags/xmlunit/AssertDocumentsEqualTag.java
@@ -39,7 +39,7 @@ public class AssertDocumentsEqualTag extends 
XMLUnitTagSupport {
     /**
      * Controls whether whitespace differences are reported as differences.
      *
-     * Defaults to {@code false}, so if <code>trim</code> is set to
+     * Defaults to {@code false}, so if {@code trim} is set to
      * {@code false} whitespace differences are detected.
      */
     private boolean ignoreWhitespace = false;
@@ -113,7 +113,7 @@ public class AssertDocumentsEqualTag extends 
XMLUnitTagSupport {
     /**
      * Controls whether whitespace differences should be interpreted as
      * differences or not.  The default is {@code false}.  Note that the
-     * use of the <code>trim</code> attribute is crucial here.
+     * use of the {@code trim} attribute is crucial here.
      */
     public void setIgnoreWhitespace(final boolean ignoreWhitespace) {
         this.ignoreWhitespace = ignoreWhitespace;

Reply via email to