diff options
Diffstat (limited to 'src/manual')
| -rw-r--r-- | src/manual/scala/man1/scalac.scala | 24 | ||||
| -rw-r--r-- | src/manual/scala/tools/docutil/resources/index.html | 4 |
2 files changed, 2 insertions, 26 deletions
diff --git a/src/manual/scala/man1/scalac.scala b/src/manual/scala/man1/scalac.scala index 13b1fd58e0..1c0c7c4a96 100644 --- a/src/manual/scala/man1/scalac.scala +++ b/src/manual/scala/man1/scalac.scala @@ -146,13 +146,6 @@ object scalac extends Command { CmdOption("sourcepath", Argument("path")), "Specify location(s) of source files."), Definition( - CmdOptionBound("target:", Argument("target")), - SeqPara( - "Specify which backend to use (" & Mono("jvm-1.5," & - "msil") & ").", - "The default value is " & Mono("\"jvm-1.5\"") & " (was " & - Mono("\"jvm-1.4\"") & " up to Scala version 2.6.1).")), - Definition( CmdOption("toolcp", Argument("path")), "Add to the runner classpath."), Definition( @@ -182,19 +175,6 @@ object scalac extends Command { Section("Advanced Options", DefinitionList( Definition( - CmdOption("Xassem-extdirs", Argument("dirs")), - "(Requires " & Mono("-target:msil") & - ") List of directories containing assemblies." & - " default:" & Mono("lib") & "."), - Definition( - CmdOption("Xassem-name", Argument("file")), - "(Requires " & Mono("-target:msil") & - ") Name of the output assembly."), - Definition( - CmdOption("Xassem-path", Argument("path")), - "(Requires " & Mono("-target:msil") & - ") List of assemblies referenced by the program."), - Definition( CmdOption("Xcheck-null"), "Warn upon selection of nullable reference"), Definition( @@ -290,10 +270,6 @@ object scalac extends Command { CmdOption("Xsource-reader", Argument("classname")), "Specify a custom method for reading source files."), Definition( - CmdOption("Xsourcedir", Argument("path")), - "(Requires " & Mono("-target:msil") & - ") Mirror source folder structure in output directory.."), - Definition( CmdOption("Xverify"), "Verify generic signatures in generated bytecode."), Definition( diff --git a/src/manual/scala/tools/docutil/resources/index.html b/src/manual/scala/tools/docutil/resources/index.html index aaef94d400..18e2343930 100644 --- a/src/manual/scala/tools/docutil/resources/index.html +++ b/src/manual/scala/tools/docutil/resources/index.html @@ -8,7 +8,7 @@ <meta http-equiv="Content-Style-Type" content="text/css"/> <meta http-equiv="Content-Language" content="en"/> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> - <meta name="Copyright" content="(C) 2002-2012 LAMP/EPFL"/> + <meta name="Copyright" content="(C) 2002-2013 LAMP/EPFL"/> <meta name="Language" content="en"/> <meta name="Description" content="The Scala Programming Language"/> <meta name="Author" content="Stephane Micheloud"/> @@ -180,7 +180,7 @@ <hr/> <div style="font-size:x-small;"> - Copyright (c) 2002-2012 <a href="http://www.epfl.ch/">EPFL</a>, + Copyright (c) 2002-2013 <a href="http://www.epfl.ch/">EPFL</a>, Lausanne, unless specified otherwise.<br/> All rights reserved. </div> |