diff options
| author | Vlad Ureche <vlad.ureche@gmail.com> | 2012-06-04 19:57:56 +0200 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2012-06-08 15:32:23 +0200 |
| commit | 13213e3df0384b1fd815c0798758a22284572cdb (patch) | |
| tree | ac9c9c51d39f47e17747a2589477f00b028d8d27 /src/manual | |
| parent | 7b0f0a142bb526f4bd108a8c208ec9a8952398c9 (diff) | |
| download | scala-13213e3df0384b1fd815c0798758a22284572cdb.tar.gz scala-13213e3df0384b1fd815c0798758a22284572cdb.tar.bz2 scala-13213e3df0384b1fd815c0798758a22284572cdb.zip | |
Fixes SI-4909 and SI-5763
Finally, -sourcepath is split into:
-Ysourcepath - for the library bootstrapping
-doc-source-path - for scaladoc links to source code
(squished the resident compiler test fix into this commit)
Review by @jsuereth.
Diffstat (limited to 'src/manual')
| -rw-r--r-- | src/manual/scala/man1/scalac.scala | 3 | ||||
| -rw-r--r-- | src/manual/scala/man1/scaladoc.scala | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/manual/scala/man1/scalac.scala b/src/manual/scala/man1/scalac.scala index 49324ffa83..be2a9d2cf7 100644 --- a/src/manual/scala/man1/scalac.scala +++ b/src/manual/scala/man1/scalac.scala @@ -143,9 +143,6 @@ object scalac extends Command { CmdOption("print"), "Print program with all Scala-specific features removed."), Definition( - 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," & diff --git a/src/manual/scala/man1/scaladoc.scala b/src/manual/scala/man1/scaladoc.scala index 193c77fc51..333b6ad7e1 100644 --- a/src/manual/scala/man1/scaladoc.scala +++ b/src/manual/scala/man1/scaladoc.scala @@ -75,7 +75,13 @@ object scaladoc extends Command { "Define the overall version number of the documentation, typically the version of the library being documented."), Definition( CmdOption("doc-source-url", Argument("url")), - "Define a URL to be concatenated with source locations for link to source files."))), + "Define a URL to be concatenated with source locations for link to source files."), + Definition( + CmdOption("doc-diagrams"), + "Generate diagrams in the current scaladoc compilation run."), + Definition( + CmdOption("doc-implicits"), + "List members generated from implicit conversions in the scaladoc page."))), Section("Compiler Options", DefinitionList( @@ -103,8 +109,8 @@ object scaladoc extends Command { "include the current directory in the search path, you must " & "include " & Mono("\".\"") & " in the new settings.")), Definition( - CmdOption("sourcepath", Argument("path")), - "Specify where to find input source files."), + CmdOption("doc-source-path", Argument("path")), + "Specify the common prefix in the source files' paths. Used when generating links to source."), Definition( CmdOption("bootclasspath", Argument("path")), "Override location of bootstrap class files (where to find the " & |