Merge commit '1b7e660' into merge-2.11-may-12

4 files changed, 7 insertions, 6 deletions

diff --git a/src/library/scala/Array.scala b/src/library/scala/Array.scala
index 6ab82d998e..d89e9d291d 100644
--- a/src/library/scala/Array.scala
+++ b/src/library/scala/Array.scala
@@ -483,7 +483,7 @@ object Array extends FallbackArrayBuilding {
  *
  *  @author Martin Odersky
  *  @version 1.0
- *  @see [[http://www.scala-lang.org/docu/files/ScalaReference.pdf Scala Language Specification]], for in-depth information on the transformations the Scala compiler makes on Arrays (Sections 6.6 and 6.15 respectively.)
+ *  @see [[http://www.scala-lang.org/files/archive/spec/2.11/ Scala Language Specification]], for in-depth information on the transformations the Scala compiler makes on Arrays (Sections 6.6 and 6.15 respectively.)
  *  @see [[http://docs.scala-lang.org/sips/completed/scala-2-8-arrays.html "Scala 2.8 Arrays"]] the Scala Improvement Document detailing arrays since Scala 2.8.
  *  @see [[http://docs.scala-lang.org/overviews/collections/arrays.html "The Scala 2.8 Collections' API"]] section on `Array` by Martin Odersky for more information.
  *  @define coll array
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala
index 3cc83654b7..0914bcefa3 100644
--- a/src/library/scala/Predef.scala
+++ b/src/library/scala/Predef.scala
@@ -35,9 +35,9 @@ import scala.io.StdIn
  *  === Assertions ===
  *
  *  A set of `assert` functions are provided for use as a way to document
- *  and dynamically check invariants in code. `assert` statements can be elided
- *  at runtime by providing the command line argument `-Xdisable-assertions` to
- *  the `scala` command.
+ *  and dynamically check invariants in code. Invocations of `assert` can be elided
+ *  at compile time by providing the command line option `-Xdisable-assertions`,
+ *  which raises `-Xelide-below` above `elidable.ASSERTION`, to the `scalac` command.
  *
  *  Variants of `assert` intended for use with static analysis tools are also
  *  provided: `assume`, `require` and `ensuring`. `require` and `ensuring` are
diff --git a/src/library/scala/collection/GenSeqLike.scala b/src/library/scala/collection/GenSeqLike.scala
index cf1de0c8e6..f786293822 100644
--- a/src/library/scala/collection/GenSeqLike.scala
+++ b/src/library/scala/collection/GenSeqLike.scala
@@ -275,6 +275,7 @@ trait GenSeqLike[+A, +Repr] extends Any with GenIterableLike[A, Repr] with Equal
    *  @tparam That     $thatinfo
    *  @param bf        $bfinfo
    *  @return a new $coll` which is a copy of this $coll with the element at position `index` replaced by `elem`.
+   *  @throws IndexOutOfBoundsException if `index` does not satisfy `0 <= index < length`.
    *
    *  @usecase def updated(index: Int, elem: A): $Coll[A]
    *    @inheritdoc
diff --git a/src/library/scala/util/Try.scala b/src/library/scala/util/Try.scala
index c807677119..1a13ac2305 100644
--- a/src/library/scala/util/Try.scala
+++ b/src/library/scala/util/Try.scala
@@ -165,8 +165,8 @@ sealed abstract class Try[+T] extends Product with Serializable {
   def flatten[U](implicit ev: T <:< Try[U]): Try[U]
 
   /**
-   * Completes this `Try` with an exception wrapped in a `Success`. The exception is either the exception that the
-   * `Try` failed with (if a `Failure`) or an `UnsupportedOperationException`.
+   * Inverts this `Try`. If this is a `Failure`, returns its exception wrapped in a `Success`.
+   * If this is a `Success`, returns a `Failure` containing an `UnsupportedOperationException`.
    */
   def failed: Try[Throwable]