diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Configurable.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Configurable.java
index 30f7031f9..d2812d7f8 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Configurable.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Configurable.java
@@ -19,9 +19,9 @@
 package com.puppycrawl.tools.checkstyle.api;
 
 /**
- * A component that can be configured.
- * The general idea of Configuration/Configurable was taken from
- * <a target="_top" href="http://jakarta.apache.org/avalon/">Jakarta's Avalon framework</a>.
+ * A component that can be configured.  The general idea of
+ * Configuration/Configurable was taken from <a target="_top"
+ * href="http://jakarta.apache.org/avalon/">Jakarta's Avalon framework</a>.
  * @author lkuehne
  */
 public interface Configurable
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Configuration.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Configuration.java
index 701072f6d..e1f3a3421 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Configuration.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Configuration.java
@@ -22,9 +22,9 @@ import java.io.Serializable;
 
 
 /**
- * A Configuration is used to configure a Configurable component.
- * The general idea of Configuration/Configurable was taken from
- * <a target="_top" href="http://jakarta.apache.org/avalon/">Jakarta's Avalon framework</a>.
+ * A Configuration is used to configure a Configurable component.  The general
+ * idea of Configuration/Configurable was taken from <a target="_top"
+ * href="http://jakarta.apache.org/avalon/">Jakarta's Avalon framework</a>.
  * @author lkuehne
  */
 public interface Configuration extends Serializable
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Context.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Context.java
index 21d4ef267..179f282e6 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Context.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Context.java
@@ -19,9 +19,9 @@
 package com.puppycrawl.tools.checkstyle.api;
 
 /**
- * A context to be used in subcomponents.
- * The general idea of Context/Contextualizable was taken from
- * <a target="_top" href="http://jakarta.apache.org/avalon/">Jakarta's Avalon framework</a>.
+ * A context to be used in subcomponents. The general idea of
+ * Context/Contextualizable was taken from <a target="_top"
+ * href="http://jakarta.apache.org/avalon/">Jakarta's Avalon framework</a>.
  * @author lkuehne
  * @see Contextualizable
  */
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Contextualizable.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Contextualizable.java
index d5c28a16a..7f38a064e 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Contextualizable.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/api/Contextualizable.java
@@ -22,9 +22,9 @@ package com.puppycrawl.tools.checkstyle.api;
 /**
  * A Component that needs context information from it's container to work.
  * The container will create a Context object and pass it to this
- * Contextualizable. Contextualization will occur before configuration.
- * The general idea of Context/Contextualizable was taken from
- * <a target="_top" href="http://jakarta.apache.org/avalon/">Jakarta's Avalon framework</a>.
+ * Contextualizable. Contextualization will occur before configuration. The
+ * general idea of Context/Contextualizable was taken from <a target="_top"
+ * href="http://jakarta.apache.org/avalon/">Jakarta's Avalon framework</a>.
  * @author lkuehne
  */
 public interface Contextualizable