Cleaned up and brought up to date the help text...

Cleaned up and brought up to date the help text for -X and -Y options.
Made some enhancements to PhasesSetting, which are documented if you
run scalac -X or -Y. (Try it!) Disabled some dead settings and renamed
others to reflect their current purpose. No review.

1 files changed, 17 insertions, 18 deletions

diff --git a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
index dcefd8bb16..118daed7ff 100644
--- a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
@@ -18,33 +18,32 @@ trait StandardScalaSettings {
 
   /** Path related settings.
    */
-  val bootclasspath =     PathSetting ("-bootclasspath", "path", "Override location of bootstrap class files", Defaults.scalaBootClassPath)
+  val bootclasspath =     PathSetting ("-bootclasspath", "Override location of bootstrap class files.", Defaults.scalaBootClassPath)
   val classpath:          PathSetting // is mutated directly in various places (thus inspiring this very effort)
   val d:                OutputSetting // depends on mutable OutputDirs class
-  val extdirs =           PathSetting ("-extdirs", "dirs", "Override location of installed extensions", Defaults.scalaExtDirs)
-  val javabootclasspath = PathSetting ("-javabootclasspath", "path", "Override java boot classpath.", Defaults.javaBootClassPath)
-  val javaextdirs =       PathSetting ("-javaextdirs", "path", "Override java extdirs classpath.", Defaults.javaExtDirs)
-  val sourcepath =        PathSetting ("-sourcepath", "path", "Specify where to find input source files", "") // Defaults.scalaSourcePath
+  val extdirs =           PathSetting ("-extdirs", "Override location of installed extensions.", Defaults.scalaExtDirs)
+  val javabootclasspath = PathSetting ("-javabootclasspath", "Override java boot classpath.", Defaults.javaBootClassPath)
+  val javaextdirs =       PathSetting ("-javaextdirs", "Override java extdirs classpath.", Defaults.javaExtDirs)
+  val sourcepath =        PathSetting ("-sourcepath", "Specify location(s) of source files.", "") // Defaults.scalaSourcePath
 
   /** Other settings.
    */
-  val dependencyfile =  StringSetting ("-dependencyfile", "file", "Specify the file in which dependencies are tracked", ".scala_dependencies")
-  val deprecation =    BooleanSetting ("-deprecation", "Output source locations where deprecated APIs are used")
-  val encoding =        StringSetting ("-encoding", "encoding", "Specify character encoding used by source files", Properties.sourceEncoding)
-  val explaintypes =   BooleanSetting ("-explaintypes", "Explain type errors in more detail")
-  val g =               ChoiceSetting ("-g", "Specify level of generated debugging info", List("none", "source", "line", "vars", "notailcalls"), "vars")
+  val dependencyfile =  StringSetting ("-dependencyfile", "file", "Set dependency tracking file.", ".scala_dependencies")
+  val deprecation =    BooleanSetting ("-deprecation", "Emit warning and location for usages of deprecated APIs.")
+  val encoding =        StringSetting ("-encoding", "encoding", "Specify character encoding used by source files.", Properties.sourceEncoding)
+  val explaintypes =   BooleanSetting ("-explaintypes", "Explain type errors in more detail.")
+  val g =               ChoiceSetting ("-g", "level", "Set level of generated debugging info.", List("none", "source", "line", "vars", "notailcalls"), "vars")
   val help =           BooleanSetting ("-help", "Print a synopsis of standard options")
-  val make =            ChoiceSetting ("-make", "Specify recompilation detection strategy", List("all", "changed", "immediate", "transitive", "transitivenocp"), "all") .
-                                          withHelpSyntax("-make:<strategy>")
+  val make =            ChoiceSetting ("-make", "policy", "Recompilation detection policy", List("all", "changed", "immediate", "transitive", "transitivenocp"), "all")
   val nowarn =         BooleanSetting ("-nowarn", "Generate no warnings")
   val optimise:        BooleanSetting // depends on post hook which mutates other settings
-  val print =          BooleanSetting ("-print", "Print program with all Scala-specific features removed")
-  val target =          ChoiceSetting ("-target", "Specify for which target object files should be built", List("jvm-1.5", "msil"), "jvm-1.5")
-  val unchecked =      BooleanSetting ("-unchecked", "Enable detailed unchecked warnings")
-  val uniqid =         BooleanSetting ("-uniqid", "Print identifiers with unique names for debugging")
+  val print =          BooleanSetting ("-print", "Print program with Scala-specific features removed.")
+  val target =          ChoiceSetting ("-target", "target", "Specify for which target object files should be built", List("jvm-1.5", "msil"), "jvm-1.5")
+  val unchecked =      BooleanSetting ("-unchecked", "Enable detailed unchecked (erasure) warnings.")
+  val uniqid =         BooleanSetting ("-uniqid", "Uniquely tag all identifiers in debugging output.")
   val usejavacp =      BooleanSetting ("-usejavacp", "Utilize the java.class.path in classpath resolution.")
-  val verbose =        BooleanSetting ("-verbose", "Output messages about what the compiler is doing")
-  val version =        BooleanSetting ("-version", "Print product version and exit")
+  val verbose =        BooleanSetting ("-verbose", "Output messages about what the compiler is doing.")
+  val version =        BooleanSetting ("-version", "Print product version and exit.")
 
   /** These are @<file> and -Dkey=val style settings, which don't
    *  nicely map to identifiers.