diff --git a/src/java/org/apache/commons/lang/CharSet.java b/src/java/org/apache/commons/lang/CharSet.java
index 3a7512414..4bd568673 100644
--- a/src/java/org/apache/commons/lang/CharSet.java
+++ b/src/java/org/apache/commons/lang/CharSet.java
@@ -70,7 +70,7 @@
  * @author Phil Steitz
  * @author Pete Gieser
  * @since 1.0
- * @version $Id: CharSet.java,v 1.16 2003/08/18 02:22:22 bayard Exp $
+ * @version $Id: CharSet.java,v 1.17 2003/08/19 00:11:20 scolebourne Exp $
  */
 public class CharSet implements Serializable {
 
@@ -124,7 +124,7 @@ public class CharSet implements Serializable {
      * </ul>
      *
      * <p>The matching order is:</p>
-     * <ol
+     * <ol>
      *  <li>Negated multi character range, such as "^a-e"
      *  <li>Ordinary multi character range, such as "a-e"
      *  <li>Negated single character, such as "^a"
diff --git a/src/java/org/apache/commons/lang/StringUtils.java b/src/java/org/apache/commons/lang/StringUtils.java
index 31d5318d0..f6b141e69 100644
--- a/src/java/org/apache/commons/lang/StringUtils.java
+++ b/src/java/org/apache/commons/lang/StringUtils.java
@@ -74,8 +74,10 @@
  *      - index-of any of a set of Strings</li>
  *  <li><b>ContainsOnly/ContainsNone</b>
  *      - does String contains only/none of these characters</li>
- *  <li><b>SubString/Left/Right/Mid/SubStringBefore/SubStringAfter</b>
+ *  <li><b>Substring/Left/Right/Mid</b>
  *      - null-safe substring extractions</li>
+ *  <li><b>SubstringBefore/SubstringAfter/SubstringBetween</b>
+ *      - substring extraction relative to other strings</li>
  *  <li><b>Split/Join</b>
  *      - splits a String into an array of substrings and vice versa</li>
  *  <li><b>Replace/Delete/Overlay</b>
@@ -86,8 +88,6 @@
  *      - pads a String</li>
  *  <li><b>UpperCase/LowerCase/SwapCase/Capitalize/Uncapitalize</b>
  *      - changes the case of a String</li>
- *  <li><b>NestedString</b>
- *      - returns a substring nested within other Strings</li>
  *  <li><b>CountMatches</b>
  *      - counts the number of occurrances of one String in another</li>
  *  <li><b>IsAlpha/IsNumeric/IsWhitespace</b>
@@ -121,8 +121,8 @@
  * details vary by method.</p>
  * 
  * <p>A side effect of the <code>null</code> handling is that a 
- * {@link java.lang.NullPointerException} should be considered a bug in <code>StringUtils</code>
- * (except for deprecated methods).</p>
+ * <code>NullPointerException</code> should be considered a bug in
+ * <code>StringUtils</code> (except for deprecated methods).</p>
  * 
  * <p>Methods in this class give sample code to explain their operation.
  * The symbol <code>*</code> is used to indicate any input including <code>null</code>.</p>
@@ -145,7 +145,7 @@
  * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
  * @author Phil Steitz
  * @since 1.0
- * @version $Id: StringUtils.java,v 1.102 2003/08/18 02:22:23 bayard Exp $
+ * @version $Id: StringUtils.java,v 1.103 2003/08/19 00:11:20 scolebourne Exp $
  */
 public class StringUtils {
     // Performance testing notes (JDK 1.4, Jul03, scolebourne)
diff --git a/src/java/org/apache/commons/lang/WordUtils.java b/src/java/org/apache/commons/lang/WordUtils.java
index 570a12199..6ffc3d71b 100644
--- a/src/java/org/apache/commons/lang/WordUtils.java
+++ b/src/java/org/apache/commons/lang/WordUtils.java
@@ -66,7 +66,7 @@
  * @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
  * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
  * @since 2.0
- * @version $Id: WordUtils.java,v 1.5 2003/08/18 02:22:23 bayard Exp $
+ * @version $Id: WordUtils.java,v 1.6 2003/08/19 00:11:20 scolebourne Exp $
  */
 public class WordUtils {
 
@@ -168,7 +168,7 @@ public WordUtils() {
      *
      * <pre>
      * WordUtils.wrap(null, *) = null
-     * WordUtils.wrap("", *) = null
+     * WordUtils.wrap("", *) = ""
      * </pre>
      *
      * @param str  the String to be word wrapped, may be null
@@ -187,7 +187,7 @@ public static String wrap(String str, int wrapLength) {
      * 
      * <pre>
      * WordUtils.wrap(null, *, *, *) = null
-     * WordUtils.wrap("", *, *, *) = null
+     * WordUtils.wrap("", *, *, *) = ""
      * </pre>
      *
      * @param str  the String to be word wrapped, may be null