diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/EquinoxAttributeDefinition.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/EquinoxAttributeDefinition.java
index e91eed867c1..5bca9c86dd8 100644
--- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/EquinoxAttributeDefinition.java
+++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/EquinoxAttributeDefinition.java
@@ -17,10 +17,11 @@
  * attribute definition} allowing access to any
  * {@link Extendable#getExtensionAttributes(String) extension attributes}
  * provided by third parties.
- * <p/>
+ * <p>
  * For example, an Equinox attribute definition will contain all XML attributes
  * specified as part of the &lt;AD/&gt; element with namespaces other than the
  * metatype namespace as extension attributes.
+ * </p>
  * 
  * @since 1.2
  * @noimplement This interface is not intended to be implemented by clients.
diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/EquinoxObjectClassDefinition.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/EquinoxObjectClassDefinition.java
index 33a5df78656..7799b02fffd 100644
--- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/EquinoxObjectClassDefinition.java
+++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/EquinoxObjectClassDefinition.java
@@ -17,10 +17,11 @@
  * object class definition} allowing access to any
  * {@link Extendable#getExtensionAttributes(String) extension attributes}
  * provided by third parties.
- * <p/>
+ * <p>
  * For example, an Equinox object class definition will contain all XML
  * attributes specified as part of the &lt;OCD/&gt; element with namespaces
  * other than the metatype namespace as extension attributes.
+ * </p>
  * 
  * @since 1.2
  */
diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/Extendable.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/Extendable.java
index 25c304e59dc..39c55bbb922 100644
--- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/Extendable.java
+++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/Extendable.java
@@ -19,8 +19,8 @@
  * a custom property added by a third party.
  * 
  * The use case for this interface was to expose third party attributes included
- * in the metadata XML on elements that support <anyAttribute/> according to the
- * metatype schema, but it is not strictly limited to this use.
+ * in the metadata XML on elements that support {@code <anyAttribute/>}
+ * according to the metatype schema, but it is not strictly limited to this use.
  * 
  * @since 1.2
  */
diff --git a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeInformationImpl.java b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeInformationImpl.java
index f5be611b858..1c7ea33c51a 100644
--- a/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeInformationImpl.java
+++ b/bundles/org.eclipse.equinox.metatype/src/org/eclipse/equinox/metatype/impl/MetaTypeInformationImpl.java
@@ -26,13 +26,14 @@
  * Implementation of MetaTypeProvider
  * <p>
  * Extension of MetaTypeProvider
+ * </p>
  * <p>
  * Provides methods to:
- * <p>
- * - getPids() get the Pids for a given Locale
- * <p>
- * - getFactoryPids() get the Factory Pids for a given Locale
- * <p>
+ * </p>
+ * <ul>
+ * <li>getPids() get the Pids for a given Locale</li>
+ * <li>getFactoryPids() get the Factory Pids for a given Locale</li>
+ * </ul>
  */
 public class MetaTypeInformationImpl extends MetaTypeProviderImpl implements EquinoxMetaTypeInformation {
 	static final String[] emptyStringArray = new String[0];
diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Authorization.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Authorization.java
index 194181d5444..2804bb610a7 100644
--- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Authorization.java
+++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Authorization.java
@@ -27,7 +27,7 @@
  * Authorization contexts are instantiated by calling
  * {@link UserAdmin#getAuthorization}
  * <p>
- * <font size="+1">Trusting Authorization objects.</font>
+ * <h2>Trusting Authorization objects.</h2>
  * <p>
  * There are no restrictions regarding the creation of Authorization objects.
  * Hence, a service must only accept Authorization objects from bundles that has