From 831455f60203cd9a80b92190f2d4e1dabcbc45f5 Mon Sep 17 00:00:00 2001 From: Christopher Dow Date: Mon, 22 Apr 2013 08:27:55 -0700 Subject: [PATCH] Documentation typos --- src/linux/usr/share/man/man1/sbt.1 | 4 ++-- src/scripts/sbt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/linux/usr/share/man/man1/sbt.1 b/src/linux/usr/share/man/man1/sbt.1 index cb9f6c580..8c806e165 100644 --- a/src/linux/usr/share/man/man1/sbt.1 +++ b/src/linux/usr/share/man/man1/sbt.1 @@ -82,9 +82,9 @@ The user configuration file. If this file exists in the sbt root, it is prepended to the runner args. .SH ENVIRONMENT -.IP JAVAOPTS +.IP JAVA_OPTS If non-null a set of arguments passed to java. -.IP SBTOPTS +.IP SBT_OPTS environment variable, if unset uses "$default_sbt_opts". .SH EXAMPLES Most users of this script will only have to call "sbt" on the command line. diff --git a/src/scripts/sbt b/src/scripts/sbt index ea674f6a4..c2249d9a5 100755 --- a/src/scripts/sbt +++ b/src/scripts/sbt @@ -63,7 +63,7 @@ Usage: $script_name [options] -Dkey=val pass -Dkey=val directly to the java runtime -J-X pass option -X directly to the java runtime (-J is stripped) - -S-X add -X to sbt's scalacOptions (-J is stripped) + -S-X add -X to sbt's scalacOptions (-S is stripped) In the case of duplicated or conflicting options, the order above shows precedence: JAVA_OPTS lowest, command line options highest.