Skip to content

Commit 097e25b

Browse files
committed
Update links to docs, codehaus and citeseer
docs.scala-lang.org - Align some links to new layout for docs.scala-lang.org - Include link to concrete parallel collection performance characteristics codehaus - Subsitute a link to a JIRA email for the 404 JRUBY-3576 JIRA link in Codec.scala. jira.codehaus.org is not redirecting this. citeseer - Replace the citeseer link with a direct link to a PDF which is not behind a login challenge.
1 parent 7d91f64 commit 097e25b

File tree

8 files changed

+11
-8
lines changed

8 files changed

+11
-8
lines changed

src/library/scala/collection/immutable/IntMap.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ private[immutable] class IntMapKeyIterator[V](it: IntMap[V]) extends IntMapItera
146146
import IntMap._
147147

148148
/** Specialised immutable map structure for integer keys, based on
149-
* <a href="http://citeseer.ist.psu.edu/okasaki98fast.html">Fast Mergeable Integer Maps</a>
149+
* [[http://ittc.ku.edu/~andygill/papers/IntMap98.pdf Fast Mergeable Integer Maps]]
150150
* by Okasaki and Gill. Essentially a trie based on binary digits of the integers.
151151
*
152152
* '''Note:''' This class is as of 2.8 largely superseded by HashMap.

src/library/scala/collection/mutable/Queue.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import generic._
2121
* @author Martin Odersky
2222
* @version 2.8
2323
* @since 1
24-
* @see [[http://docs.scala-lang.org/overviews/collections/concrete-mutable-collection-classes.html#mutable_queues "Scala's Collection Library overview"]]
24+
* @see [[http://docs.scala-lang.org/overviews/collections/concrete-mutable-collection-classes.html#queues "Scala's Collection Library overview"]]
2525
* section on `Queues` for more information.
2626
*
2727
* @define Coll `mutable.Queue`

src/library/scala/collection/package.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ package scala
6969
* characteristics which are described
7070
* in [[http://docs.scala-lang.org/overviews/collections/performance-characteristics.html the guide]].
7171
*
72+
* The concrete parallel collections also have specific performance characteristics which are
73+
* described in [[http://docs.scala-lang.org/overviews/parallel-collections/concrete-parallel-collections.html#performance-characteristics the parallel collections guide]]
74+
*
7275
* === Converting between Java Collections ===
7376
*
7477
* The `JavaConversions` object provides implicit defs that will allow mostly seamless integration

src/library/scala/io/Codec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import scala.language.implicitConversions
2121
// XML: optional encoding parameter.
2222
// <?xml version="1.0" encoding="ISO8859-1" ?>
2323
//
24-
// MacRoman vs. UTF-8: see http://jira.codehaus.org/browse/JRUBY-3576
24+
// MacRoman vs. UTF-8: see http://osdir.com/ml/lang-jruby-devel/2009-04/msg00071.html
2525
// -Dfile.encoding: see http://bugs.java.com/bugdatabase/view_bug.do?bug_id=4375816
2626

2727
/** A class for character encoding/decoding preferences.

src/reflect/scala/reflect/internal/pickling/UnPickler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ abstract class UnPickler {
244244

245245
(module map { case (group, art) =>
246246
s"""\n(NOTE: It looks like the $art module is missing; try adding a dependency on "$group" : "$art".
247-
| See http://docs.scala-lang.org/overviews/core/scala-2.11.html for more information.)""".stripMargin
247+
| See http://docs.scala-lang.org/overviews/ for more information.)""".stripMargin
248248
} getOrElse "")
249249
}
250250

src/reflect/scala/reflect/macros/blackbox/Context.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ package blackbox
2929
* which means that its expansion will be upcast to its return type, enforcing faithfullness of that macro to its
3030
* type signature. Whitebox macros, i.e. the ones defined with `whitebox.Context`, aren't bound by this restriction,
3131
* which enables a number of important use cases, but they are also going to enjoy less support than blackbox macros,
32-
* so choose wisely. See the [[http://docs.scala-lang.org/overviews/macros.html Macros Guide]] for more information.
32+
* so choose wisely. See the [[http://docs.scala-lang.org/overviews/macros/overview.html Macros Guide]] for more information.
3333
*
3434
* @see `scala.reflect.macros.whitebox.Context`
3535
*/

src/reflect/scala/reflect/macros/package.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ package reflect
1010
* Within these functions the programmer has access to compiler APIs.
1111
* For example, it is possible to generate, analyze and typecheck code.
1212
*
13-
* See the [[http://docs.scala-lang.org/overviews/macros.html Macros Guide]] on how to get started with Scala macros.
13+
* See the [[http://docs.scala-lang.org/overviews/macros/overview.html Macros Guide]] on how to get started with Scala macros.
1414
*/
1515
package object macros {
1616
/** The Scala macros context.
1717
*
1818
* In Scala 2.11, macros that were once the one are split into blackbox and whitebox macros,
1919
* with the former being better supported and the latter being more powerful. You can read about
20-
* the details of the split and the associated trade-offs in the [[http://docs.scala-lang.org/overviews/macros.html Macros Guide]].
20+
* the details of the split and the associated trade-offs in the [[http://docs.scala-lang.org/overviews/macros/overview.html Macros Guide]].
2121
*
2222
* `scala.reflect.macros.Context` follows this tendency and turns into `scala.reflect.macros.blackbox.Context`
2323
* and `scala.reflect.macros.whitebox.Context`. The original `Context` is left in place for compatibility reasons,

src/reflect/scala/reflect/macros/whitebox/Context.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ package whitebox
2929
* gaining the ability to refine the type of its expansion beyond its official return type, which enables a number of important use cases.
3030
* Blackbox macros, i.e. the ones defined with `blackbox.Context`, can't do that, so they are less powerful.
3131
* However blackbox macros are also going to enjoy better support than whitebox macros, so choose wisely.
32-
* See the [[http://docs.scala-lang.org/overviews/macros.html Macros Guide]] for more information.
32+
* See the [[http://docs.scala-lang.org/overviews/macros/overview.html Macros Guide]] for more information.
3333
*
3434
* @see `scala.reflect.macros.blackbox.Context`
3535
*/

0 commit comments

Comments
 (0)