diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java
index fec3fda7..43f26dcc 100644
--- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java
@@ -289,9 +289,9 @@ public class FlowFacesContext extends FacesContextWrapper {
 
 	/**
 	 * Adapter class to convert a {@link FacesMessage} to a Spring {@link Message}. This adapter is required to allow
-	 * <tt>FacesMessages</tt> to be registered with Spring whilst still retaining their mutable nature. It is not
-	 * uncommon for <tt>FacesMessages</tt> to be changed after they have been added to a <tt>FacesContext</tt>, for
-	 * example, from a <tt>PhaseListener</tt>.
+	 * <code>FacesMessages</code> to be registered with Spring whilst still retaining their mutable nature. It is not
+	 * uncommon for <code>FacesMessages</code> to be changed after they have been added to a <code>FacesContext</code>, for
+	 * example, from a <code>PhaseListener</code>.
 	 * <p>
 	 * NOTE: Only {@link javax.faces.application.FacesMessage} instances are directly adapted, any subclasses will be
 	 * converted to the standard FacesMessage implementation. This is to protect against bugs such as SWF-1073.
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/action/FormAction.java b/spring-webflow/src/main/java/org/springframework/webflow/action/FormAction.java
index 38298e6f..c80b8cf1 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/action/FormAction.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/action/FormAction.java
@@ -165,7 +165,7 @@ import org.springframework.webflow.execution.ScopeType;
  *     &lt;/evaluate&gt;
  * </pre>
  * 
- * Would result in the <tt>public void validateSearchCriteria(SearchCriteria, Errors)</tt> method of the registered
+ * Would result in the <code>public void validateSearchCriteria(SearchCriteria, Errors)</code> method of the registered
  * validator being called if the form object class would be <code>SearchCriteria</code>.</li>
  * <li>If you want to do full validation using the
  * {@link org.springframework.validation.Validator#validate(java.lang.Object, org.springframework.validation.Errors)
@@ -910,7 +910,7 @@ public class FormAction extends MultiAction implements InitializingBean {
 	 * display on a user interface such as a HTML page.
 	 * <p>
 	 * This default implementation will call the {@link #registerPropertyEditors(PropertyEditorRegistry) simpler form}
-	 * of the method not taking a <tt>RequestContext</tt> parameter.
+	 * of the method not taking a <code>RequestContext</code> parameter.
 	 * @param context the action execution context, for accessing and setting data in "flow scope" or "request scope"
 	 * @param registry the property editor registry to register editors in
 	 * @see #registerPropertyEditors(PropertyEditorRegistry)
@@ -927,7 +927,7 @@ public class FormAction extends MultiAction implements InitializingBean {
 	 * Property editors give you full control over how objects are transformed to and from a formatted String form for
 	 * display on a user interface such as a HTML page.
 	 * <p>
-	 * This default implementation will simply call <tt>registerCustomEditors</tt> on the
+	 * This default implementation will simply call <code>registerCustomEditors</code> on the
 	 * {@link #getPropertyEditorRegistrar() propertyEditorRegistrar} object that has been set for the action, if any.
 	 * @param registry the property editor registry to register editors in
 	 */
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/core/collection/MutableAttributeMap.java b/spring-webflow/src/main/java/org/springframework/webflow/core/collection/MutableAttributeMap.java
index 3eeef053..dc094249 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/core/collection/MutableAttributeMap.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/core/collection/MutableAttributeMap.java
@@ -55,7 +55,7 @@ public interface MutableAttributeMap<V> extends AttributeMap<V> {
 	/**
 	 * Remove an attribute from this map.
 	 * @param attributeName the name of the attribute to remove
-	 * @return previous value associated with specified attribute name, or <tt>null</tt> if there was no mapping for the
+	 * @return previous value associated with specified attribute name, or <code>null</code> if there was no mapping for the
 	 * name
 	 */
 	Object remove(String attributeName);
diff --git a/src/api/overview.html b/src/api/overview.html
index eaafe7f6..8ec46d25 100644
--- a/src/api/overview.html
+++ b/src/api/overview.html
@@ -1,7 +1,7 @@
 <html>
 <body>
-<p align="center">
-<img src="https://docs.spring.io/spring-webflow/images/spring-webflow.jpg"><br>
+<p style="text-align: center">
+<img src="https://docs.spring.io/spring-webflow/images/spring-webflow.jpg" alt="Spring Web Flow logo"><br>
 The public Java Documentation for the Spring Web Flow project.
 </p>
 <p>Spring Web Flow facilitates building web applications that require guided navigation -- e.g. a shopping cart, flight check-in, a loan application, and many others. In contrast to stateless, free-form navigation such use cases have a clear start and end point, one or more screens to go through in a specific order, and a set of changes that are not finalized to the end.</p>