This is an automated email from the ASF dual-hosted git repository.
srowen pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/spark-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 080ecf0 Fix wording in Java style guide
080ecf0 is described below
commit 080ecf0179cea517b2fa6b5a56097071a6522f9b
Author: HyukjinKwon <gurwls...@apache.org>
AuthorDate: Thu Aug 15 10:46:42 2019 -0500
Fix wording in Java style guide
"Many Scala guidelines" is not clear. This PR fixes the wording in Java
style in coding style.
Author: HyukjinKwon <gurwls...@apache.org>
Closes #210 from HyukjinKwon/wording.
---
contributing.md | 6 +++---
site/contributing.html | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/contributing.md b/contributing.md
index 2d26645..2b927b7 100644
--- a/contributing.md
+++ b/contributing.md
@@ -397,9 +397,9 @@ lines can be up to 100 characters in length, not 79.
<a href="https://google.github.io/styleguide/Rguide.xml";>Google's R Style
Guide</a> with three exceptions:
lines can be up to 100 characters in length, not 80, there is no limit on
function name but it has a initial
lower case latter and S4 objects/methods are allowed.
-- For Java code, Apache Spark follows
-<a
href="http://www.oracle.com/technetwork/java/codeconvtoc-136057.html";>Oracle's
Java code conventions</a>.
-Many Scala guidelines below also apply to Java.
+- For Java code, Apache Spark follows
+<a
href="http://www.oracle.com/technetwork/java/codeconvtoc-136057.html";>Oracle's
Java code conventions</a> and
+Scala guidelines below. The latter is preferred.
- For Scala code, Apache Spark follows the official
<a href="http://docs.scala-lang.org/style/";>Scala style guide</a> and
<a href="https://github.com/databricks/scala-style-guide";>Databricks Scala
guide</a>. The latter is preferred. To format Scala code, run ./dev/scalafmt
prior to submitting a PR.
diff --git a/site/contributing.html b/site/contributing.html
index fa00a63..53d1350 100644
--- a/site/contributing.html
+++ b/site/contributing.html
@@ -652,9 +652,9 @@ lines can be up to 100 characters in length, not 79.</li>
<a href="https://google.github.io/styleguide/Rguide.xml";>Google’s R
Style Guide</a> with three exceptions:
lines can be up to 100 characters in length, not 80, there is no limit on
function name but it has a initial
lower case latter and S4 objects/methods are allowed.</li>
- <li>For Java code, Apache Spark follows
-<a
href="http://www.oracle.com/technetwork/java/codeconvtoc-136057.html";>Oracle’s
Java code conventions</a>.
-Many Scala guidelines below also apply to Java.</li>
+ <li>For Java code, Apache Spark follows
+<a
href="http://www.oracle.com/technetwork/java/codeconvtoc-136057.html";>Oracle’s
Java code conventions</a> and
+Scala guidelines below. The latter is preferred.</li>
<li>For Scala code, Apache Spark follows the official
<a href="http://docs.scala-lang.org/style/";>Scala style guide</a> and
<a href="https://github.com/databricks/scala-style-guide";>Databricks Scala
guide</a>. The latter is preferred. To format Scala code, run ./dev/scalafmt
prior to submitting a PR.</li>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
