diff --git a/src/java/org/apache/http/conn/HttpConnectionManager.java b/src/java/org/apache/http/conn/HttpConnectionManager.java
index 4c53b7af9..8611c8d17 100644
--- a/src/java/org/apache/http/conn/HttpConnectionManager.java
+++ b/src/java/org/apache/http/conn/HttpConnectionManager.java
@@ -32,7 +32,9 @@
 package org.apache.http.conn;
 
 /**
- * An interface for classes that manage {@link HttpHostConnection}s.
+ * "Old" connection manager interface, as ported from HttpClient 3.x.
+ * @deprecated kept temporarily for reference. To be replaced by
+ *      {@link ClientConnectionManager}.
  * 
  * @author Michael Becke
  * @author <a href="mailto:mbowler@GargoyleSoftware.com">Mike Bowler</a>
diff --git a/src/java/org/apache/http/conn/HttpHostConnection.java b/src/java/org/apache/http/conn/HttpHostConnection.java
index 6ed4efe75..994def044 100644
--- a/src/java/org/apache/http/conn/HttpHostConnection.java
+++ b/src/java/org/apache/http/conn/HttpHostConnection.java
@@ -39,6 +39,12 @@ import org.apache.http.HttpInetConnection;
 import org.apache.http.HttpResponse;
 import org.apache.http.params.HttpParams;
 
+/**
+ * "Old" connection interface, as ported from HttpClient 3.x.
+ * @deprecated kept temporarily for reference. To be replaced by
+ *      {@link OperatedClientConnection} and
+ *      {@link ManagedClientConnection}.
+ */
 public interface HttpHostConnection extends HttpClientConnection, HttpInetConnection {
     
     void setHttpConnectionManager(HttpConnectionManager manager);
diff --git a/src/java/org/apache/http/impl/conn/DefaultHttpHostConnection.java b/src/java/org/apache/http/impl/conn/DefaultHttpHostConnection.java
index d9e370376..dc40c5870 100644
--- a/src/java/org/apache/http/impl/conn/DefaultHttpHostConnection.java
+++ b/src/java/org/apache/http/impl/conn/DefaultHttpHostConnection.java
@@ -50,6 +50,10 @@ import org.apache.http.params.HttpParams;
 /**
  * Default {@link HttpHostConnection} implementation.
  *
+ * @deprecated kept temporarily for reference. To be replaced by
+ *      {@link DefaultClientConnection} and
+ *      {@link AbstractClientConnectionAdapter}.
+ *
  * @author Rod Waldhoff
  * @author Sean C. Sullivan
  * @author Ortwin Glueck
diff --git a/src/java/org/apache/http/impl/conn/MultiThreadedHttpConnectionManager.java b/src/java/org/apache/http/impl/conn/MultiThreadedHttpConnectionManager.java
index 489618c47..4319364b1 100644
--- a/src/java/org/apache/http/impl/conn/MultiThreadedHttpConnectionManager.java
+++ b/src/java/org/apache/http/impl/conn/MultiThreadedHttpConnectionManager.java
@@ -59,6 +59,8 @@ import org.apache.http.params.HttpParams;
 
 /**
  * Manages a set of HttpConnections for various HostConfigurations.
+ * @deprecated kept temporarily for reference. To be replaced by
+ *      {@link ThreadSafeClientConnManager}.
  *
  * @author <a href="mailto:becke@u.washington.edu">Michael Becke</a>
  * @author Eric Johnson
diff --git a/src/java/org/apache/http/impl/conn/SimpleHttpConnectionManager.java b/src/java/org/apache/http/impl/conn/SimpleHttpConnectionManager.java
index f978e44e0..5f0f53d3e 100644
--- a/src/java/org/apache/http/impl/conn/SimpleHttpConnectionManager.java
+++ b/src/java/org/apache/http/impl/conn/SimpleHttpConnectionManager.java
@@ -47,6 +47,7 @@ import org.apache.http.params.HttpParams;
  * A connection manager that provides access to a single HttpConnection.  This
  * manager makes no attempt to provide exclusive access to the contained
  * HttpConnection.
+ * @deprecated To be adapted to the new connection handler interface.
  *
  * @author <a href="mailto:becke@u.washington.edu">Michael Becke</a>
  * @author Eric Johnson