summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2009-05-15 15:44:54 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2009-05-15 15:44:54 +0000
commit10830eaae2955766378369b8d1bcc0e6963b9b7f (patch)
tree595d0d162d94eda17062d4d13710378930b7ac7f /docs
parentfbf991833d5ec0d9890ac1e7df9f53209e313552 (diff)
downloadscala-10830eaae2955766378369b8d1bcc0e6963b9b7f.tar.gz
scala-10830eaae2955766378369b8d1bcc0e6963b9b7f.tar.bz2
scala-10830eaae2955766378369b8d1bcc0e6963b9b7f.zip
1.4-related cleanup and reorganization.
Removed a bunch of now useless 1.4 code, merged back jvm5-specific partest tests into the general jvm tests, documentation updates.
Diffstat (limited to 'docs')
-rw-r--r--docs/development/jvm.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/development/jvm.txt b/docs/development/jvm.txt
index 2497f9b741..2078505799 100644
--- a/docs/development/jvm.txt
+++ b/docs/development/jvm.txt
@@ -53,7 +53,7 @@ Scala Environment Options
In the following example, simply replace <jdk> by
-"java-1.4", "java-1.5", "java-1.6", "java-1.7" or
+"java-1.5", "java-1.6", "java-1.7" or
"java-ibm-1.5" to experiment with different Java VMs:
> env JAVACMD=/home/linuxsoft/apps/<jdk>/bin/java \