[pull] master from apache:master

src/main/java/org/apache/commons/cli/help/AbstractHelpFormatter.java

@@ -75,7 +75,7 @@ protected Builder() {
         /**
          * Returns this instance cast to {@code B}.
          *
-         * @return this instance cast to {@code B}.
+         * @return {@code this} instance cast to {@code B}.
          */
         @SuppressWarnings("unchecked")
         protected B asThis() {

src/main/java/org/apache/commons/cli/help/HelpFormatter.java

@@ -94,7 +94,7 @@ public HelpFormatter get() {
          * Sets the showSince flag.
          *
          * @param showSince the desired value of the showSince flag.
-         * @return this instance.
+         * @return {@code this} instance.
          */
         public Builder setShowSince(final boolean showSince) {
             this.showSince = showSince;

src/main/java/org/apache/commons/cli/help/OptionFormatter.java

@@ -114,7 +114,7 @@ public OptionFormatter get() {
          *
          * @param begin the beginning delimiter.
          * @param end   the ending delimiter.
-         * @return this instance.
+         * @return {@code this} instance.
          */
         public Builder setArgumentNameDelimiters(final String begin, final String end) {
             this.argNameDelimiters[0] = Util.defaultValue(begin, "");
@@ -137,7 +137,7 @@ public Builder setDefaultArgName(final String name) {
          * Specifies the function to construct the deprecated massage for the Option. Should include the description text if desired.
          *
          * @param deprecatedFormatFunction the function to specify the deprecated message for the option.
-         * @return this instance.
+         * @return {@code this} instance.
          */
         public Builder setDeprecatedFormatFunction(final Function<Option, String> deprecatedFormatFunction) {
             this.deprecatedFormatFunction = deprecatedFormatFunction;
@@ -172,7 +172,7 @@ public Builder setOptArgSeparator(final String optArgSeparator) {
          *
          * @param begin the beginning delimiter.
          * @param end   the ending delimiter.
-         * @return this instance.
+         * @return {@code this} instance.
          */
         public Builder setOptionalDelimiters(final String begin, final String end) {
             this.optionalDelimiters[0] = Util.defaultValue(begin, "");
@@ -184,7 +184,7 @@ public Builder setOptionalDelimiters(final String begin, final String end) {
          * Specifies the short option prefix.
          *
          * @param optPrefix the prefix for short options.
-         * @return this instance.
+         * @return {@code this} instance.
          */
         public Builder setOptPrefix(final String optPrefix) {
             this.optPrefix = Util.defaultValue(optPrefix, "");

src/main/java/org/apache/commons/cli/help/TextStyle.java

@@ -200,7 +200,7 @@ public Builder setMinWidth(final int minWidth) {
          * Sets whether the column can be made wider or to narrower width to fit constraints of the HelpAppendable and formatting.
          *
          * @param scalable Whether the text width can be adjusted.
-         * @return this instance.
+         * @return {@code this} instance.
          */
         public Builder setScalable(final boolean scalable) {
             this.scalable = scalable;
@@ -211,7 +211,7 @@ public Builder setScalable(final boolean scalable) {
          * Sets all properties from the given text style.
          *
          * @param style the source text style.
-         * @return this instance.
+         * @return {@code this} instance.
          */
         public Builder setTextStyle(final TextStyle style) {
             this.alignment = style.alignment;