diff --git a/build.gradle b/build.gradle
index 6d9c0ffd..52f8d300 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,6 +66,7 @@ configure(allprojects) {
 		"http://fasterxml.github.com/jackson-core/javadoc/2.3.0/",
 		"http://fasterxml.github.com/jackson-databind/javadoc/2.3.0/",
 		"http://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/",
+		"http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/"
 	] as String[]
 
 	// servlet-api (2.5) and tomcat-servlet-api (3.0) classpath entries should not be
diff --git a/spring-android-core/src/main/java/org/springframework/core/convert/support/ConfigurableConversionService.java b/spring-android-core/src/main/java/org/springframework/core/convert/support/ConfigurableConversionService.java
index c9929a67..6d9f9b09 100644
--- a/spring-android-core/src/main/java/org/springframework/core/convert/support/ConfigurableConversionService.java
+++ b/spring-android-core/src/main/java/org/springframework/core/convert/support/ConfigurableConversionService.java
@@ -24,15 +24,10 @@
  * types. Consolidates the read-only operations exposed by {@link ConversionService} and
  * the mutating operations of {@link ConverterRegistry} to allow for convenient ad-hoc
  * addition and removal of {@link org.springframework.core.convert.converter.Converter
- * Converters} through. The latter is particularly useful when working against a
- * {@link org.springframework.core.env.ConfigurableEnvironment ConfigurableEnvironment}
- * instance in application context bootstrapping code.
+ * Converters} through.
  *
  * @author Chris Beams
  * @since 2.0
- * @see org.springframework.core.env.ConfigurablePropertyResolver#getConversionService()
- * @see org.springframework.core.env.ConfigurableEnvironment
- * @see org.springframework.context.ConfigurableApplicationContext#getEnvironment()
  */
 public interface ConfigurableConversionService extends ConversionService, ConverterRegistry {
 
diff --git a/spring-android-core/src/main/java/org/springframework/util/ResourceUtils.java b/spring-android-core/src/main/java/org/springframework/util/ResourceUtils.java
index 87a43742..64ec58f1 100644
--- a/spring-android-core/src/main/java/org/springframework/util/ResourceUtils.java
+++ b/spring-android-core/src/main/java/org/springframework/util/ResourceUtils.java
@@ -30,16 +30,6 @@
  *
  * <p>Consider using Spring's Resource abstraction in the core package
  * for handling all kinds of file resources in a uniform manner.
- * {@link org.springframework.core.io.ResourceLoader}'s {@code getResource()}
- * method can resolve any location to a {@link org.springframework.core.io.Resource}
- * object, which in turn allows one to obtain a {@code java.io.File} in the
- * file system through its {@code getFile()} method.
- *
- * <p>The main reason for these utility methods for resource location handling
- * is to support {@link Log4jConfigurer}, which must be able to resolve
- * resource locations <i>before the logging system has been initialized</i>.
- * Spring's {@code Resource} abstraction in the core package, on the other hand,
- * already expects the logging system to be available.
  *
  * @author Juergen Hoeller
  * @since 1.0
@@ -47,7 +37,6 @@
  * @see org.springframework.core.io.ClassPathResource
  * @see org.springframework.core.io.FileSystemResource
  * @see org.springframework.core.io.UrlResource
- * @see org.springframework.core.io.ResourceLoader
  */
 public abstract class ResourceUtils {
 
diff --git a/spring-android-rest-template/src/main/java/org/springframework/http/HttpHeaders.java b/spring-android-rest-template/src/main/java/org/springframework/http/HttpHeaders.java
index e1d86bc2..de996366 100644
--- a/spring-android-rest-template/src/main/java/org/springframework/http/HttpHeaders.java
+++ b/spring-android-rest-template/src/main/java/org/springframework/http/HttpHeaders.java
@@ -51,7 +51,7 @@
  * <li>{@link #set(String, String)} sets the header value to a single string value</li>
  * </ul>
  *
- * <p>Inspired by {@link com.sun.net.httpserver.Headers}.
+ * <p>Inspired by {@code com.sun.net.httpserver.Headers}.
  *
  * @author Arjen Poutsma
  * @author Roy Clarkson
diff --git a/spring-android-rest-template/src/main/java/org/springframework/http/client/support/HttpAccessor.java b/spring-android-rest-template/src/main/java/org/springframework/http/client/support/HttpAccessor.java
index 07b52fad..24f64d5a 100644
--- a/spring-android-rest-template/src/main/java/org/springframework/http/client/support/HttpAccessor.java
+++ b/spring-android-rest-template/src/main/java/org/springframework/http/client/support/HttpAccessor.java
@@ -22,7 +22,6 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpRequestFactory;
-import org.springframework.http.client.HttpComponentsAndroidClientHttpRequestFactory;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.util.Assert;
@@ -53,6 +52,7 @@ public abstract class HttpAccessor {
 	private ClientHttpRequestFactory requestFactory;
 
 
+	@SuppressWarnings("deprecation")
 	protected HttpAccessor() {
 		if (httpClient43Present) {
 			this.requestFactory = new HttpComponentsClientHttpRequestFactory();
@@ -61,7 +61,7 @@ else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
 			this.requestFactory = new SimpleClientHttpRequestFactory();
 		}
 		else {
-			this.requestFactory = new HttpComponentsAndroidClientHttpRequestFactory();
+			this.requestFactory = new org.springframework.http.client.HttpComponentsAndroidClientHttpRequestFactory();
 		}
 	}
 
diff --git a/spring-android-rest-template/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java b/spring-android-rest-template/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
index 6ec7abb5..2523f194 100644
--- a/spring-android-rest-template/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
+++ b/spring-android-rest-template/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
@@ -63,7 +63,7 @@
  * LinkedMultiValueMap&lt;String, Object&gt;(); parts.add("field 1", "value 1"); parts.add("file", new
  * ClassPathResource("myFile.jpg")); template.postForLocation("http://example.com/myFileUpload", parts); </pre>
  *
- * <p>Some methods in this class were inspired by {@link org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity}.
+ * <p>Some methods in this class were inspired by {@code org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity}.
  *
  * @author Arjen Poutsma
  * @see MultiValueMap