summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2016-02-10 21:42:11 +0100
committerLukas Rytz <lukas.rytz@typesafe.com>2016-02-10 21:42:11 +0100
commit2a6c652b0d08809a85bd8d0ec28fa82c181c28ee (patch)
treec2074f95a5a5948f688aa5becab945b94741ac92 /src/compiler
parent8f8f81b72ef07140952aeb76120bd032e35cc918 (diff)
parentdcc455ad9ce1159fab122d677fda84132f52059d (diff)
downloadscala-2a6c652b0d08809a85bd8d0ec28fa82c181c28ee.tar.gz
scala-2a6c652b0d08809a85bd8d0ec28fa82c181c28ee.tar.bz2
scala-2a6c652b0d08809a85bd8d0ec28fa82c181c28ee.zip
Merge pull request #4928 from szeiger/wip/document-e-nc
Document that `scala -e` starts/uses a compilation daemon
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/GenericRunnerCommand.scala6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala b/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala
index 2584054686..24496fa013 100644
--- a/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala
+++ b/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala
@@ -87,7 +87,11 @@ A file argument will be run as a scala script unless it contains only
self-contained compilation units (classes and objects) and exactly one
runnable main method. In that case the file will be compiled and the
main method invoked. This provides a bridge between scripts and standard
-scala source.%n"""
+scala source.
+
+When running a script or using -e, an already running compilation daemon
+(fsc) is used, or a new one started on demand. The -nc option can be
+used to prevent this.%n"""
}
object GenericRunnerCommand {