diff options
author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-05-20 09:53:59 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-05-20 09:53:59 +0200 |
commit | 7f24266f0ae738be2db8959747f82726ebfe03b9 (patch) | |
tree | f14234c071f60fbf18bde34e9fb2cfc830ad960b | |
parent | e9ba325ab0fd1d740740e7c8d731888c059079fa (diff) | |
parent | 232c3167395b6d80ea7ec64cc1d68cb423ec21a3 (diff) | |
download | scala-7f24266f0ae738be2db8959747f82726ebfe03b9.tar.gz scala-7f24266f0ae738be2db8959747f82726ebfe03b9.tar.bz2 scala-7f24266f0ae738be2db8959747f82726ebfe03b9.zip |
Merge pull request #4509 from retronym/topic/man
Document -target:jvm-1.8 in the man page
-rw-r--r-- | src/manual/scala/man1/scalac.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/manual/scala/man1/scalac.scala b/src/manual/scala/man1/scalac.scala index 3954ed588e..c658fe89f8 100644 --- a/src/manual/scala/man1/scalac.scala +++ b/src/manual/scala/man1/scalac.scala @@ -152,11 +152,12 @@ 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}"), + CmdOptionBound("target:", "{jvm-1.5,jvm-1.6,jvm-1.7,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.7\"") & " target JVM 1.7,", + Mono("\"jvm-1.8\"") & " target JVM 1.8,")), Definition( CmdOption("toolcp", Argument("path")), "Add to the runner classpath."), |