summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-04-30 20:00:39 +0000
committerPaul Phillips <paulp@improving.org>2011-04-30 20:00:39 +0000
commitacc5311c157358c99420ba5a8be4231ffae9fc8e (patch)
treec99d20bb582b9474bc7520a6afca7fb2f7cb6296 /src/library
parent95ae7765e85fb7942ce8724170e72fa8c3076aa0 (diff)
downloadscala-acc5311c157358c99420ba5a8be4231ffae9fc8e.tar.gz
scala-acc5311c157358c99420ba5a8be4231ffae9fc8e.tar.bz2
scala-acc5311c157358c99420ba5a8be4231ffae9fc8e.zip
After having to update the code for someone els...
After having to update the code for someone else, ran damarau levenshtein on trunk again. Patchwise, I guess correcting spelling errors in comments is about as safe as it gets. No review.
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/App.scala2
-rw-r--r--src/library/scala/Array.scala2
-rw-r--r--src/library/scala/collection/JavaConversions.scala2
-rwxr-xr-xsrc/library/scala/collection/JavaConverters.scala2
-rw-r--r--src/library/scala/collection/TraversableProxy.scala2
-rw-r--r--src/library/scala/collection/mutable/SetLike.scala2
-rw-r--r--src/library/scala/collection/package.scala2
-rw-r--r--src/library/scala/math/Ordered.scala4
-rw-r--r--src/library/scala/sys/process/Process.scala4
-rw-r--r--src/library/scala/xml/factory/LoggedNodeFactory.scala2
10 files changed, 12 insertions, 12 deletions
diff --git a/src/library/scala/App.scala b/src/library/scala/App.scala
index 59c6fccec3..826278ade0 100644
--- a/src/library/scala/App.scala
+++ b/src/library/scala/App.scala
@@ -51,7 +51,7 @@ trait App extends DelayedInit {
/** The main method.
* This stores all argument so that they can be retrieved with `args`
- * and the executes all initialization code segements in the order they were
+ * and the executes all initialization code segments in the order they were
* passed to `delayedInit`
* @param args the arguments passed to the main method
*/
diff --git a/src/library/scala/Array.scala b/src/library/scala/Array.scala
index 66ce9320bd..07cf9e039f 100644
--- a/src/library/scala/Array.scala
+++ b/src/library/scala/Array.scala
@@ -26,7 +26,7 @@ class FallbackArrayBuilding {
* does not have a class manifest. Note that fallbackBuilder factory
* needs an implicit parameter (otherwise it would not be dominated in implicit search
* by Array.canBuildFrom). We make sure that that implicit search is always
- * successfull.
+ * successful.
*/
implicit def fallbackCanBuildFrom[T](implicit m: DummyImplicit): CanBuildFrom[Array[_], T, ArraySeq[T]] =
new CanBuildFrom[Array[_], T, ArraySeq[T]] {
diff --git a/src/library/scala/collection/JavaConversions.scala b/src/library/scala/collection/JavaConversions.scala
index fdb77a48c1..8b98f10875 100644
--- a/src/library/scala/collection/JavaConversions.scala
+++ b/src/library/scala/collection/JavaConversions.scala
@@ -504,7 +504,7 @@ object JavaConversions {
* Scala ConcurrentMap will be returned.
*
* @param m The ConcurrentMap to be converted.
- * @return A Scala mutable ConcurrrentMap view of the argument.
+ * @return A Scala mutable ConcurrentMap view of the argument.
*/
implicit def asScalaConcurrentMap[A, B](m: juc.ConcurrentMap[A, B]): mutable.ConcurrentMap[A, B] = m match {
case cmw: ConcurrentMapWrapper[a, b] => cmw.underlying
diff --git a/src/library/scala/collection/JavaConverters.scala b/src/library/scala/collection/JavaConverters.scala
index 4bb61b960a..0b55f54810 100755
--- a/src/library/scala/collection/JavaConverters.scala
+++ b/src/library/scala/collection/JavaConverters.scala
@@ -454,7 +454,7 @@ object JavaConverters {
* Scala <code>ConcurrentMap</code> will be returned.
*
* @param m The <code>ConcurrentMap</code> to be converted.
- * @return An object with an `asScala` method that returns a Scala mutable <code>ConcurrrentMap</code> view of the argument.
+ * @return An object with an `asScala` method that returns a Scala mutable <code>ConcurrentMap</code> view of the argument.
*/
implicit def asScalaConcurrentMapConverter[A, B](m: juc.ConcurrentMap[A, B]): AsScala[mutable.ConcurrentMap[A, B]] =
new AsScala(asScalaConcurrentMap(m))
diff --git a/src/library/scala/collection/TraversableProxy.scala b/src/library/scala/collection/TraversableProxy.scala
index e965523ab2..215cf086d9 100644
--- a/src/library/scala/collection/TraversableProxy.scala
+++ b/src/library/scala/collection/TraversableProxy.scala
@@ -10,7 +10,7 @@
package scala.collection
-// Methods could be printed by cat TraverableLike.scala | egrep '^ (override )?def'
+// Methods could be printed by cat TraversableLike.scala | egrep '^ (override )?def'
/** This trait implements a proxy for traversable objects. It forwards
diff --git a/src/library/scala/collection/mutable/SetLike.scala b/src/library/scala/collection/mutable/SetLike.scala
index a74f904aa3..c3bc106153 100644
--- a/src/library/scala/collection/mutable/SetLike.scala
+++ b/src/library/scala/collection/mutable/SetLike.scala
@@ -173,7 +173,7 @@ trait SetLike[A, +This <: SetLike[A, This] with Set[A]]
* $addDuplicates
*
* @param xs the traversable object.
- * @return a new set cconsisting of elements of this set and those in `xs`.
+ * @return a new set consisting of elements of this set and those in `xs`.
*/
@migration(2, 8,
"As of 2.8, this operation creates a new set. To add the elements as a\n"+
diff --git a/src/library/scala/collection/package.scala b/src/library/scala/collection/package.scala
index f951f22057..f0a0c40bcd 100644
--- a/src/library/scala/collection/package.scala
+++ b/src/library/scala/collection/package.scala
@@ -5,7 +5,7 @@ package scala
*
* == Guide ==
*
- * A detailed guide for the collections library is avaialble
+ * A detailed guide for the collections library is available
* at [[http://www.scala-lang.org/docu/files/collections-api]].
*
* == Using Collections ==
diff --git a/src/library/scala/math/Ordered.scala b/src/library/scala/math/Ordered.scala
index 5a07451f4a..64cbd5e8f2 100644
--- a/src/library/scala/math/Ordered.scala
+++ b/src/library/scala/math/Ordered.scala
@@ -20,14 +20,14 @@ package scala.math
* there is no reasonable way to provide a default implementation
* of equality for instances of Ordered[A]. Therefore, if you need
* to be able to use equality on an instance of Ordered[A] you must
- * provide it yourself either when inheiriting or instantiating.
+ * provide it yourself either when inheriting or instantiating.
*
* It is important that the hashCode method for an instance of
* Ordered[A] be consistent with the compare method. However,
* it is not possible to provide a sensible default implementation.
* Therefore, if you need to be able compute the hash of an
* instance of Ordered[A] you must provide it yourself either when
- * inheiriting or instantiating.
+ * inheriting or instantiating.
*
* @author Martin Odersky
* @version 1.1, 2006-07-24
diff --git a/src/library/scala/sys/process/Process.scala b/src/library/scala/sys/process/Process.scala
index 983fc8309c..01fbaf19e3 100644
--- a/src/library/scala/sys/process/Process.scala
+++ b/src/library/scala/sys/process/Process.scala
@@ -38,7 +38,7 @@ trait ProcessCreation {
def apply(command: Seq[String], cwd: File, extraEnv: (String, String)*): ProcessBuilder =
apply(command, Some(cwd), extraEnv: _*)
- /** create ProcessBuilder with working dir optionaly set to File and extra environment variables */
+ /** create ProcessBuilder with working dir optionally set to File and extra environment variables */
def apply(command: String, cwd: Option[File], extraEnv: (String, String)*): ProcessBuilder = {
apply(command.split("""\s+"""), cwd, extraEnv : _*)
// not smart to use this on windows, because CommandParser uses \ to escape ".
@@ -48,7 +48,7 @@ trait ProcessCreation {
}*/
}
- /** create ProcessBuilder with working dir optionaly set to File and extra environment variables */
+ /** create ProcessBuilder with working dir optionally set to File and extra environment variables */
def apply(command: Seq[String], cwd: Option[File], extraEnv: (String, String)*): ProcessBuilder = {
val jpb = new JProcessBuilder(command.toArray: _*)
cwd foreach (jpb directory _)
diff --git a/src/library/scala/xml/factory/LoggedNodeFactory.scala b/src/library/scala/xml/factory/LoggedNodeFactory.scala
index 6a777f4605..c15a9ebe7b 100644
--- a/src/library/scala/xml/factory/LoggedNodeFactory.scala
+++ b/src/library/scala/xml/factory/LoggedNodeFactory.scala
@@ -37,7 +37,7 @@ trait LoggedNodeFactory[A <: Node] extends NodeFactory[A] with scala.util.loggin
final val NONE = 0
final val CACHE = 1
final val FULL = 2
- /** 0 = no loggging, 1 = cache hits, 2 = detail */
+ /** 0 = no logging, 1 = cache hits, 2 = detail */
val logCompressLevel = 1
// methods of NodeFactory