summaryrefslogtreecommitdiff
path: root/src/manual/scala/man1
diff options
context:
space:
mode:
authorStefan Zeiger <szeiger@novocode.com>2016-01-28 19:23:08 +0100
committerStefan Zeiger <szeiger@novocode.com>2016-02-01 15:21:03 +0100
commitdcc455ad9ce1159fab122d677fda84132f52059d (patch)
treeace77d9a92c5d94701939aa1cd5d1c4588d57b58 /src/manual/scala/man1
parentea154faf467ae27c221ba0dcd7235e1e55673c51 (diff)
downloadscala-dcc455ad9ce1159fab122d677fda84132f52059d.tar.gz
scala-dcc455ad9ce1159fab122d677fda84132f52059d.tar.bz2
scala-dcc455ad9ce1159fab122d677fda84132f52059d.zip
Document when the `scala` command starts/uses a compilation daemon
Diffstat (limited to 'src/manual/scala/man1')
-rw-r--r--src/manual/scala/man1/scala.scala9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/manual/scala/man1/scala.scala b/src/manual/scala/man1/scala.scala
index 92d9c59cca..0fc73d2c91 100644
--- a/src/manual/scala/man1/scala.scala
+++ b/src/manual/scala/man1/scala.scala
@@ -65,6 +65,10 @@ object scala extends Command {
"Do not use the " & MBold("fsc") & " offline compiler."),
Definition(
+ CmdOption("nc"),
+ "Same as " & Mono("-nocompdaemon") & "."),
+
+ Definition(
CmdOptionBound("D", "property=value"),
"Set a Java system property. If no value is specified, " &
"then the property is set to the empty string."),
@@ -135,6 +139,11 @@ object scala extends Command {
"line. Headers can be used to make stand-alone script files, as shown " &
"in the examples below.",
+ "When running a script or using " & Mono("-e") & ", an already running " &
+ "compilation daemon (fsc) is used, or a new one started on demand. The " &
+ Mono("-nocompdaemon") & " or " & Mono("-nc") & " option can be used to " &
+ "prevent this.",
+
"If " & Mono("scala") & " is run from an sbaz(1) directory, " &
"then it will add to its classpath any jars installed in the " &
"lib directory of the sbaz directory. Additionally, if no " &