Other small CLI javadoc/logging improvements

Author: bbottema

modules/cli-module/src/test/java/org/simplejavamail/internal/clisupport/GenerateCliHelpTest.java

@@ -14,6 +14,7 @@ public class GenerateCliHelpTest {
 
 	@Before
 	public void setUpStreams() {
+		System.out.println("GenerateCliHelpTest.setUpStreams(): DISABLING System.out during CLI debug logging");
 		sysOut = System.out;
 		System.setOut(new PrintStream(outContent));
 	}

modules/core-module/src/main/java/org/simplejavamail/api/email/EmailPopulatingBuilder.java

@@ -1080,7 +1080,7 @@ public interface EmailPopulatingBuilder {
 	 * @param description             An optional description that will find its way in the MimeMEssage with the Content-Description header. This is rarely needed.
 	 * @param contentTransferEncoding An optional encoder option to force the data encoding while in MimeMessage/EML format.
 	 *
-	 * @see #withAttachment(String, DataSource)
+	 * @see #withAttachment(String, DataSource, String, ContentTransferEncoding)
 	 * @see #withAttachments(List)
 	 */
 	EmailPopulatingBuilder withAttachment(@Nullable String name, @NotNull byte[] data, @NotNull String mimetype, @Nullable String description, @Nullable ContentTransferEncoding contentTransferEncoding);
@@ -1116,7 +1116,7 @@ public interface EmailPopulatingBuilder {
 	 * @param description             An optional description that will find its way in the MimeMEssage with the Content-Description header. This is rarely needed.
 	 * @param contentTransferEncoding An optional encoder option to force the data encoding while in MimeMessage/EML format.
 	 *
-	 * @see #withAttachment(String, byte[], String)
+	 * @see #withAttachment(String, DataSource, String, ContentTransferEncoding)
 	 * @see #withAttachments(List)
 	 */
 	EmailPopulatingBuilder withAttachment(@Nullable String name, @NotNull DataSource filedata, @Nullable final String description, @Nullable final ContentTransferEncoding contentTransferEncoding);

modules/simple-java-mail/src/main/java/org/simplejavamail/email/internal/EmailPopulatingBuilderImpl.java

@@ -1773,7 +1773,7 @@ public InternalEmailPopulatingBuilder withDecryptedAttachments(@NotNull final Li
 	}
 
 	/**
-	 * Delegates to {@link EmailPopulatingBuilder#signWithDomainKey(byte[], String, String)}.
+	 * @see EmailPopulatingBuilder#signWithDomainKey(String, String, String)
 	 */
 	@Override
 	@Cli.ExcludeApi(reason = "delegated method is an identical api from CLI point of view")
@@ -1783,7 +1783,7 @@ public EmailPopulatingBuilder signWithDomainKey(@NotNull final String dkimPrivat
 	}
 
 	/**
-	 * Delegates to {@link EmailPopulatingBuilder#signWithDomainKey(InputStream, String, String)}.
+	 * @see EmailPopulatingBuilder#signWithDomainKey(File, String, String)
 	 */
 	@Override
 	@Cli.ExcludeApi(reason = "delegated method is an identical api from CLI point of view")
@@ -1797,7 +1797,7 @@ public EmailPopulatingBuilder signWithDomainKey(@NotNull final File dkimPrivateK
 	}
 
 	/**
-	 * Delegates to {@link EmailPopulatingBuilder#signWithDomainKey(byte[], String, String)}.
+	 * @see EmailPopulatingBuilder#signWithDomainKey(InputStream, String, String)
 	 */
 	@Override
 	public EmailPopulatingBuilder signWithDomainKey(@NotNull final InputStream dkimPrivateKeyInputStream, @NotNull final String signingDomain,