Merge pull request scala#514 from solimant/solimant-patch-1

SethTisue · SethTisue · commit ade70f292dc0 · 2016-04-03T16:58:04.000-04:00
Reword for clarity (minor improvement)
diff --git a/style/naming-conventions.md b/style/naming-conventions.md
@@ -247,9 +247,9 @@ easily transform even the simplest code into symbolic soup.
 
 ## Constants, Values, Variable and Methods
 
-Constant names should be in upper camel case. That is, if the member is
-final, immutable and it belongs to a package object or an object,
-it may be considered a constant (similar to Java's `static final` members):
+Constant names should be in upper camel case. Similar to Java's `static final`
+members, if the member is final, immutable and it belongs to a package
+object or an object, it may be considered a constant:
 
     object Container {
       val MyConstant = ...
