diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-01-09 06:16:20 -0800 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-01-09 06:16:20 -0800 |
commit | 9934bae50cc0893ab345203b5445e6618a2f1698 (patch) | |
tree | cb4109d0843915523cd0217e499ea7140ba27305 /src/library | |
parent | 383c175740ced977a971cbd95f5842eb388bc1e7 (diff) | |
parent | 906e517135c5fe002ab2ae1c96433583e6fe20b2 (diff) | |
download | scala-9934bae50cc0893ab345203b5445e6618a2f1698.tar.gz scala-9934bae50cc0893ab345203b5445e6618a2f1698.tar.bz2 scala-9934bae50cc0893ab345203b5445e6618a2f1698.zip |
Merge pull request #3338 from gourlaysama/t7491
SI-7491 fix typo in scala.App documentation
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/App.scala | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/library/scala/App.scala b/src/library/scala/App.scala index 90a8977e81..ef39ee2134 100644 --- a/src/library/scala/App.scala +++ b/src/library/scala/App.scala @@ -28,9 +28,8 @@ import scala.collection.mutable.ListBuffer * functionality, which means that fields of the object will not have been initialized * before the main method has been executed.''''' * - * It should also be noted that the `main` method will not normally need to be overridden: - * the purpose is to turn the whole class body into the “main method”. You should only - * chose to override it if you know what you are doing. + * It should also be noted that the `main` method should not be overridden: + * the whole class body becomes the “main method”. * * @author Martin Odersky * @version 2.1, 15/02/2011 @@ -61,11 +60,12 @@ trait App extends DelayedInit { } /** The main method. - * This stores all argument so that they can be retrieved with `args` - * and the executes all initialization code segments in the order they were - * passed to `delayedInit` + * This stores all arguments so that they can be retrieved with `args` + * and then executes all initialization code segments in the order in which + * they were passed to `delayedInit`. * @param args the arguments passed to the main method */ + @deprecatedOverriding("main should not be overridden", "2.11.0") def main(args: Array[String]) = { this._args = args for (proc <- initCode) proc() |