diff --git a/module-client/src/main/java/org/apache/http/client/HttpClient.java b/module-client/src/main/java/org/apache/http/client/HttpClient.java
index 89700c359..3685aab20 100644
--- a/module-client/src/main/java/org/apache/http/client/HttpClient.java
+++ b/module-client/src/main/java/org/apache/http/client/HttpClient.java
@@ -82,9 +82,7 @@ ClientConnectionManager getConnectionManager()
         ;
 
     /**
-     * Executes a request using the
-     * {@link #getDefaultContext() default context}.
-     * See there for details.
+     * Executes a request using the default context.
      *
      * @param request   the request to execute
      *
@@ -106,8 +104,7 @@ HttpResponse execute(HttpUriRequest request)
      *
      * @param request   the request to execute
      * @param context   the context to use for the execution, or
-     *                  <code>null</code> to use the
-     *                  {@link #getDefaultContext default context}
+     *                  <code>null</code> to use the default context
      *
      * @return  the response to the request. This is always a final response,
      *          never an intermediate response with an 1xx status code.
@@ -126,8 +123,7 @@ HttpResponse execute(HttpUriRequest request, HttpContext context)
 
 
     /**
-     * Executes a request to the target using the
-     * {@link #getDefaultContext() default context}.
+     * Executes a request to the target using the default context.
      * See there for details.
      *
      * @param target    the target host for the request.
@@ -161,8 +157,7 @@ HttpResponse execute(HttpHost target, HttpRequest request)
      *                  to a default target or by inspecting the request.
      * @param request   the request to execute
      * @param context   the context to use for the execution, or
-     *                  <code>null</code> to use the
-     *                  {@link #getDefaultContext default context}
+     *                  <code>null</code> to use the default context
      *
      * @return  the response to the request. This is always a final response,
      *          never an intermediate response with an 1xx status code.
diff --git a/module-client/src/main/java/org/apache/http/impl/auth/NTLMEngine.java b/module-client/src/main/java/org/apache/http/impl/auth/NTLMEngine.java
index bc82279e1..dff51956e 100644
--- a/module-client/src/main/java/org/apache/http/impl/auth/NTLMEngine.java
+++ b/module-client/src/main/java/org/apache/http/impl/auth/NTLMEngine.java
@@ -35,7 +35,7 @@
  * generate Type1 messages and Type3 messages in response to a 
  * Type2 challenge.
  * <p/>
- * For details see {@linkplain http://davenport.sourceforge.net/ntlm.html}}
+ * For details see <a href="http://davenport.sourceforge.net/ntlm.html">this resource</a>
  * 
  * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
 */
diff --git a/module-client/src/test/java/org/apache/http/mockup/SecureSocketFactoryMockup.java b/module-client/src/test/java/org/apache/http/mockup/SecureSocketFactoryMockup.java
index f6ae2ed71..be89b4188 100644
--- a/module-client/src/test/java/org/apache/http/mockup/SecureSocketFactoryMockup.java
+++ b/module-client/src/test/java/org/apache/http/mockup/SecureSocketFactoryMockup.java
@@ -35,7 +35,7 @@
 import org.apache.http.conn.scheme.LayeredSocketFactory;
 
 /**
- * {@link SecureSocketFactory} mockup implementation.
+ * {@link LayeredSocketFactory} mockup implementation.
  */
 public class SecureSocketFactoryMockup extends SocketFactoryMockup
     implements LayeredSocketFactory {