summaryrefslogtreecommitdiff
path: root/src/manual
diff options
context:
space:
mode:
authorLex Spoon <lex@lexspoon.org>2006-06-22 12:56:11 +0000
committerLex Spoon <lex@lexspoon.org>2006-06-22 12:56:11 +0000
commit189cd283fb643e831ae0ffc50c0ce383467db6d1 (patch)
tree1164d42f015ac4992f51edfdb6ec09e1001c7dc1 /src/manual
parenta833d535ec9ca01a8fea7bf9a7a7a6338a227435 (diff)
downloadscala-189cd283fb643e831ae0ffc50c0ce383467db6d1.tar.gz
scala-189cd283fb643e831ae0ffc50c0ce383467db6d1.tar.bz2
scala-189cd283fb643e831ae0ffc50c0ce383467db6d1.zip
be clearer about the ability of JAVACMD to incl...
be clearer about the ability of JAVACMD to include JVM options
Diffstat (limited to 'src/manual')
-rw-r--r--src/manual/scala/man1/scala.scala20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/manual/scala/man1/scala.scala b/src/manual/scala/man1/scala.scala
index 2c7a4da4f1..db3e03a184 100644
--- a/src/manual/scala/man1/scala.scala
+++ b/src/manual/scala/man1/scala.scala
@@ -126,10 +126,9 @@ object scala extends Command {
Definition(
MBold("JAVACMD"),
"Specify the " & MBold("java") & " command to be used " &
- "for running the Scala code. Arguments may be specified; " &
- "they will be expanded by the shell. (Likewise, if the " &
- "command includes any spaces, then the command should be " &
- "wrapped in explicit quotation marks.)")))
+ "for running the Scala code. Arguments may be specified " &
+ "as part of the environment variable; spaces, quotation marks " &
+ "etc., will be passed directly to the shell for expansion.")))
val examples = Section("EXAMPLES",
@@ -146,10 +145,15 @@ object scala extends Command {
CmdLine(CmdOption("classpath", "classes") & "hello.HelloWorld")),
Definition(
- "Execute a Scala program using a user-defined " & MBold("java") & " " &
- "command",
- MBold("env JAVACMD") & Mono("=/usr/local/bin/cacao ") &
- CmdLine(CmdOption("classpath", "classes") & "hello.HelloWorld"))),
+ "Execute a Scala program using a user-defined " & MBold("java") & " " &
+ "command",
+ MBold("env JAVACMD") & Mono("=/usr/local/bin/cacao ") &
+ CmdLine(CmdOption("classpath", "classes") & "hello.HelloWorld")),
+
+ Definition(
+ "Execute a Scala program using JVM options",
+ MBold("env JAVACMD") & Mono("=\"java -Dmsg=hello -enableassertions\" ") &
+ CmdLine(CmdOption("classpath", "classes") & "hello.HelloWorld"))),
"Here is a complete Scala script for Unix: ",