diff options
| author | Seth Tisue <seth@tisue.net> | 2016-02-22 12:31:38 -0500 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2016-02-22 12:31:38 -0500 |
| commit | d6b559fc5021f546f9050e51b102669082e8e582 (patch) | |
| tree | be157b15ee68ea334ee4a5e5252254110272be49 | |
| parent | 32dd86e4d0c84e312728d2ea1928ef5e847e392d (diff) | |
| parent | fb8cc9fc25ef98972df1998e53c5869c9b951f9b (diff) | |
| download | scala-d6b559fc5021f546f9050e51b102669082e8e582.tar.gz scala-d6b559fc5021f546f9050e51b102669082e8e582.tar.bz2 scala-d6b559fc5021f546f9050e51b102669082e8e582.zip | |
Merge pull request #4986 from janekdb/2.11.x-remove-GNU-Java-man-pages-help
Remove GIJ memory configuration advice from man pages.
| -rw-r--r-- | src/manual/scala/man1/fsc.scala | 6 | ||||
| -rw-r--r-- | src/manual/scala/man1/scala.scala | 6 | ||||
| -rw-r--r-- | src/manual/scala/man1/scalac.scala | 6 |
3 files changed, 3 insertions, 15 deletions
diff --git a/src/manual/scala/man1/fsc.scala b/src/manual/scala/man1/fsc.scala index f2f8feb3fa..c7399da635 100644 --- a/src/manual/scala/man1/fsc.scala +++ b/src/manual/scala/man1/fsc.scala @@ -126,11 +126,7 @@ object fsc extends Command { "With Java 1.5 (or newer) one may for example configure the " & "memory usage of the JVM as follows: " & - Mono("JAVA_OPTS=\"-Xmx512M -Xms16M -Xss16M\""), - - "With " & Link("GNU Java", "http://gcc.gnu.org/java/") & " one " & - "may configure the memory usage of the GIJ as follows: " & - Mono("JAVA_OPTS=\"--mx512m --ms16m\"") + Mono("JAVA_OPTS=\"-Xmx512M -Xms16M -Xss16M\"") )))) val exitStatus = Section("EXIT STATUS", diff --git a/src/manual/scala/man1/scala.scala b/src/manual/scala/man1/scala.scala index 0fc73d2c91..9f97dd546c 100644 --- a/src/manual/scala/man1/scala.scala +++ b/src/manual/scala/man1/scala.scala @@ -184,11 +184,7 @@ object scala extends Command { "With Java 1.5 (or newer) one may for example configure the " & "memory usage of the JVM as follows: " & - Mono("JAVA_OPTS=\"-Xmx512M -Xms16M -Xss16M\""), - - "With " & Link("GNU Java", "http://gcc.gnu.org/java/") & " one " & - "may configure the memory usage of the GIJ as follows: " & - Mono("JAVA_OPTS=\"--mx512m --ms16m\"") + Mono("JAVA_OPTS=\"-Xmx512M -Xms16M -Xss16M\"") )))) val examples = Section("EXAMPLES", diff --git a/src/manual/scala/man1/scalac.scala b/src/manual/scala/man1/scalac.scala index c658fe89f8..7e8277f5ad 100644 --- a/src/manual/scala/man1/scalac.scala +++ b/src/manual/scala/man1/scalac.scala @@ -450,11 +450,7 @@ object scalac extends Command { "With Java 1.5 (or newer) one may for example configure the " & "memory usage of the JVM as follows: " & - Mono("JAVA_OPTS=\"-Xmx512M -Xms16M -Xss16M\""), - - "With " & Link("GNU Java", "http://gcc.gnu.org/java/") & " one " & - "may configure the memory usage of the GIJ as follows: " & - Mono("JAVA_OPTS=\"--mx512m --ms16m\"") + Mono("JAVA_OPTS=\"-Xmx512M -Xms16M -Xss16M\"") )))) val examples = Section("EXAMPLES", |