Make the Javadoc HTML5 compatible
diff --git a/apidocs/pom.xml b/apidocs/pom.xml
index ea262a9..beaf7f4 100644
--- a/apidocs/pom.xml
+++ b/apidocs/pom.xml
@@ -168,7 +168,7 @@
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <configuration>
                             <additionalOptions>
-                                <additionalOption>-html4</additionalOption>
+                                <additionalOption>-html5</additionalOption>
                             </additionalOptions>
                         </configuration>
                     </plugin>
diff --git a/aspects/core-aspects/src/main/java/org/apache/axiom/core/AttributeMatcher.java b/aspects/core-aspects/src/main/java/org/apache/axiom/core/AttributeMatcher.java
index 9921c0a..1ffdc2b 100644
--- a/aspects/core-aspects/src/main/java/org/apache/axiom/core/AttributeMatcher.java
+++ b/aspects/core-aspects/src/main/java/org/apache/axiom/core/AttributeMatcher.java
@@ -46,22 +46,22 @@
     boolean matches(CoreAttribute attr, String namespaceURI, String name);
 
     /**
-     * Get the <tt>namespaceURI</tt> parameter for an existing attribute. This method is used by
+     * Get the {@code namespaceURI} parameter for an existing attribute. This method is used by
      * {@link CoreElement#coreSetAttribute(AttributeMatcher, CoreAttribute, Semantics)}
      * which passes its return value as parameter to {@link #matches(CoreAttribute, String, String)}.
      * 
      * @param attr the attribute
-     * @return the <tt>namespaceURI</tt> parameter to be passed to {@link #matches(CoreAttribute, String, String)}
+     * @return the {@code namespaceURI} parameter to be passed to {@link #matches(CoreAttribute, String, String)}
      */
     String getNamespaceURI(CoreAttribute attr);
     
     /**
-     * Get the <tt>name</tt> parameter for an existing attribute. This method is used by
+     * Get the {@code name} parameter for an existing attribute. This method is used by
      * {@link CoreElement#coreSetAttribute(AttributeMatcher, CoreAttribute, Semantics)}
      * which passes its return value as parameter to {@link #matches(CoreAttribute, String, String)}.
      * 
      * @param attr the attribute
-     * @return the <tt>name</tt> parameter to be passed to {@link #matches(CoreAttribute, String, String)}
+     * @return the {@code name} parameter to be passed to {@link #matches(CoreAttribute, String, String)}
      */
     String getName(CoreAttribute attr);
     
