Merge pull request #3335 from swartzrock/master

Fixes #3330 with Scaladoc changes only

4 files changed, 42 insertions, 45 deletions

diff --git a/src/library/scala/collection/GenSeqLike.scala b/src/library/scala/collection/GenSeqLike.scala
index e265beca1b..c3bad60072 100644
--- a/src/library/scala/collection/GenSeqLike.scala
+++ b/src/library/scala/collection/GenSeqLike.scala
@@ -38,8 +38,8 @@ trait GenSeqLike[+A, +Repr] extends Any with GenIterableLike[A, Repr] with Equal
    * Example:
    *
    * {{{
-   *    scala> val x = LinkedList(1, 2, 3, 4, 5)
-   *    x: scala.collection.mutable.LinkedList[Int] = LinkedList(1, 2, 3, 4, 5)
+   *    scala> val x = List(1, 2, 3, 4, 5)
+   *    x: List[Int] = List(1, 2, 3, 4, 5)
    *
    *    scala> x(3)
    *    res1: Int = 4
@@ -302,14 +302,14 @@ trait GenSeqLike[+A, +Repr] extends Any with GenIterableLike[A, Repr] with Equal
    *
    *    Example:
    *    {{{
-   *      scala> val x = LinkedList(1)
-   *      x: scala.collection.mutable.LinkedList[Int] = LinkedList(1)
+   *      scala> val x = List(1)
+   *      x: List[Int] = List(1)
    *
    *      scala> val y = 2 +: x
-   *      y: scala.collection.mutable.LinkedList[Int] = LinkedList(2, 1)
+   *      y: List[Int] = List(2, 1)
    *
    *      scala> println(x)
-   *      LinkedList(1)
+   *      List(1)
    *    }}}
    *
    *    @return a new $coll consisting of `elem` followed
@@ -335,17 +335,14 @@ trait GenSeqLike[+A, +Repr] extends Any with GenIterableLike[A, Repr] with Equal
    *
    *    Example:
    *    {{{
-   *       scala> import scala.collection.mutable.LinkedList
-   *       import scala.collection.mutable.LinkedList
-   *
-   *       scala> val a = LinkedList(1)
-   *       a: scala.collection.mutable.LinkedList[Int] = LinkedList(1)
-   *
+   *       scala> val a = List(1)
+   *       a: List[Int] = List(1)
+   *       
    *       scala> val b = a :+ 2
-   *       b: scala.collection.mutable.LinkedList[Int] = LinkedList(1, 2)
-   *
+   *       b: List[Int] = List(1, 2)
+   *       
    *       scala> println(a)
-   *       LinkedList(1)
+   *       List(1)
    *    }}}
    *
    *    @return a new $coll consisting of
diff --git a/src/library/scala/collection/GenTraversableLike.scala b/src/library/scala/collection/GenTraversableLike.scala
index a0c519884c..ca098e57b9 100644
--- a/src/library/scala/collection/GenTraversableLike.scala
+++ b/src/library/scala/collection/GenTraversableLike.scala
@@ -267,20 +267,20 @@ trait GenTraversableLike[+A, +Repr] extends Any with GenTraversableOnce[A] with
    *
    *    Example:
    *    {{{
-   *      scala> val a = LinkedList(1)
-   *      a: scala.collection.mutable.LinkedList[Int] = LinkedList(1)
-   *
-   *      scala> val b = LinkedList(2)
-   *      b: scala.collection.mutable.LinkedList[Int] = LinkedList(2)
-   *
+   *      scala> val a = List(1)
+   *      a: List[Int] = List(1)
+   *      
+   *      scala> val b = List(2)
+   *      b: List[Int] = List(2)
+   *      
    *      scala> val c = a ++ b
-   *      c: scala.collection.mutable.LinkedList[Int] = LinkedList(1, 2)
-   *
-   *      scala> val d = LinkedList('a')
-   *      d: scala.collection.mutable.LinkedList[Char] = LinkedList(a)
-   *
+   *      c: List[Int] = List(1, 2)
+   *      
+   *      scala> val d = List('a')
+   *      d: List[Char] = List(a)
+   *      
    *      scala> val e = c ++ d
-   *      e: scala.collection.mutable.LinkedList[AnyVal] = LinkedList(1, 2, a)
+   *      e: List[AnyVal] = List(1, 2, a)
    *    }}}
    *
    *    @return       a new $coll which contains all elements of this $coll
diff --git a/src/library/scala/collection/GenTraversableOnce.scala b/src/library/scala/collection/GenTraversableOnce.scala
index a9fe279599..01d179aeb6 100644
--- a/src/library/scala/collection/GenTraversableOnce.scala
+++ b/src/library/scala/collection/GenTraversableOnce.scala
@@ -130,8 +130,8 @@ trait GenTraversableOnce[+A] extends Any {
    *
    *  Note that the folding function used to compute b is equivalent to that used to compute c.
    *  {{{
-   *      scala> val a = LinkedList(1,2,3,4)
-   *      a: scala.collection.mutable.LinkedList[Int] = LinkedList(1, 2, 3, 4)
+   *      scala> val a = List(1,2,3,4)
+   *      a: List[Int] = List(1, 2, 3, 4)
    *
    *      scala> val b = (5 /: a)(_+_)
    *      b: Int = 15
@@ -167,8 +167,8 @@ trait GenTraversableOnce[+A] extends Any {
    *
    *  Note that the folding function used to compute b is equivalent to that used to compute c.
    *  {{{
-   *      scala> val a = LinkedList(1,2,3,4)
-   *      a: scala.collection.mutable.LinkedList[Int] = LinkedList(1, 2, 3, 4)
+   *      scala> val a = List(1,2,3,4)
+   *      a: List[Int] = List(1, 2, 3, 4)
    *
    *      scala> val b = (a :\ 5)(_+_)
    *      b: Int = 15
diff --git a/src/library/scala/collection/TraversableOnce.scala b/src/library/scala/collection/TraversableOnce.scala
index 26af32046c..072fd3da44 100644
--- a/src/library/scala/collection/TraversableOnce.scala
+++ b/src/library/scala/collection/TraversableOnce.scala
@@ -320,14 +320,14 @@ trait TraversableOnce[+A] extends Any with GenTraversableOnce[A] {
    * Example:
    *
    * {{{
-   *      scala> val a = LinkedList(1,2,3,4)
-   *      a: scala.collection.mutable.LinkedList[Int] = LinkedList(1, 2, 3, 4)
-   *
+   *      scala> val a = List(1,2,3,4)
+   *      a: List[Int] = List(1, 2, 3, 4)
+   *      
    *      scala> val b = new StringBuilder()
-   *      b: StringBuilder =
-   *
-   *      scala> a.addString(b, "LinkedList(", ", ", ")")
-   *      res1: StringBuilder = LinkedList(1, 2, 3, 4)
+   *      b: StringBuilder = 
+   *      
+   *      scala> a.addString(b , "List(" , ", " , ")")
+   *      res5: StringBuilder = List(1, 2, 3, 4)
    * }}}
    *
    *  @param  b    the string builder to which elements are appended.
@@ -362,9 +362,9 @@ trait TraversableOnce[+A] extends Any with GenTraversableOnce[A] {
    * Example:
    *
    * {{{
-   *      scala> val a = LinkedList(1,2,3,4)
-   *      a: scala.collection.mutable.LinkedList[Int] = LinkedList(1, 2, 3, 4)
-   *
+   *      scala> val a = List(1,2,3,4)
+   *      a: List[Int] = List(1, 2, 3, 4)
+   *      
    *      scala> val b = new StringBuilder()
    *      b: StringBuilder =
    *
@@ -385,14 +385,14 @@ trait TraversableOnce[+A] extends Any with GenTraversableOnce[A] {
    * Example:
    *
    * {{{
-   *      scala> val a = LinkedList(1,2,3,4)
-   *      a: scala.collection.mutable.LinkedList[Int] = LinkedList(1, 2, 3, 4)
-   *
+   *      scala> val a = List(1,2,3,4)
+   *      a: List[Int] = List(1, 2, 3, 4)
+   *      
    *      scala> val b = new StringBuilder()
    *      b: StringBuilder =
    *
    *      scala> val h = a.addString(b)
-   *      b: StringBuilder = 1234
+   *      h: StringBuilder = 1234
    * }}}
 
    *  @param  b    the string builder to which elements are appended.