summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2016-09-30 17:05:42 +0200
committerGitHub <noreply@github.com>2016-09-30 17:05:42 +0200
commita82c0b8b1d3f5038930c041fd48d550e25479a21 (patch)
tree911ebb66930d4a6f2e198138eeeecb60dd10411e
parente1e895cebc3514409c6b01e736b990ebd373e44c (diff)
parent26b9c3cdcc6c0ba478f9ef358e9173f9f7452377 (diff)
downloadscala-a82c0b8b1d3f5038930c041fd48d550e25479a21.tar.gz
scala-a82c0b8b1d3f5038930c041fd48d550e25479a21.tar.bz2
scala-a82c0b8b1d3f5038930c041fd48d550e25479a21.zip
Merge pull request #5420 from SethTisue/ah-sbaz-those-were-the-days
expunge a stray reference to sbaz in the Scala man page
-rw-r--r--src/manual/scala/man1/scala.scala7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/manual/scala/man1/scala.scala b/src/manual/scala/man1/scala.scala
index 9f97dd546c..3cfa9f8cb1 100644
--- a/src/manual/scala/man1/scala.scala
+++ b/src/manual/scala/man1/scala.scala
@@ -144,17 +144,14 @@ object scala extends Command {
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 " &
- "-classpath option is specified, then " & Mono("scala") &
+ "If no -classpath option is specified, then " & Mono("scala") &
" will add " & Quote(".") & ", the current directory, to the " &
"end of the classpath.")
val options = Section("OPTIONS",
"If any compiler options are specified, they must be first in the " &
- "command line and must be followed by a bare hypen (" & Quote("-") &
+ "command line and must be followed by a bare hyphen (" & Quote("-") &
") character. " &
"If no arguments are specified after the optional compiler arguments, " &
"then an interactive Scala shell is started. Otherwise, either a " &