diff options
Diffstat (limited to 'src/manual/scala')
| -rw-r--r-- | src/manual/scala/man1/scala.scala | 7 | ||||
| -rw-r--r-- | src/manual/scala/man1/scalac.scala | 15 | ||||
| -rw-r--r-- | src/manual/scala/man1/scalap.scala | 2 |
3 files changed, 9 insertions, 15 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 " & diff --git a/src/manual/scala/man1/scalac.scala b/src/manual/scala/man1/scalac.scala index a20c1ac2e6..b4d479cb85 100644 --- a/src/manual/scala/man1/scalac.scala +++ b/src/manual/scala/man1/scalac.scala @@ -148,12 +148,9 @@ object scalac extends Command { CmdOption("sourcepath", Argument("path")), "Specify location(s) of source files."), Definition( - CmdOptionBound("target:", "{jvm-1.5,jvm-1.6,jvm-1.7,jvm-1.8}"), + CmdOptionBound("target:", "{jvm-1.8}"), SeqPara( - Mono("\"jvm-1.5\"") & " target JVM 1.5 (deprecated),", - Mono("\"jvm-1.6\"") & " target JVM 1.6 (default),", - Mono("\"jvm-1.7\"") & " target JVM 1.7,", - Mono("\"jvm-1.8\"") & " target JVM 1.8,")), + Mono("\"jvm-1.8\"") & " target JVM 1.8 (default)")), Definition( CmdOption("toolcp", Argument("path")), "Add to the runner classpath."), @@ -183,7 +180,7 @@ object scalac extends Command { Mono(Bold("@") & Argument("file")), "A text file containing compiler arguments (options and source files)") - // TODO - Add macros an dsuch here. + // TODO - Add macros and such here. ) ), @@ -382,8 +379,8 @@ object scalac extends Command { MItalic("posterasure"), "clean up erased inline classes"), Definition( - MItalic("lazyvals"), - "allocate bitmaps, translate lazy vals into lazified defs"), + MItalic("fields"), + "synthesize accessors and fields, including bitmaps for lazy vals"), Definition( MItalic("lambdalift"), "move nested functions to top level"), @@ -477,7 +474,7 @@ object scalac extends Command { val exitStatus = Section("EXIT STATUS", - MBold(command) & " returns a zero exist status if it succeeds to " & + MBold(command) & " returns a zero exit status if it succeeds to " & "compile the specified input files. Non zero is returned in case " & "of failure.") diff --git a/src/manual/scala/man1/scalap.scala b/src/manual/scala/man1/scalap.scala index 472b522e17..b58fe6a81f 100644 --- a/src/manual/scala/man1/scalap.scala +++ b/src/manual/scala/man1/scalap.scala @@ -76,7 +76,7 @@ object scalap extends Command { val exitStatus = Section("EXIT STATUS", - MBold(command) & " returns a zero exist status if it succeeds to process " & + MBold(command) & " returns a zero exit status if it succeeds to process " & "the specified input files. Non zero is returned in case of failure.") override val authors = Section("AUTHOR", |