From 52ce2fb1741f58a978bf12ac41983fa63ac1abd6 Mon Sep 17 00:00:00 2001
From: Lex Spoon <lex@lexspoon.org>
Date: Fri, 14 Jul 2006 12:45:34 +0000
Subject: documented -nocompdaemon and -D

---
 src/manual/scala/man1/scala.scala | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/manual')

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(
@@ -50,6 +48,15 @@ object scala extends Command {
         "runs of the same script, the pre-compiled " & Mono(".jar") & " file " &
         "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."),
-- 
cgit v1.2.3