Better description of Javadoc deprecation and add missing @deprecation

annotation at the package level.

src/main/java/org/apache/commons/lang3/StringEscapeUtils.java

@@ -36,7 +36,7 @@ import org.apache.commons.lang3.text.translate.UnicodeUnpairedSurrogateRemover;
  *
  * <p>#ThreadSafe#</p>
  * @since 2.0
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/StringEscapeUtils.html">
  * StringEscapeUtils</a> instead
  */

src/main/java/org/apache/commons/lang3/StringUtils.java

@@ -2128,7 +2128,7 @@ public class StringUtils {
      * @return result score
      * @throws IllegalArgumentException if either String input {@code null} or Locale input {@code null}
      * @since 3.4
-     * @deprecated as of 3.6, use commons-text
+     * @deprecated As of 3.6, use Apache Commons Text
      * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/similarity/FuzzyScore.html">
      * FuzzyScore</a> instead
      */
@@ -2275,7 +2275,7 @@ public class StringUtils {
      * @return result distance
      * @throws IllegalArgumentException if either String input {@code null}
      * @since 3.3
-     * @deprecated as of 3.6, use commons-text
+     * @deprecated As of 3.6, use Apache Commons Text
      * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/similarity/JaroWinklerDistance.html">
      * JaroWinklerDistance</a> instead
      */
@@ -2328,7 +2328,7 @@ public class StringUtils {
      * @throws IllegalArgumentException if either String input {@code null}
      * @since 3.0 Changed signature from getLevenshteinDistance(String, String) to
      * getLevenshteinDistance(CharSequence, CharSequence)
-     * @deprecated as of 3.6, use commons-text
+     * @deprecated As of 3.6, use Apache Commons Text
      * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/similarity/LevenshteinDistance.html">
      * LevenshteinDistance</a> instead
      */
@@ -2419,7 +2419,7 @@ public class StringUtils {
      * @param threshold the target threshold, must not be negative
      * @return result distance, or {@code -1} if the distance would be greater than the threshold
      * @throws IllegalArgumentException if either String input {@code null} or negative threshold
-     * @deprecated as of 3.6, use commons-text
+     * @deprecated As of 3.6, use Apache Commons Text
      * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/similarity/LevenshteinDistance.html">
      * LevenshteinDistance</a> instead
      */

src/main/java/org/apache/commons/lang3/text/CompositeFormat.java

@@ -25,7 +25,7 @@ import java.text.ParsePosition;
  * Formats using one formatter and parses using a different formatter. An
  * example of use for this would be a webapp where data is taken in one way and
  * stored in a database another way.
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/CompositeFormat.html">
  * CompositeFormat</a> instead
  */

src/main/java/org/apache/commons/lang3/text/ExtendedMessageFormat.java

@@ -66,7 +66,7 @@ import org.apache.commons.lang3.Validate;
  * </ul>
  *
  * @since 2.4
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/ExtendedMessageFormat.html">
  * ExtendedMessageFormat</a> instead
  */

src/main/java/org/apache/commons/lang3/text/FormatFactory.java

@@ -23,7 +23,7 @@ import java.util.Locale;
  * Format factory.
  *
  * @since 2.4
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/FormatFactory.html">
  * FormatFactory</a> instead
  */

src/main/java/org/apache/commons/lang3/text/FormattableUtils.java

@@ -33,7 +33,7 @@ import org.apache.commons.lang3.Validate;
  * and padding, and is not designed to allow generalised alternate formats.</p>
  *
  * @since 3.0
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/FormattableUtils.html">
  * FormattableUtils</a> instead
  */

src/main/java/org/apache/commons/lang3/text/StrBuilder.java

@@ -73,7 +73,7 @@ import org.apache.commons.lang3.builder.Builder;
  * the interface.
  *
  * @since 2.2
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/TextStringBuilder.html">
  * TextStringBuilder</a> instead
  */

src/main/java/org/apache/commons/lang3/text/StrLookup.java

@@ -33,7 +33,7 @@ import java.util.Map;
  *
  * @param <V> Unused.
  * @since 2.2
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/lookup/StringLookupFactory.html">
  * StringLookupFactory</a> instead
  */

src/main/java/org/apache/commons/lang3/text/StrMatcher.java

@@ -29,7 +29,7 @@ import org.apache.commons.lang3.StringUtils;
  * If these do not suffice, you can subclass and implement your own matcher.
  *
  * @since 2.2
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/matcher/StringMatcherFactory.html">
  * StringMatcherFactory</a> instead
  */

src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java

@@ -121,7 +121,7 @@ import org.apache.commons.lang3.StringUtils;
  * <p>This class is <b>not</b> thread safe.</p>
  *
  * @since 2.2
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/StringSubstitutor.html">
  * StringSubstitutor</a> instead
  */

src/main/java/org/apache/commons/lang3/text/StrTokenizer.java

@@ -82,7 +82,7 @@ import org.apache.commons.lang3.StringUtils;
  * </table>
  *
  * @since 2.2
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/StringTokenizer.html">
  * StringTokenizer</a> instead
  */

src/main/java/org/apache/commons/lang3/text/WordUtils.java

@@ -30,7 +30,7 @@ import org.apache.commons.lang3.StringUtils;
  * Each method documents its behavior in more detail.</p>
  *
  * @since 2.0
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/WordUtils.html">
  * WordUtils</a> instead
  */

src/main/java/org/apache/commons/lang3/text/package-info.java

@@ -23,5 +23,8 @@
  * While somewhat ungainly, the {@code Str} prefix has been used to ensure we don't clash with any current or future standard Java classes. </p>
  *
  * @since 2.1
+ * @deprecated As of 3.6, use the Apache Commons Text
+ * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/package-summary.html">
+ * text package</a>.
  */
 package org.apache.commons.lang3.text;

src/main/java/org/apache/commons/lang3/text/translate/AggregateTranslator.java

@@ -26,7 +26,7 @@ import org.apache.commons.lang3.ArrayUtils;
  * the first translator consumes codepoints from the input.
  *
  * @since 3.0
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/translate/AggregateTranslator.html">
  * AggregateTranslator</a> instead
  */

src/main/java/org/apache/commons/lang3/text/translate/CharSequenceTranslator.java

@@ -27,7 +27,7 @@ import java.util.Locale;
  * is completely contextual, the API does not present two separate signatures.
  *
  * @since 3.0
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/translate/CharSequenceTranslator.html">
  * CharSequenceTranslator</a> instead
  */

src/main/java/org/apache/commons/lang3/text/translate/CodePointTranslator.java

@@ -24,7 +24,7 @@ import java.io.Writer;
  * will replace up to one character at a time.
  *
  * @since 3.0
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/translate/CodePointTranslator.html">
  * CharSequenceTranslator</a> instead
  */

src/main/java/org/apache/commons/lang3/text/translate/EntityArrays.java

@@ -22,7 +22,7 @@ package org.apache.commons.lang3.text.translate;
  * All arrays are of length [*][2].
  *
  * @since 3.0
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/translate/CodePointTranslator.html">
  * EntityArrays</a> instead
  */

src/main/java/org/apache/commons/lang3/text/translate/JavaUnicodeEscaper.java

@@ -20,7 +20,7 @@ package org.apache.commons.lang3.text.translate;
  * Translates codepoints to their Unicode escaped value suitable for Java source.
  *
  * @since 3.2
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/translate/UnicodeEscaper.html">
  * UnicodeEscaper</a> instead
  */

src/main/java/org/apache/commons/lang3/text/translate/LookupTranslator.java

@@ -25,7 +25,7 @@ import java.util.HashSet;
  * Translates a value using a lookup table.
  *
  * @since 3.0
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/translate/LookupTranslator.html">
  * LookupTranslator</a> instead
  */

src/main/java/org/apache/commons/lang3/text/translate/NumericEntityEscaper.java

@@ -23,7 +23,7 @@ import java.io.Writer;
  * Translates codepoints to their XML numeric entity escaped value.
  *
  * @since 3.0
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/translate/NumericEntityEscaper.html">
  * NumericEntityEscaper</a> instead
  */

src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java

@@ -29,7 +29,7 @@ import java.util.EnumSet;
  * Note that the semicolon is optional.
  *
  * @since 3.0
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/translate/NumericEntityUnescaper.html">
  * NumericEntityUnescaper</a> instead
  */

src/main/java/org/apache/commons/lang3/text/translate/OctalUnescaper.java

@@ -28,7 +28,7 @@ import java.io.Writer;
  * 1 to 377. This is because parsing Java is the main use case.
  *
  * @since 3.0
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/translate/OctalUnescaper.html">
  * OctalUnescaper</a> instead
  */

src/main/java/org/apache/commons/lang3/text/translate/UnicodeEscaper.java

@@ -23,7 +23,7 @@ import java.io.Writer;
  * Translates codepoints to their Unicode escaped value.
  *
  * @since 3.0
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/translate/UnicodeEscaper.html">
  * UnicodeEscaper</a> instead
  */

src/main/java/org/apache/commons/lang3/text/translate/UnicodeUnescaper.java

@@ -25,7 +25,7 @@ import java.io.Writer;
  * without the +.
  *
  * @since 3.0
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/translate/UnicodeUnescaper.html">
  * UnicodeUnescaper</a> instead
  */

src/main/java/org/apache/commons/lang3/text/translate/UnicodeUnpairedSurrogateRemover.java

@@ -22,7 +22,7 @@ import java.io.Writer;
 /**
  * Helper subclass to CharSequenceTranslator to remove unpaired surrogates.
  *
- * @deprecated as of 3.6, use commons-text
+ * @deprecated As of 3.6, use Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/translate/UnicodeUnpairedSurrogateRemover.html">
  * UnicodeUnpairedSurrogateRemover</a> instead
  */

src/main/java/org/apache/commons/lang3/text/translate/package-info.java

@@ -20,8 +20,8 @@
  * <p>These classes are immutable, and therefore thread-safe.</p>
  *
  * @since 3.0
- * @deprecated as of 3.6, use the commons-text
+ * @deprecated As of 3.6, use the Apache Commons Text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/translate/package-summary.html">
- * translate package</a> instead
+ * translate package</a>.
  */
 package org.apache.commons.lang3.text.translate;