diff options
author | Heather Miller <heather.miller@epfl.ch> | 2012-05-15 14:40:56 +0200 |
---|---|---|
committer | Heather Miller <heather.miller@epfl.ch> | 2012-05-15 14:40:56 +0200 |
commit | 135c26d90affb7addb1a28bd7244cf924eff16a3 (patch) | |
tree | e80ac4b1296e2274368985b1264148475b599da0 /src/library | |
parent | 5963be026e32a3cf391939f333d45d0dd40edfb3 (diff) | |
download | scala-135c26d90affb7addb1a28bd7244cf924eff16a3.tar.gz scala-135c26d90affb7addb1a28bd7244cf924eff16a3.tar.bz2 scala-135c26d90affb7addb1a28bd7244cf924eff16a3.zip |
Small documentation fixes & small fix to Scaladoc @see formatting
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/Array.scala | 9 | ||||
-rw-r--r-- | src/library/scala/collection/package.scala | 4 | ||||
-rw-r--r-- | src/library/scala/util/Try.scala | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/src/library/scala/Array.scala b/src/library/scala/Array.scala index cf72973b7c..f63c3d2086 100644 --- a/src/library/scala/Array.scala +++ b/src/library/scala/Array.scala @@ -439,9 +439,7 @@ object Array extends FallbackArrayBuilding { * example code. * Line 2 is translated into a call to `apply(Int)`, while line 3 is translated into a call to * `update(Int, T)`. For more information on these transformations, see the - * [[http://www.scala-lang.org/docu/files/ScalaReference.pdf Scala Language Specification v2.8]], Sections - * 6.6 and 6.15 respectively. - * + * * Two implicit conversions exist in [[scala.Predef]] that are frequently applied to arrays: a conversion * to [[scala.collection.mutable.ArrayOps]] (shown on line 4 of the example above) and a conversion * to [[scala.collection.mutable.WrappedArray]] (a subtype of [[scala.collections.Seq]]). @@ -465,8 +463,9 @@ object Array extends FallbackArrayBuilding { * * @author Martin Odersky * @version 1.0 - * @see [[http://www.scala-lang.org/docu/files/collections-api/collections_38.html#anchor "The Scala 2.8 Collections' API"]] - * section on `Array` by Martin Odersky for more information. + * @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://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 * @define Coll `Array` * @define orderDependent diff --git a/src/library/scala/collection/package.scala b/src/library/scala/collection/package.scala index 0dd4405cf7..237ca28018 100644 --- a/src/library/scala/collection/package.scala +++ b/src/library/scala/collection/package.scala @@ -14,7 +14,7 @@ package scala * == Guide == * * A detailed guide for the collections library is available - * at [[http://www.scala-lang.org/docu/files/collections-api]]. + * at [[http://docs.scala-lang.org/overviews/collections/introduction.html]]. * * == Using Collections == * @@ -67,7 +67,7 @@ package scala * Also note that the collections library was carefully designed to include several implementations of * each of the three basic collection types. These implementations have specific performance * characteristics which are described - * in [[http://www.scala-lang.org/docu/files/collections-api the guide]]. + * in [[http://docs.scala-lang.org/overviews/collections/performance-characteristics.html the guide]]. * * === Converting between Java Collections === * diff --git a/src/library/scala/util/Try.scala b/src/library/scala/util/Try.scala index efa2fcabb8..8faba236f0 100644 --- a/src/library/scala/util/Try.scala +++ b/src/library/scala/util/Try.scala @@ -92,8 +92,8 @@ sealed abstract class Try[+T] { def andThen[U](f: T => Try[U]): Try[U] = flatMap(f) /** - * Transforms a nested `Try`, i.e., a `Try` of type `Try[Try[T]]`, - * into an un-nested `Try`, i.e., a `Try` of type `Try[T]`. + * Transforms a nested `Try`, ie, a `Try` of type `Try[Try[T]]`, + * into an un-nested `Try`, ie, a `Try` of type `Try[T]`. */ def flatten[U](implicit ev: T <:< Try[U]): Try[U] |