diff --git a/retrofit/src/main/java/retrofit/ErrorHandler.java b/retrofit/src/main/java/retrofit/ErrorHandler.java
index 81f09443a8..9934528cee 100644
--- a/retrofit/src/main/java/retrofit/ErrorHandler.java
+++ b/retrofit/src/main/java/retrofit/ErrorHandler.java
@@ -32,7 +32,7 @@ public interface ErrorHandler {
    * class MyErrorHandler implements ErrorHandler {
    *   @Override public Throwable handleError(RetrofitError cause) {
    *     Response r = cause.getResponse();
-   *     if (r != null && r.getStatus() == 401) {
+   *     if (r != null && r.getStatus() == 401) {
    *       return new UnauthorizedException(cause);
    *     }
    *     return cause;
diff --git a/retrofit/src/main/java/retrofit/RestAdapter.java b/retrofit/src/main/java/retrofit/RestAdapter.java
index be98cca8f3..18174734fd 100644
--- a/retrofit/src/main/java/retrofit/RestAdapter.java
+++ b/retrofit/src/main/java/retrofit/RestAdapter.java
@@ -98,9 +98,10 @@
  * <pre>
  * public interface MyApi {
  *   &#64;POST("/category/{cat}") // Asynchronous execution.
- *   void categoryList(@Path("cat") String a, @Query("page") int b, Callback&lt;List&lt;Item>> cb);
+ *   void categoryList(@Path("cat") String a, @Query("page") int b,
+ *                     Callback&lt;List&lt;Item&gt;&gt; cb);
  *   &#64;POST("/category/{cat}") // Synchronous execution.
- *   List&lt;Item> categoryList(@Path("cat") String a, @Query("page") int b);
+ *   List&lt;Item&gt; categoryList(@Path("cat") String a, @Query("page") int b);
  * }
  * </pre>
  * <p>
diff --git a/retrofit/src/main/java/retrofit/http/FieldMap.java b/retrofit/src/main/java/retrofit/http/FieldMap.java
index 8bbfda2c2b..df1b925e89 100644
--- a/retrofit/src/main/java/retrofit/http/FieldMap.java
+++ b/retrofit/src/main/java/retrofit/http/FieldMap.java
@@ -31,7 +31,7 @@
  * <pre>
  * &#64;FormUrlEncoded
  * &#64;POST("/things")
- * void things(@FieldMap Map<String, String> fields);
+ * void things(@FieldMap Map&lt;String, String&gt; fields);
  * }
  * </pre>
  * Calling with {@code foo.things(ImmutableMap.of("foo", "bar", "kit", "kat")} yields a request
diff --git a/retrofit/src/main/java/retrofit/http/Header.java b/retrofit/src/main/java/retrofit/http/Header.java
index 7aadc3af62..501b40b810 100644
--- a/retrofit/src/main/java/retrofit/http/Header.java
+++ b/retrofit/src/main/java/retrofit/http/Header.java
@@ -27,7 +27,7 @@
  * <p>
  * <pre>
  * &#64;GET("/")
- * void foo(@Header("Accept-Language") String lang, Callback&lt;Response> cb);
+ * void foo(@Header("Accept-Language") String lang, Callback&lt;Response&gt; cb);
  * </pre>
  * <p>
  * Header parameters may be {@code null} which will omit them from the request.
diff --git a/retrofit/src/main/java/retrofit/http/QueryMap.java b/retrofit/src/main/java/retrofit/http/QueryMap.java
index cb3bb0056d..46a9c5e09f 100644
--- a/retrofit/src/main/java/retrofit/http/QueryMap.java
+++ b/retrofit/src/main/java/retrofit/http/QueryMap.java
@@ -31,7 +31,7 @@
  * Simple Example:
  * <pre>
  * &#64;GET("/search")
- * void list(@QueryMap Map<String, String> filters);
+ * void list(@QueryMap Map&lt;String, String&gt; filters);
  * </pre>
  * Calling with {@code foo.list(ImmutableMap.of("foo", "bar", "kit", "kat"))} yields
  * {@code /search?foo=bar&kit=kat}.
diff --git a/retrofit/src/main/java/retrofit/package-info.java b/retrofit/src/main/java/retrofit/package-info.java
index 133eaf17b3..0c6596b3e4 100644
--- a/retrofit/src/main/java/retrofit/package-info.java
+++ b/retrofit/src/main/java/retrofit/package-info.java
@@ -5,7 +5,7 @@
  * <pre>
  * public interface GitHubService {
  *   &#64;GET("/users/{user}/repos")
- *   List<Repo> listRepos(@Path("user") String user);
+ *   List&lt;Repo&gt; listRepos(@Path("user") String user);
  * }
  * </pre>
  */