diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-02-25 21:45:05 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-02-25 21:48:26 +1000 |
| commit | 964630ec1f4cf94f4d09eff394f959e733e3fcf7 (patch) | |
| tree | edbe21ff3fd89156701c8ecedf5d900915bfb759 /src/manual/scala/man1/scalac.scala | |
| parent | d375334c26c625da345c5e77bca2975f21b8bd10 (diff) | |
| parent | e0fc92a2b7b27141b41cecafd3ec7804ad02707b (diff) | |
| download | scala-964630ec1f4cf94f4d09eff394f959e733e3fcf7.tar.gz scala-964630ec1f4cf94f4d09eff394f959e733e3fcf7.tar.bz2 scala-964630ec1f4cf94f4d09eff394f959e733e3fcf7.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20160225
Conflicts:
scripts/jobs/integrate/bootstrap
src/build/maven/scala-actors-pom.xml
test/files/pos/t3420.flags
Conflicts were trivial to resolve.
Diffstat (limited to 'src/manual/scala/man1/scalac.scala')
| -rw-r--r-- | src/manual/scala/man1/scalac.scala | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/manual/scala/man1/scalac.scala b/src/manual/scala/man1/scalac.scala index 3219b10293..811fb2d94e 100644 --- a/src/manual/scala/man1/scalac.scala +++ b/src/manual/scala/man1/scalac.scala @@ -447,11 +447,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", |