You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/08/24 13:29:33 UTC
[maven-shared-utils] branch master updated: [MSHARED-954] fix
JavaDoc typos (#64)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shared-utils.git
The following commit(s) were added to refs/heads/master by this push:
new 5b66de0 [MSHARED-954] fix JavaDoc typos (#64)
5b66de0 is described below
commit 5b66de0a12831e27bc42f972b99c6c0678e3a3d9
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Mon Aug 24 13:29:24 2020 +0000
[MSHARED-954] fix JavaDoc typos (#64)
* fix JavaDoc typos
* Oxford comma
---
src/main/java/org/apache/maven/shared/utils/StringUtils.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/utils/StringUtils.java b/src/main/java/org/apache/maven/shared/utils/StringUtils.java
index b0906e0..b70cdae 100644
--- a/src/main/java/org/apache/maven/shared/utils/StringUtils.java
+++ b/src/main/java/org/apache/maven/shared/utils/StringUtils.java
@@ -2398,7 +2398,7 @@ public class StringUtils
/**
* Parses the given String and replaces all occurrences of
- * '\n', '\r' and '\r\n' with the system line separator.
+ * '\n', '\r', and "\r\n" with the system line separator.
*
* @param s a not null String
* @return a String that contains only System line separators
@@ -2406,7 +2406,7 @@ public class StringUtils
* @deprecated this method produces platform dependent code and contributes to
* non-reproducible builds. In the context of Maven, this is almost never what's needed.
* Remove calls to this method and do not replace them. That is, change
- * {@code Stringutils.unifyLineSeparators(s)} with simply {@code s}.
+ * {@code Stringutils.unifyLineSeparators(s)} to simply {@code s}.
*/
@Deprecated
public static String unifyLineSeparators( @Nullable String s )
@@ -2419,9 +2419,9 @@ public class StringUtils
* '\n', '\r' and '\r\n' with the system line separator.
*
* @param s a not null String
- * @param ls the wanted line separator ("\n" on UNIX), if null using the System line separator.
+ * @param ls the wanted line separator ("\n" on UNIX), if null using the System line separator
* @return a String that contains only System line separators
- * @throws IllegalArgumentException if ls is not '\n', '\r' and '\r\n' characters.
+ * @throws IllegalArgumentException if ls is not '\n', '\r', or "\r\n"
*
*/
public static String unifyLineSeparators( @Nullable String s, @Nullable String ls )