diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-06-17 15:25:41 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-06-17 15:25:41 -0700 |
commit | f0388d29881ef19035247aed20cf6734fabe19fc (patch) | |
tree | fe02131261408fab087a7967d525dee46370cb87 | |
parent | 918ca9a0218868ae67c66264a8287824c23d46ff (diff) | |
parent | fea652827dbef0b49893bb438205204019f00554 (diff) | |
download | scala-f0388d29881ef19035247aed20cf6734fabe19fc.tar.gz scala-f0388d29881ef19035247aed20cf6734fabe19fc.tar.bz2 scala-f0388d29881ef19035247aed20cf6734fabe19fc.zip |
Merge pull request #4558 from janekdb/2.11.x-scaladoc-1-list-buffer-try
Improve API documentation for ListBuffer and Try
-rw-r--r-- | src/library/scala/collection/mutable/ListBuffer.scala | 2 | ||||
-rw-r--r-- | src/library/scala/util/Try.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/collection/mutable/ListBuffer.scala b/src/library/scala/collection/mutable/ListBuffer.scala index 8faaf97741..f9bab40a1e 100644 --- a/src/library/scala/collection/mutable/ListBuffer.scala +++ b/src/library/scala/collection/mutable/ListBuffer.scala @@ -15,7 +15,7 @@ import immutable.{List, Nil, ::} import java.io._ import scala.annotation.migration -/** A `Buffer` implementation back up by a list. It provides constant time +/** A `Buffer` implementation backed by a list. It provides constant time * prepend and append. Most other operations are linear. * * @author Matthias Zenger diff --git a/src/library/scala/util/Try.scala b/src/library/scala/util/Try.scala index 0a6a7972c2..b0eae74043 100644 --- a/src/library/scala/util/Try.scala +++ b/src/library/scala/util/Try.scala @@ -48,7 +48,7 @@ import scala.language.implicitConversions * catching exceptions along the way. The `flatMap` and `map` combinators in the above example each essentially * pass off either their successfully completed value, wrapped in the `Success` type for it to be further operated * upon by the next combinator in the chain, or the exception wrapped in the `Failure` type usually to be simply - * passed on down the chain. Combinators such as `rescue` and `recover` are designed to provide some type of + * passed on down the chain. Combinators such as `recover` and `recoverWith` are designed to provide some type of * default behavior in the case of failure. * * ''Note'': only non-fatal exceptions are caught by the combinators on `Try` (see [[scala.util.control.NonFatal]]). |