diff --git a/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java b/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java
index 6b5cb6128..1072b862b 100644
--- a/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java
+++ b/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java
@@ -95,7 +95,7 @@ public interface AuthScheme {
      * Tests if the authentication scheme is provides authorization on a per
      * connection basis instead of usual per request basis
      *
-     * @return {@code true</tt> if the scheme is connection based, <tt>false}
+     * @return {@code true} if the scheme is connection based, {@code false}
      * if the scheme is request based.
      */
     boolean isConnectionBased();
diff --git a/httpclient/src/main/java/org/apache/http/auth/AuthScope.java b/httpclient/src/main/java/org/apache/http/auth/AuthScope.java
index 9a8d50058..dc1e18cca 100644
--- a/httpclient/src/main/java/org/apache/http/auth/AuthScope.java
+++ b/httpclient/src/main/java/org/apache/http/auth/AuthScope.java
@@ -89,7 +89,7 @@ public class AuthScope {
     private final HttpHost origin;
 
     /**
-     * Defines auth scope with the given {@code host</tt>, <tt>port</tt>, <tt>realm}, and
+     * Defines auth scope with the given {@code host}, {@code port}, {@code realm}, and
      * {@code authentication scheme}.
      *
      * @param host authentication host. May be {@link #ANY_HOST} if applies
@@ -148,7 +148,7 @@ public class AuthScope {
     }
 
     /**
-     * Defines auth scope with the given {@code host</tt>, <tt>port</tt> and <tt>realm}.
+     * Defines auth scope with the given {@code host}, {@code port} and {@code realm}.
      *
      * @param host authentication host. May be {@link #ANY_HOST} if applies
      *   to any host.
@@ -162,7 +162,7 @@ public class AuthScope {
     }
 
     /**
-     * Defines auth scope with the given {@code host</tt> and <tt>port}.
+     * Defines auth scope with the given {@code host} and {@code port}.
      *
      * @param host authentication host. May be {@link #ANY_HOST} if applies
      *   to any host.
diff --git a/httpclient/src/main/java/org/apache/http/auth/AuthenticationException.java b/httpclient/src/main/java/org/apache/http/auth/AuthenticationException.java
index 5c2f716a3..8d8e34c63 100644
--- a/httpclient/src/main/java/org/apache/http/auth/AuthenticationException.java
+++ b/httpclient/src/main/java/org/apache/http/auth/AuthenticationException.java
@@ -60,7 +60,7 @@ public class AuthenticationException extends ProtocolException {
      * Creates a new AuthenticationException with the specified detail message and cause.
      *
      * @param message the exception detail message
-     * @param cause the {@code Throwable</tt> that caused this exception, or <tt>null}
+     * @param cause the {@code Throwable} that caused this exception, or {@code null}
      * if the cause is unavailable, unknown, or not a {@code Throwable}
      */
     public AuthenticationException(final String message, final Throwable cause) {
diff --git a/httpclient/src/main/java/org/apache/http/auth/InvalidCredentialsException.java b/httpclient/src/main/java/org/apache/http/auth/InvalidCredentialsException.java
index ee5e9a776..e357241c1 100644
--- a/httpclient/src/main/java/org/apache/http/auth/InvalidCredentialsException.java
+++ b/httpclient/src/main/java/org/apache/http/auth/InvalidCredentialsException.java
@@ -60,7 +60,7 @@ public class InvalidCredentialsException extends AuthenticationException {
      * Creates a new InvalidCredentialsException with the specified detail message and cause.
      *
      * @param message the exception detail message
-     * @param cause the {@code Throwable</tt> that caused this exception, or <tt>null}
+     * @param cause the {@code Throwable} that caused this exception, or {@code null}
      * if the cause is unavailable, unknown, or not a {@code Throwable}
      */
     public InvalidCredentialsException(final String message, final Throwable cause) {
diff --git a/httpclient/src/main/java/org/apache/http/auth/MalformedChallengeException.java b/httpclient/src/main/java/org/apache/http/auth/MalformedChallengeException.java
index ac1e01305..172ba0c6e 100644
--- a/httpclient/src/main/java/org/apache/http/auth/MalformedChallengeException.java
+++ b/httpclient/src/main/java/org/apache/http/auth/MalformedChallengeException.java
@@ -61,7 +61,7 @@ public class MalformedChallengeException extends ProtocolException {
      * Creates a new MalformedChallengeException with the specified detail message and cause.
      *
      * @param message the exception detail message
-     * @param cause the {@code Throwable</tt> that caused this exception, or <tt>null}
+     * @param cause the {@code Throwable} that caused this exception, or {@code null}
      * if the cause is unavailable, unknown, or not a {@code Throwable}
      */
     public MalformedChallengeException(final String message, final Throwable cause) {
diff --git a/httpclient/src/main/java/org/apache/http/client/CircularRedirectException.java b/httpclient/src/main/java/org/apache/http/client/CircularRedirectException.java
index 5e40924eb..489aa72e0 100644
--- a/httpclient/src/main/java/org/apache/http/client/CircularRedirectException.java
+++ b/httpclient/src/main/java/org/apache/http/client/CircularRedirectException.java
@@ -59,7 +59,7 @@ public class CircularRedirectException extends RedirectException {
      * Creates a new CircularRedirectException with the specified detail message and cause.
      *
      * @param message the exception detail message
-     * @param cause the {@code Throwable</tt> that caused this exception, or <tt>null}
+     * @param cause the {@code Throwable} that caused this exception, or {@code null}
      * if the cause is unavailable, unknown, or not a {@code Throwable}
      */
     public CircularRedirectException(final String message, final Throwable cause) {
diff --git a/httpclient/src/main/java/org/apache/http/client/RedirectException.java b/httpclient/src/main/java/org/apache/http/client/RedirectException.java
index 866bfcac2..cf2abacd0 100644
--- a/httpclient/src/main/java/org/apache/http/client/RedirectException.java
+++ b/httpclient/src/main/java/org/apache/http/client/RedirectException.java
@@ -60,7 +60,7 @@ public class RedirectException extends ProtocolException {
      * Creates a new RedirectException with the specified detail message and cause.
      *
      * @param message the exception detail message
-     * @param cause the {@code Throwable</tt> that caused this exception, or <tt>null}
+     * @param cause the {@code Throwable} that caused this exception, or {@code null}
      * if the cause is unavailable, unknown, or not a {@code Throwable}
      */
     public RedirectException(final String message, final Throwable cause) {
diff --git a/httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java b/httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java
index d9f87d739..ef6c76e56 100644
--- a/httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java
+++ b/httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java
@@ -92,7 +92,7 @@ public class ResponseContentEncoding implements HttpResponseInterceptor {
     }
 
     /**
-     * Handles {@code gzip</tt> and <tt>deflate} compressed entities by using the following
+     * Handles {@code gzip} and {@code deflate} compressed entities by using the following
      * decoders:
      * <ul>
      * <li>gzip - see {@link GZIPInputStream}</li>
diff --git a/httpclient/src/main/java/org/apache/http/cookie/CookieAttributeHandler.java b/httpclient/src/main/java/org/apache/http/cookie/CookieAttributeHandler.java
index 611e04a61..95e1c331a 100644
--- a/httpclient/src/main/java/org/apache/http/cookie/CookieAttributeHandler.java
+++ b/httpclient/src/main/java/org/apache/http/cookie/CookieAttributeHandler.java
@@ -66,7 +66,7 @@ public interface CookieAttributeHandler {
    *
    * @param cookie {@link org.apache.http.cookie.Cookie} to match
    * @param origin the cookie source to match against
-   * @return {@code true</tt> if the match is successful; <tt>false} otherwise
+   * @return {@code true} if the match is successful; {@code false} otherwise
    */
   boolean match(Cookie cookie, CookieOrigin origin);
 
diff --git a/httpclient/src/main/java/org/apache/http/cookie/MalformedCookieException.java b/httpclient/src/main/java/org/apache/http/cookie/MalformedCookieException.java
index 8bc4561ec..da70979c6 100644
--- a/httpclient/src/main/java/org/apache/http/cookie/MalformedCookieException.java
+++ b/httpclient/src/main/java/org/apache/http/cookie/MalformedCookieException.java
@@ -62,7 +62,7 @@ public class MalformedCookieException extends ProtocolException {
      * Creates a new MalformedCookieException with the specified detail message and cause.
      *
      * @param message the exception detail message
-     * @param cause the {@code Throwable</tt> that caused this exception, or <tt>null}
+     * @param cause the {@code Throwable} that caused this exception, or {@code null}
      * if the cause is unavailable, unknown, or not a {@code Throwable}
      */
     public MalformedCookieException(final String message, final Throwable cause) {
diff --git a/httpclient/src/main/java/org/apache/http/cookie/SetCookie2.java b/httpclient/src/main/java/org/apache/http/cookie/SetCookie2.java
index 5094519a0..18b0b498b 100644
--- a/httpclient/src/main/java/org/apache/http/cookie/SetCookie2.java
+++ b/httpclient/src/main/java/org/apache/http/cookie/SetCookie2.java
@@ -50,7 +50,7 @@ public interface SetCookie2 extends SetCookie {
     /**
      * Set the Discard attribute.
      *
-     * Note: {@code Discard</tt> attribute overrides <tt>Max-age}.
+     * Note: {@code Discard} attribute overrides {@code Max-age}.
      *
      * @see #isPersistent()
      */
diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineException.java b/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineException.java
index 7448c20ac..f902ae1bc 100644
--- a/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineException.java
+++ b/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineException.java
@@ -57,7 +57,7 @@ public class NTLMEngineException extends AuthenticationException {
      * Creates a new NTLMEngineException with the specified detail message and cause.
      *
      * @param message the exception detail message
-     * @param cause the {@code Throwable</tt> that caused this exception, or <tt>null}
+     * @param cause the {@code Throwable} that caused this exception, or {@code null}
      * if the cause is unavailable, unknown, or not a {@code Throwable}
      */
     public NTLMEngineException(final String message, final Throwable cause) {
diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java b/httpclient/src/main/java/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java
index 3eea852bb..2d6b6ec84 100644
--- a/httpclient/src/main/java/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java
+++ b/httpclient/src/main/java/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java
@@ -60,7 +60,7 @@ public class UnsupportedDigestAlgorithmException extends RuntimeException {
      * Creates a new UnsupportedAuthAlgoritmException with the specified detail message and cause.
      *
      * @param message the exception detail message
-     * @param cause the {@code Throwable</tt> that caused this exception, or <tt>null}
+     * @param cause the {@code Throwable} that caused this exception, or {@code null}
      * if the cause is unavailable, unknown, or not a {@code Throwable}
      */
     public UnsupportedDigestAlgorithmException(final String message, final Throwable cause) {
diff --git a/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java b/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java
index b9bb6c4d2..29876035b 100644
--- a/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java
+++ b/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java
@@ -58,7 +58,7 @@ import org.apache.http.util.TextUtils;
 /**
  * Default implementation of {@link RedirectStrategy}. This strategy honors the restrictions
  * on automatic redirection of entity enclosing methods such as POST and PUT imposed by the
- * HTTP specification. {@code 302 Moved Temporarily</tt>, <tt>301 Moved Permanently} and
+ * HTTP specification. {@code 302 Moved Temporarily}, {@code 301 Moved Permanently} and
  * {@code 307 Temporary Redirect} status codes will result in an automatic redirect of
  * HEAD and GET methods only. POST and PUT methods will not be automatically redirected
  * as requiring user confirmation.
diff --git a/httpclient/src/test/java/org/apache/http/impl/cookie/TestCookieRFC2965Spec.java b/httpclient/src/test/java/org/apache/http/impl/cookie/TestCookieRFC2965Spec.java
index 94fd745d0..97203711a 100644
--- a/httpclient/src/test/java/org/apache/http/impl/cookie/TestCookieRFC2965Spec.java
+++ b/httpclient/src/test/java/org/apache/http/impl/cookie/TestCookieRFC2965Spec.java
@@ -416,7 +416,7 @@ public class TestCookieRFC2965Spec {
     }
 
     /**
-     * test parsing {@code "Comment"</tt>, <tt>"CommentURL"} and
+     * test parsing {@code "Comment"}, {@code "CommentURL"} and
      * {@code "Secure"} attributes.
      */
     @Test