diff options
| author | stepancheg <stepancheg@epfl.ch> | 2008-06-14 12:16:26 +0000 |
|---|---|---|
| committer | stepancheg <stepancheg@epfl.ch> | 2008-06-14 12:16:26 +0000 |
| commit | 70ead2ee53c24d199a9156637b3dd5f44e00298f (patch) | |
| tree | 81eb970e19369bedf887ed296184e625da27a28a /src/manual | |
| parent | aa2a5f89d06b4e2db62b467660da044a87527652 (diff) | |
| download | scala-70ead2ee53c24d199a9156637b3dd5f44e00298f.tar.gz scala-70ead2ee53c24d199a9156637b3dd5f44e00298f.tar.bz2 scala-70ead2ee53c24d199a9156637b3dd5f44e00298f.zip | |
Scripts should use JAVA_HOME to find java execu...
Scripts should use JAVA_HOME to find java executable (#995)
Diffstat (limited to 'src/manual')
| -rw-r--r-- | src/manual/scala/man1/fsc.scala | 4 | ||||
| -rw-r--r-- | src/manual/scala/man1/scala.scala | 4 | ||||
| -rw-r--r-- | src/manual/scala/man1/scalac.scala | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/manual/scala/man1/fsc.scala b/src/manual/scala/man1/fsc.scala index 1b354494c2..cf339b9376 100644 --- a/src/manual/scala/man1/fsc.scala +++ b/src/manual/scala/man1/fsc.scala @@ -113,6 +113,10 @@ object fsc extends Command { "as part of the environment variable; spaces, quotation marks, " & "etc., will be passed directly to the shell for expansion."), Definition( + MBold("JAVA_HOME"), + "Specify JDK/JRE home directory. This directory is used to locate " & + "the " & MBold("java") & " command unless " & MBold("JAVACMD") & " variable set."), + Definition( MBold("JAVA_OPTS"), SeqPara( "Specify the options to be passed to the " & MBold("java") & diff --git a/src/manual/scala/man1/scala.scala b/src/manual/scala/man1/scala.scala index 3bcd751d66..3806faf11d 100644 --- a/src/manual/scala/man1/scala.scala +++ b/src/manual/scala/man1/scala.scala @@ -161,6 +161,10 @@ object scala extends Command { "as part of the environment variable; spaces, quotation marks, " & "etc., will be passed directly to the shell for expansion."), Definition( + MBold("JAVA_HOME"), + "Specify JDK/JRE home directory. This directory is used to locate " & + "the " & MBold("java") & " command unless " & MBold("JAVACMD") & " variable set."), + Definition( MBold("JAVA_OPTS"), SeqPara( "Specify the options to be passed to the " & MBold("java") & diff --git a/src/manual/scala/man1/scalac.scala b/src/manual/scala/man1/scalac.scala index 34d69d2ef4..068bfa2f8e 100644 --- a/src/manual/scala/man1/scalac.scala +++ b/src/manual/scala/man1/scalac.scala @@ -301,6 +301,10 @@ object scalac extends Command { "as part of the environment variable; spaces, quotation marks, " & "etc., will be passed directly to the shell for expansion."), Definition( + MBold("JAVA_HOME"), + "Specify JDK/JRE home directory. This directory is used to locate " & + "the " & MBold("java") & " command unless " & MBold("JAVACMD") & " variable set."), + Definition( MBold("JAVA_OPTS"), SeqPara( "Specify the options to be passed to the " & MBold("java") & |