added scaladoc option '-access'

2 files changed, 17 insertions, 13 deletions

diff --git a/src/manual/scala/man1/scala.scala b/src/manual/scala/man1/scala.scala
index a3f4044fe9..3bcd751d66 100644
--- a/src/manual/scala/man1/scala.scala
+++ b/src/manual/scala/man1/scala.scala
@@ -190,15 +190,16 @@ object scala extends Command {
         CmdLine(CmdOption("classpath", "classes") & "hello.HelloWorld")),
 
       Definition(
-          "Execute a Scala program using a user-defined " & MBold("java") & " " &
-          "command",
-          MBold("JAVACMD") & Mono("=/usr/local/bin/cacao ") &
-          CmdLine(CmdOption("classpath", "classes") & "hello.HelloWorld")),
+        "Execute a Scala program using a user-defined " & MBold("java") & " " &
+        "command",
+        MBold("env JAVACMD") & Mono("=/usr/local/bin/cacao ") &
+        CmdLine(CmdOption("classpath", "classes") & "hello.HelloWorld")),
 
       Definition(
-          "Execute a Scala program using JVM options",
-          MBold("JAVACMD") & Mono("=\"java -Dmsg=hello -enableassertions\" ") &
-          CmdLine(CmdOption("classpath", "classes") & "hello.HelloWorld"))),
+        "Execute a Scala program using JVM options",
+        MBold("env JAVACMD") & Mono("=java ") &
+        MBold("JAVA_OPTS") & Mono("=\"-Dmsg=hello -enableassertions\" ") &
+        CmdLine(CmdOption("classpath", "classes") & "hello.HelloWorld"))),
 
     "Here is a complete Scala script for Unix: ",
 
@@ -225,12 +226,11 @@ object scala extends Command {
     "command:",
 
     CodeSample(
-        "#!/bin/sh\n" +
-        "exec scala -savecompiled \"$0\" \"$@\"\n" +
-        "!#\n" +
-        "Console.println(\"Hello, world!\")\n" +
-        "argv.toList foreach Console.println"))
-
+      "#!/bin/sh\n" +
+      "exec scala -savecompiled \"$0\" \"$@\"\n" +
+      "!#\n" +
+      "Console.println(\"Hello, world!\")\n" +
+      "argv.toList foreach Console.println"))
 
   val exitStatus = Section("EXIT STATUS",
 
diff --git a/src/manual/scala/man1/scaladoc.scala b/src/manual/scala/man1/scaladoc.scala
index 2a8970339b..7fc52cd741 100644
--- a/src/manual/scala/man1/scaladoc.scala
+++ b/src/manual/scala/man1/scaladoc.scala
@@ -69,6 +69,10 @@ object scaladoc extends Command {
           CmdOption("d", Argument("directory")),
           "Specify where to place generated class files."),
         Definition(
+          CmdOption("access:<access>"),
+          "Show only public, protected/public (default) or all classes " &
+          "and members (" & Mono("public") & ",protected,private)"),
+        Definition(
           CmdOption("windowtitle", Argument("windowtitle")),
           "Specify window title of generated HTML documentation"),
         Definition(