diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/InterpreterCommand.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/InterpreterLoop.scala | 2 | ||||
| -rw-r--r-- | src/manual/scala/man1/sbaz.scala | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/InterpreterCommand.scala b/src/compiler/scala/tools/nsc/InterpreterCommand.scala index 2ea52a322f..4d20b4ab76 100644 --- a/src/compiler/scala/tools/nsc/InterpreterCommand.scala +++ b/src/compiler/scala/tools/nsc/InterpreterCommand.scala @@ -9,6 +9,6 @@ package scala.tools.nsc /** a command line for the interpreter */ class InterpreterCommand(arguments: List[String], error: String => unit) extends CompilerCommand(arguments, error, false) { - override val cmdName = "scalaint" + override val cmdName = "scala" override val fileEnding = ".scalaint" } diff --git a/src/compiler/scala/tools/nsc/InterpreterLoop.scala b/src/compiler/scala/tools/nsc/InterpreterLoop.scala index 88987898f0..7a847e7ec9 100644 --- a/src/compiler/scala/tools/nsc/InterpreterLoop.scala +++ b/src/compiler/scala/tools/nsc/InterpreterLoop.scala @@ -192,7 +192,7 @@ class InterpreterLoop(in: BufferedReader, out: PrintWriter) { /** process command-line arguments and do as they request */ def main(args: Array[String]): unit = { - def error1(msg: String): Unit = out.println("scalaint: " + msg) + def error1(msg: String): Unit = out.println("scala: " + msg) val command = new InterpreterCommand(List.fromArray(args), error1) if (!command.ok || command.settings.help.value) { diff --git a/src/manual/scala/man1/sbaz.scala b/src/manual/scala/man1/sbaz.scala index 71d56abc3b..b780990aea 100644 --- a/src/manual/scala/man1/sbaz.scala +++ b/src/manual/scala/man1/sbaz.scala @@ -162,9 +162,7 @@ object sbaz extends Command { Link(MBold("scala") & "(1)", "scala.html") & ", " & Link(MBold("scalac") & "(1)", "scalac.html") & ", " & - Link(MBold("scaladoc") & "(1)", "scaladoc.html") & ", " & - Link(MBold("scalaint") & "(1)", "scalaint.html") & ", " & - Link(MBold("scalascript") & "(1)", "scalascript.html")) + Link(MBold("scaladoc") & "(1)", "scaladoc.html")) def manpage = new Document { title = command |