diff --git a/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/ContentIDGenerator.java b/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/ContentIDGenerator.java
index 48e58a5..4971c12 100644
--- a/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/ContentIDGenerator.java
+++ b/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/ContentIDGenerator.java
@@ -23,7 +23,7 @@
 
 /**
  * Content ID generator interface. Implementations of this interface are used by
- * {@link XOPEncodingFilterHandler} to generate content IDs for use in <tt>xop:Include</tt>
+ * {@link XOPEncodingFilterHandler} to generate content IDs for use in {@code xop:Include}
  * elements.
  */
 public interface ContentIDGenerator {
diff --git a/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicy.java b/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicy.java
index 057aef8..a71010e 100644
--- a/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicy.java
+++ b/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/OptimizationPolicy.java
@@ -77,7 +77,7 @@
      *            indicates whether the binary content was initially marked as eligible for
      *            optimization (see above)
      * @return <code>true</code> if the binary content should be optimized using XOP, i.e. encoded
-     *         using <tt>xop:Include</tt>
+     *         using {@code xop:Include}
      * @throws IOException
      *             if an error occurs while reading the data handler
      */
@@ -93,7 +93,7 @@
      *            indicates whether the binary content was initially marked as eligible for
      *            optimization (see above)
      * @return <code>true</code> if the binary content should be optimized using XOP, i.e. encoded
-     *         using <tt>xop:Include</tt>
+     *         using {@code xop:Include}
      * @throws IOException
      *             if an error occurs while reading the data handler
      */
diff --git a/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPEncodingFilterHandler.java b/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPEncodingFilterHandler.java
index 1212b25..6e81048 100644
--- a/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPEncodingFilterHandler.java
+++ b/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPEncodingFilterHandler.java
@@ -64,11 +64,11 @@
     }
 
     /**
-     * Get the set of content IDs referenced in <tt>xop:Include</tt> element information items
+     * Get the set of content IDs referenced in {@code xop:Include} element information items
      * produced by this wrapper.
      * 
      * @return The set of content IDs in their order of appearance in the infoset. If no
-     *         <tt>xop:Include</tt> element information items have been produced yet, an empty
+     *         {@code xop:Include} element information items have been produced yet, an empty
      *         set will be returned.
      */
     public Set<String> getContentIDs() {
diff --git a/axiom-api/src/main/java/org/apache/axiom/attachments/Attachments.java b/axiom-api/src/main/java/org/apache/axiom/attachments/Attachments.java
index 143c98d..a229af9 100644
--- a/axiom-api/src/main/java/org/apache/axiom/attachments/Attachments.java
+++ b/axiom-api/src/main/java/org/apache/axiom/attachments/Attachments.java
@@ -216,7 +216,7 @@
      * use that interface to determine the size of the MIME part.
      * 
      * @param contentID
-     *            the raw content ID (without the surrounding angle brackets and <tt>cid:</tt>
+     *            the raw content ID (without the surrounding angle brackets and {@code cid:}
      *            prefix) of the MIME part
      * @return the {@link DataHandler} of the MIME part referred by the content ID or
      *         <code>null</code> if the MIME part referred by the content ID does not exist
@@ -303,7 +303,7 @@
      * Get the content ID of the root part of the MIME message. This content ID is determined as
      * follows:
      * <ul>
-     * <li>If the content type of the MIME message has a <tt>start</tt> parameter, then the content
+     * <li>If the content type of the MIME message has a {@code start} parameter, then the content
      * ID will be extracted from that parameter.
      * <li>Otherwise the content ID of the first MIME part of the MIME message is returned.
      * </ul>
diff --git a/axiom-api/src/main/java/org/apache/axiom/ext/stax/DTDReader.java b/axiom-api/src/main/java/org/apache/axiom/ext/stax/DTDReader.java
index edc4e82..c3f5303 100644
--- a/axiom-api/src/main/java/org/apache/axiom/ext/stax/DTDReader.java
+++ b/axiom-api/src/main/java/org/apache/axiom/ext/stax/DTDReader.java
@@ -37,7 +37,7 @@
     String PROPERTY = DTDReader.class.getName();
     
     /**
-     * Get the root name of the DTD, i.e. the name immediately following the <tt>DOCTYPE</tt> keyword.
+     * Get the root name of the DTD, i.e. the name immediately following the {@code DOCTYPE} keyword.
      * 
      * @return the root name; must not be <code>null</code>
      * @throws IllegalStateException
diff --git a/axiom-api/src/main/java/org/apache/axiom/ext/stax/datahandler/DataHandlerReader.java b/axiom-api/src/main/java/org/apache/axiom/ext/stax/datahandler/DataHandlerReader.java
index 06bcafe..038e5a7 100644
--- a/axiom-api/src/main/java/org/apache/axiom/ext/stax/datahandler/DataHandlerReader.java
+++ b/axiom-api/src/main/java/org/apache/axiom/ext/stax/datahandler/DataHandlerReader.java
@@ -100,10 +100,10 @@
      * <p>
      * If available, the returned value MUST be a raw content ID. In particular:
      * <ul>
-     * <li>If the content ID has been extracted from an <tt>href</tt> attribute, it MUST NOT
-     * contain the <tt>cid:</tt> prefix.</li>
-     * <li>If it has been extracted from a <tt>Content-ID</tt> MIME header, it MUST NOT be
-     * enclosed in angles (<tt>&lt;&gt;</tt>).</li>
+     * <li>If the content ID has been extracted from an {@code href} attribute, it MUST NOT
+     * contain the {@code cid:} prefix.</li>
+     * <li>If it has been extracted from a {@code Content-ID} MIME header, it MUST NOT be
+     * enclosed in angles ({@code <>}).</li>
      * </ul>
      * <p>
      * A consumer MAY use the return value of this method in contexts where it is desirable to
diff --git a/axiom-api/src/main/java/org/apache/axiom/locator/Activator.java b/axiom-api/src/main/java/org/apache/axiom/locator/Activator.java
index d26aa6c..b979b9b 100644
--- a/axiom-api/src/main/java/org/apache/axiom/locator/Activator.java
+++ b/axiom-api/src/main/java/org/apache/axiom/locator/Activator.java
@@ -30,7 +30,7 @@
 import org.osgi.util.tracker.BundleTracker;
 
 /**
- * The OSGi bundle activator for the <tt>axiom-api</tt> bundle. This activator sets up an OSGi
+ * The OSGi bundle activator for the {@code axiom-api} bundle. This activator sets up an OSGi
  * specific {@link OMMetaFactoryLocator} and injects it into {@link OMAbstractFactory} using
  * {@link OMAbstractFactory#setMetaFactoryLocator(OMMetaFactoryLocator)}.
  */
diff --git a/axiom-api/src/main/java/org/apache/axiom/locator/loader/OMMetaFactoryLoader.java b/axiom-api/src/main/java/org/apache/axiom/locator/loader/OMMetaFactoryLoader.java
index 791786e..3147318 100644
--- a/axiom-api/src/main/java/org/apache/axiom/locator/loader/OMMetaFactoryLoader.java
+++ b/axiom-api/src/main/java/org/apache/axiom/locator/loader/OMMetaFactoryLoader.java
@@ -25,7 +25,7 @@
 /**
  * Loads the {@link OMMetaFactory} for a given Axiom implementation. An Axiom implementation must
  * provide an implementation of this interface. That implementation class is specified in the
- * <tt>META-INF/axiom.xml</tt> of the Axiom implementation.
+ * {@code META-INF/axiom.xml} of the Axiom implementation.
  */
 public interface OMMetaFactoryLoader {
     /**
diff --git a/axiom-api/src/main/java/org/apache/axiom/locator/package.html b/axiom-api/src/main/java/org/apache/axiom/locator/package.html
index 20e295a..3911d5b 100644
--- a/axiom-api/src/main/java/org/apache/axiom/locator/package.html
+++ b/axiom-api/src/main/java/org/apache/axiom/locator/package.html
@@ -18,7 +18,7 @@
   -->
 <html>
 <body>
-Contains classes used internally by the <tt>axiom-api</tt> artifact to locate Axiom implementations.
+Contains classes used internally by the <code>axiom-api</code> artifact to locate Axiom implementations.
 Classes in this package should never be used directly by application code.
 </body>
 </html>
\ No newline at end of file
diff --git a/axiom-api/src/main/java/org/apache/axiom/mime/ContentType.java b/axiom-api/src/main/java/org/apache/axiom/mime/ContentType.java
index 257148d..85a8caa 100644
--- a/axiom-api/src/main/java/org/apache/axiom/mime/ContentType.java
+++ b/axiom-api/src/main/java/org/apache/axiom/mime/ContentType.java
@@ -28,7 +28,7 @@
 import javax.activation.MimeType;
 
 /**
- * Represents the (parsed) value of a <tt>Content-Type</tt> header as defined by
+ * Represents the (parsed) value of a {@code Content-Type} header as defined by
  * <a href="http://tools.ietf.org/html/rfc2045">RFC 2045</a>.
  * <p>
  * The relevant productions from RFC 2045 and RFC 822 are:
@@ -171,10 +171,10 @@
     }
 
     /**
-     * Constructor that parses a <tt>Content-Type</tt> header value.
+     * Constructor that parses a {@code Content-Type} header value.
      * 
      * @param type
-     *            the value of the <tt>Content-Type</tt> header conforming to RFC 2045
+     *            the value of the {@code Content-Type} header conforming to RFC 2045
      * @throws ParseException
      *             if the value is invalid and could not be parsed
      */
@@ -265,7 +265,7 @@
     
     /**
      * Create a string representation of this content type suitable as the value for a
-     * <tt>Content-Type</tt> header as specified by RFC 2045. Note that this method serializes all
+     * {@code Content-Type} header as specified by RFC 2045. Note that this method serializes all
      * parameter values as quoted strings, even values that could be represented as tokens. This is
      * compatible with R1109 in WS-I Basic Profile 1.2 and 2.0.
      * 
diff --git a/axiom-api/src/main/java/org/apache/axiom/mime/MediaType.java b/axiom-api/src/main/java/org/apache/axiom/mime/MediaType.java
index 8c708e8..8f7cdca 100644
--- a/axiom-api/src/main/java/org/apache/axiom/mime/MediaType.java
+++ b/axiom-api/src/main/java/org/apache/axiom/mime/MediaType.java
@@ -23,7 +23,7 @@
 /**
  * Represents a media type as defined by <a href="http://tools.ietf.org/html/rfc2045">RFC 2045</a>
  * and <a href="http://tools.ietf.org/html/rfc2046">RFC 2046</a>. It specifies a primary type (e.g.
- * <tt>text</tt>) and a subtype (e.g. <tt>xml</tt>). Note that in RFC 2045, "media type" refers to
+ * {@code text}) and a subtype (e.g. {@code xml}). Note that in RFC 2045, "media type" refers to
  * what is called "primary type" here, while this class uses "media type" to refer to the
  * combination of primary and subtype.
  * <p>
@@ -32,37 +32,37 @@
  */
 public final class MediaType {
     /**
-     * The media type for <tt>text/xml</tt>.
+     * The media type for {@code text/xml}.
      */
     public static final MediaType TEXT_XML = new MediaType("text", "xml");
     
     /**
-     * The media type for <tt>application/xml</tt>.
+     * The media type for {@code application/xml}.
      */
     public static final MediaType APPLICATION_XML = new MediaType("application", "xml");
     
     /**
-     * The media type for <tt>application/soap+xml</tt>.
+     * The media type for {@code application/soap+xml}.
      */
     public static final MediaType APPLICATION_SOAP_XML = new MediaType("application", "soap+xml");
     
     /**
-     * The media type for <tt>application/xop+xml</tt>.
+     * The media type for {@code application/xop+xml}.
      */
     public static final MediaType APPLICATION_XOP_XML = new MediaType("application", "xop+xml");
     
     /**
-     * The media type for <tt>multipart/related</tt>.
+     * The media type for {@code multipart/related}.
      */
     public static final MediaType MULTIPART_RELATED = new MediaType("multipart", "related");
     
     /**
-     * The media type for <tt>application/octet-stream</tt>.
+     * The media type for {@code application/octet-stream}.
      */
     public static final MediaType APPLICATION_OCTET_STREAM = new MediaType("application", "octet-stream");
     
     /**
-     * The media type for <tt>text/plain</tt>.
+     * The media type for {@code text/plain}.
      */
     public static final MediaType TEXT_PLAIN = new MediaType("text", "plain");
     
diff --git a/axiom-api/src/main/java/org/apache/axiom/mime/MultipartBodyWriter.java b/axiom-api/src/main/java/org/apache/axiom/mime/MultipartBodyWriter.java
index 9b4497a..163ef49 100644
--- a/axiom-api/src/main/java/org/apache/axiom/mime/MultipartBodyWriter.java
+++ b/axiom-api/src/main/java/org/apache/axiom/mime/MultipartBodyWriter.java
@@ -124,7 +124,7 @@
      * {@link OutputStream#close()} must be called to complete the writing of the MIME part.
      * 
      * @param contentType
-     *            the value of the <tt>Content-Type</tt> header of the MIME part; may be {@code null}
+     *            the value of the {@code Content-Type} header of the MIME part; may be {@code null}
      * @param contentTransferEncoding
      *            the content transfer encoding to be used (see above); must not be
      *            <code>null</code>
diff --git a/axiom-api/src/main/java/org/apache/axiom/om/OMAbstractFactory.java b/axiom-api/src/main/java/org/apache/axiom/om/OMAbstractFactory.java
index a72262d..b6b69a2 100644
--- a/axiom-api/src/main/java/org/apache/axiom/om/OMAbstractFactory.java
+++ b/axiom-api/src/main/java/org/apache/axiom/om/OMAbstractFactory.java
@@ -38,11 +38,11 @@
  * </dl>
  * Implementations may define other custom features.
  * <p>
- * Axiom discovers implementations by looking for <tt>META-INF/axiom.xml</tt> resources. They
+ * Axiom discovers implementations by looking for {@code META-INF/axiom.xml} resources. They
  * specify the {@link OMMetaFactory} implementation as well as the set of features that each
  * implementation supports. If multiple implementations with the same feature are found, then Axiom
  * will select the one with the highest priority. The priority for a given feature is also declared
- * in <tt>META-INF/axiom.xml</tt>. This algorithm is used both in non OSGi and OSGi environments.
+ * in {@code META-INF/axiom.xml}. This algorithm is used both in non OSGi and OSGi environments.
  * <p>
  * In a non OSGi environment, the default Axiom implementation can be overridden using the system
  * property specified by {@link #META_FACTORY_NAME_PROPERTY}.
@@ -60,7 +60,7 @@
     /**
      * The name of the system property that allows to override the default Axiom implementation. The
      * value must be the fully qualified name of a class implementing {@link OMMetaFactory} and that
-     * is visible to the class loader from which the <tt>axiom-api</tt> library is loaded. An
+     * is visible to the class loader from which the {@code axiom-api} library is loaded. An
      * instance of this class will be returned by {@link #getMetaFactory()}.
      * <p>
      * Note that this system property is not supported in an OSGi environment.
@@ -148,7 +148,7 @@
      * Get the meta factory instance for the Axiom implementation with a given feature. If multiple
      * Axiom implementations declare the same feature, then the method will return the meta factory
      * for the implementation that declares the highest priority for that feature in its
-     * <tt>META-INF/axiom.xml</tt> descriptor.
+     * {@code META-INF/axiom.xml} descriptor.
      * 
      * @param feature
      *            the requested feature
diff --git a/axiom-api/src/main/java/org/apache/axiom/om/OMAttachmentAccessor.java b/axiom-api/src/main/java/org/apache/axiom/om/OMAttachmentAccessor.java
index c8d57f8..e1dd059 100644
--- a/axiom-api/src/main/java/org/apache/axiom/om/OMAttachmentAccessor.java
+++ b/axiom-api/src/main/java/org/apache/axiom/om/OMAttachmentAccessor.java
@@ -28,7 +28,7 @@
      * Get the {@link DataHandler} for the MIME part identified by a given content ID.
      * 
      * @param contentID
-     *            the raw content ID (without the surrounding angle brackets and <tt>cid:</tt>
+     *            the raw content ID (without the surrounding angle brackets and {@code cid:}
      *            prefix) of the MIME part
      * @return the {@link DataHandler} of the MIME part referred by the content ID or
      *         <code>null</code> if the MIME part referred by the content ID does not exist
diff --git a/axiom-api/src/main/java/org/apache/axiom/om/OMContainer.java b/axiom-api/src/main/java/org/apache/axiom/om/OMContainer.java
index ef3afd0..d8c5968 100644
--- a/axiom-api/src/main/java/org/apache/axiom/om/OMContainer.java
+++ b/axiom-api/src/main/java/org/apache/axiom/om/OMContainer.java
@@ -275,7 +275,7 @@
      * of the <code>cache</code> parameter, but the side effects of calling this method and
      * consuming the reader are different:
      * <p>
-     * <table border="2" rules="all" cellpadding="4" cellspacing="0">
+     * <table border="1">
      * <caption>Side effects of consuming events from the reader returned by
      * {@link #getXMLStreamReader(boolean)}</caption>
      * <tr>
@@ -362,7 +362,7 @@
      * <pre>&lt;root xmlns:ns="urn:ns"&gt;&lt;element attr="ns:someThing"/&gt;&lt;root&gt;</pre>
      * <p>
      * In that case, to correctly interpret the attribute value, the SAX content handler must be
-     * aware of the namespace mapping for the <tt>ns</tt> prefix, even if the serialization starts
+     * aware of the namespace mapping for the {@code ns} prefix, even if the serialization starts
      * only at the child element.
      * <p>
      * No other form of namespace repairing is performed.
diff --git a/axiom-api/src/main/java/org/apache/axiom/om/OMDataSource.java b/axiom-api/src/main/java/org/apache/axiom/om/OMDataSource.java
index 34601ac..7d6db4b 100644
--- a/axiom-api/src/main/java/org/apache/axiom/om/OMDataSource.java
+++ b/axiom-api/src/main/java/org/apache/axiom/om/OMDataSource.java
@@ -99,7 +99,7 @@
      * NOT use the namespace unaware methods {@link XMLStreamWriter#writeStartElement(String)} or
      * {@link XMLStreamWriter#writeEmptyElement(String)}. On the other hand, it MAY use the
      * namespace unaware {@link XMLStreamWriter#writeAttribute(String, String)} method, provided
-     * that the specified name is an <tt>NCName</tt>.
+     * that the specified name is an {@code NCName}.
      * <li>The implementation MUST ensure that the produced XML is well formed with respect to
      * namespaces, i.e. it MUST generate the required namespace declarations using
      * {@link XMLStreamWriter#writeNamespace(String, String)} and
@@ -116,7 +116,7 @@
      * {@link XMLStreamWriter#getPrefix(String)} and {@link XMLStreamWriter#getNamespaceContext()}).
      * This means that the implementation MUST NOT assume that the empty prefix is bound to the
      * empty namespace URI. Therefore if the implementation outputs elements that have no namespace,
-     * it MUST generate namespace declarations of the form <tt>xmlns=""</tt> in the appropriate
+     * it MUST generate namespace declarations of the form {@code xmlns=""} in the appropriate
      * locations. In addition it MAY use the namespace context information to minimize the number of
      * generated namespace declarations (by reusing already bound prefixes).
      * <li>To produce base64 binary data (that could be optimized using XOP/MTOM), the
@@ -130,7 +130,7 @@
      * content is produced by a third party library that is not aware of these APIs.
      * <li>Cast the {@link XMLStreamWriter} to an {@link MTOMXMLStreamWriter}, use
      * {@link MTOMXMLStreamWriter#prepareDataHandler(DataHandler)} and generate the
-     * necessary <tt>xop:Include</tt> elements. In this case, the implementation MAY use
+     * necessary {@code xop:Include} elements. In this case, the implementation MAY use
      * {@link MTOMXMLStreamWriter#isOptimized()} to check if XOP/MTOM is enabled at all.
      * </ul>
      * <li>The implementation MUST NOT call {@link XMLStreamWriter#close()}.
diff --git a/axiom-api/src/main/java/org/apache/axiom/om/OMDocType.java b/axiom-api/src/main/java/org/apache/axiom/om/OMDocType.java
index 907e3bb..d8f5a7a 100644
--- a/axiom-api/src/main/java/org/apache/axiom/om/OMDocType.java
+++ b/axiom-api/src/main/java/org/apache/axiom/om/OMDocType.java
@@ -22,7 +22,7 @@
 /** Interface OMDocType */
 public interface OMDocType extends OMNode {
     /**
-     * Get the root name, i.e. the name immediately following the <tt>DOCTYPE</tt> keyword.
+     * Get the root name, i.e. the name immediately following the {@code DOCTYPE} keyword.
      * 
      * @return the root name; must not be <code>null</code>
      */
diff --git a/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java b/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java
index 25d085b..a7506ad 100644
--- a/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java
+++ b/axiom-api/src/main/java/org/apache/axiom/om/OMElement.java
@@ -132,7 +132,7 @@
      * 
      * @return The default namespace or <code>null</code> if no default namespace is in scope. This
      *         method never returns an {@link OMNamespace} object with an empty namespace URI; if
-     *         the element or one of its ancestors has a <tt>xmlns=""</tt> declaration, then
+     *         the element or one of its ancestors has a {@code xmlns=""} declaration, then
      *         <code>null</code> is returned. Note that if the method returns an {@link OMNamespace}
      *         object, then its prefix will obviously be the empty string.
      */
@@ -159,7 +159,7 @@
      * Add a namespace declaration that undeclares a given prefix. Prefix undeclaring is supported
      * in XML 1.1, but forbidden in XML 1.0. If an object model on which this method has been used
      * is later serialized to an XML 1.0 document, an error will occur. When serialized to an XML
-     * 1.1 document, a namespace declaration in the form <tt>xmlns:p=""</tt> will be produced.
+     * 1.1 document, a namespace declaration in the form {@code xmlns:p=""} will be produced.
      * <p>
      * A namespace declaration with empty namespace name will be added even if no existing namespace
      * declaration for the given prefix is in scope in the context of the current element. If a
@@ -179,15 +179,15 @@
      * Finds a namespace with the given uri and prefix, in the scope of the hierarchy.
      * <p>
      * Searches from the current element and goes up the hiararchy until a match is found. If no
-     * match is found, returns <tt>null</tt>.</p>
+     * match is found, returns {@code null}.</p>
      * <p>
-     * Either <tt>prefix</tt> or <tt>uri</tt> should be null.  Results are undefined if both are
+     * Either {@code prefix} or {@code uri} should be null.  Results are undefined if both are
      * specified.
      *
-     * @param uri    The namespace to look for.  If this is specified, <tt>prefix</tt> should be
+     * @param uri    The namespace to look for.  If this is specified, {@code prefix} should be
      *               null.
-     * @param prefix The prefix to look for.  If this is specified, <tt>uri</tt> should be null.
-     * @return Returns the matching namespace declaration, or <tt>null</tt> if none was found.
+     * @param prefix The prefix to look for.  If this is specified, {@code uri} should be null.
+     * @return Returns the matching namespace declaration, or {@code null} if none was found.
      * @see #declareNamespace(String, String)
      * @see #declareNamespace(OMNamespace)
      * @see #getAllDeclaredNamespaces()
@@ -246,7 +246,7 @@
      * with an empty prefix if and only if there is a default namespace. It will never return an
      * {@link OMNamespace} object with both the prefix and the namespace URI set to the empty
      * string, even if the element or one of its ancestors has a namespace declaration of the form
-     * <tt>xmlns=""</tt>.
+     * {@code xmlns=""}.
      * <p>
      * The order in which the iterator returns the namespaces is undefined, and invoking the
      * {@link Iterator#remove()} method on the returned iterator is not supported. The iterator may
@@ -288,7 +288,7 @@
      * Returns a list of OMAttributes.
      * <p>
      * Note that the iterator returned by this function will be invalidated by any
-     * <tt>addAttribute</tt> call.
+     * {@code addAttribute} call.
      * 
      * @return An iterator over the {@link OMAttribute} items associated with the element. If the
      *         element has no attributes, an empty iterator is returned.
@@ -385,7 +385,7 @@
     /**
      * Returns the first child element of the element.
      *
-     * @return Returns the first child element of the element, or <tt>null</tt> if none was found.
+     * @return Returns the first child element of the element, or {@code null} if none was found.
      */
 
     OMElement getFirstElement();
@@ -422,7 +422,7 @@
      * This method iterates over all the text children of the element and concatenates
      * them to a single string. Only direct children will be considered, i.e. the text
      * is not extracted recursively. For example the return value for
-     * <tt>&lt;element&gt;A&lt;child&gt;B&lt;/child&gt;C&lt;/element&gt;</tt> will be <tt>AC</tt>.
+     * {@code <element>A<child>B</child>C</element>} will be {@code AC}.
      * <p>
      * All whitespace will be preserved.
      *
diff --git a/axiom-api/src/main/java/org/apache/axiom/om/OMFactory.java b/axiom-api/src/main/java/org/apache/axiom/om/OMFactory.java
index 602bdf2..34e4bc2 100644
--- a/axiom-api/src/main/java/org/apache/axiom/om/OMFactory.java
+++ b/axiom-api/src/main/java/org/apache/axiom/om/OMFactory.java
@@ -329,13 +329,13 @@
                                          String value);
 
     /**
-     * Creates DTD (<tt>DOCTYPE</tt> declaration) node.
+     * Creates DTD ({@code DOCTYPE} declaration) node.
      *
      * @param parent
      *            the parent to which the newly created text node will be added; this may be
      *            <code>null</code>
      * @param rootName
-     *            the root name, i.e. the name immediately following the <tt>DOCTYPE</tt> keyword
+     *            the root name, i.e. the name immediately following the {@code DOCTYPE} keyword
      * @param publicId
      *            the public ID of the external subset, or <code>null</code> if there is no external
      *            subset or no public ID has been specified for the external subset
diff --git a/axiom-api/src/main/java/org/apache/axiom/om/OMNamespace.java b/axiom-api/src/main/java/org/apache/axiom/om/OMNamespace.java
index ecdb69f..e9a20cd 100644
--- a/axiom-api/src/main/java/org/apache/axiom/om/OMNamespace.java
+++ b/axiom-api/src/main/java/org/apache/axiom/om/OMNamespace.java
@@ -62,7 +62,7 @@
 
     /**
      * Get the namespace URI. This method never returns <code>null</code>. It may return an empty
-     * string if this instance represents a namespace declaration of type <tt>xmlns=""</tt>. This
+     * string if this instance represents a namespace declaration of type {@code xmlns=""}. This
      * may be the case for instances returned by {@link OMElement#getAllDeclaredNamespaces()}. On
      * the other hand, methods such as {@link OMNamedInformationItem#getNamespace()} will return
      * <code>null</code> for information items that have no namespace. In that case the returned
diff --git a/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java b/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java
index cd5394e..f7a81e2 100644
--- a/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java
+++ b/axiom-api/src/main/java/org/apache/axiom/om/OMXMLParserWrapper.java
@@ -97,7 +97,7 @@
      * method depends on the type of source object passed to {@link OMXMLBuilderFactory} to create
      * the builder:
      * <p>
-     * <table border="2" rules="all" cellpadding="4" cellspacing="0">
+     * <table border="1">
      * <caption>Actions performed by the {@link #detach()} method</caption>
      * <tr>
      * <th>Source object type</th>
diff --git a/axiom-api/src/main/java/org/apache/axiom/om/OMXMLStreamReaderConfiguration.java b/axiom-api/src/main/java/org/apache/axiom/om/OMXMLStreamReaderConfiguration.java
index bb49c50..394e9c2 100644
--- a/axiom-api/src/main/java/org/apache/axiom/om/OMXMLStreamReaderConfiguration.java
+++ b/axiom-api/src/main/java/org/apache/axiom/om/OMXMLStreamReaderConfiguration.java
@@ -56,7 +56,7 @@
      * More precisely, if this option is enabled, then the namespace declarations reported for the
      * first {@link XMLStreamConstants#START_ELEMENT} event in the returned stream will be the same
      * as the declarations that would be returned by {@link OMElement#getNamespacesInScope()}, with
-     * the exception that a <tt>xmlns=""</tt> declaration present on the element will be preserved.
+     * the exception that a {@code xmlns=""} declaration present on the element will be preserved.
      * <p>
      * This feature is useful for code that relies on the namespace declarations reported by the
      * {@link XMLStreamReader} to reconstruct the namespace context (instead of using the namespace
@@ -76,13 +76,13 @@
      * </pre>
      * <p>
      * When {@link OMContainer#getXMLStreamReader(boolean)} is invoked on the {@link OMElement}
-     * corresponding to <tt>ns:echo</tt>, only the namespace declaration for the <tt>ns</tt> prefix
+     * corresponding to {@code ns:echo}, only the namespace declaration for the {@code ns} prefix
      * will be reported. This may cause a problem when the caller attempts to resolve the QName
-     * value <tt>xsd:string</tt> of the <tt>xsi:type</tt> attribute. If namespace context
+     * value {@code xsd:string} of the {@code xsi:type} attribute. If namespace context
      * preservation is enabled, then the {@link XMLStreamReader} returned by this method will
-     * generate additional namespace declarations for the <tt>soapenv</tt>, <tt>xsd</tt> and
-     * <tt>xsi</tt> prefixes. They are reported for the {@link XMLStreamConstants#START_ELEMENT}
-     * event representing the <tt>ns:echo</tt> element.
+     * generate additional namespace declarations for the {@code soapenv}, {@code xsd} and
+     * {@code xsi} prefixes. They are reported for the {@link XMLStreamConstants#START_ELEMENT}
+     * event representing the {@code ns:echo} element.
      * 
      * @param preserveNamespaceContext
      *            the value to set for this option
diff --git a/axiom-api/src/main/java/org/apache/axiom/om/dom/DOMMetaFactory.java b/axiom-api/src/main/java/org/apache/axiom/om/dom/DOMMetaFactory.java
index 6d5baf7..ef2f1d3 100644
--- a/axiom-api/src/main/java/org/apache/axiom/om/dom/DOMMetaFactory.java
+++ b/axiom-api/src/main/java/org/apache/axiom/om/dom/DOMMetaFactory.java
@@ -59,7 +59,7 @@
  * API, and nodes created by the implementation MUST implement both the Axiom interfaces and the DOM
  * interfaces corresponding, as specified by the following table:
  * <p>
- * <table border="2" rules="all" cellpadding="4" cellspacing="0">
+ * <table border="1">
  * <caption>Mapping between Axiom and DOM interfaces</caption>
  * <tr>
  * <th>Axiom interface</th>
diff --git a/axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java b/axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java
index 251664a..b7b49b0 100644
--- a/axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java
+++ b/axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java
@@ -46,11 +46,11 @@
      * or
      * {@link XMLStreamWriterUtils#writeDataHandler(XMLStreamWriter, DataHandlerProvider, String, boolean)}
      * to submit any binary content and let this writer decide whether the content should be written
-     * as base64 encoded character data or using <tt>xop:Include</tt>. This makes optimization
+     * as base64 encoded character data or using {@code xop:Include}. This makes optimization
      * entirely transparent for the caller and there should be no need to check if the writer is
      * producing MTOM. However, in some cases this is not possible, such as when integrating with
      * 3rd party libraries. The serialization code should then use
-     * {@link #prepareDataHandler(DataHandler)} so that it can write <tt>xop:Include</tt> elements
+     * {@link #prepareDataHandler(DataHandler)} so that it can write {@code xop:Include} elements
      * directly to the stream. In that case, the code may use the {@link #isOptimized()} method
      * check if MTOM is enabled at all.
      * 
@@ -65,7 +65,7 @@
      * the method returns <code>null</code> and the caller is expected to use
      * {@link #writeCharacters(String)} or {@link #writeCharacters(char[], int, int)} to write the
      * base64 encoded data to the stream. If the data should be optimized, then the method returns a
-     * content ID and the caller is expected to generate an <tt>xop:Include</tt> element referring
+     * content ID and the caller is expected to generate an {@code xop:Include} element referring
      * to that content ID.
      * <p>
      * This method should only be used to integrate Axiom with third party libraries that support
@@ -74,11 +74,11 @@
      * or
      * {@link XMLStreamWriterUtils#writeDataHandler(XMLStreamWriter, DataHandlerProvider, String, boolean)}
      * should be used to write base64Binary values and the application code should never generate
-     * <tt>xop:Include</tt> elements itself.
+     * {@code xop:Include} elements itself.
      * 
      * @param dataHandler
      *            the {@link DataHandler} that the caller intends to write to the stream
-     * @return the content ID that the caller must use in the <tt>xop:Include</tt> element or
+     * @return the content ID that the caller must use in the {@code xop:Include} element or
      *         <code>null</code> if the base64 encoded data should not be optimized
      */
     public abstract String prepareDataHandler(DataHandler dataHandler);
diff --git a/axiom-api/src/main/java/org/apache/axiom/om/package.html b/axiom-api/src/main/java/org/apache/axiom/om/package.html
index 722dcc4..4d601e8 100644
--- a/axiom-api/src/main/java/org/apache/axiom/om/package.html
+++ b/axiom-api/src/main/java/org/apache/axiom/om/package.html
@@ -21,7 +21,7 @@
 Contains core interfaces of the Axiom API.
 <p>In particular, this package defines interfaces for the information items identified by the
 <a href="http://www.w3.org/TR/xml-infoset/">XML Information Set</a> W3C Recommendation:</p>
-<table border="2" rules="all" cellpadding="4" cellspacing="0">
+<table border="1">
     <caption>Interfaces defined by Axiom.</caption>
     <thead>
         <tr>
diff --git a/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java b/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java
index 098cb7c..da86e35 100644
--- a/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java
+++ b/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java
@@ -51,27 +51,27 @@
  * instances. This class caches the corresponding factories, i.e. {@link XMLInputFactory}
  * and {@link XMLOutputFactory} objects.</p>
  * <p>Default properties for these factories can be specified using
- * <tt>XMLInputFactory.properties</tt> and <tt>XMLOutputFactory.properties</tt> files.
+ * {@code XMLInputFactory.properties} and {@code XMLOutputFactory.properties} files.
  * These files are loaded using the class loader that loaded the {@link StAXUtils} class.
  * Properties with boolean, integer and string values are supported.
  * Both standard StAX properties and implementation specific properties can be specified. This
  * feature should be used with care since changing some properties to non default values will break
- * Axiom. Good candidates for <tt>XMLInputFactory.properties</tt> are:</p>
+ * Axiom. Good candidates for {@code XMLInputFactory.properties} are:</p>
  * <dl>
- *   <dt><tt>javax.xml.stream.isCoalescing</tt></dt>
+ *   <dt>{@code javax.xml.stream.isCoalescing}</dt>
  *   <dd>Requires the processor to coalesce adjacent character data (text nodes and CDATA
  *       sections). This property also controls whether CDATA sections are reported or not.</dd>
- *   <dt><tt>com.ctc.wstx.inputBufferLength</tt></dt>
+ *   <dt>{@code com.ctc.wstx.inputBufferLength}</dt>
  *   <dd>Size of input buffer (in chars), to use for reading XML content from input stream/reader.
  *       This property is Woodstox specific.</dd>
- *   <dt><tt>com.ctc.wstx.minTextSegment</tt></dt>
+ *   <dt>{@code com.ctc.wstx.minTextSegment}</dt>
  *   <dd>Property to specify shortest non-complete text segment (part of CDATA section or text
  *       content) that the parser is allowed to return, if not required to coalesce text.
  *       This property is Woodstox specific.</dd>
  * </dl>
- * <p>Good candidates for <tt>XMLOutputFactory.properties</tt> are:</p>
+ * <p>Good candidates for {@code XMLOutputFactory.properties} are:</p>
  * <dl>
- *   <dt><tt>com.ctc.wstx.outputEscapeCr</tt></dt>
+ *   <dt>{@code com.ctc.wstx.outputEscapeCr}</dt>
  *   <dd>Property that determines whether Carriage Return (\r) characters are to be escaped when
  *       output or not. If enabled, all instances of of character \r are escaped using a character
  *       entity (where possible, that is, within CHARACTERS events, and attribute values).
diff --git a/axiom-api/src/main/java/org/apache/axiom/soap/SOAPHeader.java b/axiom-api/src/main/java/org/apache/axiom/soap/SOAPHeader.java
index 72b7baa..ac3e899 100644
--- a/axiom-api/src/main/java/org/apache/axiom/soap/SOAPHeader.java
+++ b/axiom-api/src/main/java/org/apache/axiom/soap/SOAPHeader.java
@@ -108,7 +108,7 @@
 
     /**
      * Returns an iterator over all the {@link SOAPHeaderBlock} objects in this {@link SOAPHeader}
-     * object that have the specified role and that have a <tt>MustUnderstand</tt> attribute whose
+     * object that have the specified role and that have a {@code MustUnderstand} attribute whose
      * value is equivalent to <code>true</code>.
      * 
      * @param role
diff --git a/axiom-api/src/main/java/org/apache/axiom/soap/SOAPHeaderBlock.java b/axiom-api/src/main/java/org/apache/axiom/soap/SOAPHeaderBlock.java
index 02da34d..3851e10 100644
--- a/axiom-api/src/main/java/org/apache/axiom/soap/SOAPHeaderBlock.java
+++ b/axiom-api/src/main/java/org/apache/axiom/soap/SOAPHeaderBlock.java
@@ -73,13 +73,13 @@
     void setMustUnderstand(boolean mustUnderstand);
 
     /**
-     * Returns the boolean value of the <tt>mustUnderstand</tt> attribute for this header block.
+     * Returns the boolean value of the {@code mustUnderstand} attribute for this header block.
      * 
-     * @return <code>true</code> if a <tt>mustUnderstand</tt> attribute is present and its value is
-     *         equivalent to true, <code>false</code> if the <tt>mustUnderstand</tt> is not present
+     * @return <code>true</code> if a {@code mustUnderstand} attribute is present and its value is
+     *         equivalent to true, <code>false</code> if the {@code mustUnderstand} is not present
      *         or its value is equivalent to false
      * @throws SOAPProcessingException
-     *             if the <tt>mustUnderstand</tt> attribute is present, but has an invalid value
+     *             if the {@code mustUnderstand} attribute is present, but has an invalid value
      */
     boolean getMustUnderstand() throws SOAPProcessingException;
 
diff --git a/axiom-api/src/main/java/org/apache/axiom/util/UIDGenerator.java b/axiom-api/src/main/java/org/apache/axiom/util/UIDGenerator.java
index a76e7c9..bfca7b3 100644
--- a/axiom-api/src/main/java/org/apache/axiom/util/UIDGenerator.java
+++ b/axiom-api/src/main/java/org/apache/axiom/util/UIDGenerator.java
@@ -136,8 +136,8 @@
     /**
      * Generates a unique ID suitable for usage as a MIME content ID.
      * <p>
-     * RFC2045 (MIME) specifies that the value of the <tt>Content-ID</tt> header
-     * must match the <tt>msg-id</tt> production, which is defined by RFC2822 as
+     * RFC2045 (MIME) specifies that the value of the {@code Content-ID} header
+     * must match the {@code msg-id} production, which is defined by RFC2822 as
      * follows:
      * <pre>
      * msg-id        = [CFWS] "&lt;" id-left "@" id-right "&gt;" [CFWS]
@@ -158,7 +158,7 @@
      * synchronization.
      * 
      * @return The generated content ID. Note that this value does not include
-     *         the angle brackets of the <tt>msg-id</tt> production, but only
+     *         the angle brackets of the {@code msg-id} production, but only
      *         represents the bare content ID.
      */
     public static String generateContentId() {
@@ -181,7 +181,7 @@
      * <p>
      * It should be noted that the boundary in general will also appear as a parameter in the
      * content type of the MIME package. According to RFC2045 (which defines the
-     * <tt>Content-Type</tt> header), it will require quoting if it contains characters from
+     * {@code Content-Type} header), it will require quoting if it contains characters from
      * the following production:
      * <pre>
      * tspecials := "(" / ")" / "&lt;" / "&gt;" / "@" /
@@ -224,8 +224,8 @@
     }
     
     /**
-     * Generate a URN with <tt>uuid</tt> NID (namespace identifier). These URNs have the following
-     * form: <tt>urn:uuid:dae6fae1-93df-4824-bc70-884c9edb5973</tt>. The UUID is generated using
+     * Generate a URN with {@code uuid} NID (namespace identifier). These URNs have the following
+     * form: {@code urn:uuid:dae6fae1-93df-4824-bc70-884c9edb5973}. The UUID is generated using
      * a cryptographically strong pseudo random number generator.
      * 
      * @return the generated URN
@@ -281,7 +281,7 @@
     }
     
     /**
-     * Generate a URN with <tt>uuid</tt> NID (namespace identifier). This method does the
+     * Generate a URN with {@code uuid} NID (namespace identifier). This method does the
      * same as {@link #generateURNString()}, but returns a {@link URI} object.
      * 
      * @return the generated URN
diff --git a/axiom-api/src/main/java/org/apache/axiom/util/activation/EmptyDataSource.java b/axiom-api/src/main/java/org/apache/axiom/util/activation/EmptyDataSource.java
index 955a21c..414519b 100644
--- a/axiom-api/src/main/java/org/apache/axiom/util/activation/EmptyDataSource.java
+++ b/axiom-api/src/main/java/org/apache/axiom/util/activation/EmptyDataSource.java
@@ -30,7 +30,7 @@
  */
 public class EmptyDataSource implements SizeAwareDataSource {
     /**
-     * Empty data source instance with content type <tt>application/octet-stream</tt>.
+     * Empty data source instance with content type {@code application/octet-stream}.
      */
     public static final EmptyDataSource INSTANCE = new EmptyDataSource("application/octet-stream");
     
diff --git a/axiom-api/src/main/java/org/apache/axiom/util/namespace/AbstractNamespaceContext.java b/axiom-api/src/main/java/org/apache/axiom/util/namespace/AbstractNamespaceContext.java
index 109abc7..1101b82 100644
--- a/axiom-api/src/main/java/org/apache/axiom/util/namespace/AbstractNamespaceContext.java
+++ b/axiom-api/src/main/java/org/apache/axiom/util/namespace/AbstractNamespaceContext.java
@@ -27,7 +27,7 @@
 
 /**
  * Partial {@link NamespaceContext} implementation that takes care of the
- * implicit namespace bindings (for the <tt>xml</tt> and <tt>xmlns</tt>
+ * implicit namespace bindings (for the {@code xml} and {@code xmlns}
  * prefixes) defined in the {@link NamespaceContext} Javadoc.
  */
 public abstract class AbstractNamespaceContext implements NamespaceContext {
diff --git a/axiom-api/src/main/java/org/apache/axiom/util/stax/WrappedTextNodeStreamReader.java b/axiom-api/src/main/java/org/apache/axiom/util/stax/WrappedTextNodeStreamReader.java
index bae70a9..110edca 100644
--- a/axiom-api/src/main/java/org/apache/axiom/util/stax/WrappedTextNodeStreamReader.java
+++ b/axiom-api/src/main/java/org/apache/axiom/util/stax/WrappedTextNodeStreamReader.java
@@ -46,7 +46,7 @@
  *   <li>END_DOCMENT</li>
  * </ul>
  * The class is implemented as a simple state machine, where the state is identified
- * by the current event type. The initial state is <tt>START_DOCUMENT</tt> and the
+ * by the current event type. The initial state is {@code START_DOCUMENT} and the
  * following transitions are triggered by {@link #next()}:
  * <ul>
  *   <li>START_DOCUMENT &rarr; START_ELEMENT</li>
diff --git a/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamWriterUtils.java b/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamWriterUtils.java
index d9e0170..93e9edc 100644
--- a/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamWriterUtils.java
+++ b/axiom-api/src/main/java/org/apache/axiom/util/stax/XMLStreamWriterUtils.java
@@ -170,13 +170,13 @@
     }
     
     /**
-     * Prepare the <tt>DOCTYPE</tt> declaration using the provided information and output it using
+     * Prepare the {@code DOCTYPE} declaration using the provided information and output it using
      * {@link XMLStreamWriter#writeDTD(String)}.
      * 
      * @param writer
-     *            the stream writer to write the <tt>DOCTYPE</tt> declaration to
+     *            the stream writer to write the {@code DOCTYPE} declaration to
      * @param rootName
-     *            the root name, i.e. the name immediately following the <tt>DOCTYPE</tt> keyword
+     *            the root name, i.e. the name immediately following the {@code DOCTYPE} keyword
      * @param publicId
      *            the public ID of the external subset, or <code>null</code> if there is no external
      *            subset or no public ID has been specified for the external subset
diff --git a/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/ImplicitNamespaceContextWrapper.java b/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/ImplicitNamespaceContextWrapper.java
index 62e7492..db97334 100644
--- a/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/ImplicitNamespaceContextWrapper.java
+++ b/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/ImplicitNamespaceContextWrapper.java
@@ -27,7 +27,7 @@
 
 /**
  * {@link NamespaceContext} wrapper that adds support for the implicit namespace
- * bindings for the <tt>xml</tt> and <tt>xmlns</tt> prefixes. This wrapper may
+ * bindings for the {@code xml} and {@code xmlns} prefixes. This wrapper may
  * be used to fix the behavior of broken {@link NamespaceContext}
  * implementations.
  */
diff --git a/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialect.java b/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialect.java
index 10ec773..bda7b2d 100644
--- a/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialect.java
+++ b/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialect.java
@@ -137,7 +137,7 @@
  *       {@link javax.xml.stream.XMLStreamException} in this case. This is considered as a
  *       violation of the specifications because this exception should only be used
  *       "if there is an error processing the underlying XML source", which is not the case.</li>
- *   <li>An XML document may contain a namespace declaration such as <tt>xmlns=""</tt>. In this
+ *   <li>An XML document may contain a namespace declaration such as {@code xmlns=""}. In this
  *       case, it is not clear if {@link javax.xml.stream.XMLStreamReader#getNamespaceURI(int)}
  *       should return <code>null</code> or an empty string.</li>
  *   <li>The documentation of {@link javax.xml.stream.XMLStreamWriter#setPrefix(String, String)}
@@ -200,7 +200,7 @@
     
     /**
      * Configure the given factory to disallow DOCTYPE declarations. The effect of this is similar
-     * to the <tt>http://apache.org/xml/features/disallow-doctype-decl</tt> feature in Xerces. The
+     * to the {@code http://apache.org/xml/features/disallow-doctype-decl} feature in Xerces. The
      * factory instance returned by this method MUST satisfy the following requirements:
      * <ul>
      * <li>The factory or the reader implementation MUST throw an exception when requested to parse
diff --git a/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java b/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java
index 871972c..d860ea8 100644
--- a/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java
+++ b/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java
@@ -69,7 +69,7 @@
     /**
      * Map that stores detected dialects by location. The location is the URL corresponding to the
      * root folder of the classpath entry from which the StAX implementation is loaded. Note that
-     * in the case of a JAR file, this is not the URL pointing to the JAR, but a <tt>jar:</tt>
+     * in the case of a JAR file, this is not the URL pointing to the JAR, but a {@code jar:}
      * URL that points to the root folder of the archive.
      */
     private static final Map<URL,StAXDialect> dialectByUrl =
diff --git a/axiom-api/src/test/java/org/apache/axiom/util/stax/XMLStreamReaderUtilsTest.java b/axiom-api/src/test/java/org/apache/axiom/util/stax/XMLStreamReaderUtilsTest.java
index 7403ab7..4eee156 100644
--- a/axiom-api/src/test/java/org/apache/axiom/util/stax/XMLStreamReaderUtilsTest.java
+++ b/axiom-api/src/test/java/org/apache/axiom/util/stax/XMLStreamReaderUtilsTest.java
Binary files differ
diff --git a/axiom-compat/src/main/java/org/apache/axiom/attachments/utils/IOUtils.java b/axiom-compat/src/main/java/org/apache/axiom/attachments/utils/IOUtils.java
index 72f53ce..ba1857b 100644
--- a/axiom-compat/src/main/java/org/apache/axiom/attachments/utils/IOUtils.java
+++ b/axiom-compat/src/main/java/org/apache/axiom/attachments/utils/IOUtils.java
@@ -35,7 +35,7 @@
 
     /**
      * Reads into a byte array. Ensures that the full buffer is read. Helper method, just calls
-     * <tt>readFully(in, b, 0, b.length)</tt>
+     * {@code readFully(in, b, 0, b.length)}
      *
      * @see #readFully(java.io.InputStream, byte[], int, int)
      */
@@ -45,7 +45,7 @@
     }
 
     /**
-     * Same as the normal <tt>in.read(b, off, len)</tt>, but tries to ensure that the entire len
+     * Same as the normal {@code in.read(b, off, len)}, but tries to ensure that the entire len
      * number of bytes is read.
      *
      * @return Returns the number of bytes read, or -1 if the end of file is reached before any
diff --git a/axiom-compat/src/main/java/org/apache/axiom/mime/ContentTypeBuilder.java b/axiom-compat/src/main/java/org/apache/axiom/mime/ContentTypeBuilder.java
index 8475f0b..5d886b0 100644
--- a/axiom-compat/src/main/java/org/apache/axiom/mime/ContentTypeBuilder.java
+++ b/axiom-compat/src/main/java/org/apache/axiom/mime/ContentTypeBuilder.java
@@ -55,10 +55,10 @@
     }
     
     /**
-     * Constructor that parses a <tt>Content-Type</tt> header value.
+     * Constructor that parses a {@code Content-Type} header value.
      * 
      * @param type
-     *            the value of the <tt>Content-Type</tt> header conforming to RFC 2045
+     *            the value of the {@code Content-Type} header conforming to RFC 2045
      * @throws ParseException
      *             if the value is invalid and could not be parsed
      */
diff --git a/axiom-compat/src/main/java/org/apache/axiom/mime/MultipartWriter.java b/axiom-compat/src/main/java/org/apache/axiom/mime/MultipartWriter.java
index b1e93cf..7f2e9cb 100644
--- a/axiom-compat/src/main/java/org/apache/axiom/mime/MultipartWriter.java
+++ b/axiom-compat/src/main/java/org/apache/axiom/mime/MultipartWriter.java
@@ -40,14 +40,14 @@
  * <ul>
  *   <li>It is the responsibility of the implementation to apply the content transfer encoding
  *       as specified by the <code>contentTransferEncoding</code> argument. The caller only
- *       provides the unencoded data. The implementation should support at least <tt>binary</tt>
- *       and <tt>base64</tt>. If it doesn't support the specified encoding, it may use an
+ *       provides the unencoded data. The implementation should support at least {@code binary}
+ *       and {@code base64}. If it doesn't support the specified encoding, it may use an
  *       alternative one. In any case, the implementation must make sure that the MIME part
- *       has a <tt>Content-Transfer-Encoding</tt> header appropriate for the applied
+ *       has a {@code Content-Transfer-Encoding} header appropriate for the applied
  *       encoding.</li>
  *   <li>The content ID passed as argument is always the raw ID (without the angle brackets).
  *       It is the responsibility of the implementation to properly format the value
- *       of the <tt>Content-ID</tt> header.</li>
+ *       of the {@code Content-ID} header.</li>
  * </ul>
  * 
  * @deprecated Use {@link MultipartBodyWriter} instead.
@@ -59,7 +59,7 @@
      * {@link OutputStream#close()} must be called to complete the writing of the MIME part.
      * 
      * @param contentType
-     *            the value of the <tt>Content-Type</tt> header of the MIME part
+     *            the value of the {@code Content-Type} header of the MIME part
      * @param contentTransferEncoding
      *            the content transfer encoding to be used (see above); must not be
      *            <code>null</code>
@@ -78,7 +78,7 @@
      * MIME part.
      * 
      * @param contentType
-     *            the value of the <tt>Content-Type</tt> header of the MIME part
+     *            the value of the {@code Content-Type} header of the MIME part
      * @param contentTransferEncoding
      *            the content transfer encoding to be used (see above); must not be
      *            <code>null</code>
diff --git a/axiom-compat/src/main/java/org/apache/axiom/mime/MultipartWriterFactory.java b/axiom-compat/src/main/java/org/apache/axiom/mime/MultipartWriterFactory.java
index 4d786ee..771a749 100644
--- a/axiom-compat/src/main/java/org/apache/axiom/mime/MultipartWriterFactory.java
+++ b/axiom-compat/src/main/java/org/apache/axiom/mime/MultipartWriterFactory.java
@@ -35,7 +35,7 @@
      *            The output stream to write the MIME package to.
      * @param boundary
      *            The MIME boundary to use. The value should not include the leading dashes, i.e. it
-     *            is the same value as used in the <tt>boundary</tt> content type parameter.
+     *            is the same value as used in the {@code boundary} content type parameter.
      * @return the writer instance
      */
     MultipartWriter createMultipartWriter(OutputStream out, String boundary);
diff --git a/axiom-compat/src/main/java/org/apache/axiom/om/impl/serialize/OMXMLReader.java b/axiom-compat/src/main/java/org/apache/axiom/om/impl/serialize/OMXMLReader.java
index c09df15..666bef3 100644
--- a/axiom-compat/src/main/java/org/apache/axiom/om/impl/serialize/OMXMLReader.java
+++ b/axiom-compat/src/main/java/org/apache/axiom/om/impl/serialize/OMXMLReader.java
@@ -69,7 +69,7 @@
  * To understand why this is important, consider the following example:
  * <pre>&lt;root xmlns:ns="urn:ns"&gt;&lt;element attr="ns:someThing"/&gt;&lt;root&gt;</pre>
  * In that case, to correctly interpret the attribute value, the SAX content handler must be
- * aware of the namespace mapping for the <tt>ns</tt> prefix, even if the serialization starts
+ * aware of the namespace mapping for the {@code ns} prefix, even if the serialization starts
  * only at the child element.
  * 
  * @deprecated This class is used internally by {@link OMSource}. Starting with Axiom 1.2.13,
diff --git a/axiom-compat/src/main/java/org/apache/axiom/om/impl/traverse/OMChildElementIterator.java b/axiom-compat/src/main/java/org/apache/axiom/om/impl/traverse/OMChildElementIterator.java
index 30627ea..2203892 100644
--- a/axiom-compat/src/main/java/org/apache/axiom/om/impl/traverse/OMChildElementIterator.java
+++ b/axiom-compat/src/main/java/org/apache/axiom/om/impl/traverse/OMChildElementIterator.java
@@ -56,15 +56,15 @@
 
     /**
      * Removes the last element returned by the iterator (optional operation) from the underlying
-     * collection. This method can be called only once per call to <tt>next</tt>.  The behavior of
+     * collection. This method can be called only once per call to {@code next}.  The behavior of
      * an iterator is unspecified if the underlying collection is modified while the iteration is in
      * progress in any way other than by calling this method.
      *
-     * @throws UnsupportedOperationException if the <tt>remove</tt> operation is not supported by
+     * @throws UnsupportedOperationException if the {@code remove} operation is not supported by
      *                                       this Iterator.
-     * @throws IllegalStateException         if the <tt>next</tt> method has not yet been called, or
-     *                                       the <tt>remove</tt> method has already been called
-     *                                       after the last call to the <tt>next</tt> method.
+     * @throws IllegalStateException         if the {@code next} method has not yet been called, or
+     *                                       the {@code remove} method has already been called
+     *                                       after the last call to the {@code next} method.
      */
     @Override
     public void remove() {
@@ -85,10 +85,10 @@
     }
 
     /**
-     * Returns <tt>true</tt> if the iteration has more elements. (In other words, returns
-     * <tt>true</tt> if <tt>next</tt> would return an element rather than throwing an exception.)
+     * Returns {@code true} if the iteration has more elements. (In other words, returns
+     * {@code true} if {@code next} would return an element rather than throwing an exception.)
      *
-     * @return Returns <tt>true</tt> if the iterator has more elements.
+     * @return Returns {@code true} if the iterator has more elements.
      */
     @Override
     public boolean hasNext() {
diff --git a/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/ContentIDGenerator.java b/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/ContentIDGenerator.java
index b5c8139..a4a333c 100644
--- a/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/ContentIDGenerator.java
+++ b/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/ContentIDGenerator.java
@@ -23,7 +23,7 @@
 
 /**
  * Content ID generator interface. Implementations of this interface are used by
- * {@link XOPEncodingStreamReader} to generate content IDs for use in <tt>xop:Include</tt>
+ * {@link XOPEncodingStreamReader} to generate content IDs for use in {@code xop:Include}
  * elements.
  */
 public interface ContentIDGenerator {
diff --git a/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/MimePartProvider.java b/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/MimePartProvider.java
index 1faf0d1..121d885 100644
--- a/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/MimePartProvider.java
+++ b/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/MimePartProvider.java
@@ -25,14 +25,14 @@
 
 /**
  * Interface used by {@link XOPDecodingStreamReader} to load MIME parts referenced by
- * <tt>xop:Include</tt> elements.
+ * {@code xop:Include} elements.
  */
 public interface MimePartProvider {
     /**
      * Get the {@link DataHandler} for the MIME part identified by a given content ID.
      * 
      * @param contentID
-     *            a content ID referenced in an <tt>xop:Include</tt> element
+     *            a content ID referenced in an {@code xop:Include} element
      * @return the {@link DataHandler} for the MIME part identified by the content ID; may not be
      *         <code>null</code>
      * @throws IllegalArgumentException
diff --git a/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/OptimizationPolicy.java b/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/OptimizationPolicy.java
index adc7e84..52f4707 100644
--- a/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/OptimizationPolicy.java
+++ b/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/OptimizationPolicy.java
@@ -77,7 +77,7 @@
      *            indicates whether the binary content was initially marked as eligible for
      *            optimization (see above)
      * @return <code>true</code> if the binary content should be optimized using XOP, i.e. encoded
-     *         using <tt>xop:Include</tt>
+     *         using {@code xop:Include}
      * @throws IOException
      *             if an error occurs while reading the data handler
      */
@@ -93,7 +93,7 @@
      *            indicates whether the binary content was initially marked as eligible for
      *            optimization (see above)
      * @return <code>true</code> if the binary content should be optimized using XOP, i.e. encoded
-     *         using <tt>xop:Include</tt>
+     *         using {@code xop:Include}
      * @throws IOException
      *             if an error occurs while reading the data handler
      */
diff --git a/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamReader.java b/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamReader.java
index 09a2551..d58b845 100644
--- a/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamReader.java
+++ b/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamReader.java
@@ -40,15 +40,15 @@
 /**
  * {@link XMLStreamReader} wrapper that decodes XOP. It uses the extension defined by
  * {@link DataHandlerReader} to expose the {@link DataHandler} objects referenced by
- * <tt>xop:Include</tt> elements encountered in the underlying stream. If the consumer uses
+ * {@code xop:Include} elements encountered in the underlying stream. If the consumer uses
  * {@link #getText()}, {@link #getTextCharacters()},
  * {@link #getTextCharacters(int, char[], int, int)} or {@link #getElementText()} when an
- * <tt>xop:Include</tt> element is present in the underlying stream, then the decoder will produce
+ * {@code xop:Include} element is present in the underlying stream, then the decoder will produce
  * a base64 representation of the data.
  * <p>
  * Note that this class only implements infoset transformation, but doesn't handle MIME processing.
  * A {@link MimePartProvider} implementation must be provided to the constructor of this class. This
- * object will be used to load MIME parts referenced by <tt>xop:Include</tt> elements encountered
+ * object will be used to load MIME parts referenced by {@code xop:Include} elements encountered
  * in the underlying stream.
  * <p>
  * This class supports deferred loading of MIME parts: If the consumer uses
@@ -93,7 +93,7 @@
      * @param mimePartProvider
      *            An implementation of the {@link MimePartProvider} interface that will be used to
      *            load the {@link DataHandler} objects for MIME parts referenced by
-     *            <tt>xop:Include</tt> element information items encountered in the underlying
+     *            {@code xop:Include} element information items encountered in the underlying
      *            stream.
      */
     public XOPDecodingStreamReader(XMLStreamReader parent, MimePartProvider mimePartProvider) {
@@ -107,16 +107,16 @@
     }
     
     /**
-     * Process an <tt>xop:Include</tt> event and return the content ID.
+     * Process an {@code xop:Include} event and return the content ID.
      * <p>
-     * Precondition: The parent reader is on the START_ELEMENT event for the <tt>xop:Include</tt>
+     * Precondition: The parent reader is on the START_ELEMENT event for the {@code xop:Include}
      * element. Note that the method doesn't check this condition.
      * <p>
      * Postcondition: The parent reader is on the event following the END_ELEMENT event for the
-     * <tt>xop:Include</tt> element, i.e. the parent reader is on the END_ELEMENT event of the
-     * element enclosing the <tt>xop:Include</tt> element.
+     * {@code xop:Include} element, i.e. the parent reader is on the END_ELEMENT event of the
+     * element enclosing the {@code xop:Include} element.
      * 
-     * @return the content ID the <tt>xop:Include</tt> refers to
+     * @return the content ID the {@code xop:Include} refers to
      * 
      * @throws XMLStreamException
      */
diff --git a/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamWriter.java b/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamWriter.java
index 6b2b58a..32f7f3d 100644
--- a/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamWriter.java
+++ b/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamWriter.java
@@ -32,7 +32,7 @@
 /**
  * {@link XMLStreamWriter} wrapper that decodes XOP. It assumes that the underlying stream
  * implements the {@link DataHandlerWriter} extension and translates calls that write
- * <tt>xop:Include</tt> elements into calls to the appropriate methods defined by
+ * {@code xop:Include} elements into calls to the appropriate methods defined by
  * {@link DataHandlerWriter}.
  */
 public class XOPDecodingStreamWriter extends XMLStreamWriterWrapper {
@@ -50,7 +50,7 @@
      * @param mimePartProvider
      *            an implementation of the {@link MimePartProvider} interface that will be used to
      *            load the {@link DataHandler} objects for MIME parts referenced by
-     *            <tt>xop:Include</tt> element information items written to this wrapper
+     *            {@code xop:Include} element information items written to this wrapper
      */
     public XOPDecodingStreamWriter(XMLStreamWriter parent, MimePartProvider mimePartProvider) {
         super(parent);
diff --git a/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamReader.java b/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamReader.java
index e7b6d0a..9a4773d 100644
--- a/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamReader.java
+++ b/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamReader.java
@@ -40,7 +40,7 @@
  * information items to optimize (by looking for
  * {@link javax.xml.stream.XMLStreamConstants#CHARACTERS} events for which
  * {@link DataHandlerReader#isBinary()} returns <code>true</code>). The {@link DataHandler}
- * objects for the parts referenced by <tt>xop:Include</tt> element information items produced by
+ * objects for the parts referenced by {@code xop:Include} element information items produced by
  * an instance of this class can be retrieved using the {@link #getDataHandler(String)} method.
  * <p>
  * Note that the primary purpose of this class is not to serialize an XML infoset to an XOP package
@@ -118,7 +118,7 @@
      *            {@link DataHandlerReader}.
      * @param contentIDGenerator
      *            used to generate content IDs for the binary content exposed as
-     *            <tt>xop:Include</tt> element information items
+     *            {@code xop:Include} element information items
      * @param optimizationPolicy
      *            the policy to apply to decide which binary content to optimize
      * 
diff --git a/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamWrapper.java b/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamWrapper.java
index 7255e95..48bf815 100644
--- a/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamWrapper.java
+++ b/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamWrapper.java
@@ -70,11 +70,11 @@
     }
 
     /**
-     * Get the set of content IDs referenced in <tt>xop:Include</tt> element information items
+     * Get the set of content IDs referenced in {@code xop:Include} element information items
      * produced by this wrapper.
      * 
      * @return The set of content IDs in their order of appearance in the infoset. If no
-     *         <tt>xop:Include</tt> element information items have been produced yet, an empty
+     *         {@code xop:Include} element information items have been produced yet, an empty
      *         set will be returned.
      */
     public Set<String> getContentIDs() {
diff --git a/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamWriter.java b/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamWriter.java
index e9f8d6c..877c0d2 100644
--- a/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamWriter.java
+++ b/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamWriter.java
@@ -33,7 +33,7 @@
 /**
  * {@link XMLStreamWriter} wrapper that encodes XOP. It implements the extension
  * defined by {@link DataHandlerWriter}. The {@link DataHandler}
- * objects for the parts referenced by <tt>xop:Include</tt> element information items produced by
+ * objects for the parts referenced by {@code xop:Include} element information items produced by
  * an instance of this class can be retrieved using the {@link #getDataHandler(String)} method.
  */
 public class XOPEncodingStreamWriter extends XOPEncodingStreamWrapper
@@ -47,7 +47,7 @@
      *            the XML stream to write the encoded infoset to
      * @param contentIDGenerator
      *            used to generate content IDs for the binary content encoded as
-     *            <tt>xop:Include</tt> element information items
+     *            {@code xop:Include} element information items
      * @param optimizationPolicy
      *            the policy to apply to decide which binary content to optimize
      */
diff --git a/buildutils/shade-axiom-xml/src/main/java/org/apache/axiom/buildutils/shade/axiomxml/AxiomXmlResourceTransformer.java b/buildutils/shade-axiom-xml/src/main/java/org/apache/axiom/buildutils/shade/axiomxml/AxiomXmlResourceTransformer.java
index 810bf5e..23a2f34 100644
--- a/buildutils/shade-axiom-xml/src/main/java/org/apache/axiom/buildutils/shade/axiomxml/AxiomXmlResourceTransformer.java
+++ b/buildutils/shade-axiom-xml/src/main/java/org/apache/axiom/buildutils/shade/axiomxml/AxiomXmlResourceTransformer.java
@@ -32,7 +32,7 @@
 import org.w3c.dom.NodeList;
 
 /**
- * Merges <tt>META-INF/axiom.xml</tt> files.
+ * Merges {@code META-INF/axiom.xml} files.
  */
 public class AxiomXmlResourceTransformer implements ResourceTransformer {
     private static final String AXIOM_XML = "META-INF/axiom.xml";
diff --git a/components/core-streams/src/main/java/org/apache/axiom/core/stream/XmlHandler.java b/components/core-streams/src/main/java/org/apache/axiom/core/stream/XmlHandler.java
index d1d8a75..44d4fa9 100644
--- a/components/core-streams/src/main/java/org/apache/axiom/core/stream/XmlHandler.java
+++ b/components/core-streams/src/main/java/org/apache/axiom/core/stream/XmlHandler.java
@@ -62,7 +62,7 @@
      * @param value
      *            the value of the attribute; never <code>null</code>
      * @param type
-     *            the attribute type (e.g. <tt>CDATA</tt>); never <code>null</code>
+     *            the attribute type (e.g. {@code CDATA}); never <code>null</code>
      * @throws StreamException
      */
     void processAttribute(String namespaceURI, String localName, String prefix, String value, String type, boolean specified) throws StreamException;
@@ -75,7 +75,7 @@
      * @param value
      *            the value of the attribute; never <code>null</code>
      * @param type
-     *            the attribute type (e.g. <tt>CDATA</tt>); never <code>null</code>
+     *            the attribute type (e.g. {@code CDATA}); never <code>null</code>
      * @throws StreamException
      */
     void processAttribute(String name, String value, String type, boolean specified) throws StreamException;
diff --git a/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java b/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
index 2d885b1..2a30142 100644
--- a/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
+++ b/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
@@ -45,13 +45,13 @@
 import org.osgi.framework.launch.FrameworkFactory;
 
 /**
- * Tests that the Axiom bundles have <tt>Export-Package</tt> directives with the appropriate uses
+ * Tests that the Axiom bundles have {@code Export-Package} directives with the appropriate uses
  * constraints so that the OSGi runtime can guarantee that packages are wired consistently. This is
  * a regression test for <a href="https://issues.apache.org/jira/browse/AXIOM-457">AXIOM-457</a>.
  * <p>
- * The test installs two test bundles, one importing the <tt>javax.xml.stream</tt> package from the
+ * The test installs two test bundles, one importing the {@code javax.xml.stream} package from the
  * framework bundle (i.e. the JRE) and the other importing the same package from the ServiceMix StAX
- * API bundle. Both bundles also import <tt>org.apache.axiom.om</tt>. Since the StAX API is used in
+ * API bundle. Both bundles also import {@code org.apache.axiom.om}. Since the StAX API is used in
  * the public Axiom API, this would lead to a class loading issue (reported as a
  * {@link LinkageError} at runtime). With the appropriate uses constraints, the OSGi runtime should
  * detect this when the bundles are resolved. The test registers a {@link FrameworkListener} to
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetAttributeTypeDefault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetAttributeTypeDefault.java
index 01768ec..199d2e9 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetAttributeTypeDefault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/attribute/TestGetAttributeTypeDefault.java
@@ -25,7 +25,7 @@
 import org.apache.axiom.ts.AxiomTestCase;
 
 /**
- * Tests that the default attribute type for programmatically created attributes is <tt>CDATA</tt>.
+ * Tests that the default attribute type for programmatically created attributes is {@code CDATA}.
  */
 public class TestGetAttributeTypeDefault extends AxiomTestCase {
     public TestGetAttributeTypeDefault(OMMetaFactory metaFactory) {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing2.java
index 5944b4c..30a7093 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateStAXOMBuilderNamespaceRepairing2.java
@@ -32,7 +32,7 @@
 
 /**
  * Tests that {@link OMMetaFactory#createStAXOMBuilder(XMLStreamReader)} correctly
- * performs namespace repairing in cases where a namespace declaration of the form <tt>xmlns=""</tt>
+ * performs namespace repairing in cases where a namespace declaration of the form {@code xmlns=""}
  * is required. This is a regression test for <a
  * href="https://issues.apache.org/jira/browse/AXIOM-408">AXIOM-408</a>.
  */
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithMaskedNamespaceDeclaration.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithMaskedNamespaceDeclaration.java
index 75e7aa0..d0aa97f 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithMaskedNamespaceDeclaration.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddAttributeWithMaskedNamespaceDeclaration.java
@@ -39,10 +39,10 @@
  *     &lt;c xmlns:p="urn:ns1" p:attr="test"/&gt;
  *   &lt;/b&gt;
  * &lt;/a&gt;</pre>
- * It only explicitly creates the namespace declarations on <tt>&lt;a&gt;</tt> and
- * <tt>&lt;b&gt;</tt>. When adding the attribute to <tt>&lt;c&gt;</tt>, Axiom must generate
- * a new namespace declaration because the declaration on <tt>&lt;a&gt;</tt> is masked
- * by the one on <tt>&lt;b&gt;</tt>.
+ * It only explicitly creates the namespace declarations on {@code <a>} and
+ * {@code <b>}. When adding the attribute to {@code <c>}, Axiom must generate
+ * a new namespace declaration because the declaration on {@code <a>} is masked
+ * by the one on {@code <b>}.
  * <p>
  * Note that because of WSTX-202, Axiom will not be able to serialize the resulting XML.
  */
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix1.java
index cd24dad..dbb0861 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix1.java
@@ -28,7 +28,7 @@
 
 /**
  * Test that {@link OMElement#getAttributeValue(QName)} works properly for an attribute with the
- * <tt>xml</tt> prefix, even if this prefix is not declared explicitly. This is a regression test
+ * {@code xml} prefix, even if this prefix is not declared explicitly. This is a regression test
  * for <a href="https://issues.apache.org/jira/browse/AXIS2-329">AXIS2-329</a>.
  */
 public class TestGetAttributeValueWithXmlPrefix1 extends AxiomTestCase {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix2.java
index 39d3ab3..e01eab0 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeValueWithXmlPrefix2.java
@@ -28,7 +28,7 @@
 
 /**
  * Test that {@link OMElement#getAttributeValue(QName)} works properly for an attribute with the
- * <tt>xml</tt> prefix, even if this prefix is not declared explicitly. This is a regression test
+ * {@code xml} prefix, even if this prefix is not declared explicitly. This is a regression test
  * for <a href="https://issues.apache.org/jira/browse/AXIS2-329">AXIS2-329</a>.
  */
 public class TestGetAttributeValueWithXmlPrefix2 extends AxiomTestCase {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix1.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix1.java
index 437f082..8be9ef4 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix1.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix1.java
@@ -29,7 +29,7 @@
 
 /**
  * Test that {@link OMElement#getAttribute(QName)} works properly for an attribute with the
- * <tt>xml</tt> prefix, even if this prefix is not declared explicitly. This is a regression test
+ * {@code xml} prefix, even if this prefix is not declared explicitly. This is a regression test
  * for <a href="https://issues.apache.org/jira/browse/AXIS2-329">AXIS2-329</a>.
  */
 public class TestGetAttributeWithXmlPrefix1 extends AxiomTestCase {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix2.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix2.java
index 929c5c2..d7386ad 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix2.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAttributeWithXmlPrefix2.java
@@ -29,7 +29,7 @@
 
 /**
  * Test that {@link OMElement#getAttribute(QName)} works properly for an attribute with the
- * <tt>xml</tt> prefix, even if this prefix is not declared explicitly. This is a regression test
+ * {@code xml} prefix, even if this prefix is not declared explicitly. This is a regression test
  * for <a href="https://issues.apache.org/jira/browse/AXIS2-329">AXIS2-329</a>.
  */
 public class TestGetAttributeWithXmlPrefix2 extends AxiomTestCase {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalizedWithParser.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalizedWithParser.java
index 92f286a..6e35d85 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalizedWithParser.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalizedWithParser.java
@@ -29,7 +29,7 @@
 /**
  * Tests that {@link OMNamedInformationItem#getNamespace()} returns <code>null</code> for an element
  * with no namespace. The case considered in this test is an element created using a parser and that
- * has an explicit namespace declaration for the default namespace, i.e. <tt>xmlns=""</tt>. This is
+ * has an explicit namespace declaration for the default namespace, i.e. {@code xmlns=""}. This is
  * a regression test for <a href="https://issues.apache.org/jira/browse/AXIOM-398">AXIOM-398</a>.
  */
 public class TestGetNamespaceNormalizedWithParser extends AxiomTestCase {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalizedWithSAXSource.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalizedWithSAXSource.java
index 2220da3..129f9d5 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalizedWithSAXSource.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalizedWithSAXSource.java
@@ -35,7 +35,7 @@
  * Tests that {@link OMNamedInformationItem#getNamespace()} returns <code>null</code> for an element
  * with no namespace. The case considered in this test is an element created using a
  * {@link SAXSource} and that has an explicit namespace declaration for the default namespace, i.e.
- * <tt>xmlns=""</tt>. This is a regression test for <a
+ * {@code xmlns=""}. This is a regression test for <a
  * href="https://issues.apache.org/jira/browse/AXIOM-398">AXIOM-398</a>.
  */
 public class TestGetNamespaceNormalizedWithSAXSource extends AxiomTestCase {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransformOnFragment.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransformOnFragment.java
index 450b63c..2a55b7a 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransformOnFragment.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetSAXSourceIdentityTransformOnFragment.java
@@ -49,7 +49,7 @@
  * Example:
  * <pre>&lt;root xmlns:ns="urn:ns"&gt;&lt;element attr="ns:someThing"/&gt;&lt;root&gt;</pre>
  * In that case, when constructing an {@link SAXSource} from the child element, the namespace
- * mapping for the <tt>ns</tt> prefix should be visible to the consumer. Otherwise it would not
+ * mapping for the {@code ns} prefix should be visible to the consumer. Otherwise it would not
  * be able to interpret the attribute value correctly. This is relevant e.g. when validating
  * a part of a document against an XML schema (see
  * <a href="https://issues.apache.org/jira/browse/SYNAPSE-501">SYNAPSE-501</a>).
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace3.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace3.java
index 0cc0894..3829b40 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace3.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithoutNamespace3.java
@@ -28,7 +28,7 @@
 /**
  * Tests the behavior of the <code>createOMElement</code> methods in {@link OMFactory} when
  * requested to create an element without namespace as a child of an element with a
- * <tt>xmlns=""</tt> declaration. In this case, no namespace declaration is added to the created
+ * {@code xmlns=""} declaration. In this case, no namespace declaration is added to the created
  * element.
  */
 public class TestCreateOMElementWithoutNamespace3 extends CreateOMElementTestCase {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeDefault.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeDefault.java
index 57fabaf..e331f2b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeDefault.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeDefault.java
@@ -29,7 +29,7 @@
 
 /**
  * Tests that {@link SOAPHeaderBlock#getMustUnderstand()} (resp. {@link SOAPHeaderBlock#getRelay()})
- * returns <code>false</code> if the <tt>mustUnderstand</tt> (resp. <tt>relay</tt>) attribute is
+ * returns <code>false</code> if the {@code mustUnderstand} (resp. {@code relay}) attribute is
  * absent.
  */
 public class TestGetBooleanAttributeDefault extends BooleanAttributeTestCase {
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeInvalid.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeInvalid.java
index 9472407..b3af817 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeInvalid.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestGetBooleanAttributeInvalid.java
@@ -30,7 +30,7 @@
 
 /**
  * Tests that {@link SOAPHeaderBlock#getMustUnderstand()} (resp. {@link SOAPHeaderBlock#getRelay()})
- * throws {@link SOAPProcessingException} if a <tt>mustUnderstand</tt> (resp. <tt>relay</tt>)
+ * throws {@link SOAPProcessingException} if a {@code mustUnderstand} (resp. {@code relay})
  * attribute is present but has an invalid value.
  */
 public class TestGetBooleanAttributeInvalid extends BooleanAttributeTestCase {
diff --git a/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java b/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java
index 5b8d082..b4c33d7 100644
--- a/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java
+++ b/testing/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPSpec.java
@@ -208,8 +208,8 @@
     
     /**
      * Get the boolean literals recognized by this SOAP version. While SOAP 1.2 refers to the
-     * <tt>xs:boolean</tt> type and therefore recognizes <tt>true</tt>, <tt>false</tt>, <tt>1</tt>
-     * and <tt>0</tt>, SOAP 1.1 only recognizes <tt>1</tt> and <tt>0</tt>.
+     * {@code xs:boolean} type and therefore recognizes {@code true}, {@code false}, {@code 1}
+     * and {@code 0}, SOAP 1.1 only recognizes {@code 1} and {@code 0}.
      * 
      * @return an array with the recognized boolean literals
      */
diff --git a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/MessageFactoryConfigurator.java b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/MessageFactoryConfigurator.java
index 946393f..36d16c4 100644
--- a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/MessageFactoryConfigurator.java
+++ b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/MessageFactoryConfigurator.java
@@ -42,10 +42,10 @@
     /**
      * Configure a {@link SoapMessageFactory} in the given application context. The method must
      * <ul>
-     * <li>add a bean of type {@link SoapMessageFactory} and name <tt>messageFactory</tt> to the
+     * <li>add a bean of type {@link SoapMessageFactory} and name {@code messageFactory} to the
      * context;
      * <li>configure that {@link SoapMessageFactory} to use the SOAP version specified by the
-     * <tt>soapVersion</tt> property (which specifies the name of one of the constants defined in
+     * {@code soapVersion} property (which specifies the name of one of the constants defined in
      * {@link SoapVersion}).
      * </ul>
      *