summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2016-01-14 10:34:20 -0500
committerSeth Tisue <seth@tisue.net>2016-01-14 10:34:20 -0500
commitf6bd7123fcce1bd72f141a8a0f95559c12bb5dd2 (patch)
treed7e56af68a536c17b2dfe51c1ece825d23f4c749
parent9a2e71258df2e0d7b105b062dfecfb4fb19e9af4 (diff)
parent17450e731ca230a0236efdd0c7d550b5d1f54026 (diff)
downloadscala-f6bd7123fcce1bd72f141a8a0f95559c12bb5dd2.tar.gz
scala-f6bd7123fcce1bd72f141a8a0f95559c12bb5dd2.tar.bz2
scala-f6bd7123fcce1bd72f141a8a0f95559c12bb5dd2.zip
Merge pull request #4886 from janekdb/2.11.x-scaladoc-Duration-links
Fix Scaladoc overloaded method link to Duration companion object
-rw-r--r--src/library/scala/concurrent/duration/Duration.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/concurrent/duration/Duration.scala b/src/library/scala/concurrent/duration/Duration.scala
index 182c2d172a..e68a897f82 100644
--- a/src/library/scala/concurrent/duration/Duration.scala
+++ b/src/library/scala/concurrent/duration/Duration.scala
@@ -94,7 +94,7 @@ object Duration {
timeUnitLabels flatMap { case (unit, names) => expandLabels(names) map (_ -> unit) } toMap
/**
- * Extract length and time unit out of a string, where the format must match the description for [[Duration$.apply(String):Duration apply(String)]].
+ * Extract length and time unit out of a string, where the format must match the description for [[Duration$.apply(s:String)* apply(String)]].
* The extractor will not match for malformed strings or non-finite durations.
*/
def unapply(s: String): Option[(Long, TimeUnit)] =
@@ -355,7 +355,7 @@ object Duration {
* - isomorphic to `java.lang.Double` when it comes to infinite or undefined values
*
* The conversion between Duration and Double is done using [[Duration.toUnit]] (with unit NANOSECONDS)
- * and [[Duration$.fromNanos(Double):Duration Duration.fromNanos(Double)]].
+ * and [[Duration$.fromNanos(nanos:Double)* Duration.fromNanos(Double)]]
*
* <h2>Ordering</h2>
*