diff options
-rw-r--r-- | src/compiler/scala/tools/ant/ScalaTool.scala | 4 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/InterpreterLoop.scala | 4 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/doc/DocGenerator.scala | 17 | ||||
-rw-r--r-- | src/library/scala/concurrent/pilib.scala | 14 | ||||
-rw-r--r-- | src/library/scala/mobile/Code.scala | 4 | ||||
-rw-r--r-- | src/library/scala/mobile/Location.scala | 4 | ||||
-rw-r--r-- | src/manual/scala/man1/Command.scala | 2 | ||||
-rw-r--r-- | src/manual/scala/man1/fsc.scala | 4 | ||||
-rw-r--r-- | src/manual/scala/man1/sbaz.scala | 4 | ||||
-rw-r--r-- | src/manual/scala/man1/scala.scala | 4 | ||||
-rw-r--r-- | src/manual/scala/man1/scalac.scala | 2 | ||||
-rw-r--r-- | src/manual/scala/man1/scaladoc.scala | 4 | ||||
-rw-r--r-- | src/manual/scala/man1/scalap.scala | 4 | ||||
-rw-r--r-- | src/manual/scala/tools/docutil/EmitManPage.scala | 6 |
14 files changed, 39 insertions, 38 deletions
diff --git a/src/compiler/scala/tools/ant/ScalaTool.scala b/src/compiler/scala/tools/ant/ScalaTool.scala index 4ea280e7b9..a4a8366f84 100644 --- a/src/compiler/scala/tools/ant/ScalaTool.scala +++ b/src/compiler/scala/tools/ant/ScalaTool.scala @@ -1,7 +1,7 @@ /* __ ______________ *\ ** / |/ / ____/ ____/ ** ** / | | /___ / /___ ** -** /_/|__/_____/_____/ Copyright 2005-2006 LAMP/EPFL ** +** /_/|__/_____/_____/ Copyright 2005-2007 LAMP/EPFL ** ** ** \* */ @@ -27,7 +27,7 @@ package scala.tools.ant { /** <p> * An Ant task that generates a shell or batch script to execute a - * <a href="http://scala.epfl.ch/" target="_top">Scala</a> program. + * <a href="http://scala-lang.org/" target="_top">Scala</a> program. * This task can take the following parameters as attributes: * </p><ul> * <li>file (mandatory),</li> diff --git a/src/compiler/scala/tools/nsc/InterpreterLoop.scala b/src/compiler/scala/tools/nsc/InterpreterLoop.scala index d6ac724685..6696f210df 100644 --- a/src/compiler/scala/tools/nsc/InterpreterLoop.scala +++ b/src/compiler/scala/tools/nsc/InterpreterLoop.scala @@ -1,5 +1,5 @@ /* NSC -- new Scala compiler - * Copyright 2005-2006 LAMP/EPFL + * Copyright 2005-2007 LAMP/EPFL * @author Alexander Spoon */ // $Id$ @@ -16,7 +16,7 @@ import scala.tools.nsc.util.{Position} import nsc.{InterpreterResults=>IR} /** The main loop of the command-line interface to the - * <a href="http://scala.epfl.ch/" target="_top">Scala</a> interpreter. + * <a href="http://scala-lang.org/" target="_top">Scala</a> interpreter. * After instantiation, clients should call the <code>main()</code> method. * * @author Lex Spoon diff --git a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala index 97d0c3b60a..dd9a6f0f79 100644 --- a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala +++ b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala @@ -917,10 +917,10 @@ abstract class DocGenerator extends Models { def descr = """ /** <p> * Class <code>Nothing</code> (previously named <code>All</code> in - * <a href="http://scala.epfl.ch" target="_top">Scala</a> 2.2.0 and + * <a href="http://scala-lang.org" target="_top">Scala</a> 2.2.0 and * older versions) is - together with class <a href="Null.html"> * <code>Null</code></a> - at the bottom of the - * <a href="http://scala.epfl.ch" target="_top">Scala</a> type + * <a href="http://scala-lang.org" target="_top">Scala</a> type * hierarchy. * </p> * <p> @@ -928,11 +928,11 @@ abstract class DocGenerator extends Models { * (including <a href="Null.html"><code>Null</code></a>); there * exist <em>no instances</em> of this type. Even though type * <code>Nothing</code> is empty, it is nevertheless useful as a - * type parameter. For instance, the <a href="http://scala.epfl.ch" + * type parameter. For instance, the <a href="http://scala-lang.org" * target="_top">Scala</a> library defines a value * <a href="Nil$object.html"><code>Nil</code></a> of type * <code><a href="List.html">List</a>[Nothing]</code>. Because lists - * are covariant in <a href="http://scala.epfl.ch" target="_top">Scala</a>, + * are covariant in <a href="http://scala-lang.org" target="_top">Scala</a>, * this makes <a href="Nil$object.html"><code>Nil</code></a> an * instance of <code><a href="List.html">List</a>[T]</code>, for * any element type <code>T</code>. @@ -944,10 +944,10 @@ abstract class DocGenerator extends Models { def descr = """ /** <p> * Class <code>Null</code> (previously named <code>AllRef</code> in - * <a href="http://scala.epfl.ch" target="_top">Scala</a> 2.2.0 and + * <a href="http://scala-lang.org" target="_top">Scala</a> 2.2.0 and * older versions) is - together with class <a href="Nothing.html"> * <code>Nothing</code> - at the bottom of the - * <a href="http://scala.epfl.ch" target="_top">Scala</a> type + * <a href="http://scala-lang.org" target="_top">Scala</a> type * hierarchy. * </p> * <p> @@ -964,9 +964,10 @@ abstract class DocGenerator extends Models { def sym = definitions.AnyClass def descr = """ /** <p> - * Class <code>Any</code> is the root of the <a href="http://scala.epfl.ch/" + * Class <code>Any</code> is the root of the <a + * href="http://scala-lang.org/" * target="_top">Scala</a> class hierarchy. Every class in a - * <a href="http://scala.epfl.ch/" target="_top">Scala</a> execution + * <a href="http://scala-lang.org/" target="_top">Scala</a> execution * environment inherits directly or indirectly from this class. * Class <code>Any</code> has two direct subclasses: * <a href="AnyRef.html"><code>AnyRef</code></a> and diff --git a/src/library/scala/concurrent/pilib.scala b/src/library/scala/concurrent/pilib.scala index 506b0c2d2e..b76a274219 100644 --- a/src/library/scala/concurrent/pilib.scala +++ b/src/library/scala/concurrent/pilib.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2006, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2003-2007, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -12,11 +12,11 @@ package scala.concurrent -/** - * Library for using Pi-calculus concurrent primitives in Scala. As an - * example, the definition of a two-place buffer using the <code>pilib</code> - * library looks like: - * <pre> +/** <p> + * Library for using Pi-calculus concurrent primitives in Scala. As an + * example, the definition of a two-place buffer using the <code>pilib</code> + * library looks like: + * </p><pre> * <b>def</b> Buffer[a](put: Chan[a], get: Chan[a]): unit = { * <b>def</b> B0: unit = choice ( put * { x => B1(x) } ); * <b>def</b> B1(x: a): unit = choice ( get(x) * B0, put * { y => B2(x, y) } ) @@ -25,7 +25,7 @@ package scala.concurrent * } * </pre> * - * @see <a href="http://scala.epfl.ch/docu/related.html">PiLib: A Hosted Language for Pi-Calculus Style Concurrency</a> + * @see <a href="http://scala-lang.org/docu/related.html">PiLib: A Hosted Language for Pi-Calculus Style Concurrency</a> * @author Vincent Cremet, Martin Odersky * @version 1.0 */ diff --git a/src/library/scala/mobile/Code.scala b/src/library/scala/mobile/Code.scala index 33ddc8f6fa..e90d7015a3 100644 --- a/src/library/scala/mobile/Code.scala +++ b/src/library/scala/mobile/Code.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2007, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -20,7 +20,7 @@ import java.lang.NoSuchMethodException * a function simply by specifying its name and argument types.<p/> * * Example:<pre> - * <b>val</b> url = <b>new</b> URL("http://scala.epfl.ch/classes/examples.jar"); + * <b>val</b> url = <b>new</b> URL("http://scala-lang.org/classes/examples.jar"); * <b>val</b> obj = <b>new</b> Location(url) create "examples.sort"; * <b>val</b> ar = Array(6, 2, 8, 5, 1); * obj[Array[Int], Unit]("println")(ar); diff --git a/src/library/scala/mobile/Location.scala b/src/library/scala/mobile/Location.scala index 2b8d456ea5..bcb66387e5 100644 --- a/src/library/scala/mobile/Location.scala +++ b/src/library/scala/mobile/Location.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2007, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -25,7 +25,7 @@ import scala.collection.mutable._ * as the used class names and method signatures are the same.<p/> * * Example:<pre> - * <b>val</b> url = <b>new</b> URL("http://scala.epfl.ch/classes/examples.jar"); + * <b>val</b> url = <b>new</b> URL("http://scala-lang.org/classes/examples.jar"); * <b>val</b> obj = <b>new</b> Location(url) create "examples.sort";</pre> * * @see <a href="Code.html">Code</a> diff --git a/src/manual/scala/man1/Command.scala b/src/manual/scala/man1/Command.scala index fb1909de86..136f97a9ab 100644 --- a/src/manual/scala/man1/Command.scala +++ b/src/manual/scala/man1/Command.scala @@ -36,7 +36,7 @@ trait Command { def authors = Section("AUTHOR", "Written by Martin Odersky and other members of the " & - Link("Scala team", "http://scala.epfl.ch/community/") & ".") + Link("Scala team", "http://scala-lang.org/community/") & ".") def copyright = Section("COPYRIGHT", diff --git a/src/manual/scala/man1/fsc.scala b/src/manual/scala/man1/fsc.scala index d6d48661a3..e42fdba413 100644 --- a/src/manual/scala/man1/fsc.scala +++ b/src/manual/scala/man1/fsc.scala @@ -1,5 +1,5 @@ /* NSC -- new Scala compiler - * Copyright 2005-2006 LAMP/EPFL + * Copyright 2005-2007 LAMP/EPFL * @author Stephane Micheloud */ //$Id$ @@ -15,7 +15,7 @@ object fsc extends Command { val name = Section("NAME", MBold(command) & " " & NDash & " Fast offline compiler for the " & - Link("Scala 2", "http://scala.epfl.ch/") & " language") + Link("Scala 2", "http://scala-lang.org/") & " language") val synopsis = Section("SYNOPSIS", diff --git a/src/manual/scala/man1/sbaz.scala b/src/manual/scala/man1/sbaz.scala index 54b19b653f..4e327555c4 100644 --- a/src/manual/scala/man1/sbaz.scala +++ b/src/manual/scala/man1/sbaz.scala @@ -1,5 +1,5 @@ /* NSC -- new Scala compiler - * Copyright 2005-2006 LAMP/EPFL + * Copyright 2005-2007 LAMP/EPFL * @author Stephane Micheloud */ //$Id$ @@ -14,7 +14,7 @@ object sbaz extends Command { val name = Section("NAME", MBold(command) & " " & NDash & " Scala package sharing tool for the " & - Link("Scala 2", "http://scala.epfl.ch/") & " language") + Link("Scala 2", "http://scala-lang.org/") & " language") val synopsis = Section("SYNOPSIS", diff --git a/src/manual/scala/man1/scala.scala b/src/manual/scala/man1/scala.scala index 98282724aa..76ebbccff0 100644 --- a/src/manual/scala/man1/scala.scala +++ b/src/manual/scala/man1/scala.scala @@ -1,5 +1,5 @@ /* NSC -- new Scala compiler - * Copyright 2005-2006 LAMP/EPFL + * Copyright 2005-2007 LAMP/EPFL * @author Stephane Micheloud */ //$Id$ @@ -14,7 +14,7 @@ object scala extends Command { val name = Section("NAME", MBold(command) & " " & NDash & " Run code in the " & - Link("Scala 2", "http://scala.epfl.ch/") & + Link("Scala 2", "http://scala-lang.org/") & " language") val synopsis = Section("SYNOPSIS", diff --git a/src/manual/scala/man1/scalac.scala b/src/manual/scala/man1/scalac.scala index eb19270f78..3a365bdc7c 100644 --- a/src/manual/scala/man1/scalac.scala +++ b/src/manual/scala/man1/scalac.scala @@ -14,7 +14,7 @@ object scalac extends Command { val name = Section("NAME", MBold(command) & " " & NDash & " Compiler for the " & - Link("Scala 2", "http://scala.epfl.ch/") & " language") + Link("Scala 2", "http://scala-lang.org/") & " language") val synopsis = Section("SYNOPSIS", diff --git a/src/manual/scala/man1/scaladoc.scala b/src/manual/scala/man1/scaladoc.scala index 1b826dd16e..325f179336 100644 --- a/src/manual/scala/man1/scaladoc.scala +++ b/src/manual/scala/man1/scaladoc.scala @@ -1,5 +1,5 @@ /* NSC -- new Scala compiler - * Copyright 2005-2006 LAMP/EPFL + * Copyright 2005-2007 LAMP/EPFL * @author Stephane Micheloud */ //$Id$ @@ -11,7 +11,7 @@ object scaladoc extends Command { protected def cn = new Error().getStackTrace()(0).getClassName() - val scalaLink = Link("Scala 2", "http://scala.epfl.ch/") + val scalaLink = Link("Scala 2", "http://scala-lang.org/") val name = Section("NAME", diff --git a/src/manual/scala/man1/scalap.scala b/src/manual/scala/man1/scalap.scala index 3d82879c9b..da327122ba 100644 --- a/src/manual/scala/man1/scalap.scala +++ b/src/manual/scala/man1/scalap.scala @@ -1,5 +1,5 @@ /* NSC -- new Scala compiler - * Copyright 2005-2006 LAMP/EPFL + * Copyright 2005-2007 LAMP/EPFL * @author Stephane Micheloud */ //$Id$ @@ -14,7 +14,7 @@ object scalap extends Command { val name = Section("NAME", MBold(command) & " " & NDash & " Scala class file decoder for the " & - Link("Scala 2", "http://scala.epfl.ch/") & " language") + Link("Scala 2", "http://scala-lang.org/") & " language") val synopsis = Section("SYNOPSIS", diff --git a/src/manual/scala/tools/docutil/EmitManPage.scala b/src/manual/scala/tools/docutil/EmitManPage.scala index 78b7674bfb..7be8229ce9 100644 --- a/src/manual/scala/tools/docutil/EmitManPage.scala +++ b/src/manual/scala/tools/docutil/EmitManPage.scala @@ -1,5 +1,5 @@ /* NSC -- new Scala compiler - * Copyright 2005-2006 LAMP/EPFL + * Copyright 2005-2007 LAMP/EPFL * @author Stephane Micheloud * Adapted from Lex Spoon's sbaz manual */ @@ -147,9 +147,9 @@ object EmitManPage { out.println(".\\\" ##########################################################################") out.println(".\\\" # __ #") out.println(".\\\" # ________ ___ / / ___ Scala 2 On-line Manual Pages #") - out.println(".\\\" # / __/ __// _ | / / / _ | (c) 2002-2006, LAMP/EPFL #") + out.println(".\\\" # / __/ __// _ | / / / _ | (c) 2002-2007, LAMP/EPFL #") out.println(".\\\" # __\\ \\/ /__/ __ |/ /__/ __ | #") - out.println(".\\\" # /____/\\___/_/ |_/____/_/ | | http://scala.epfl.ch/ #") + out.println(".\\\" # /____/\\___/_/ |_/____/_/ | | http://scala-lang.org/ #") out.println(".\\\" # |/ #") out.println(".\\\" ##########################################################################") out.println(".\\\"") |