summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-01-14 11:39:03 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-01-14 11:39:03 -0800
commita49722990655633c2c97ddf5699adf25bc8bea76 (patch)
tree582a7e7f3460fdacedddf863a30054edc8dcab7e /src
parentd2e02dc4bf09763229264b9bb19b3038b2ec7336 (diff)
parent76aab735d8c80915d804f147693cca52279f9cfc (diff)
downloadscala-a49722990655633c2c97ddf5699adf25bc8bea76.tar.gz
scala-a49722990655633c2c97ddf5699adf25bc8bea76.tar.bz2
scala-a49722990655633c2c97ddf5699adf25bc8bea76.zip
Merge pull request #1837 from julio/fix-typo
Fix dependant => dependent
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/ant/ScalaTool.scala2
-rw-r--r--src/jline/src/main/java/scala/tools/jline/console/ConsoleReader.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/ant/ScalaTool.scala b/src/compiler/scala/tools/ant/ScalaTool.scala
index 57d24f6213..633145a97c 100644
--- a/src/compiler/scala/tools/ant/ScalaTool.scala
+++ b/src/compiler/scala/tools/ant/ScalaTool.scala
@@ -108,7 +108,7 @@ class ScalaTool extends ScalaMatchingTask {
* for general purpose scripts, as this does not assume all elements are
* relative to the Ant `basedir`. Additionally, the platform specific
* demarcation of any script variables (e.g. `${SCALA_HOME}` or
- * `%SCALA_HOME%`) can be specified in a platform independant way (e.g.
+ * `%SCALA_HOME%`) can be specified in a platform independent way (e.g.
* `@SCALA_HOME@`) and automatically translated for you.
*/
def setClassPath(input: String) {
diff --git a/src/jline/src/main/java/scala/tools/jline/console/ConsoleReader.java b/src/jline/src/main/java/scala/tools/jline/console/ConsoleReader.java
index 9df42708bb..a375b84a5c 100644
--- a/src/jline/src/main/java/scala/tools/jline/console/ConsoleReader.java
+++ b/src/jline/src/main/java/scala/tools/jline/console/ConsoleReader.java
@@ -1712,7 +1712,7 @@ public class ConsoleReader
}
/**
- * Output a platform-dependant newline.
+ * Output a platform-dependent newline.
*/
public final void println() throws IOException {
print(CR);