Browse files

Fix dependant => dependent

  • Loading branch information...
1 parent 6665722 commit 76aab735d8c80915d804f147693cca52279f9cfc @julio julio committed Jan 3, 2013
12 README.rst
@@ -7,11 +7,11 @@ and how to build it. For information about Scala as a language, you can visit
the web site
Part I. The repository layout
Follows the file layout of the Scala repository. Files marked with a † are not
part of the repository but are either automatically generated by the
-build script or user-created if needed. This is not a complete listing. ::
+build script or user-created if needed. This is not a complete listing. ::
+--build/ Build products output directory for ant.
+--build.xml The main Ant build script.
@@ -67,7 +67,7 @@ description of the four layers that SABBUS uses, from bottom to top:
- ``strap``: a test layer used to check stability of the build.
SABBUS compiles, for each layer, the Scala library first and the compiler next.
That means that any changes in the library can immediately be used in the
@@ -110,12 +110,12 @@ Part III. Common use-cases
- ``ln -s build/quick/bin qbin`` (once):
- ``ant && qbin/scalac -d sandbox sandbox/test.scala && qbin/scala -cp sandbox Test``
Incrementally builds quick, and then uses it to compile and run the file
``sandbox/test.scala``. This is a typical debug cycle.
- ``ant replacelocker``
"unfreezes" locker by updating it to match the current source code.
- This will delete quick so as not to mix classes compiled with different
@@ -136,7 +136,7 @@ Part III. Common use-cases
ANT_OPTS="-Xms512M -Xmx2048M -Xss1M -XX:MaxPermSize=128M" ant docs
- ``ant dist``
Builds a distribution.
- Rebuilds locker from scratch (to make sure it bootstraps).
2 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) {
2 src/jline/src/main/java/scala/tools/jline/console/
@@ -1712,7 +1712,7 @@ public final void println(final CharSequence s) throws IOException {
- * Output a platform-dependant newline.
+ * Output a platform-dependent newline.
public final void println() throws IOException {

0 comments on commit 76aab73

Please sign in to comment.