summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordgruntz <dominik.gruntz@fhnw.ch>2014-07-15 00:48:39 +0200
committerAntoine Gourlay <antoine@gourlay.fr>2014-08-11 17:55:18 +0200
commit9ef3d29d044da28218fea03d0c6678e281c4c550 (patch)
tree78e6f54ab5a58de13829d9ffadf2b744e8623ec4
parent3b7a98911ea67c4e9e2962aeaf6defa029b632bc (diff)
downloadscala-9ef3d29d044da28218fea03d0c6678e281c4c550.tar.gz
scala-9ef3d29d044da28218fea03d0c6678e281c4c550.tar.bz2
scala-9ef3d29d044da28218fea03d0c6678e281c4c550.zip
[backport] Fixes first sentence delimiters
Scaladoc places the first sentence in the method summary table and index. The first sentence is defined as the sequence of chars up to the first period (not as in JavaDoc where the sentence ends with the first period *followed by a blank*). As a consequence, the clause starting with `i.e.` is interpreted as sentende delimiter. This request replaces `i.e.` with `i&period;e&period;`. Alghough a valid HTML code, I do not know whether this change is compatible with other tools. And I assume that this is not the only source file affected. (cherry picked from commit c2e4da674d8c40e2d220854a966b0510fb6d459e)
-rw-r--r--src/library/scala/concurrent/Future.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/concurrent/Future.scala b/src/library/scala/concurrent/Future.scala
index 4ed0687334..a9b7d79e63 100644
--- a/src/library/scala/concurrent/Future.scala
+++ b/src/library/scala/concurrent/Future.scala
@@ -102,7 +102,7 @@ trait Future[+T] extends Awaitable[T] {
/* Callbacks */
- /** When this future is completed successfully (i.e. with a value),
+ /** When this future is completed successfully (i&period;e&period; with a value),
* apply the provided partial function to the value if the partial function
* is defined at that value.
*
@@ -118,7 +118,7 @@ trait Future[+T] extends Awaitable[T] {
case _ =>
}
- /** When this future is completed with a failure (i.e. with a throwable),
+ /** When this future is completed with a failure (i&period;e&period; with a throwable),
* apply the provided callback to the throwable.
*
* $caughtThrowables