summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKato Kazuyoshi <kato.kazuyoshi@gmail.com>2011-06-12 12:28:19 +0000
committerKato Kazuyoshi <kato.kazuyoshi@gmail.com>2011-06-12 12:28:19 +0000
commit5b09130d85459bc848acadf862757cab54bfa9d2 (patch)
tree13c7798130565b2d8d3469fb750cbccdca552c7b
parentf0cea787c7df82b6b41e4717a2ef74f3aecbe5bf (diff)
downloadscala-5b09130d85459bc848acadf862757cab54bfa9d2.tar.gz
scala-5b09130d85459bc848acadf862757cab54bfa9d2.tar.bz2
scala-5b09130d85459bc848acadf862757cab54bfa9d2.zip
We migrated the Scala wiki from Trac to Conflue...
We migrated the Scala wiki from Trac to Confluence. Review by rytz.
-rw-r--r--src/compiler/scala/tools/util/PathResolver.scala2
-rw-r--r--src/manual/scala/man1/scaladoc.scala2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/util/PathResolver.scala b/src/compiler/scala/tools/util/PathResolver.scala
index 1055bfdef2..347e900886 100644
--- a/src/compiler/scala/tools/util/PathResolver.scala
+++ b/src/compiler/scala/tools/util/PathResolver.scala
@@ -15,7 +15,7 @@ import ClassPath.{ JavaContext, DefaultJavaContext, join, split }
import PartialFunction.condOpt
// Loosely based on the draft specification at:
-// https://lampsvn.epfl.ch/trac/scala/wiki/Classpath
+// https://wiki.scala-lang.org/display/SW/Classpath
object PathResolver {
def firstNonEmpty(xs: String*) = xs find (_ != "") getOrElse ""
diff --git a/src/manual/scala/man1/scaladoc.scala b/src/manual/scala/man1/scaladoc.scala
index afe8c46582..5c64150efc 100644
--- a/src/manual/scala/man1/scaladoc.scala
+++ b/src/manual/scala/man1/scaladoc.scala
@@ -46,7 +46,7 @@ object scaladoc extends Command {
// tags are defined in class "scala.tools.nsc.doc.DocGenerator"
"The recognised format of comments in source is described in the " & Link("online documentation",
- "http://lampsvn.epfl.ch/trac/scala-old/wiki/Scaladoc"))
+ "https://wiki.scala-lang.org/display/SW/Scaladoc"))
val options = Section("OPTIONS",