diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/AbstractJmxCacheStatisticsProvider.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/AbstractJmxCacheStatisticsProvider.java
index 3ba8ec208ea..f37a0411bad 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/AbstractJmxCacheStatisticsProvider.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/AbstractJmxCacheStatisticsProvider.java
@@ -67,7 +67,7 @@ public abstract class AbstractJmxCacheStatisticsProvider<C extends Cache> implem
 	 * {@code null} if none is found.
 	 * @param cache the cache to handle
 	 * @return the object name of the cache statistics MBean
-	 * @throws MalformedObjectNameException
+	 * @throws MalformedObjectNameException if the {@link ObjectName} for that cache is invalid
 	 */
 	protected abstract ObjectName getObjectName(C cache)
 			throws MalformedObjectNameException;
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/aggregate/AggregateMetricReader.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/aggregate/AggregateMetricReader.java
index 6028321e2cf..5d0a8eab524 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/aggregate/AggregateMetricReader.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/aggregate/AggregateMetricReader.java
@@ -27,11 +27,9 @@ import org.springframework.util.StringUtils;
 /**
  * A metric reader that aggregates values from a source reader, normally one that has been
  * collecting data from many sources in the same form (like a scaled-out application). The
- * source has metrics with names in the form <code>*.*.counter.**</code> and
- * <code>*.*.[anything].**</code> (the length of the prefix is controlled by the
- * {@link #setTruncateKeyLength(int) truncateKeyLength} property, and defaults to 2,
- * meaning 2 period separated fields), and the result has metric names in the form
- * <code>aggregate.count.**</code> and <code>aggregate.[anything].**</code>. Counters are
+ * source has metrics with names in the form {@code *.*.counter.**} and
+ * {@code *.*.[anything].**}, and the result has metric names in the form
+ * {@code aggregate.count.**} and {@code aggregate.[anything].**}. Counters are
  * summed and anything else (i.e. gauges) are aggregated by choosing the most recent
  * value.
  *
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbMetricWriter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbMetricWriter.java
index e1676a3bb83..4a97f72575d 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbMetricWriter.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbMetricWriter.java
@@ -40,7 +40,7 @@ import org.springframework.web.client.RestTemplate;
  * {@link #setBufferSize(int) bufferSize} property, and only flushed automatically when
  * the buffer size is reached. Users should either manually {@link #flush()} after writing
  * a batch of data if that makes sense, or consider adding a {@link Scheduled
- * <code>@Scheduled</code>} task to flush periodically.
+ * Scheduled} task to flush periodically.
  *
  * @author Dave Syer
  * @since 1.3.0