summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2014-12-01 17:47:31 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2014-12-01 17:47:31 -0800
commit80443f91235c7ef020263f73bf5607a24ebc1d9c (patch)
treecc804ab8162fa5a007f1216fbbcc185162417e43
parenta83be33140ca28317d0b6c733174ad344f6a2de0 (diff)
parentd3f8182b9ee84258f274e41a67ef1ba73e4371ff (diff)
downloadscala-80443f91235c7ef020263f73bf5607a24ebc1d9c.tar.gz
scala-80443f91235c7ef020263f73bf5607a24ebc1d9c.tar.bz2
scala-80443f91235c7ef020263f73bf5607a24ebc1d9c.zip
Merge pull request #4173 from kanielc/SI-7988
SI-7988 - scala.collection.JavaConverters spelling mistake
-rwxr-xr-xsrc/library/scala/collection/JavaConverters.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/collection/JavaConverters.scala b/src/library/scala/collection/JavaConverters.scala
index a4fa58b13c..875f6e1c02 100755
--- a/src/library/scala/collection/JavaConverters.scala
+++ b/src/library/scala/collection/JavaConverters.scala
@@ -37,8 +37,8 @@ import convert._
* val sl2 : scala.collection.mutable.Buffer[Int] = jl.asScala
* assert(sl eq sl2)
* }}}
- * The following conversions also are supported, but the
- * direction Scala to Java is done my a more specifically named method:
+ * The following conversions are also supported, but the
+ * direction from Scala to Java is done by the more specifically named methods:
* `asJavaCollection`, `asJavaEnumeration`, `asJavaDictionary`.
*
* - `scala.collection.Iterable` <=> `java.util.Collection`