Merge commit '1b98061' into merge/2.11.x-to-2.12.x-20140915

1 files changed, 4 insertions, 5 deletions

diff --git a/src/library/scala/sys/package.scala b/src/library/scala/sys/package.scala
index 386bd84113..e493603bc2 100644
--- a/src/library/scala/sys/package.scala
+++ b/src/library/scala/sys/package.scala
@@ -61,16 +61,15 @@ package object sys {
   def env: immutable.Map[String, String] = immutable.Map(System.getenv().asScala.toSeq: _*)
 
   /** Register a shutdown hook to be run when the VM exits.
-   *  The newly created thread is marked as a daemon so it will not
-   *  interfere with VM shutdown.  The hook is automatically registered:
-   *  the returned value can be ignored, but is available in case the
-   *  Thread requires further modification.  It can also be unregistered
-   *  by calling ShutdownHookThread#remove().
+   *  The hook is automatically registered: the returned value can be ignored,
+   *  but is available in case the Thread requires further modification.
+   *  It can also be unregistered by calling ShutdownHookThread#remove().
    *
    *  Note that shutdown hooks are NOT guaranteed to be run.
    *
    *  @param    body  the body of code to run at shutdown
    *  @return   the   Thread which will run the shutdown hook.
+   *  @see      [[scala.sys.ShutdownHookThread]]
    */
   def addShutdownHook(body: => Unit): ShutdownHookThread = ShutdownHookThread(body)