summaryrefslogtreecommitdiff
path: root/src/manual
diff options
context:
space:
mode:
authorLex Spoon <lex@lexspoon.org>2006-07-14 12:45:34 +0000
committerLex Spoon <lex@lexspoon.org>2006-07-14 12:45:34 +0000
commit52ce2fb1741f58a978bf12ac41983fa63ac1abd6 (patch)
tree4d16112360a1faaa9eeeb20bee50b8c0db69be84 /src/manual
parent7796d36f0bf884d8022590b2b66c706547fd8d39 (diff)
downloadscala-52ce2fb1741f58a978bf12ac41983fa63ac1abd6.tar.gz
scala-52ce2fb1741f58a978bf12ac41983fa63ac1abd6.tar.bz2
scala-52ce2fb1741f58a978bf12ac41983fa63ac1abd6.zip
documented -nocompdaemon and -D
Diffstat (limited to 'src/manual')
-rw-r--r--src/manual/scala/man1/scala.scala15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/manual/scala/man1/scala.scala b/src/manual/scala/man1/scala.scala
index 1ba280e690..98282724aa 100644
--- a/src/manual/scala/man1/scala.scala
+++ b/src/manual/scala/man1/scala.scala
@@ -20,9 +20,7 @@ object scala extends Command {
val synopsis = Section("SYNOPSIS",
CmdLine(
- " [ " & Argument("compiler-option") & " | " &
- Mono("-howtorun:") & Argument("how") & " | " &
- Mono("-savecompiled") & " ]... " &
+ " [ " & Argument("option") & " ]... " &
"[ " & Argument("torun") & " " & Argument("argument") &
"... ]"))
@@ -31,7 +29,7 @@ object scala extends Command {
DefinitionList(
Definition(
Mono(Argument("compiler-option")),
- "Options for the compiler. See " &
+ "Any scalac option. See " &
Link(Bold("scalac") & "(1)", "scalac.html") & "."),
Definition(
@@ -51,6 +49,15 @@ object scala extends Command {
"will be used if it is newer than the script file."),
Definition(
+ Mono("-nocompdaemon"),
+ "Do not use the " & Bold("fsc") & " offline compiler."),
+
+ Definition(
+ Mono("-D") & Argument("property=value"),
+ "Set a Java system property. If no value is specified, " &
+ "then the property is set to the empty string."),
+
+ Definition(
Mono(Argument("torun")),
"A top-level object or a script file to run."),